增加运动icon

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalView.cpp
index 82b4121..1c4d8e4 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalView.cpp
@@ -20,17 +20,13 @@ namespace OHOS
     TraingNomalView::TraingNomalView()
     {
         /*判断是否需要GPS*/
-        if(TraingModel::GetInstance()->IsNeedGPS(TraingModel::GetInstance()->GetSportEvent()) == true)
-        {
-            TraingModel::GetInstance()->start_heart_gps();
-        }
+        TraingModel::GetInstance()->start_heart_gps();
         g_pTraingNomalView = this;
     }
 
     TraingNomalView::~TraingNomalView()
     {
         DeInit();
-        // TraingModel::GetInstance()->stop_heart_gps();
         g_pTraingNomalView = nullptr;
     }
 
@@ -214,7 +210,7 @@ namespace OHOS
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "加载GPS连接图标失败: %s", GPS_1_IMAGE);
                 return false;
             }
-            button_image_path = GPS_1_IMAGE;
+            button_image_path = GO_1_IMAGE;
         }
         else
         {
@@ -224,10 +220,12 @@ namespace OHOS
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "加载GPS断开图标失败: %s", GPS_2_IMAGE);
                 return false;
             }
-            button_image_path = GPS_2_IMAGE;
+            button_image_path = GO_2_IMAGE;
         }
         gps_image_->SetSrc(image);
         buttonGo_->SetImageSrc(button_image_path.c_str(), button_image_path.c_str());
+        //刷新一下
+        GetRootContainer()->Invalidate();
         return true; 
     }
 }

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalView.cpp
index 82b4121..1c4d8e4 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalView.cpp
@@ -20,17 +20,13 @@ namespace OHOS
     TraingNomalView::TraingNomalView()
     {
         /*判断是否需要GPS*/
-        if(TraingModel::GetInstance()->IsNeedGPS(TraingModel::GetInstance()->GetSportEvent()) == true)
-        {
-            TraingModel::GetInstance()->start_heart_gps();
-        }
+        TraingModel::GetInstance()->start_heart_gps();
         g_pTraingNomalView = this;
     }
 
     TraingNomalView::~TraingNomalView()
     {
         DeInit();
-        // TraingModel::GetInstance()->stop_heart_gps();
         g_pTraingNomalView = nullptr;
     }
 
@@ -214,7 +210,7 @@ namespace OHOS
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "加载GPS连接图标失败: %s", GPS_1_IMAGE);
                 return false;
             }
-            button_image_path = GPS_1_IMAGE;
+            button_image_path = GO_1_IMAGE;
         }
         else
         {
@@ -224,10 +220,12 @@ namespace OHOS
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "加载GPS断开图标失败: %s", GPS_2_IMAGE);
                 return false;
             }
-            button_image_path = GPS_2_IMAGE;
+            button_image_path = GO_2_IMAGE;
         }
         gps_image_->SetSrc(image);
         buttonGo_->SetImageSrc(button_image_path.c_str(), button_image_path.c_str());
+        //刷新一下
+        GetRootContainer()->Invalidate();
         return true; 
     }
 }

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingNomalView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingNomalView.cpp
index 82b4121..1c4d8e4 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingNomalView.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingNomalView.cpp
@@ -20,17 +20,13 @@ namespace OHOS
     TraingNomalView::TraingNomalView()
     {
         /*判断是否需要GPS*/
-        if(TraingModel::GetInstance()->IsNeedGPS(TraingModel::GetInstance()->GetSportEvent()) == true)
-        {
-            TraingModel::GetInstance()->start_heart_gps();
-        }
+        TraingModel::GetInstance()->start_heart_gps();
         g_pTraingNomalView = this;
     }
 
     TraingNomalView::~TraingNomalView()
     {
         DeInit();
-        // TraingModel::GetInstance()->stop_heart_gps();
         g_pTraingNomalView = nullptr;
     }
 
@@ -214,7 +210,7 @@ namespace OHOS
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "加载GPS连接图标失败: %s", GPS_1_IMAGE);
                 return false;
             }
-            button_image_path = GPS_1_IMAGE;
+            button_image_path = GO_1_IMAGE;
         }
         else
         {
@@ -224,10 +220,12 @@ namespace OHOS
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "加载GPS断开图标失败: %s", GPS_2_IMAGE);
                 return false;
             }
-            button_image_path = GPS_2_IMAGE;
+            button_image_path = GO_2_IMAGE;
         }
         gps_image_->SetSrc(image);
         buttonGo_->SetImageSrc(button_image_path.c_str(), button_image_path.c_str());
+        //刷新一下
+        GetRootContainer()->Invalidate();
         return true; 
     }
 }

diff --git a/code/sdk/files/fd230/fs/user/res/Training/icon_36x36/Riding.bin b/code/sdk/files/fd230/fs/user/res/Training/icon_36x36/Riding.bin
index 6988c96..9afc523 100644 (file)
Binary files a/code/sdk/files/fd230/fs/user/res/Training/icon_36x36/Riding.bin and b/code/sdk/files/fd230/fs/user/res/Training/icon_36x36/Riding.bin differ

diff --git a/code/sdk/files/fd230/fs/user/res/Training/icon_36x36/riding.bin b/code/sdk/files/fd230/fs/user/res/Training/icon_36x36/riding.bin
new file mode 100644 (file)
index 0000000..6988c96
Binary files /dev/null and b/code/sdk/files/fd230/fs/user/res/Training/icon_36x36/riding.bin differ

diff --git a/code/sdk/files/fd230/fs/user/res/Training/icon_36x36/running.bin b/code/sdk/files/fd230/fs/user/res/Training/icon_36x36/running.bin
new file mode 100644 (file)
index 0000000..62b06f6
Binary files /dev/null and b/code/sdk/files/fd230/fs/user/res/Training/icon_36x36/running.bin differ

diff --git a/code/sdk/files/fd230/fs/user/res/Training/icon_36x36/walking.bin b/code/sdk/files/fd230/fs/user/res/Training/icon_36x36/walking.bin
new file mode 100644 (file)
index 0000000..2d23784
Binary files /dev/null and b/code/sdk/files/fd230/fs/user/res/Training/icon_36x36/walking.bin differ

diff --git a/code/sdk/files/fd272/fs/user/res/Training/icon_36x36/Riding.bin b/code/sdk/files/fd272/fs/user/res/Training/icon_36x36/Riding.bin
index 6988c96..9afc523 100644 (file)
Binary files a/code/sdk/files/fd272/fs/user/res/Training/icon_36x36/Riding.bin and b/code/sdk/files/fd272/fs/user/res/Training/icon_36x36/Riding.bin differ

diff --git a/code/sdk/files/fd272/fs/user/res/Training/icon_36x36/riding.bin b/code/sdk/files/fd272/fs/user/res/Training/icon_36x36/riding.bin
new file mode 100644 (file)
index 0000000..6988c96
Binary files /dev/null and b/code/sdk/files/fd272/fs/user/res/Training/icon_36x36/riding.bin differ

diff --git a/code/sdk/files/fd272/fs/user/res/Training/icon_36x36/running.bin b/code/sdk/files/fd272/fs/user/res/Training/icon_36x36/running.bin
new file mode 100644 (file)
index 0000000..62b06f6
Binary files /dev/null and b/code/sdk/files/fd272/fs/user/res/Training/icon_36x36/running.bin differ

diff --git a/code/sdk/files/fd272/fs/user/res/Training/icon_36x36/walking.bin b/code/sdk/files/fd272/fs/user/res/Training/icon_36x36/walking.bin
new file mode 100644 (file)
index 0000000..2d23784
Binary files /dev/null and b/code/sdk/files/fd272/fs/user/res/Training/icon_36x36/walking.bin differ

diff --git a/code/sdk/files/n9/fs/user/res/Training/icon_36x36/Walking.bin b/code/sdk/files/n9/fs/user/res/Training/icon_36x36/Walking.bin
new file mode 100644 (file)
index 0000000..d1ff8c4
Binary files /dev/null and b/code/sdk/files/n9/fs/user/res/Training/icon_36x36/Walking.bin differ

diff --git a/code/sdk/files/n9/fs/user/res/Training/icon_36x36/riding.bin b/code/sdk/files/n9/fs/user/res/Training/icon_36x36/riding.bin
new file mode 100644 (file)
index 0000000..6988c96
Binary files /dev/null and b/code/sdk/files/n9/fs/user/res/Training/icon_36x36/riding.bin differ

diff --git a/code/sdk/files/n9/fs/user/res/Training/icon_36x36/running.bin b/code/sdk/files/n9/fs/user/res/Training/icon_36x36/running.bin
new file mode 100644 (file)
index 0000000..62b06f6
Binary files /dev/null and b/code/sdk/files/n9/fs/user/res/Training/icon_36x36/running.bin differ