解决莫名奇妙进入语言界面问题，手表名称改为KUMI WATCH Soar

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistView.h b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistView.h
index fcfe2b9..b5a2388 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistView.h
@@ -47,7 +47,6 @@ public:
         if ((event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) &&
             (event.GetDeltaX() > X_DRAG_OFFSET) && (event.GetDeltaX() > (DOUBLES * MATH_ABS(event.GetDeltaY())))) {
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Applist Ondrag!!");
-            NativeAbility::GetInstance().ClearSliceIdStack();/*凡是回到主界面都要清空栈*/
             NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN, TransitionType::TRANSITION_ZOOM);
         }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp b/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
index 19835ba..c6163d9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
@@ -135,7 +135,6 @@ void KeyInputListener::CallVolumeDipSwitchControl(VolumeChangeStatus status)
                     if (mcu_pms_is_screen_on())
                     {
                         PressAlarmNotify();
-                        NativeAbility::GetInstance().ClearSliceIdStack();
                         NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN, TransitionType::TRANSITION_ZOOM);
                     }
                 }
@@ -150,8 +149,8 @@ void KeyInputListener::CallVolumeDipSwitchControl(VolumeChangeStatus status)
                         }
                         else
                         {
-                            // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST, TransitionType::TRANSITION_ZOOM);
-                            NativeAbility::GetInstance().EnterSlice(VIEW_APPLIST, TransitionType::TRANSITION_ZOOM);
+                            NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST, TransitionType::TRANSITION_ZOOM);
+                            // NativeAbility::GetInstance().EnterSlice(VIEW_APPLIST, TransitionType::TRANSITION_ZOOM);
                         }
                     }
                 }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
index c7baeb3..711f3a9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-03-28 14:17:43
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-22 19:03:52
+ * @LastEditTime: 2024-08-03 20:21:27
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
  */
 #include "AppViewIDs.h"
@@ -106,6 +106,7 @@ namespace OHOS
                 uapi_set_screen_on_api();
                 NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
                 ConfigModel::GetInstance()->SetisFirstTimeStart(false);
+                NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN);
             }
         }
         /* -------------------------------------------------------------------------- */

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
index f7b0919..70c4868 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-07-18 14:55:27
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-08-03 17:53:50
+ * @LastEditTime: 2024-08-03 20:21:43
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
  */
 
@@ -40,6 +40,7 @@ namespace OHOS
                 uapi_set_screen_on_api();
                 NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
                 ConfigModel::GetInstance()->SetisFirstTimeStart(false);
+                NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN);
             }
         }
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
index cab3d82..15abc8c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
@@ -246,7 +246,7 @@ namespace OHOS
         #ifdef CUSTOM_Z1\r
             .text = "Z1",\r
         #else\r
-            .text = "Watch Soar",\r
+            .text = "KUMI WATCH Soar",\r
         #endif\r
             .lineBreakMode = UILabel::LINE_BREAK_WRAP,\r
         };\r

diff --git a/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h b/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h
index 1dd83f5..3a5c635 100755 (executable)
--- a/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h
+++ b/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h
@@ -149,7 +149,6 @@ public:
         }
     }
 
-    /*打印栈中元素*/
     /*打印栈中元素*/
     void showsStackSliceId()
     {

diff --git a/code/sdk/application/wearable/nativeabilityfwk/src/Ability.cpp b/code/sdk/application/wearable/nativeabilityfwk/src/Ability.cpp
index 6b187db..e811e93 100755 (executable)
--- a/code/sdk/application/wearable/nativeabilityfwk/src/Ability.cpp
+++ b/code/sdk/application/wearable/nativeabilityfwk/src/Ability.cpp
@@ -20,6 +20,7 @@
 #include "dock/focus_manager.h"
 #include <TransitionType.h>
 #include "BaseView.h"
+#include "AppViewIDs.h"
 namespace OHOS {
 /*
  * @brief 负责将一个SliceProxy对象添加到Ability对象中,如果传入的sliceId是无效的或者代理对象proxy为空，则不执行任何操作。
@@ -118,6 +119,10 @@ ListsNode<Ability::ProxyStruct>* Ability::Find(const uint16_t sliceId)
  */
 void Ability::ChangeSlice(const uint16_t targetSliceId, TransitionType type, const uint16_t priority)
 {
+    if(targetSliceId == VIEW_MAIN)
+    {
+        ClearSliceIdStack();/*凡是回到主界面都要清空栈*/
+    }
     // showsStackSliceId();
     /*
         if (GetCurSliceId() == targetSliceId) {

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.h b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.h
index 6bcfa2b..3a57381 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.h
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.h
@@ -31,7 +31,7 @@ extern uint16_t g_ble_server_handle;
 #ifdef CUSTOM_Z1
 #define BLE_DEFAULT_NAME  "Z1"//"KUMI U6"
 #else
-#define BLE_DEFAULT_NAME  "WatchSoar"//"KUMI U6"
+#define BLE_DEFAULT_NAME  "WATCHSoar"//"KUMI U6"
 #endif
 void svr_ble_bluetooth_init(void);//蓝牙服务初始化
 void custom_ble_service_stop(void);//主动关闭蓝牙