增加运动过程中gps丢失界面

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
index 4606562..2be36be 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
@@ -71,7 +71,7 @@ namespace OHOS
         //ECG
         {VIEW_ECG, PNG_APPLIST_ECG_IMAGE_BIG, PNG_APPLIST_ECG_IMAGE, PNG_APPLIST_DEFAULT_IMG, "ECG", STR_BP_CHECK, nullptr},
         //情绪
-        {VIEW_EMOTION, PNG_APPLIST_EMOTION_IMAGE_BIG, PNG_APPLIST_EMOTION_IMAGE, PNG_APPLIST_DEFAULT_IMG, "情绪", STR_EMOTION, nullptr},
+        // {VIEW_EMOTION, PNG_APPLIST_EMOTION_IMAGE_BIG, PNG_APPLIST_EMOTION_IMAGE, PNG_APPLIST_DEFAULT_IMG, "情绪", STR_EMOTION, nullptr},
         //压力
         //{VIEW_STRESS, PNG_APPLIST_STRESS_IMAGE_BIG, PNG_APPLIST_STRESS_IMAGE, PNG_APPLIST_DEFAULT_IMG, "压力", STR_STRESS, nullptr},
         //疲劳度

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h
index 8c8d773..f738530 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h
@@ -82,6 +82,7 @@ namespace OHOS
         UICardPage *InitDataPage(void);\r
         UICardPage *InitMusicPage(void);\r
 \r
+\r
         UICardPage *InitDetailPage(void);\r
 \r
         void InitView();\r
@@ -90,9 +91,12 @@ namespace OHOS
         void PreLoad(void);\r
 \r
         void InitImageAnimator();\r
+\r
         void ShowGetTagView();\r
         void ShowEndView();\r
         void ShowHeartView();\r
+        void ShowGPSView();\r
+\r
         bool RefreshEndView();\r
         UICrossView *GetTraingCrad();\r
         int GetCurrentPage();\r
@@ -110,6 +114,7 @@ namespace OHOS
         UIScrollView *endView{nullptr};\r
         UIScrollView *getView{nullptr};\r
         UIScrollView *heartView{nullptr};\r
+        UIScrollView *gpsView{nullptr};\r
         TrainingControlView *controlview_{nullptr}; // 控制卡片\r
         TraingDataAllView *dataallview_{nullptr};      // 数据卡片\r
         TrainingDetailView *DetailView{nullptr};   // 详细数据卡片\r
@@ -137,6 +142,12 @@ namespace OHOS
         UIImageView *heartiamge = nullptr;\r
         UILabelButtonExt *buttonnote_ = nullptr;\r
 \r
+        /*GPS弹窗*/\r
+        UILabelExt *gpstitle = nullptr;\r
+        UILabelExt *gpsnote = nullptr;\r
+        UIImageView *gpsiamge = nullptr;\r
+        UILabelButtonExt *gpsbuttonnote_ = nullptr;\r
+\r
         bool viewiInitStatus{false};\r
         bool momentumFlag{false};\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
index ca2ebc0..05cbf93 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
@@ -658,6 +658,17 @@ void TraingCardView::DeInit() {
   hearttitle = nullptr;\r
   delete labelnote;\r
   labelnote = nullptr;\r
+\r
+  delete gpstitle;\r
+  gpstitle = nullptr;\r
+  delete gpsnote;\r
+  gpsnote = nullptr;\r
+  delete gpsiamge;\r
+  gpsiamge = nullptr;\r
+  delete gpsbuttonnote_;\r
+  gpsbuttonnote_ = nullptr;\r
+\r
+\r
   /*图片*/\r
   delete heartiamge;\r
   heartiamge = nullptr;\r
@@ -686,6 +697,8 @@ void TraingCardView::DeInit() {
   dataallview_ = nullptr;\r
   delete musicview_;\r
   musicview_ = nullptr;\r
+  delete gpsView;\r
+  gpsView = nullptr;\r
   delete DetailView; //删除屏蔽卡片\r
   DetailView = nullptr;\r
 \r
@@ -937,6 +950,42 @@ void TraingCardView::ShowHeartView() {
   heartView->SetVisible(false); // 界面隐藏\r
   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ShowHeartView end");\r
 }\r
+void TraingCardView::ShowGPSView() {\r
+  gpsView = new UIScrollView();\r
+  if (gpsView == nullptr) {\r
+    return;\r
+  }\r
+  gpsView->SetPosition(0, 0);\r
+  gpsView->Resize(VERTICAL_RESOLUTION, HORIZONTAL_RESOLUTION);\r
+  gpsView->SetScrollBlankSize(20);\r
+  gpsView->SetReboundSize(50);\r
+  gpsView->SetDirection(1);\r
+\r
+  // 初始化Lable 根据gps状态显示\r
+  InitLabel(gpstitle, 83, 50, 300, 35, "label1", "GPS丢失",\r
+                DEFAULT_VECTOR_FONT_FILENAME, 35);\r
+  gpsView->Add(gpstitle);\r
+\r
+  InitLabel(gpsnote, 53, 269, 360, 35, "label3", "当前位置搜索不到GPS信号",\r
+            DEFAULT_VECTOR_FONT_FILENAME_EN, 30);\r
+  gpsnote->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
+  gpsnote->SetRollSpeed(23);\r
+  gpsView->Add(gpsnote);\r
+\r
+  InitImageView(gpsiamge, 193, 140, 80, 80, "note", WARNING_IMAGE);\r
+  gpsView->Add(gpsiamge);\r
+\r
+  InitButtonExt(gpsbuttonnote_, 0, 366, 466, 100, BUTTONNOTE, STR_OK, 30);\r
+  gpsbuttonnote_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE);\r
+  gpsbuttonnote_->SetOnClickListener(static_cast<UIView::OnClickListener *>(\r
+      TraingCardPresenter::GetInstance()));\r
+  gpsView->Add(gpsbuttonnote_);\r
+\r
+  RootView::GetInstance()->Add(gpsView);\r
+  gpsView->SetDraggable(false);\r
+  gpsView->SetTouchable(true);\r
+  gpsView->SetVisible(false); // 界面隐藏\r
+}\r
 /*获取运动量结束弹窗界面刷新*/\r
 bool TraingCardView::RefreshEndView() {\r
   // 获取训练卡路里判断运动量\r