更改冲突文件

diff --cc autobuild.sh
index 213c4a2,005950e..005950e
mode 100755,100644..100755
--- 1/autobuild.sh
--- 2/autobuild.sh
+++ b/autobuild.sh

diff --cc code/sdk/application/brandy/brandy_standard/thread_pri_init.c
index f3796c9,a004aba..24eba13
--- 1/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
--- 2/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
+++ b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
@@@ -350,17 -353,11 +354,21 @@@ static void thread_main(const void *unu
      cat1_server_init();\r
  #endif\r
  \r
+ #ifdef ENABLE_CYWEE\r
+     uapi_cywee_service_init();\r
+ #endif \r
+ \r
 +#ifdef SUPPORT_BLE_SERVICE\r
 +    svr_bluetooth_init();\r
 +#endif \r
 +\r
 +#ifdef SUPPORT_ALIPAY_SEC\r
 +    uapi_alipay_svr_init();\r
 +#endif\r
 +    // ble_hid_server_init();\r
      set_startup_finish_flag();\r
-     \r
 +\r
++\r
  }\r
  \r
  void thread_pri_init(void)\r

diff --cc code/sdk/application/wearable/fd230app/CMakeLists.txt
Simple merge

diff --cc code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
Simple merge

diff --cc code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothPresenter.cpp
Simple merge

diff --cc code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
index adf360d,bb50991..fdd8a0d
--- 1/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
--- 2/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
@@@ -118,11 -112,11 +119,19 @@@ namespace OHO
          {\r
          case UICheckBox::SELECTED:\r
              WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BlueTooth Capability Is Enabled");\r
++<<<<<<< HEAD\r
 +            openBle();//主动开启蓝牙\r
 +            break;\r
 +        case UICheckBox::UNSELECTED:\r
 +            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BlueTooth Capability Is Disabled");\r
 +            closeBle();\r
++=======\r
+             init_btaddr_btname();\r
+             break;\r
+         case UICheckBox::UNSELECTED:\r
+             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BlueTooth Capability Is Disabled");\r
+             disable_bt_service();\r
++>>>>>>> 8e1e7eb140c0231eb2571eb3826cc0fe3679ea1e\r
              break;\r
          default:\r
              break;\r

diff --cc code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
index 998905f,d09e732..f52b7c9
--- 1/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
--- 2/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
@@@ -13,14 -14,14 +14,19 @@@
  #include "system/include/SystemSuperviseView.h"\r
  #include "system/include/SystemLanguageView.h"\r
  #include "system/include/SystemFactoryResetView.h"\r
++<<<<<<< HEAD\r
 +\r
 +\r
++=======\r
+ #include "system/include/Systemupgrade.h"\r
++>>>>>>> 8e1e7eb140c0231eb2571eb3826cc0fe3679ea1e\r
  namespace OHOS\r
  {\r
-     static const char *ABOUT_THE_WATCH = "AboutTheWatchButton";  // 关于手表\r
-     static const char *SUPERVISE = "SuperviseButton";            // 监管\r
-     static const char *SYSTEM_LANGUAGE = "SystemLanguageButton"; // 系统语言\r
-     static const char *FACTORY_RESET = "FactoryResetButton";     // 恢复出厂设置\r
+     static const char *ABOUT_THE_WATCH = "AboutTheWatchButton";   // 关于手表\r
+     static const char *SUPERVISE = "SuperviseButton";             // 监管\r
+     static const char *SYSTEM_LANGUAGE = "SystemLanguageButton";  // 系统语言\r
+     static const char *FACTORY_RESET = "FactoryResetButton";      // 恢复出厂设置\r
+     static const char *SYSTEM_UPGRADE = "SystemUpgradeButtonExt"; // 系统升级\r
      static const char *ABOUT_THE_WATCH_IMAGESRC = "/user/res/system/SYSTEM_ABOUT_THE_WATCH.bin";\r
      static const char *SUPERVISE_IMAGESRC = "/user/res/system/SYSTEM_SUPERVISE.bin";\r
      static const char *SYSTEM_LANGUAGE_IMAGESRC = "/user/res/system/SYSTEM_SYSTEM_LANGUAGE.bin";\r

diff --cc code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
Simple merge

diff --cc code/sdk/build/config/target_config/brandy/config.py
index 590632c,d7772e8..c420c5a
--- 1/code/sdk/build/config/target_config/brandy/config.py
--- 2/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@@ -160,12 -160,12 +161,14 @@@ target = 
                            "audio_manager",
                            "custom_utils",
                            "rotary_encoder",
-                         #   "nativelauncher",
-                           "fd230launcher",
-                           "ppg_service",
-                           "batterry_service",
-                           "ble_service",
+                           #"nativelauncher",
+                            "fd230launcher",
+                            "ppg_service",
+                           "acc_sensor",
+                         #    "cywee",
+                           "batterry_service"
++                            "ble_service",
 +                          "hid_service"
                                                  ],
          'ram_component_set': ['bgh', 'media', 'gpu', 'graphic_uikit', 'bgh_audio', 'dfx_set', 'ohos_set', 'wearable_set', 'alipay_set'],
          'dsp_version': 'max',