1.修改applist返回键配置，也就是从applist中进入其他slice可通过power返回，除setting不行

2.applist更新闹钟，设置，血氧图片需重新烧录

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp
index 091024a..c92562d 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp
@@ -446,16 +446,12 @@ bool AlarmPresenter::OnKeyAct(UIView& view, const KeyEvent& event)
 {
     uint16 keyID = event.GetKeyId();
     WEARABLE_LOGD("","into key! keyID %u\n",keyID);
-#if 0
     //如果是power键就返回上一级
     if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER))
     {
         uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
         NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);
     }
-#endif
-    //目前只有一个按键。直接切换
-    NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);
     return true;
 }
 bool AlarmStatusBtnChangeListener::OnChange(UICheckBox::UICheckBoxState state)

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/bloodoxygen/src/BloodOxygenPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/bloodoxygen/src/BloodOxygenPresenter.cpp
index dc519e1..676165c 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/bloodoxygen/src/BloodOxygenPresenter.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/bloodoxygen/src/BloodOxygenPresenter.cpp
@@ -102,17 +102,12 @@ bool BloodOxygenPresenter::OnKeyAct(UIView& view, const KeyEvent& event)
     WEARABLE_LOGD("","into the view is: %s\n", typeid(view).name());
     uint16 keyID = event.GetKeyId();
     WEARABLE_LOGD("","into key! keyID %u\n",keyID);
-#if 0
     //如果是power键就返回上一级
     if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER))
     {
         uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
         NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);
     }
-#endif
-    //目前只有一个按键。直接切换
-    uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
-    NativeAbility::GetInstance().ChangeSlice(preSlice);
     return true;
 }
 void BloodOxygenPresenter::ProgressNotify(void)

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/indoorwalk/src/IndoorWalkPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/indoorwalk/src/IndoorWalkPresenter.cpp
index 24d3e25..06bc11d 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/indoorwalk/src/IndoorWalkPresenter.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/indoorwalk/src/IndoorWalkPresenter.cpp
@@ -278,17 +278,12 @@ bool IndoorWalkPresenter::OnKeyAct(UIView &view, const KeyEvent &event)
 {
        uint16 keyID = event.GetKeyId();
     WEARABLE_LOGD("","into key! keyID %u\n",keyID);
-#if 0
-               //如果是power键就返回上一级
-               if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER))
-               {
-                       uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
-                       NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);
-               }
-#endif
-       // 目前只有一个按键。直接切换
-       uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
-       NativeAbility::GetInstance().ChangeSlice(preSlice);
+    //如果是power键就返回上一级
+    if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER))
+    {
+        uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
+        NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);
+    }
        return true;
 }
 

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/screensetting/src/ScreenModels.cpp b/code/sdk/application/wearable/nativeapp/nativeui/screensetting/src/ScreenModels.cpp
index 56fc190..d8970a3 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/screensetting/src/ScreenModels.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/screensetting/src/ScreenModels.cpp
@@ -169,7 +169,7 @@ bool ScreenModels::LoadAppImages(std::string file, UIImageView *view, uint32_t r
 void ScreenModels::PreLoadAppimages(void)
 {
     LoadAppMultiImages(PLAYER_IAMGES, PLAYER_BACKGROUND, PLAYER_PLAYING);
-    LoadAppMultiImages(CLOCK_IAMGES, CLOCK_CLASSIC_GEOMETRY, CLOCK_SECOND);
+    LoadAppMultiImages(CLOCK_IAMGES, CLOCK_CLOCK0, CLOCK_SECOND);
     LoadAppMultiImages(COMPASS_IAMGES, COMPASS_COMPASS0, COMPASS_COMPASS2);
     LoadAppMultiImages(DROPDOWN_IAMGES, DROPDOWN_BLUETOOTHCONNECTED, DROPDOWN_SETTING);
     LoadAppMultiImages(HEART_IAMGES, HEART_HEARTRATECOOR, HEART_HEARTRATE_TOP);

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/APPLIST_ALARM.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/APPLIST_ALARM.bin
index 00a75bf..61b893e 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/APPLIST_ALARM.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/APPLIST_ALARM.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/APPLIST_SETTING.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/APPLIST_SETTING.bin
index c96716a..bf4e839 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/APPLIST_SETTING.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/APPLIST_SETTING.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/APPLIST_SPO2.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/APPLIST_SPO2.bin
index 8177b45..cc9c664 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/APPLIST_SPO2.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/res/APPLIST_SPO2.bin differ