Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5

# Conflicts:
#	3.code/1.watch/2.code/ui_main_menu.py

diff --cc 3.code/1.watch/2.code/ui_main_menu.py
index ebd6b9d,a48bf24..f19adb9
--- 1/3.code/1.watch/2.code/ui_main_menu.py
--- 2/3.code/1.watch/2.code/ui_main_menu.py
+++ b/3.code/1.watch/2.code/ui_main_menu.py
@@@ -53,10 -53,10 +53,10 @@@ class MainMenuScreen(Screen)
          self.meta = None
          self.main_menu_style_num = "MainMenu2"
          self.main_menu_WatchFace = None
 -        self.menu_id = "0"
 +        EventMesh.subscribe("watch_top_show", self.watch_top_show)
- 
      def initialization(self):
          print("main_menu INIT !!!!!!!!")
+         init_flag = False
          if self.main_menu_list == [] : #第一次初始化
              #self.main_menu_list.append( MainMenu1())
              self.main_menu_list.append( MainMenu2())
@@@ -104,7 -104,8 +106,7 @@@
  
      def done_return(self):
          id = self.main_menu_style.MainMenu.get_tile_act().get_child(0).get_text()
-         self.main_menu_style.MainMenu.set_tile_id(0,0,lv.ANIM.OFF)
 -        print("main id:{} {}".format(id,type(id)))
+         self.main_menu_style.MainMenu.set_tile_id(0,1,lv.ANIM.OFF)
         
      def btn1_release(self):
          flag = EventMesh.publish("get_lcd_state")
@@@ -115,22 -117,15 +117,22 @@@
          
      def btn8_press(self):
          flag = EventMesh.publish("get_lcd_state")
 -        if self.main_menu_style.MainMenu.get_tile_act().get_child(0).get_text() == "0":
 -            print("flag {}".format(flag))
 -            if flag == 1:
 -                EventMesh.publish(constants.EVENT.SYSTEM_SLEEP)
 +        if self.main_menu_style.MainMenu.get_tile_act() != None:
 +            id = self.main_menu_style.MainMenu.get_tile_act().get_child(0).get_text()
 +            if id == "0":
 +                print("flag {}".format(flag))
 +                if flag == 1:
 +                    EventMesh.publish(constants.EVENT.SYSTEM_SLEEP)
 +                else:
 +                    EventMesh.publish(constants.EVENT.SYSTEM_UP)
              else:
 -                EventMesh.publish(constants.EVENT.SYSTEM_UP)
 +                if flag == 1:
 +                    self.main_menu_style.MainMenu.set_tile_id(0,0,lv.ANIM.OFF)
 +                else:
 +                    EventMesh.publish(constants.EVENT.SYSTEM_UP)
          else:
              if flag == 1:
-                 self.main_menu_style.MainMenu.set_tile_id(0,0,lv.ANIM.OFF)
+                 self.main_menu_style.MainMenu.set_tile_id(0,1,lv.ANIM.OFF)
              else:
                  EventMesh.publish(constants.EVENT.SYSTEM_UP)