优化部分界面逻辑
authorCaisking <3449750381@qq.com>
Fri, 15 Dec 2023 03:22:56 +0000 (11:22 +0800)
committerCaisking <3449750381@qq.com>
Fri, 15 Dec 2023 03:22:56 +0000 (11:22 +0800)
code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingEndnote2View.cpp
code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingGPSlackPresenter.cpp
code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingSetPresenter.cpp

index 07a3a47..0285ef2 100644 (file)
@@ -128,8 +128,8 @@ namespace OHOS
         }
 
         // 初始化Lable
-        InitLabel(label1_, 173, 52, 90, 35, "label1", "注意", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        InitLabel(label2_, 116, 187, 60, 40, "label2", "当前运动量太小,无法记录\n是否结束运动", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(label1_, 203, 52, 90, 35, "label1", "注意", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(label2_, 56, 167, 60, 40, "label2", "当前运动量太小,无法记录\n是否结束运动", DEFAULT_VECTOR_FONT_FILENAME, 30);
 
         container_->Add(label1_);
         container_->Add(label2_);
index 64f8625..624a246 100755 (executable)
@@ -62,7 +62,7 @@ namespace OHOS
             (event.GetDeltaX() > 40) && (event.GetDeltaX() > (2 * MATH_ABS(event.GetDeltaY()))))
         {
             uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
-           NativeAbility::GetInstance().ChangeSlice(preSlice);
+           NativeAbility::GetInstance().ChangeSlice(VIEW_TRAINING);
         }
         UNUSED(view);
         return true;
index 11be7f9..79af641 100755 (executable)
@@ -61,8 +61,8 @@ namespace OHOS
         if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT &&\r
             (event.GetDeltaX() > 40) && (event.GetDeltaX() > (2 * MATH_ABS(event.GetDeltaY()))))\r
         {\r
-            uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();\r
-            NativeAbility::GetInstance().ChangeSlice(preSlice);\r
+            //uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();\r
+            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL);\r
         }\r
         UNUSED(view);\r
         return true;\r