From: dxy <1731678236@qq.com>
Date: Tue, 19 Mar 2024 11:22:17 +0000 (+0800)
Subject: 更改冲突文件
X-Git-Tag: release_V1.2.70_20241020_135402~1296
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=c693c97d879d8a8d8113a02ce56565cc79037c95;p=mirrors%2FFD230.git

更改冲突文件
---

c693c97d879d8a8d8113a02ce56565cc79037c95
diff --cc autobuild.sh
index 213c4a28d,005950e8e..005950e8e
mode 100755,100644..100755
--- a/autobuild.sh
+++ b/autobuild.sh
diff --cc code/sdk/application/brandy/brandy_standard/thread_pri_init.c
index f3796c9a6,a004aba23..24eba13c3
--- a/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();
  #endif
  
+ #ifdef ENABLE_CYWEE
+     uapi_cywee_service_init();
+ #endif 
+ 
 +#ifdef SUPPORT_BLE_SERVICE
 +    svr_bluetooth_init();
 +#endif 
 +
 +#ifdef SUPPORT_ALIPAY_SEC
 +    uapi_alipay_svr_init();
 +#endif
 +    // ble_hid_server_init();
      set_startup_finish_flag();
 +
-     
++
  }
  
  void thread_pri_init(void)
diff --cc code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
index adf360d6d,bb50991df..fdd8a0daa
--- a/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
          {
          case UICheckBox::SELECTED:
              WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BlueTooth Capability Is Enabled");
++<<<<<<< HEAD
 +            openBle();//主动开启蓝牙
 +            break;
 +        case UICheckBox::UNSELECTED:
 +            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BlueTooth Capability Is Disabled");
 +            closeBle();
++=======
+             init_btaddr_btname();
+             break;
+         case UICheckBox::UNSELECTED:
+             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BlueTooth Capability Is Disabled");
+             disable_bt_service();
++>>>>>>> 8e1e7eb140c0231eb2571eb3826cc0fe3679ea1e
              break;
          default:
              break;
diff --cc code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
index 998905fc7,d09e732c9..f52b7c9c9
--- a/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"
  #include "system/include/SystemLanguageView.h"
  #include "system/include/SystemFactoryResetView.h"
++<<<<<<< HEAD
 +
 +
++=======
+ #include "system/include/Systemupgrade.h"
++>>>>>>> 8e1e7eb140c0231eb2571eb3826cc0fe3679ea1e
  namespace OHOS
  {
-     static const char *ABOUT_THE_WATCH = "AboutTheWatchButton";  // 关于手表
-     static const char *SUPERVISE = "SuperviseButton";            // 监管
-     static const char *SYSTEM_LANGUAGE = "SystemLanguageButton"; // 系统语言
-     static const char *FACTORY_RESET = "FactoryResetButton";     // 恢复出厂设置
+     static const char *ABOUT_THE_WATCH = "AboutTheWatchButton";   // 关于手表
+     static const char *SUPERVISE = "SuperviseButton";             // 监管
+     static const char *SYSTEM_LANGUAGE = "SystemLanguageButton";  // 系统语言
+     static const char *FACTORY_RESET = "FactoryResetButton";      // 恢复出厂设置
+     static const char *SYSTEM_UPGRADE = "SystemUpgradeButtonExt"; // 系统升级
      static const char *ABOUT_THE_WATCH_IMAGESRC = "/user/res/system/SYSTEM_ABOUT_THE_WATCH.bin";
      static const char *SUPERVISE_IMAGESRC = "/user/res/system/SYSTEM_SUPERVISE.bin";
      static const char *SYSTEM_LANGUAGE_IMAGESRC = "/user/res/system/SYSTEM_SYSTEM_LANGUAGE.bin";
diff --cc code/sdk/build/config/target_config/brandy/config.py
index 590632ca1,d7772e88e..c420c5a37
--- a/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',