更正图片按键背景警告

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp
index 2fe0e4a..eda7226 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp
@@ -46,13 +46,13 @@ namespace OHOS
         //  初始化Button\r
         TraingModel::GetInstance()->InitButton(button1_, 100, 202, 100, 100, BUTTONSTOP);\r
         // Set additional property\r
-        button1_->SetImageSrc(SPORT_STOP_IMAGE, nullptr);\r
+        button1_->SetImageSrc(SPORT_STOP_IMAGE, SPORT_STOP_IMAGE);\r
         // 设置按钮的点击事件监听器为 TraingGPSPresenter 的实例\r
         button1_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingControlPresenter::GetInstance()));\r
         container_->Add(button1_);\r
         TraingModel::GetInstance()->InitButton(button2_, 255, 202, 100, 100, BUTTONPAUSE);\r
         // Set additional property\r
-        button2_->SetImageSrc(SPORT_PAUSE_IMAGE, nullptr);\r
+        button2_->SetImageSrc(SPORT_PAUSE_IMAGE, SPORT_PAUSE_IMAGE);\r
         button2_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingControlPresenter::GetInstance()));\r
         container_->Add(button2_);\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp
index 0579133..5202692 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp
@@ -67,7 +67,7 @@ namespace OHOS
         //  初始化Button\r
         TraingModel::GetInstance()->InitButton(button1_, 275, 350, 26, 26, BUTTONNOTE);\r
         // Set additional property\r
-        button1_->SetImageSrc(NOTE_IMAGE, nullptr);\r
+        button1_->SetImageSrc(NOTE_IMAGE, NOTE_IMAGE);\r
         button1_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingDataPresenter::GetInstance()));\r
         container_->Add(button1_);\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp
index 015872e..635a0cf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp
@@ -53,12 +53,12 @@ namespace OHOS
         TraingModel::GetInstance()->InitButton(button1_, 111, 299, 100, 100, BUTTONNO);
         button1_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingEndnote2Presenter::GetInstance()));
         // Set additional property
-        button1_->SetImageSrc(NO_IMAGE, nullptr);
+        button1_->SetImageSrc(NO_IMAGE, NO_IMAGE);
 
         TraingModel::GetInstance()->InitButton(button2_, 256, 299, 100, 100, BUTTONYES);
         button2_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingEndnote2Presenter::GetInstance()));
         // Set additional property
-        button2_->SetImageSrc(YES_IMAGE, nullptr);
+        button2_->SetImageSrc(YES_IMAGE, YES_IMAGE);
 
         container_->Add(button1_);
         container_->Add(button2_);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp
index e139db1..59a6739 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp
@@ -53,12 +53,12 @@ namespace OHOS
         TraingModel::GetInstance()->InitButton(button1_, 111, 299, 100, 100, BUTTONNO);
         button1_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingEndnotePresenter::GetInstance()));
         // Set additional property
-        button1_->SetImageSrc(NO_IMAGE, nullptr);
+        button1_->SetImageSrc(NO_IMAGE, NO_IMAGE);
 
         TraingModel::GetInstance()->InitButton(button2_, 256, 299, 100, 100, BUTTONYES);
         button2_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingEndnotePresenter::GetInstance()));
         // Set additional property
-        button2_->SetImageSrc(YES_IMAGE, nullptr);
+        button2_->SetImageSrc(YES_IMAGE, YES_IMAGE);
 
         container_->Add(button1_);
         container_->Add(button2_);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp
index 3aa1607..037a778 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp
@@ -50,7 +50,7 @@ namespace OHOS
         // 初始化Button
         TraingModel::GetInstance()->InitButton(buttonGo_, 133, 133, 200, 200, BUTTONGO);
         // Set additional property
-        buttonGo_->SetImageSrc(GO_1_IMAGE, nullptr);
+        buttonGo_->SetImageSrc(GO_1_IMAGE, GO_1_IMAGE);
 
         TraingModel::GetInstance()->InitButtonExt(buttonSet_, 160, 370, 150, 50, BUTTONSET, STR_SET_GOALS, 30);
         buttonSet_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000); // 设置为透明按键

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp
index 072c142..2f82e46 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp
@@ -118,7 +118,7 @@ namespace OHOS
         //  初始化Button\r
         TraingModel::GetInstance()->InitButton(button1_, 0, 366, 466, 100, BUTTONOK);\r
         // Set additional property\r
-        button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr);\r
+        button1_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE);\r
         button1_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetCaluliPresenter::GetInstance()));\r
         container_->Add(button1_);\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp
index 66f6d1e..35c0e9d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp
@@ -120,7 +120,7 @@ namespace OHOS
         TraingModel::GetInstance()->InitButton(button1_, 0, 366, 466, 100, BUTTONOK);
         // Set additional property
         button1_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetDistPresenter::GetInstance()));
-        button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr);
+        button1_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE);
         container_->Add(button1_);
     }
     /* DeInit：删除组件 */

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp
index b7bafcf..b9f8df1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp
@@ -119,7 +119,7 @@ namespace OHOS
         TraingModel::GetInstance()->InitButton(button1_, 0, 366, 466, 100, BUTTONOK);
         // Set additional property
         button1_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetSeptPresenter::GetInstance()));
-        button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr);
+        button1_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE);
         container_->Add(button1_);
     }
     /* DeInit：删除组件 */

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp
index 1352893..712e07c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp
@@ -119,7 +119,7 @@ namespace OHOS
         TraingModel::GetInstance()->InitButton(button1_, 0, 366, 466, 100, BUTTONOK);\r
         button1_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetTimePresenter::GetInstance()));\r
         // Set additional property\r
-        button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr);\r
+        button1_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE);\r
         container_->Add(button1_);\r
     }\r
     /* DeInit：删除组件 */\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
index a6104ce..f58023d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
@@ -86,22 +86,22 @@ namespace OHOS
     bool TraingView::AddButton()\r
     {\r
         TraingModel::GetInstance()->InitButton(button1_, BUTTON1_X, BUTTON1_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTON1);\r
-        button1_->SetImageSrc(BUTTONGROUND2_IMAGE, nullptr);\r
+        button1_->SetImageSrc(BUTTONGROUND2_IMAGE, BUTTONGROUND2_IMAGE);\r
         UIView::OnClickListener *button1Click = static_cast<UIView::OnClickListener *>(TraingPresenter::GetInstance());\r
         button1_->SetOnClickListener(button1Click);\r
 \r
         TraingModel::GetInstance()->InitButton(button2_, BUTTON2_X, BUTTON2_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTON2);\r
-        button2_->SetImageSrc(BOUTTONGROUND_IMAGE, nullptr);\r
+        button2_->SetImageSrc(BOUTTONGROUND_IMAGE, BOUTTONGROUND_IMAGE);\r
         UIView::OnClickListener *button2Click = static_cast<UIView::OnClickListener *>(TraingPresenter::GetInstance());\r
         button2_->SetOnClickListener(button2Click);\r
 \r
         TraingModel::GetInstance()->InitButton(button3_, BUTTON3_X, BUTTON3_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTON3);\r
-        button3_->SetImageSrc(BOUTTONGROUND_IMAGE, nullptr);\r
+        button3_->SetImageSrc(BOUTTONGROUND_IMAGE, BOUTTONGROUND_IMAGE);\r
         UIView::OnClickListener *button3Click = static_cast<UIView::OnClickListener *>(TraingPresenter::GetInstance());\r
         button3_->SetOnClickListener(button3Click);\r
 \r
         TraingModel::GetInstance()->InitButton(buttonmore_, BUTTONMORE_X, BUTTONMORE_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTONMORE);\r
-        buttonmore_->SetImageSrc(BUTTONGROUND2_IMAGE, nullptr);\r
+        buttonmore_->SetImageSrc(BUTTONGROUND2_IMAGE, BUTTONGROUND2_IMAGE);\r
         UIView::OnClickListener *button4Click = static_cast<UIView::OnClickListener *>(TraingPresenter::GetInstance());\r
         buttonmore_->SetOnClickListener(button4Click);\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp
index bbe4e31..c9ced84 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp
@@ -148,7 +148,7 @@ namespace OHOS
         TraingModel::GetInstance()->InitButton(button1_, 0, 366, 466, 100, BUTTONOK);
         // Set additional property
 
-        button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr);
+        button1_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE);
         button1_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingWinPresenter::GetInstance()));
         container_->Add(button1_);
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp
index d4957f1..4988f27 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp
@@ -55,7 +55,7 @@ namespace OHOS
         TraingModel::GetInstance()->InitButton(button1_, 0, 366, 466, 100, BUTTONOK);
         // Set additional property
         button1_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingGPSbackPresenter::GetInstance()));
-        button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr);
+        button1_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE);
         container_->Add(button1_);
     }
     /* DeInit：删除组件*/