解决patch1201合并死机问题 3362/2 3362/head 3365/target/1
authorluozheng <1732036298@qq.com>
Thu, 23 Apr 2026 08:24:04 +0000 (16:24 +0800)
committerluozheng <1732036298@qq.com>
Thu, 23 Apr 2026 08:24:04 +0000 (16:24 +0800)
commitc8137cdd04a2c2d752a37e504ec4d0e1f95bdab2
treec56956091ab6b6764c3d6b0b6382dbcb08a451db
parent0b2f4002b5d5842414a0e4f3ad35ad494a68cbe9
解决patch1201合并死机问题
141 files changed:
code/sdk/application/wearable/evb/nativeapp/brandy-native-js-fd230/libuikit_fwk.a [deleted file]
code/sdk/application/wearable/evb/nativeapp/brandy-native-js-fd230_user/libuikit_fwk.a [deleted file]
code/sdk/application/wearable/evb/nativeapp/brandy-native-js-fd272/libuikit_fwk.a [deleted file]
code/sdk/application/wearable/evb/nativeapp/brandy-native-js-ln/libuikit_fwk.a [deleted file]
code/sdk/application/wearable/evb/nativeapp/brandy-native-js-lnppp/libuikit_fwk.a [deleted file]
code/sdk/application/wearable/evb/nativeapp/brandy-native-js-n9/libuikit_fwk.a
code/sdk/application/wearable/evb/nativeapp/brandy-native-js-n9ln/libuikit_fwk.a [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportCountdownPage.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportDataPage.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportHeartRateRangeItemView.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportHeartRateRangePage.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportMenuItemView.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportMenuPage.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportMistouchPage.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportModel.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportPausePage.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportPreparePage.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportPresenter.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportPromptPage.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportRemindHeartRateItemView.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportRemindHeartRatePage.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportRemindIntervalItemView.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportRemindIntervalPage.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportRemindItemView.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportRemindPage.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportSettingsItemView.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportSettingsPage.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportTargetItemView.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportTargetPage.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportTargetPromptPage.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportTargetSettingPage.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/include/sport/SportView.h [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportCountdownPage.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportDataPage.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportHeartRateRangeItemView.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportHeartRateRangePage.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportMenuItemView.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportMenuPage.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportMistouchPage.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportModel.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportPausePage.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportPreparePage.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportPresenter.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportPromptPage.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportRemindHeartRateItemView.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportRemindHeartRatePage.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportRemindIntervalItemView.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportRemindIntervalPage.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportRemindItemView.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportRemindPage.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportSettingsItemView.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportSettingsPage.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportTargetItemView.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportTargetPage.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportTargetPromptPage.cpp [deleted file]
code/sdk/application/wearable/evb/nativeapp/nativeui/sport/src/SportTargetSettingPage.cpp [deleted file]
code/sdk/application/wearable/evb/service/msg_center/brandy-native-js-fd230/libmsg_center.a [deleted file]
code/sdk/application/wearable/evb/service/msg_center/brandy-native-js-fd230_user/libmsg_center.a [deleted file]
code/sdk/application/wearable/evb/service/msg_center/brandy-native-js-fd272/libmsg_center.a [deleted file]
code/sdk/application/wearable/evb/service/msg_center/brandy-native-js-ln/libmsg_center.a [deleted file]
code/sdk/application/wearable/evb/service/msg_center/brandy-native-js-lnppp/libmsg_center.a [deleted file]
code/sdk/application/wearable/evb/service/msg_center/brandy-native-js-n9/libmsg_center.a
code/sdk/application/wearable/evb/service/msg_center/brandy-native-js-n9ln/libmsg_center.a [deleted file]
code/sdk/application/wearable/n9/nativeabilityfwk/src/AbilitySlice.cpp
code/sdk/application/wearable/n9/nativeapp/brandy-native-js-fd230/libuikit_fwk.a [deleted file]
code/sdk/application/wearable/n9/nativeapp/brandy-native-js-n9/libuikit_fwk.a
code/sdk/application/wearable/n9/nativeapp/nativelauncher/src/NativeLauncher.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/rebootdevice/include/RebootDeviceView.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/rebootdevice/include/RebootModel.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/rebootdevice/include/RebootPresenter.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/rebootdevice/include/RebootView.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/rebootdevice/include/ShutdownDeviceView.h [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/rebootdevice/src/RebootDeviceView.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/rebootdevice/src/RebootModel.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/rebootdevice/src/RebootPresenter.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/rebootdevice/src/RebootView.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/rebootdevice/src/ShutdownDeviceView.cpp [deleted file]
code/sdk/application/wearable/n9/nativeapp/nativeui/set_dial_style/src/SetDialStyleView.cpp
code/sdk/application/wearable/n9/nativeapp/nativeui/set_time_format/src/SetTimeFormatView.cpp
code/sdk/drivers/chips/brandy/clocks/drivers/acore/clocks.h
code/sdk/drivers/chips/brandy/clocks/drivers/acore/clocks_config_priv.c
code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_recorder.a
code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd230/libdisplay_gfx.a [deleted file]
code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd230_user/libdisplay_gfx.a [deleted file]
code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd272/libdisplay_gfx.a [deleted file]
code/sdk/middleware/services/gui/hal/display/brandy-native-js-ln/libdisplay_gfx.a [deleted file]
code/sdk/middleware/services/gui/hal/display/brandy-native-js-lnppp/libdisplay_gfx.a [deleted file]
code/sdk/middleware/services/gui/hal/display/brandy-native-js-n9/libdisplay_gfx.a
code/sdk/middleware/services/gui/hal/display/brandy-native-js-n9ln/libdisplay_gfx.a [deleted file]
code/sdk/middleware/services/gui/uikit/brandy-native-js-fd230/libuikit_ext.a [deleted file]
code/sdk/middleware/services/gui/uikit/brandy-native-js-fd230_user/libuikit_ext.a [deleted file]
code/sdk/middleware/services/gui/uikit/brandy-native-js-fd272/libuikit_ext.a [deleted file]
code/sdk/middleware/services/gui/uikit/brandy-native-js-ln/libuikit_ext.a [deleted file]
code/sdk/middleware/services/gui/uikit/brandy-native-js-lnppp/libuikit_ext.a [deleted file]
code/sdk/middleware/services/gui/uikit/brandy-native-js-n9ln/libuikit_ext.a [deleted file]
code/sdk/middleware/services/gui/uikit/proprietary/include/components/ui_list_ext.h
code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service.cpp
code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/components/ui_lite_surface_view.cpp
code/sdk/middleware/services/gui/uikit/sample/sample_ui.h
code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230-r/libx_vfs_private.a [deleted file]
code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230/libx_vfs_private.a [deleted file]
code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230_user-r/libx_vfs_private.a [deleted file]
code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230_user/libx_vfs_private.a [deleted file]
code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd272-r/libx_vfs_private.a [deleted file]
code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd272/libx_vfs_private.a [deleted file]
code/sdk/middleware/utils/fs/vfs/brandy-native-js-ln-r/libx_vfs_private.a [deleted file]
code/sdk/middleware/utils/fs/vfs/brandy-native-js-ln/libx_vfs_private.a [deleted file]
code/sdk/middleware/utils/fs/vfs/brandy-native-js-lnppp-r/libx_vfs_private.a [deleted file]
code/sdk/middleware/utils/fs/vfs/brandy-native-js-lnppp/libx_vfs_private.a [deleted file]
code/sdk/middleware/utils/fs/vfs/brandy-native-js-n9-r/libx_vfs_private.a
code/sdk/middleware/utils/fs/vfs/brandy-native-js-n9/libx_vfs_private.a
code/sdk/middleware/utils/fs/vfs/brandy-native-js-n9ln-r/libx_vfs_private.a [deleted file]
code/sdk/middleware/utils/fs/vfs/brandy-native-js-n9ln/libx_vfs_private.a [deleted file]
code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230-r/libfs_yaffs2.a [deleted file]
code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230/libfs_yaffs2.a [deleted file]
code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230_user-r/libfs_yaffs2.a [deleted file]
code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230_user/libfs_yaffs2.a [deleted file]
code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd272-r/libfs_yaffs2.a [deleted file]
code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd272/libfs_yaffs2.a [deleted file]
code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-ln-r/libfs_yaffs2.a [deleted file]
code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-ln/libfs_yaffs2.a [deleted file]
code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-lnppp-r/libfs_yaffs2.a [deleted file]
code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-lnppp/libfs_yaffs2.a [deleted file]
code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-n9-r/libfs_yaffs2.a
code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-n9/libfs_yaffs2.a
code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-n9ln-r/libfs_yaffs2.a [deleted file]
code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-n9ln/libfs_yaffs2.a [deleted file]
code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-fd230/libams.a [deleted file]
code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-fd230_user/libams.a [deleted file]
code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-fd272/libams.a [deleted file]
code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-ln/libams.a [deleted file]
code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-lnppp/libams.a [deleted file]
code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-n9ln/libams.a [deleted file]
code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-fd230/libbms.a [deleted file]
code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-fd230_user/libbms.a [deleted file]
code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-fd272/libbms.a [deleted file]
code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-ln/libbms.a [deleted file]
code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-lnppp/libbms.a [deleted file]
code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-n9ln/libbms.a [deleted file]
code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-n9ln/libjerryscript.a [deleted file]