解决编译不过问题

diff --git a/autobuild.sh b/autobuild.sh
index 5ab4a35..3585ee4 100644 (file)
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -87,6 +87,15 @@ SSB_NAME=$APPLICATION_NAME-ssb
 BUILD_NAME=_FD230
 fi
 
+if [ "$1" == "fd230_user" ]
+then
+TARGET_PACK_NAME=pack_brandy_native_js
+APPLICATION_NAME=brandy-native-js
+RECOVERY_NAME=$APPLICATION_NAME-r
+SSB_NAME=$APPLICATION_NAME-ssb
+BUILD_NAME=_FD230_user
+fi
+
 if [ "$1" == "xts" ]
 then
 TARGET_PACK_NAME=pack_brandy_native_js_xts

diff --git a/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c b/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
index 2d59dca..c16bd35 100644 (file)
--- a/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
+++ b/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
@@ -17,7 +17,11 @@
 #include "securec.h"\r
 #include "cmsis_os2.h"\r
 #ifdef SUPPORT_OHOSFWK\r
+#ifdef FD230\r
 #include "bluetooth/include/BluetoothWrapper.h"\r
+#else\r
+#include "bluetooth/BluetoothWrapper.h"\r
+#endif\r
 #endif\r
 \r
 /* Gatt service UUID */\r

diff --git a/code/sdk/application/wearable/fd230_user/nativeapp/brandy-native-js-fd230_user/libuikit_fwk.a b/code/sdk/application/wearable/fd230_user/nativeapp/brandy-native-js-fd230_user/libuikit_fwk.a
new file mode 100644 (file)
index 0000000..e3ce469
Binary files /dev/null and b/code/sdk/application/wearable/fd230_user/nativeapp/brandy-native-js-fd230_user/libuikit_fwk.a differ

diff --git a/code/sdk/application/wearable/fd230_user/service/msg_center/brandy-native-js-fd230_user/libmsg_center.a b/code/sdk/application/wearable/fd230_user/service/msg_center/brandy-native-js-fd230_user/libmsg_center.a
new file mode 100644 (file)
index 0000000..b1e105a
Binary files /dev/null and b/code/sdk/application/wearable/fd230_user/service/msg_center/brandy-native-js-fd230_user/libmsg_center.a differ

diff --git a/code/sdk/application/wearable/nativeapp/brandy-native-js-fd230_user/libuikit_fwk.a b/code/sdk/application/wearable/nativeapp/brandy-native-js-fd230_user/libuikit_fwk.a
new file mode 100644 (file)
index 0000000..e3ce469
Binary files /dev/null and b/code/sdk/application/wearable/nativeapp/brandy-native-js-fd230_user/libuikit_fwk.a differ

diff --git a/code/sdk/application/wearable/service/msg_center/brandy-native-js-fd230_user/libmsg_center.a b/code/sdk/application/wearable/service/msg_center/brandy-native-js-fd230_user/libmsg_center.a
new file mode 100644 (file)
index 0000000..b1e105a
Binary files /dev/null and b/code/sdk/application/wearable/service/msg_center/brandy-native-js-fd230_user/libmsg_center.a differ

diff --git a/code/sdk/application/wstp/at_service/ohosfwk/ohosfwk_at_process.cpp b/code/sdk/application/wstp/at_service/ohosfwk/ohosfwk_at_process.cpp
index 9ec1839..b19e678 100644 (file)
--- a/code/sdk/application/wstp/at_service/ohosfwk/ohosfwk_at_process.cpp
+++ b/code/sdk/application/wstp/at_service/ohosfwk/ohosfwk_at_process.cpp
@@ -13,15 +13,22 @@
 #include "bundlems_slite_client.h"
 #include "abilityms_slite_client.h"
 #include "gt_bundle_manager_service.h"
-// #include "uiservice/ui_service.h"
+#ifdef FD230
 #include "uiservice/include/ui_service.h"
+#else
+#include "uiservice/ui_service.h"
+#endif
 #include "sign_mode.h"
 #include "NativeAbility.h"
 #include "ability_manager.h"
 #include "js_fwk_common.h"
 #include "global.h"
 #include "msg_center_customer.h"
+#ifdef FD230
 #include "applist/include/ApplistModel.h"
+#else
+#include "applist/ApplistModel.h"
+#endif
 #include "bundle_manager.h"
 #include <unistd.h>
 #ifdef SUPPORT_AT_LOCATION

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index ca626bc..992295d 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -132,7 +132,7 @@ target = {
         'ssb_version': 'brandy-ssb-native-js',
         'dsp_version': 'max',
         'packet': True,
-        'fs_image': False
+        # 'fs_image': False
     },
     #native-js-user: liteos + uikit + nandflash + mipi + psram + audio  典型合封UIKIT版本
     #离线日志版本
@@ -394,7 +394,7 @@ target = {
             #"MEM_CHECK",
             #'ENABLE_WEBSOCKET',
             'CYWEE_MAC_ACTIVE',
-            'SUPPORT_CAT1_SERVICE',
+            # 'SUPPORT_CAT1_SERVICE',
             #'SUPPORT_TCPIP',                                  
             #'SUPPORT_HID_SERVICE',
             'SUPPORT_BAIDU_MAP',
@@ -419,9 +419,9 @@ target = {
                            "mag_sensor_mmc5603",
                           "vibrator",
                           "vibrator_service",
-                          "-:lwip",
-                          "cat1Service",
-                          "cat1Test",
+                        #   "-:lwip",
+                        #   "cat1Service",
+                        #   "cat1Test",
                           "audio_manager",
                           "CustomUIcomponentTool",
                           "nativeabilityfwk",

diff --git a/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_native_js_fd230.config b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_native_js_fd230.config
new file mode 100644 (file)
index 0000000..b308abd
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_native_js_fd230.config
@@ -0,0 +1,18 @@
+# Generated by Kconfig Tool.
+# Note: !!!This file can not be modify manually!!!
+
+#
+# Main menu description, show how to use this configuration system.
+#
+
+#
+# Product
+#
+
+#
+# Config the product.
+#
+CONFIG_NORFLASH_SIZE=16
+CONFIG_LOAD_FROM_FS=y
+CONFIG_PSRAM_DENSITY_MB=32
+# end of Product

diff --git a/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_ssb_native_js_fd230.config b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_ssb_native_js_fd230.config
new file mode 100644 (file)
index 0000000..b308abd
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_ssb_native_js_fd230.config
@@ -0,0 +1,18 @@
+# Generated by Kconfig Tool.
+# Note: !!!This file can not be modify manually!!!
+
+#
+# Main menu description, show how to use this configuration system.
+#
+
+#
+# Product
+#
+
+#
+# Config the product.
+#
+CONFIG_NORFLASH_SIZE=16
+CONFIG_LOAD_FROM_FS=y
+CONFIG_PSRAM_DENSITY_MB=32
+# end of Product

diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/fs/libaudio_api.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/fs/libaudio_api.a
new file mode 100644 (file)
index 0000000..8a867d4
Binary files /dev/null and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/fs/libaudio_api.a differ

diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/fs/libaudio_core.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/fs/libaudio_core.a
new file mode 100644 (file)
index 0000000..373d9b7
Binary files /dev/null and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/fs/libaudio_core.a differ

diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/fs/libaudio_drv.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/fs/libaudio_drv.a
new file mode 100644 (file)
index 0000000..19154fc
Binary files /dev/null and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/fs/libaudio_drv.a differ

diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/fs/libaudio_sample.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/fs/libaudio_sample.a
new file mode 100644 (file)
index 0000000..9262a58
Binary files /dev/null and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/fs/libaudio_sample.a differ

diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/fs/libaudio_vendor.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/fs/libaudio_vendor.a
new file mode 100644 (file)
index 0000000..0c422d6
Binary files /dev/null and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/fs/libaudio_vendor.a differ

diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a
index ce395f7..21a2faa 100644 (file)
Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a differ

diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230_user-r/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230_user-r/libgfx_rm.a
new file mode 100644 (file)
index 0000000..a731301
Binary files /dev/null and b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230_user-r/libgfx_rm.a differ

diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230_user/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230_user/libgfx_rm.a
new file mode 100644 (file)
index 0000000..7337ef0
Binary files /dev/null and b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230_user/libgfx_rm.a differ

diff --git a/code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd230_user/libdisplay_gfx.a b/code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd230_user/libdisplay_gfx.a
new file mode 100644 (file)
index 0000000..8864f8e
Binary files /dev/null and b/code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd230_user/libdisplay_gfx.a differ

diff --git a/code/sdk/middleware/services/gui/uikit/brandy-native-js-fd230_user/libuikit_ext.a b/code/sdk/middleware/services/gui/uikit/brandy-native-js-fd230_user/libuikit_ext.a
new file mode 100644 (file)
index 0000000..9d278be
Binary files /dev/null and b/code/sdk/middleware/services/gui/uikit/brandy-native-js-fd230_user/libuikit_ext.a differ

diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service.cpp b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service.cpp
index 128f8e3..8c3e46e 100644 (file)
--- a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service.cpp
+++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service.cpp
@@ -33,7 +33,11 @@
 #include "common/screen.h"\r
 #include "components/root_view.h"\r
 #ifdef SUPPORT_OHOSFWK\r
+#ifdef FD230\r
 #include "screennotify/include/ui_screennotify.h"\r
+#else\r
+#include "screennotify/ui_screennotify.h"\r
+#endif\r
 #endif\r
 #ifdef SUPPORT_GPU_JPEG\r
 #include "drv_jpeg_intf.h"\r

diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/dfx_cmd.cpp b/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/dfx_cmd.cpp
index 741812a..7d757b0 100644 (file)
--- a/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/dfx_cmd.cpp
+++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/dfx_cmd.cpp
@@ -44,7 +44,11 @@
 #include "events/key_event.h"
 #endif
 #if defined (SUPPORT_DIAL_DEBUG)
+#ifdef FD230
 #include "main/include/dial/WatchInterface.h"
+#else
+#include "main/dial/WatchInterface.h"
+#endif
 #endif // defined (SUPPORT_DIAL_DEBUG)
 
 namespace OHOS {

diff --git a/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/ui_test_video_play.cpp b/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/ui_test_video_play.cpp
index 0a3e466..be1a96f 100644 (file)
--- a/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/ui_test_video_play.cpp
+++ b/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/ui_test_video_play.cpp
@@ -18,7 +18,11 @@
 #include "ui_test_video_play.h"\r
 #include "components/root_view.h"\r
 #ifdef SUPPORT_OHOSFWK\r
+#ifdef FD230\r
 #include "screennotify/include/ui_screennotify.h"\r
+#else\r
+#include "screennotify/ui_screennotify.h"\r
+#endif\r
 #endif\r
 \r
 namespace OHOS {\r

diff --git a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_dst.c b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_dst.c
index b4c80ff..98082c1 100644 (file)
--- a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_dst.c
+++ b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_dst.c
@@ -15,8 +15,11 @@
 #include "errcode.h"\r
 #include "transmit_resume.h"\r
 #ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE\r
+#ifdef FD230\r
 #include "bluetooth/include/BluetoothChangeBle.h"\r
-\r
+#else\r
+#include "bluetooth/BluetoothChangeBle.h"\r
+#endif\r
 #endif\r
 #ifdef CONFIG_DFX_SUPPORT_PARTITION\r
 #if (CONFIG_DFX_SUPPORT_PARTITION == DFX_YES)\r

diff --git a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_item.c b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_item.c
index 8f3f39f..3b04ca4 100644 (file)
--- a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_item.c
+++ b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_item.c
@@ -22,7 +22,11 @@
 #include "diag_msg.h"\r
 #include "diag_dfx.h"\r
 #ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE\r
+#ifdef FD230\r
 #include "bluetooth/include/BluetoothChangeBle.h"\r
+#else\r
+#include "bluetooth/BluetoothChangeBle.h"\r
+#endif\r
 #endif\r
 \r
 #define TRANSMIT_ITEM_CNT 3\r

diff --git a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_src.c b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_src.c
index d2732f7..ca0aff2 100644 (file)
--- a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_src.c
+++ b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_src.c
@@ -20,7 +20,11 @@
 #include "zdiag_adapt_layer.h"\r
 #include "errcode.h"\r
 #ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE\r
+#ifdef FD230\r
 #include "bluetooth/include/BluetoothChangeBle.h"\r
+#else\r
+#include "bluetooth/BluetoothChangeBle.h"\r
+#endif\r
 #endif\r
 \r
 STATIC uint32_t transmit_data_read(transmit_item_t *item, uint32_t offset, uint8_t *buf, uint32_t size)\r

diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230_user-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230_user-r/libx_vfs_private.a
new file mode 100644 (file)
index 0000000..ef8c37d
Binary files /dev/null and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230_user-r/libx_vfs_private.a differ

diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230_user/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230_user/libx_vfs_private.a
new file mode 100644 (file)
index 0000000..1c08fcb
Binary files /dev/null and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230_user/libx_vfs_private.a differ

diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230_user-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230_user-r/libfs_yaffs2.a
new file mode 100644 (file)
index 0000000..00beb36
Binary files /dev/null and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230_user-r/libfs_yaffs2.a differ

diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230_user/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230_user/libfs_yaffs2.a
new file mode 100644 (file)
index 0000000..50e244a
Binary files /dev/null and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230_user/libfs_yaffs2.a differ

diff --git a/code/sdk/open_source/openharmony/base/startup/syspara_lite/src/hal_sys_param.c b/code/sdk/open_source/openharmony/base/startup/syspara_lite/src/hal_sys_param.c
index 8761617..ea4ee78 100644 (file)
--- a/code/sdk/open_source/openharmony/base/startup/syspara_lite/src/hal_sys_param.c
+++ b/code/sdk/open_source/openharmony/base/startup/syspara_lite/src/hal_sys_param.c
@@ -283,6 +283,7 @@ char* HalGetHardwareProfile(void)
 \r
 char* HalGetSerial(void)\r
 {\r
+#ifdef XTS_SUPPORT\r
     static const char OHOS_SERIAL[] = "1234567890";\r
     unsigned char sn_buf[32] = {0};\r
     unsigned int len = 0;\r
@@ -308,6 +309,8 @@ char* HalGetSerial(void)
     memcpy(value, sn_buf, len); // 使用memcpy确保二进制安全\r
     value[len] = '\0';          // 手动添加字符串结束符\r
     return value;\r
+#endif\r
+    return "123456789";\r
 }\r
 char* HalGetBootloaderVersion(void)\r
 {\r

diff --git a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-fd230_user/libams.a b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-fd230_user/libams.a
new file mode 100644 (file)
index 0000000..b294a76
Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-fd230_user/libams.a differ

diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230_user/libace.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230_user/libace.a
new file mode 100644 (file)
index 0000000..e807091
Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230_user/libace.a differ

diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230_user/libace_http.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230_user/libace_http.a
new file mode 100644 (file)
index 0000000..cdfdb31
Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230_user/libace_http.a differ

diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230_user/libnetstack_http.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230_user/libnetstack_http.a
new file mode 100644 (file)
index 0000000..b9c1bb0
Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230_user/libnetstack_http.a differ

diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230_user/libwebsocket.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230_user/libwebsocket.a
new file mode 100644 (file)
index 0000000..93b5e6f
Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230_user/libwebsocket.a differ

diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/app_module.h b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/app_module.h
index 87a2efd..bf8481f 100644 (file)
--- a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/app_module.h
+++ b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/app_module.h
@@ -23,8 +23,11 @@
 #include "product_adapter.h"
 #include "abilityms_slite_client.h"
 #include "NativeAbility.h"
-// #include "settings/SetDesktopModel.h"
+#ifdef FD230
 #include "themestyle/include/ThemeStyleModel.h"
+#else
+#include "settings/SetDesktopModel.h"
+#endif
 
 namespace OHOS {
 namespace ACELite {
@@ -67,6 +70,7 @@ private:
  */
 void TerminateWrapper(uint32_t token, bool forceStop)
 {
+    #ifdef FD230
     (void)forceStop;
     uint16_t preSliceId = NativeAbility::GetInstance().GetPreSliceId();
     if (preSliceId == VIEW_APPLIST) {
@@ -78,6 +82,19 @@ void TerminateWrapper(uint32_t token, bool forceStop)
             return;
         }
     }
+    #else
+    (void)forceStop;
+    uint16_t preSliceId = NativeAbility::GetInstance().GetPreSliceId();
+    if (preSliceId == VIEW_APPLIST) {
+        if (SetDesktopModel::GetInstance().GetDesktopStyle() == HEXAGONS_STYLE) {
+            AbilityMsClient::GetInstance().TerminateAbility(token, TransitionType::TRANSITION_BACK_TO_HEXAGONS);
+            return;
+        } else if (SetDesktopModel::GetInstance().GetDesktopStyle() == WATERFALL_STYLE) {
+            AbilityMsClient::GetInstance().TerminateAbility(token, TransitionType::TRANSITION_BACK_TO_WATERFALL);
+            return;
+        }
+    }
+    #endif
     AbilityMsClient::GetInstance().TerminateAbility(token);
 }
 

diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/network/network_module.cpp b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/network/network_module.cpp
index 54c14cc..190632a 100644 (file)
--- a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/network/network_module.cpp
+++ b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/network/network_module.cpp
@@ -20,7 +20,11 @@
 #include <securec.h>\r
 #include <unistd.h>\r
 #include "network_module.h"\r
+#ifdef FD230\r
 #include "bluetooth/include/BluetoothModel.h"\r
+#else\r
+#include "bluetooth/BluetoothModel.h"\r
+#endif\r
 #include "msg_center_protocol.h"\r
 #include "bts_le_gap.h"\r
 #include "network_listener.h"\r

diff --git a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-fd230_user/libbms.a b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-fd230_user/libbms.a
new file mode 100644 (file)
index 0000000..f262ad8
Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-fd230_user/libbms.a differ

diff --git a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-fd230_user/libjerryscript.a b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-fd230_user/libjerryscript.a
new file mode 100644 (file)
index 0000000..bafd4fc
Binary files /dev/null and b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-fd230_user/libjerryscript.a differ

diff --git a/code/sdk/open_source/openharmony/third_party/lwip/lwip_v2.1.3/src/include/lwip/def.h b/code/sdk/open_source/openharmony/third_party/lwip/lwip_v2.1.3/src/include/lwip/def.h
index 6a2b9bb..ca4387f 100644 (file)
--- a/code/sdk/open_source/openharmony/third_party/lwip/lwip_v2.1.3/src/include/lwip/def.h
+++ b/code/sdk/open_source/openharmony/third_party/lwip/lwip_v2.1.3/src/include/lwip/def.h
@@ -116,7 +116,8 @@ u32_t lwip_htonl(u32_t x);
 
 /* Provide usual function names as macros for users, but this can be turned off */
 // #ifndef LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS //为了编译能过屏蔽
-#ifdef LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS
+// #ifdef LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS
+#if 0
 #define htons(x) lwip_htons(x)
 #define ntohs(x) lwip_ntohs(x)
 #define htonl(x) lwip_htonl(x)

diff --git a/code/sdk/zhihui/services/battery/service/battery_service.cpp b/code/sdk/zhihui/services/battery/service/battery_service.cpp
index 46731f3..c08126f 100644 (file)
--- a/code/sdk/zhihui/services/battery/service/battery_service.cpp
+++ b/code/sdk/zhihui/services/battery/service/battery_service.cpp
@@ -41,7 +41,7 @@ extern "C" {
 
 #include "debug_print.h"
 
-#include "cat1_utils.h"
+// #include "cat1_utils.h"
 
 // #include "cywee_service.h"
 
@@ -723,7 +723,7 @@ errcode_t uapi_battery_init(void)
     taskcfg.func = battery_check_task;
     taskcfg.use_mem = USE_EXTEND_MEM;
     
-    errcode_t ret=cat1_create_osThread_custom(&taskcfg);
+    errcode_t ret=uapi_create_osThread_custom(&taskcfg);
     if(ret != ERRCODE_SUCC)
     {
         PRINT("create battery_service failed %d!\r\n",ret);