恢复出厂页面设置为扫码界面

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/languagecode/LanguageInit.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/languagecode/LanguageInit.cpp
index 771f760..bb9b444 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/languagecode/LanguageInit.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/languagecode/LanguageInit.cpp
@@ -210,7 +210,8 @@ namespace OHOS
              * 在此之前，先设置成默认0
              */
             // thelanguage = 0;
-            NativeAbility::GetInstance().SetDefaultSliceId(VIEW_LANGUAGE_SWITCH);
+            // NativeAbility::GetInstance().SetDefaultSliceId(VIEW_LANGUAGE_SWITCH);
+            NativeAbility::GetInstance().SetDefaultSliceId(VIEW_WATCH_QR_CODE);
         }
         else
         {

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
index f198083..26d9901 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
@@ -118,7 +118,11 @@ namespace OHOS
         // 如果是power键就返回上一级
         if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0)
         {
-            NativeAbility::GetInstance().Back();
+            uint16_t curSliceId = NativeAbility::GetInstance().GetCurSliceId();
+            if (curSliceId != VIEW_WATCH_QR_CODE)
+            {
+                NativeAbility::GetInstance().Back();
+            }
             #ifdef SUPPORT_BLE_SERVICE
             br_adv_start(20);
             #endif