修复编译问题

diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
index fdd8a0d..cf45fc2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
@@ -119,19 +119,18 @@ namespace OHOS
         {\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
+\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
+\r
             break;\r
         default:\r
             break;\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
index f52b7c9..d09e732 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
@@ -14,12 +14,7 @@
 #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

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index c420c5a..8b8bf0c 100755 (executable)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -164,11 +164,11 @@ target = {
                           #"nativelauncher",
                            "fd230launcher",
                            "ppg_service",
-                          "acc_sensor",
+                           "acc_sensor",
                         #    "cywee",
-                          "batterry_service"
-                            "ble_service",
-                          "hid_service"
+                           "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',