From: Caisking <3449750381@qq.com> Date: Fri, 15 Dec 2023 03:22:56 +0000 (+0800) Subject: 优化部分界面逻辑 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=d4503afbf9eb325d0b020799dfbe21fb81a42321;p=mirrors%2FFD230.git 优化部分界面逻辑 --- diff --git a/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingEndnote2View.cpp b/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingEndnote2View.cpp index 07a3a471c..0285ef22f 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingEndnote2View.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingEndnote2View.cpp @@ -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_); diff --git a/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingGPSlackPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingGPSlackPresenter.cpp index 64f862514..624a24637 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingGPSlackPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingGPSlackPresenter.cpp @@ -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; diff --git a/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingSetPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingSetPresenter.cpp index 11be7f9ff..79af641af 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingSetPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/traing/src/TraingSetPresenter.cpp @@ -61,8 +61,8 @@ namespace OHOS if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && (event.GetDeltaX() > 40) && (event.GetDeltaX() > (2 * MATH_ABS(event.GetDeltaY())))) { - uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); - NativeAbility::GetInstance().ChangeSlice(preSlice); + //uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); + NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); } UNUSED(view); return true;