Merge #897 into sdk602patch0626 from refs/changes/897/head

Code review from 胡传军

* refs/changes/897/head: (4 commits squashed)

  - 睡眠数据上传修改

  - 修复goal界面图片位置异常bug

  - 电话 增加断连判断

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/897

diff --git a/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
index 5ef6ccc..3fbe580 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
@@ -267,12 +267,11 @@ static void ExitMakePhoneSlice(void)
             //NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);
         }
     }
-    StatusReset();//状态复位
-    // CallerLogModel::GetInstance()->SetCallStatus(false);
-    // DisableCallingTimer();
-    //if (CallerLogModel::GetInstance()->GetNotifyFlag()) {
+    if(NativeAbility::GetInstance().GetCurSliceId() == VIEW_INCOMING_CALL)
+    {
+        StatusReset();//状态复位
+    }
     g_isWatchCallView = false;
-    //}
 }
 
 static void DialingHandle(void)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalother.cpp b/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalother.cpp
index 42f6460..b61448c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalother.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalother.cpp
@@ -440,28 +440,26 @@ namespace OHOS
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpAnimatorView new fail");
                 return false;
             }
-            if(GoalView::GetInstance()==nullptr)
+            if(GoalView::GetInstance())
             {
                 // PullUpPathsArray = CreateImagePathsArray(PullUpPaths, "bin", PULLUP_ANIMATOR_VIEW_NUM_FRAMES);
-                // for (uint8_t i = 0; i < PULLUP_ANIMATOR_VIEW_NUM_FRAMES; i++)
-                // {
-                //     PullUpimageAnimatorInfo[i].imageInfo = ImageCacheManager::GetInstance().LoadSingleRes(PullUpPathsArray[i]);
-                //     PullUpimageAnimatorInfo[i].imageType = IMG_SRC_IMAGE_INFO;
-                //     PullUpimageAnimatorInfo[i].pos.x = PULLUP_ANIMATOR_VIEW_X;
-                //     PullUpimageAnimatorInfo[i].pos.y = PULLUP_ANIMATOR_VIEW_Y;
-                //     PullUpimageAnimatorInfo[i].width = PULLUP_ANIMATOR_VIEW_W;
-                //     PullUpimageAnimatorInfo[i].height = PULLUP_ANIMATOR_VIEW_H;
-                // }
+                for (uint8_t i = 0; i < PULLUP_ANIMATOR_VIEW_NUM_FRAMES; i++)
+                {
+                  GoalView::GetInstance()->PullUpimageAnimatorInfo[i].pos.y = PULLUP_ANIMATOR_VIEW_Y;
+                }
                 // PullUpAnimatorView->SetPosition(PULLUP_ANIMATOR_VIEW_X, PULLUP_ANIMATOR_VIEW_Y, PULLUP_ANIMATOR_VIEW_W, PULLUP_ANIMATOR_VIEW_H);
                 // PullUpAnimatorView->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);
                 // PullUpAnimatorView->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
-                return false;
-
+                PullUpAnimatorView->SetImageAnimatorSrc(GoalView::GetInstance()->PullUpimageAnimatorInfo, PULLUP_ANIMATOR_VIEW_NUM_FRAMES, PULLUP_ANIMATOR_VIEW_TIME);
+                PullUpAnimatorView->SetRepeat(true);
+                PullUpAnimatorView->Start();
+                Add(PullUpAnimatorView);
             }
-            PullUpAnimatorView->SetImageAnimatorSrc(GoalView::GetInstance()->PullUpimageAnimatorInfo, PULLUP_ANIMATOR_VIEW_NUM_FRAMES, PULLUP_ANIMATOR_VIEW_TIME);
-            PullUpAnimatorView->SetRepeat(true);
-            PullUpAnimatorView->Start();
         }
+              
+
+            
+        
         /* -------------------------------- 将组件添加到根视图 ------------------------------- */
         Add(caloriegoalTitle);
         Add(mileagegoalTitle);
@@ -480,7 +478,7 @@ namespace OHOS
         Add(standgoaldataLabel);
         Add(standnowdataLabel);
 
-        Add(PullUpAnimatorView);
+       
 
         Add(transverseline_1);
         Add(transverseline_2);