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

# Conflicts:
#	3.code/1.watch/2.code/main.py
#	3.code/1.watch/2.code/main_1.py

diff --cc 2.sdk/Helios_SDK/services/microPython/ports/quectel/core/appWechat.py
Simple merge

diff --cc 2.sdk/Helios_SDK/services/microPython/ports/quectel/core/mgr.py
Simple merge

diff --cc 2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui.py
Simple merge

diff --cc 2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py
Simple merge

diff --cc 2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_setting.py
Simple merge

diff --cc 3.code/1.watch/2.code/appWechat.py
Simple merge

diff --cc 3.code/1.watch/2.code/main.py
index 26d2881,019bbb9..ba2c50b
--- 1/3.code/1.watch/2.code/main.py
--- 2/3.code/1.watch/2.code/main.py
+++ b/3.code/1.watch/2.code/main.py
@@@ -42,14 -42,14 +42,14 @@@ if __name__ == '__main__'
          uos.mount(ldev,'/ext')
      res = uos.statvfs("/ext")
      res = list(res)
-     print('总ext空间:{} MB，剩余空间:{} MB'.format((((res[0] * res[2]) / 1024 / 1024)),((res[0] * res[3]) / 1024 / 1024)))
 -    print('æ\80»ext空é\97´:{} MBï¼\8cå\89©ä½\99空é\97?:{} MB'.format((((res[0] * res[2]) / 1024 / 1024)),((res[0] * res[3]) / 1024 / 1024)))
++    print('总ext空间:{} MB，剩余空�:{} MB'.format((((res[0] * res[2]) / 1024 / 1024)),((res[0] * res[3]) / 1024 / 1024)))
      print("init1:{}".format(utime.localtime()))
-     from ext import EventMesh
-     from ext.common import Abstract
+     import EventMesh
+     from common import Abstract
      print("init2:{}".format(utime.localtime()))
-     from ext.lcd import tp_cst816
+     from lcd import tp_cst816
      print("init3:{}".format(utime.localtime()))
- 
+     from btn_device_ec800m import BtnDevice
      from ui_main_menu import MainMenuScreen
      # from ui_WatchFaceScreen import WatchFaceScreen
      

diff --cc 3.code/1.watch/2.code/main_1.py
Simple merge

diff --cc 3.code/1.watch/2.code/mgr.py
Simple merge

diff --cc 3.code/1.watch/2.code/protocol.py
Simple merge

diff --cc 3.code/1.watch/2.code/ui.py
Simple merge

diff --cc 3.code/1.watch/2.code/ui_WatchFaceScreen.py
Simple merge

diff --cc 3.code/1.watch/2.code/ui_setting.py
Simple merge