产测优化为中文

diff --git a/code/sdk/zhihui/UI/producttest/src/testA5133.cpp b/code/sdk/zhihui/UI/producttest/src/testA5133.cpp
index 40d7a21..411b214 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testA5133.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testA5133.cpp
@@ -187,7 +187,7 @@ namespace OHOS
         {
             uapi_set4GCapability(true);
             send_a5133_cmd_msg(9);
-            button[1]->SetText("start transmit");
+            button[1]->SetText("开始发送");
             button[1]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Green().full);
             transmit_flag = true;
             if(A5133_TEST_timer)
@@ -200,7 +200,7 @@ namespace OHOS
         }
         else
         {
-            button[1]->SetText("stop transmit");
+            button[1]->SetText("停止发送");
             button[1]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full);   
             transmit_flag = false;
             if(A5133_TEST_timer)
@@ -220,14 +220,14 @@ namespace OHOS
         {
             uapi_set4GCapability(true);
             send_a5133_cmd_msg(10);
-            button[0]->SetText("start receive");
+            button[0]->SetText("开始接收");
             button[0]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Green().full);
             receive_flag = true;
 
         }
         else
         {
-            button[0]->SetText("stop receive");
+            button[0]->SetText("停止接收");
             button[0]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full);   
 
             receive_flag = false;
@@ -365,7 +365,7 @@ namespace OHOS
         label_a5133_SCAN[0]->SetStyle(STYLE_TEXT_FONT, 25);
 
         // Set additional property
-        label_a5133_SCAN[0]->SetText("default");
+        label_a5133_SCAN[0]->SetText("默认");
         label_a5133_SCAN[0]->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
         label_a5133_SCAN[0]->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         label_a5133_SCAN[0]->SetRollSpeed(0);
@@ -405,7 +405,7 @@ namespace OHOS
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=30;
         buttonconfig.ViewId="receive";
-        buttonconfig.str="receive";
+        buttonconfig.str="接收";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
 
         button[0]=SetTheButton_ext(buttonconfig);
@@ -466,7 +466,7 @@ namespace OHOS
         labelButton_next= testAboutView::GetInstance()->init_button_next(270,80,Test_ViewMapper_t[id].viewid_str_next);
         testa5133ScrollView->Add(labelButton_next);
         
-        Title= testAboutView::GetInstance()->init_title(165,45,"A5133_TEST");
+        Title= testAboutView::GetInstance()->init_title(165,45,"RF5133测试");
         testa5133ScrollView->Add(Title);
 
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testGPS.cpp b/code/sdk/zhihui/UI/producttest/src/testGPS.cpp
index 67ed930..e8e5105 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testGPS.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testGPS.cpp
@@ -269,7 +269,7 @@ namespace OHOS
         mainContainer->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
         
         // 固定元素：标题（顶部固定）
-        Title = testAboutView::GetInstance()->init_title(165, 15, "GPS_TEST");
+        Title = testAboutView::GetInstance()->init_title(165, 15, "定位测试");
         mainContainer->Add(Title);
         
         // 固定元素：GPS状态显示（顶部固定，居中）
@@ -375,13 +375,13 @@ namespace OHOS
         
 #if ENABLE_TEST_RESULT_BUTTONS
         // 测试结果按钮（产测必需功能）
-        if (!InitLabelButton(oktestBtn, 50, 240, 135, 60, "TestOKGPS", "成功", 22))
+        if (!InitLabelButton(oktestBtn, 50, 240, 135, 60, "TestOK定位", "成功", 22))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for OK button failed");
             return false;
         }
         
-        if (!InitLabelButton(failtestBtn, 215, 240, 135, 60, "TestNOGPS", "失败", 22))
+        if (!InitLabelButton(failtestBtn, 215, 240, 135, 60, "TestNO定位", "失败", 22))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for Fail button failed");
             return false;

diff --git a/code/sdk/zhihui/UI/producttest/src/testLCD.cpp b/code/sdk/zhihui/UI/producttest/src/testLCD.cpp
index 205aabe..1df33c5 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testLCD.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testLCD.cpp
@@ -204,13 +204,13 @@ namespace OHOS
         bool isScrollable;
         testView::GetInstance()->GetTestButtonPosition("LCD", okX, okY, failX, failY, isScrollable);
         
-        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOKLCD", "成功", 30))
+        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOK液晶", "成功", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for OK button failed");
             return false;
         }
         
-        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNOLCD", "失败", 30))
+        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNO液晶", "失败", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for Fail button failed");
             return false;

diff --git a/code/sdk/zhihui/UI/producttest/src/testModel.cpp b/code/sdk/zhihui/UI/producttest/src/testModel.cpp
index a70ae57..a006c71 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testModel.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testModel.cpp
@@ -19,22 +19,22 @@ namespace OHOS
 {
     // 测试结果数组
     test_status_t test_status_list[MAX_TEST_ITEM] = {
-        {LCD_TEST, TEST_STATUS_NONE, "LCD"},
-        {TP_TEST, TEST_STATUS_NONE, "Touch_Panel"},
-        {MAGETIC_TEST, TEST_STATUS_NONE, "Magnetic"},
-        {LUMINANCE_TEST, TEST_STATUS_NONE, "Luminance"},
-        {BAT_TEST, TEST_STATUS_NONE, "BatteryCharger"},
-        {SPK_TEST, TEST_STATUS_NONE, "Speaker"},
-        {MIC_TEST, TEST_STATUS_NONE, "Microphone"},
-        {MOTOR_TEST, TEST_STATUS_NONE, "Motor"},
-        {HR_TEST, TEST_STATUS_NONE, "Heart_Rate"},
-        {GSENSOR_TEST, TEST_STATUS_NONE, "G_Sensor"},
-        {CAT1_TEST, TEST_STATUS_NONE, "CAT1"},
-        {KEY_TEST, TEST_STATUS_NONE, "Key"},
-        {BUTTON_TEST, TEST_STATUS_NONE, "Buttons"},
-        {BT_TEST, TEST_STATUS_NONE, "Bluetooth"},
-        {APPI_TEST, TEST_STATUS_NONE, "SE_Chip"},
-        {GPS_TEST, TEST_STATUS_NONE, "GPS"},
+        {LCD_TEST, TEST_STATUS_NONE, "液晶"},
+        {TP_TEST, TEST_STATUS_NONE, "触摸屏"},
+        {MAGETIC_TEST, TEST_STATUS_NONE, "磁力计"},
+        {LUMINANCE_TEST, TEST_STATUS_NONE, "亮度"},
+        {BAT_TEST, TEST_STATUS_NONE, "电池充电"},
+        {SPK_TEST, TEST_STATUS_NONE, "喇叭"},
+        {MIC_TEST, TEST_STATUS_NONE, "麦克风"},
+        {MOTOR_TEST, TEST_STATUS_NONE, "马达"},
+        {HR_TEST, TEST_STATUS_NONE, "心率"},
+        {GSENSOR_TEST, TEST_STATUS_NONE, "加速度"},
+        {CAT1_TEST, TEST_STATUS_NONE, "4G"},
+        {KEY_TEST, TEST_STATUS_NONE, "按键"},
+        {BUTTON_TEST, TEST_STATUS_NONE, "按键组"},
+        {BT_TEST, TEST_STATUS_NONE, "蓝牙"},
+        {APPI_TEST, TEST_STATUS_NONE, "SE芯片"},
+        {GPS_TEST, TEST_STATUS_NONE, "定位"},
     };
 
     // 设置测试结果

diff --git a/code/sdk/zhihui/UI/producttest/src/testPing.cpp b/code/sdk/zhihui/UI/producttest/src/testPing.cpp
index 4949baf..3e1c7f7 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testPing.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testPing.cpp
@@ -218,7 +218,7 @@ namespace OHOS
         labelButton_next= testAboutView::GetInstance()->init_button_next(267,278,Test_ViewMapper_t[id].viewid_str_next);
         testPingScrollView->Add(labelButton_next);
         
-        Title= testAboutView::GetInstance()->init_title(165,45,"Ping_TEST");
+        Title= testAboutView::GetInstance()->init_title(165,45,"Ping测试");
         testPingScrollView->Add(Title);
 
         testPingScrollView->SetTouchable(true);

diff --git a/code/sdk/zhihui/UI/producttest/src/testSEChipTest.cpp b/code/sdk/zhihui/UI/producttest/src/testSEChipTest.cpp
index 725363d..05c2987 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testSEChipTest.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testSEChipTest.cpp
@@ -245,7 +245,7 @@ namespace OHOS
         labelButton_next= testAboutView::GetInstance()->init_button_next(267,300,Test_ViewMapper_t[id].viewid_str_next);
         testSEChipScrollView->Add(labelButton_next);
         
-        Title= testAboutView::GetInstance()->init_title(142,40,"SEChip_TEST");
+        Title= testAboutView::GetInstance()->init_title(142,40,"SE芯片测试");
         testSEChipScrollView->Add(Title);
 
 #if ENABLE_TEST_RESULT_BUTTONS
@@ -253,15 +253,15 @@ namespace OHOS
         // 获取SE Chip测试界面的按钮推荐位置
         int okX, okY, failX, failY;
         bool isScrollable;
-        testView::GetInstance()->GetTestButtonPosition("SE_Chip", okX, okY, failX, failY, isScrollable);
+        testView::GetInstance()->GetTestButtonPosition("SE芯片", okX, okY, failX, failY, isScrollable);
         
-        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOKSE_Chip", "成功", 30))
+        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOKSE芯片", "成功", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for OK button failed");
             return nullptr;
         }
         
-        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNOSE_Chip", "失败", 30))
+        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNOSE芯片", "失败", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for Fail button failed");
             return nullptr;

diff --git a/code/sdk/zhihui/UI/producttest/src/testTP.cpp b/code/sdk/zhihui/UI/producttest/src/testTP.cpp
index fde7665..43f5c3c 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testTP.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testTP.cpp
@@ -196,7 +196,7 @@ namespace OHOS
         labelButton_next= testAboutView::GetInstance()->init_button_next(167,378,Test_ViewMapper_t[id].viewid_str_next);
         testTPScrollView->Add(labelButton_next);
 
-        Title= testAboutView::GetInstance()->init_title(175,45,"TP_TEST");
+        Title= testAboutView::GetInstance()->init_title(175,45,"触摸屏测试");
         testTPScrollView->Add(Title);
 
         //  uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
@@ -213,15 +213,15 @@ namespace OHOS
         // 获取TP测试界面的按钮推荐位置
         int okX, okY, failX, failY;
         bool isScrollable;
-        testView::GetInstance()->GetTestButtonPosition("Touch_Panel", okX, okY, failX, failY, isScrollable);
+        testView::GetInstance()->GetTestButtonPosition("触摸屏", okX, okY, failX, failY, isScrollable);
         
-        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOKTouch_Panel", "成功", 30))
+        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOK触摸屏", "成功", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for OK button failed");
             return false;
         }
         
-        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNOTouch_Panel", "失败", 30))
+        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNO触摸屏", "失败", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for Fail button failed");
             return false;

diff --git a/code/sdk/zhihui/UI/producttest/src/testView.cpp b/code/sdk/zhihui/UI/producttest/src/testView.cpp
index ace8d03..bb0fe4b 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testView.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testView.cpp
@@ -40,40 +40,40 @@ namespace OHOS
     // 2.ViewMapper[] 是一个静态的视图映射数组，将视图ID与MainStopWatchView类中的特定成员函数指针进行了绑定。
     test_ext Test_ViewMapper_t[] = {
         {TESTVIEW, "", "", "", &testView::ChangeSystemAboutView, false}, // 占位，空的
-        {QRCODE, "QRCodeButton", "QRCode", "QRCodeButton_next", &testView::ChangeQRCodeTESTView, true},
-        {VISON, "AboutTheWatchButton", "Verison", "AboutTheWatchButton_next", &testView::ChangeSystemAboutView, true},
+        {QRCODE, "QRCodeButton", "二维码", "QRCodeButton_next", &testView::ChangeQRCodeTESTView, true},
+        {VISON, "AboutTheWatchButton", "版本", "AboutTheWatchButton_next", &testView::ChangeSystemAboutView, true},
         {LCD, "LCDButton", "LCD", "LCDButton_next", &testView::ChangeLCDTESTView, true},
-        {TP, "TPButton", "TP", "TPButton_next", &testView::ChangeTPTESTView, true},
+        {TP, "TPButton", "触摸屏", "TPButton_next", &testView::ChangeTPTESTView, true},
 #ifdef SUPPORT_MAG_SERVICE
-        {MAGETIC, "MAGETICButton", "Magetic", "MAGETICButton_next", &testView::ChangeMGTESTView, true},
+        {MAGETIC, "MAGETICButton", "磁力计", "MAGETICButton_next", &testView::ChangeMGTESTView, true},
 #endif
-        {LUMINANCE, "luminanceButton", "luminance", "luminanceButton_next", &testView::ChangLUMTESTView, true},
-        {CHARG, "chargingButton", "bat&charger", "chargingButton_next", &testView::ChangchargingTESTView, true},
-        {SPEAK, "speakButton", "speak", "speakButton_next", &testView::ChangspeakTESTView, true},
-        {MOTOR, "motorButton", "motor", "motorButton_next", &testView::ChangmotorTESTView, true},
+        {LUMINANCE, "luminanceButton", "亮度", "luminanceButton_next", &testView::ChangLUMTESTView, true},
+        {CHARG, "chargingButton", "电池充电", "chargingButton_next", &testView::ChangchargingTESTView, true},
+        {SPEAK, "speakButton", "喇叭", "speakButton_next", &testView::ChangspeakTESTView, true},
+        {MOTOR, "motorButton", "马达", "motorButton_next", &testView::ChangmotorTESTView, true},
 #ifdef SUPPORT_CAT1_SERVICE
-        {CAT1, "cat1button", "CAT1", "cat1button_next", &testView::ChangeCAT1TESTView, true},
+        {CAT1, "cat1button", "4G", "cat1button_next", &testView::ChangeCAT1TESTView, true},
 #endif
-        {BUTTON, "buttonbutton", "Button", "buttonbutton_next", &testView::ChangKEYTESTView, true},
-        {MICROPHONE, "microphonebutton", "microphone", "microphonebutton_next", &testView::ChangeMPTESTView, true},
-        {HRSENSON, "hrsensonbutton", "hrsensor", "hrsensonbutton_next", &testView::ChangeHRTESTView, true},
-        {GSENSON, "gsensonbutton", "gsensor", "gsensonbutton_next", &testView::ChangeGTESTView, true},
-        {BTTEST, "BTbutton", "BT", "BTbutton_next", &testView::ChangeBTTESTView, true},
-        {SEChipTest, "SEChipTestbutton", "SEChipTest", "SEChipTestbutton_next", &testView::ChangeSEChipTESTView, true},
+        {BUTTON, "buttonbutton", "按键", "buttonbutton_next", &testView::ChangKEYTESTView, true},
+        {MICROPHONE, "microphonebutton", "麦克风", "microphonebutton_next", &testView::ChangeMPTESTView, true},
+        {HRSENSON, "hrsensonbutton", "心率", "hrsensonbutton_next", &testView::ChangeHRTESTView, true},
+        {GSENSON, "gsensonbutton", "加速度", "gsensonbutton_next", &testView::ChangeGTESTView, true},
+        {BTTEST, "BTbutton", "蓝牙", "BTbutton_next", &testView::ChangeBTTESTView, true},
+        {SEChipTest, "SEChipTestbutton", "SE芯片", "SEChipTestbutton_next", &testView::ChangeSEChipTESTView, true},
         // {PingTest, "PingTestbutton", "PingTest", "PingTestbutton_next", &testView::ChangePingTESTView, true},
 #if defined(SUPPORT_GNSS)
-        {GPSTEST, "GPSTestbutton", "GPSTest", "GPSTestbutton_next", &testView::ChangeGPSTESTView, true},
+        {GPSTEST, "GPSTestbutton", "定位", "GPSTestbutton_next", &testView::ChangeGPSTESTView, true},
 #endif
 #ifdef ENABLE_LQBP002TA
-        {PRESSURETEST, "pressureTestbutton", "pressureTest", "pressureTestbutton_next", &testView::ChangepressureTestTESTView, true},
+        {PRESSURETEST, "pressureTestbutton", "气压", "pressureTestbutton_next", &testView::ChangepressureTestTESTView, true},
 #endif
 #ifdef AGINGTEST
-        {OLDTEST, "oldtestbutton", "aging", "oldtestexit", &testView::ChangeoldTESTView, true},
+        {OLDTEST, "oldtestbutton", "老化", "oldtestexit", &testView::ChangeoldTESTView, true},
 #endif
-        {DEEPSLEEP, "deepsleep", "DeepSleepCurrent", "xxxxxxxxx", &testView::ChangeoldTESTView, true},
-        {shutdown, "shutdown", "shutdown", "xxxxxxxxx", &testView::ChangeoldTESTView, true},
-        {RESET, "reset", "reset", "xxxxxxxxx", &testView::ChangeoldTESTView, true},
-        {FACTORYRESE, "FactoryReset", "FactoryReset", "xxxxxxxxx", &testView::ChangeoldTESTView, true},
+        {DEEPSLEEP, "deepsleep", "深睡电流", "xxxxxxxxx", &testView::ChangeoldTESTView, true},
+        {shutdown, "shutdown", "关机", "xxxxxxxxx", &testView::ChangeoldTESTView, true},
+        {RESET, "reset", "重启", "xxxxxxxxx", &testView::ChangeoldTESTView, true},
+        {FACTORYRESE, "FactoryReset", "恢复出厂", "xxxxxxxxx", &testView::ChangeoldTESTView, true},
 #ifdef SUPPORT_A5133_SERVICE
         {RF5133, "RF5133", "RF5133", "xxxxxxxxx", &testView::ChangeA5133TESTView, true},
 #endif
@@ -270,7 +270,7 @@ namespace OHOS
         SystemLabel->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
         SystemLabel->SetStyle(STYLE_TEXT_FONT, 30);
         SystemLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
-        SystemLabel->SetText("GNT TEST");
+        SystemLabel->SetText("GNT测试");
         SystemLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
         SystemLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         SystemLabel->SetRollSpeed(6);
@@ -1188,7 +1188,7 @@ namespace OHOS
     // 获取测试按钮的推荐位置
     void testView::GetTestButtonPosition(const char* testModuleName, int& okX, int& okY, int& failX, int& failY, bool& isScrollable)
 {
-    if (strcmp(testModuleName, "TP") == 0 || strcmp(testModuleName, "Touch_Panel") == 0)
+    if (strcmp(testModuleName, "触摸屏") == 0)
     {
         // TP测试界面不能滚动，按钮放在上面，避免遮挡触摸测试区域
         okX = 40;
@@ -1197,7 +1197,7 @@ namespace OHOS
         failY = 80;
         isScrollable = false;
     }
-    else if (strcmp(testModuleName, "LCD") == 0)
+    else if (strcmp(testModuleName, "液晶") == 0)
     {
         // LCD测试界面可以滚动，按钮放在下面，避免遮挡显示测试内容
         okX = 40;
@@ -1206,7 +1206,7 @@ namespace OHOS
         failY = 320;
         isScrollable = true;
     }
-    else if (strcmp(testModuleName, "Magnetic") == 0)
+    else if (strcmp(testModuleName, "磁力计") == 0)
     {
         // 磁力计测试界面可以滚动，按钮放在下面，避免遮挡传感器数据显示
         okX = 40;
@@ -1215,7 +1215,7 @@ namespace OHOS
         failY = 330;
         isScrollable = true;
     }
-    else if (strcmp(testModuleName, "Luminance") == 0)
+    else if (strcmp(testModuleName, "亮度") == 0)
     {
         // 亮度测试界面可以滚动，按钮放在下面，避免遮挡亮度调节滑块
         okX = 40;
@@ -1224,7 +1224,7 @@ namespace OHOS
         failY = 340;
         isScrollable = true;
     }
-    else if (strcmp(testModuleName, "BatteryCharger") == 0)
+    else if (strcmp(testModuleName, "电池充电") == 0)
     {
         // 电池充电测试界面可以滚动，按钮放在下面，避免遮挡充电状态显示
         okX = 40;
@@ -1233,7 +1233,7 @@ namespace OHOS
         failY = 335;
         isScrollable = true;
     }
-    else if (strcmp(testModuleName, "Speaker") == 0)
+    else if (strcmp(testModuleName, "喇叭") == 0)
     {
         // 扬声器测试界面可以滚动，按钮放在下面，避免遮挡音频控制按钮
         okX = 40;
@@ -1242,7 +1242,7 @@ namespace OHOS
         failY = 325;
         isScrollable = true;
     }
-    else if (strcmp(testModuleName, "Microphone") == 0)
+    else if (strcmp(testModuleName, "麦克风") == 0)
     {
         // 麦克风测试界面可以滚动，按钮放在下面，避免遮挡录音控制按钮
         okX = 40;
@@ -1251,7 +1251,7 @@ namespace OHOS
         failY = 325;
         isScrollable = true;
     }
-    else if (strcmp(testModuleName, "Motor") == 0)
+    else if (strcmp(testModuleName, "马达") == 0)
     {
         // 马达测试界面可以滚动，按钮放在下面，避免遮挡马达控制按钮
         okX = 40;
@@ -1260,7 +1260,7 @@ namespace OHOS
         failY = 325;
         isScrollable = true;
     }
-    else if (strcmp(testModuleName, "Heart_Rate") == 0)
+    else if (strcmp(testModuleName, "心率") == 0)
     {
         // 心率传感器测试界面可以滚动，按钮放在下面，避免遮挡心率数据显示
         okX = 40;
@@ -1269,7 +1269,7 @@ namespace OHOS
         failY = 335;
         isScrollable = true;
     }
-    else if (strcmp(testModuleName, "G_Sensor") == 0)
+    else if (strcmp(testModuleName, "加速度") == 0)
     {
         // G传感器测试界面可以滚动，按钮放在下面，避免遮挡传感器数据
         okX = 40;
@@ -1278,7 +1278,7 @@ namespace OHOS
         failY = 330;
         isScrollable = true;
     }
-    else if (strcmp(testModuleName, "CAT1") == 0)
+    else if (strcmp(testModuleName, "4G") == 0)
     {
         // CAT1测试界面可以滚动，按钮放在下面，避免遮挡网络状态信息
         okX = 40;
@@ -1287,7 +1287,7 @@ namespace OHOS
         failY = 330;
         isScrollable = true;
     }
-    else if (strcmp(testModuleName, "Key") == 0)
+    else if (strcmp(testModuleName, "按键") == 0)
     {
         // 按键测试界面可以滚动，按钮放在下面，避免遮挡按键测试区域
         okX = 40;
@@ -1296,7 +1296,7 @@ namespace OHOS
         failY = 345;
         isScrollable = true;
     }
-    else if (strcmp(testModuleName, "GPS") == 0)
+    else if (strcmp(testModuleName, "定位") == 0)
     {
         // GPS测试界面可以滚动，按钮放在下面，避免遮挡GPS状态信息
         okX = 40;
@@ -1339,7 +1339,7 @@ namespace OHOS
         }
         
         // 根据测试项找到对应的界面并更新按钮
-        if (testItem == "LCD")
+        if (testItem == "液晶")
         {
             if (test_LCD_view != nullptr)
             {
@@ -1362,7 +1362,7 @@ namespace OHOS
                 }
             }
         }
-        else if (testItem == "Touch_Panel")
+        else if (testItem == "触摸屏")
         {
             if (test_TP_view != nullptr)
             {
@@ -1385,7 +1385,7 @@ namespace OHOS
                 }
             }
         }
-        else if (testItem == "Bluetooth")
+        else if (testItem == "蓝牙")
         {
             if (test_BT_view != nullptr)
             {
@@ -1408,7 +1408,7 @@ namespace OHOS
                 }
             }
         }
-        else if (testItem == "CAT1")
+        else if (testItem == "4G")
         {
             if (test_cat1_view != nullptr)
             {
@@ -1432,7 +1432,7 @@ namespace OHOS
             }
         }
         #if defined(SUPPORT_GNSS)
-        else if (testItem == "GPS")
+        else if (testItem == "定位")
         {
             if (test_GPS_view != nullptr)
             {
@@ -1456,7 +1456,7 @@ namespace OHOS
             }
         }
         #endif
-        else if (testItem == "SE_Chip")
+        else if (testItem == "SE芯片")
         {
             if (test_SEChip_view != nullptr)
             {
@@ -1479,7 +1479,7 @@ namespace OHOS
                 }
             }
         }
-        else if (testItem == "Microphone")
+        else if (testItem == "麦克风")
         {
             if (test_MP_view != nullptr)
             {
@@ -1502,7 +1502,7 @@ namespace OHOS
                 }
             }
         }
-        else if (testItem == "Magnetic")
+        else if (testItem == "磁力计")
         {
             if (test_MG_view != nullptr)
             {
@@ -1525,7 +1525,7 @@ namespace OHOS
                 }
             }
         }
-        else if (testItem == "Heart_Rate")
+        else if (testItem == "心率")
         {
             if (test_hr_view != nullptr)
             {
@@ -1548,7 +1548,7 @@ namespace OHOS
                 }
             }
         }
-        else if (testItem == "G_Sensor")
+        else if (testItem == "加速度")
         {
             if (test_G_view != nullptr)
             {
@@ -1571,7 +1571,7 @@ namespace OHOS
                 }
             }
         }
-        else if (testItem == "Motor")
+        else if (testItem == "马达")
         {
             if (test_motor_view != nullptr)
             {
@@ -1594,7 +1594,7 @@ namespace OHOS
                 }
             }
         }
-        else if (testItem == "Speaker")
+        else if (testItem == "喇叭")
         {
             if (test_speak_view != nullptr)
             {
@@ -1617,7 +1617,7 @@ namespace OHOS
                 }
             }
         }
-        else if (testItem == "BatteryCharger")
+        else if (testItem == "电池充电")
         {
             if (test_charging_view != nullptr)
             {
@@ -1640,7 +1640,7 @@ namespace OHOS
                 }
             }
         }
-        else if (testItem == "Luminance")
+        else if (testItem == "亮度")
         {
             if (test_lum_view != nullptr)
             {

diff --git a/code/sdk/zhihui/UI/producttest/src/testabout.cpp b/code/sdk/zhihui/UI/producttest/src/testabout.cpp
index 7ac4650..ddc415f 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testabout.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testabout.cpp
@@ -136,7 +136,7 @@ namespace OHOS
         label_button->SetViewId(view_id);// Set style
 
         // Set additional property
-        label_button->SetText("next");
+        label_button->SetText("下一步");
         label_button->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 44);
         label_button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff0b1928, UIButton::PRESSED);
         label_button->SetStyle(STYLE_BACKGROUND_OPA, 0x80);
@@ -226,7 +226,7 @@ namespace OHOS
         }
         /* -------------------------------------------------------------------------- */
        
-        SystemAboutTheWatchTitle = init_title(142,60,"ABOUT_WATCH");
+        SystemAboutTheWatchTitle = init_title(142,60,"关于手表");
        
         testAboutTheWatchScrollView->Add(SystemAboutTheWatchTitle);
         /* -------------------------------------------------------------------------- */

diff --git a/code/sdk/zhihui/UI/producttest/src/testbt.cpp b/code/sdk/zhihui/UI/producttest/src/testbt.cpp
index 54f223c..7d18a6c 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testbt.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testbt.cpp
@@ -193,7 +193,7 @@ namespace OHOS
 
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"gap_br_start_discovery bool %d!\n",ret);
             #endif
-            button->SetText("scaning");
+            button->SetText("扫描中");
             button->SetStyle(STYLE_BACKGROUND_COLOR, Color::Green().full);
             discovery_falg=true;
         }
@@ -207,7 +207,7 @@ namespace OHOS
             
             #endif
 
-            button->SetText("discovery");
+            button->SetText("发现");
             button->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full);   
 
             discovery_falg=false;
@@ -362,7 +362,7 @@ namespace OHOS
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=30;
         buttonconfig.ViewId="discovery";
-        buttonconfig.str="discovery";
+        buttonconfig.str="发现";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
 
         button=SetTheButton_ext(buttonconfig);
@@ -382,7 +382,7 @@ namespace OHOS
         labelButton_next= testAboutView::GetInstance()->init_button_next(270,80,Test_ViewMapper_t[id].viewid_str_next);
         testBTScrollView->Add(labelButton_next);
         
-        Title= testAboutView::GetInstance()->init_title(165,45,"BT_TEST");
+        Title= testAboutView::GetInstance()->init_title(165,45,"蓝牙测试");
         testBTScrollView->Add(Title);
 
 
@@ -407,15 +407,15 @@ namespace OHOS
         // 获取BT测试界面的按钮推荐位置
         int okX, okY, failX, failY;
         bool isScrollable;
-        testView::GetInstance()->GetTestButtonPosition("Bluetooth", okX, okY, failX, failY, isScrollable);
+        testView::GetInstance()->GetTestButtonPosition("蓝牙", okX, okY, failX, failY, isScrollable);
         
-        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOKBluetooth", "成功", 30))
+        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOK蓝牙", "成功", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for OK button failed");
             return false;
         }
         
-        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNOBluetooth", "失败", 30))
+        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNO蓝牙", "失败", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for Fail button failed");
             return false;

diff --git a/code/sdk/zhihui/UI/producttest/src/testbutton.cpp b/code/sdk/zhihui/UI/producttest/src/testbutton.cpp
index 602ff22..d2064ed 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testbutton.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testbutton.cpp
@@ -259,7 +259,7 @@ namespace OHOS
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=25;
         buttonconfig.ViewId="POWER_KEY:";
-        buttonconfig.str="POWER_KEY:";
+        buttonconfig.str="电源键:";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
         button[0]=SetTheButton_ext(buttonconfig);
         testBUTTONScrollView->Add(button[0]);
@@ -272,7 +272,7 @@ namespace OHOS
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=25; 
         buttonconfig.ViewId="FUNC_KEY:";
-        buttonconfig.str="FUNC_KEY:";
+        buttonconfig.str="功能键:";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
         button[1]=SetTheButton_ext(buttonconfig);
         testBUTTONScrollView->Add(button[1]);
@@ -286,7 +286,7 @@ namespace OHOS
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=25; 
         buttonconfig.ViewId="FUNC_KEY2:";
-        buttonconfig.str="FUNC_KEY2:";
+        buttonconfig.str="功能键2:";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
         button[2]=SetTheButton_ext(buttonconfig);
         testBUTTONScrollView->Add(button[2]);
@@ -299,7 +299,7 @@ namespace OHOS
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=25; 
         buttonconfig.ViewId="crown::";
-        buttonconfig.str="crown::";
+        buttonconfig.str="表冠:";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
         button[3]=SetTheButton_ext(buttonconfig);
         testBUTTONScrollView->Add(button[3]);
@@ -314,7 +314,7 @@ namespace OHOS
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=25; 
         buttonconfig.ViewId="crown::";
-        buttonconfig.str="crown::";
+        buttonconfig.str="表冠:";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
         button[2]=SetTheButton_ext(buttonconfig);
         testBUTTONScrollView->Add(button[2]);
@@ -368,7 +368,7 @@ namespace OHOS
         labelButton_next= testAboutView::GetInstance()->init_button_next(300,220,Test_ViewMapper_t[id].viewid_str_next);
         testBUTTONScrollView->Add(labelButton_next);
 
-        Title= testAboutView::GetInstance()->init_title(165,45,"KEY_TEST");
+        Title= testAboutView::GetInstance()->init_title(165,45,"按键测试");
         testBUTTONScrollView->Add(Title);
 
         UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(testPresenter::GetInstance());

diff --git a/code/sdk/zhihui/UI/producttest/src/testcat1.cpp b/code/sdk/zhihui/UI/producttest/src/testcat1.cpp
index 18a1f5b..e649d7a 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testcat1.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testcat1.cpp
@@ -356,7 +356,7 @@ namespace OHOS
         labelButton_next= testAboutView::GetInstance()->init_button_next(267,278,Test_ViewMapper_t[id].viewid_str_next);
         testcat1ScrollView->Add(labelButton_next);
         
-        Title= testAboutView::GetInstance()->init_title(165,45,"CAT1_TEST");
+        Title= testAboutView::GetInstance()->init_title(165,45,"4G测试");
         testcat1ScrollView->Add(Title);
 
 
@@ -368,15 +368,15 @@ namespace OHOS
         // 获取CAT1测试界面的按钮推荐位置
         int okX, okY, failX, failY;
         bool isScrollable;
-        testView::GetInstance()->GetTestButtonPosition("CAT1", okX, okY, failX, failY, isScrollable);
+        testView::GetInstance()->GetTestButtonPosition("4G", okX, okY, failX, failY, isScrollable);
         
-        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOKCAT1", "成功", 30))
+        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOK4G", "成功", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for OK button failed");
             return false;
         }
         
-        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNOCAT1", "失败", 30))
+        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNO4G", "失败", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for Fail button failed");
             return false;

diff --git a/code/sdk/zhihui/UI/producttest/src/testchanging.cpp b/code/sdk/zhihui/UI/producttest/src/testchanging.cpp
index 1f58c02..26481c6 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testchanging.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testchanging.cpp
@@ -207,7 +207,7 @@ namespace OHOS
         }
        testCHANINGScrollView->SetOnDragListener(draglistener);
 
-        Title= testAboutView::GetInstance()->init_title(120,45,"CHANING_TEST");
+        Title= testAboutView::GetInstance()->init_title(120,45,"充电测试");
         testCHANINGScrollView->Add(Title);
 
 
@@ -232,15 +232,15 @@ namespace OHOS
         // 获取充电测试界面的按钮推荐位置
         int okX, okY, failX, failY;
         bool isScrollable;
-        testView::GetInstance()->GetTestButtonPosition("BatteryCharger", okX, okY, failX, failY, isScrollable);
+        testView::GetInstance()->GetTestButtonPosition("电池充电", okX, okY, failX, failY, isScrollable);
         
-        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOKBatteryCharger", "成功", 30))
+        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOK电池充电", "成功", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for OK button failed");
             return false;
         }
         
-        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNOBatteryCharger", "失败", 30))
+        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNO电池充电", "失败", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for Fail button failed");
             return false;

diff --git a/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp b/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp
index b359656..da1898f 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp
@@ -318,15 +318,15 @@ namespace OHOS
         // 获取G-Sensor测试界面的按钮推荐位置
         int okX, okY, failX, failY;
         bool isScrollable;
-        testView::GetInstance()->GetTestButtonPosition("G_Sensor", okX, okY, failX, failY, isScrollable);
+        testView::GetInstance()->GetTestButtonPosition("加速度", okX, okY, failX, failY, isScrollable);
         
-        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOKG_Sensor", "成功", 30))
+        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOK加速度", "成功", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for OK button failed");
             return false;
         }
         
-        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNOG_Sensor", "失败", 30))
+        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNO加速度", "失败", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for Fail button failed");
             return false;

diff --git a/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp b/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp
index 1fe56d9..4452521 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp
@@ -261,7 +261,7 @@ namespace OHOS
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=30;
         buttonconfig.ViewId="gray_card";
-        buttonconfig.str="gray_card";
+        buttonconfig.str="灰卡";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
         button_1=SetTheButton_ext(buttonconfig);
         testhrsensonScrollView->Add(button_1);
@@ -270,7 +270,7 @@ namespace OHOS
 
         buttonconfig.x = 300;
         buttonconfig.ViewId="leeklight";
-        buttonconfig.str="light";
+        buttonconfig.str="漏光";
         button_2=SetTheButton_ext(buttonconfig);
         testhrsensonScrollView->Add(button_2);
 
@@ -301,7 +301,7 @@ namespace OHOS
         labelButton_next= testAboutView::GetInstance()->init_button_next(167,378,Test_ViewMapper_t[id].viewid_str_next);
         testhrsensonScrollView->Add(labelButton_next);
 
-        Title= testAboutView::GetInstance()->init_title(102,45,"HRSSONSER_TEST");
+        Title= testAboutView::GetInstance()->init_title(102,45,"心率测试");
         testhrsensonScrollView->Add(Title);
 
 
@@ -313,15 +313,15 @@ namespace OHOS
         // 获取心率传感器测试界面的按钮推荐位置
         int okX, okY, failX, failY;
         bool isScrollable;
-        testView::GetInstance()->GetTestButtonPosition("Heart_Rate", okX, okY, failX, failY, isScrollable);
+        testView::GetInstance()->GetTestButtonPosition("心率", okX, okY, failX, failY, isScrollable);
         
-        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOKHeart_Rate", "成功", 30))
+        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOK心率", "成功", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for OK button failed");
             return false;
         }
         
-        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNOHeart_Rate", "失败", 30))
+        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNO心率", "失败", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for Fail button failed");
             return false;

diff --git a/code/sdk/zhihui/UI/producttest/src/testluminance.cpp b/code/sdk/zhihui/UI/producttest/src/testluminance.cpp
index ab68b65..583c4ce 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testluminance.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testluminance.cpp
@@ -148,7 +148,7 @@ namespace OHOS
         labelButton_next= testAboutView::GetInstance()->init_button_next(300,278,Test_ViewMapper_t[id].viewid_str_next);
         testLUMScrollView->Add(labelButton_next);
 
-        Title= testAboutView::GetInstance()->init_title(99,54,"BRIGHTNESS_TEST");
+        Title= testAboutView::GetInstance()->init_title(99,54,"亮度测试");
         testLUMScrollView->Add(Title);
 
 #if ENABLE_TEST_RESULT_BUTTONS
@@ -156,15 +156,15 @@ namespace OHOS
         // 获取亮度测试界面的按钮推荐位置
         int okX, okY, failX, failY;
         bool isScrollable;
-        testView::GetInstance()->GetTestButtonPosition("Luminance", okX, okY, failX, failY, isScrollable);
+        testView::GetInstance()->GetTestButtonPosition("亮度", okX, okY, failX, failY, isScrollable);
         
-        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOKLuminance", "成功", 30))
+        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOK亮度", "成功", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for OK button failed");
             return false;
         }
         
-        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNOLuminance", "失败", 30))
+        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNO亮度", "失败", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for Fail button failed");
             return false;

diff --git a/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp b/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp
index 14d7b9d..b13ff1d 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp
@@ -303,15 +303,15 @@ namespace OHOS
         // 获取磁力计测试界面的按钮推荐位置
         int okX, okY, failX, failY;
         bool isScrollable;
-        testView::GetInstance()->GetTestButtonPosition("Magnetic", okX, okY, failX, failY, isScrollable);
+        testView::GetInstance()->GetTestButtonPosition("磁力计", okX, okY, failX, failY, isScrollable);
         
-        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOKMagnetic", "成功", 30))
+        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOK磁力计", "成功", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for OK button failed");
             return false;
         }
         
-        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNOMagnetic", "失败", 30))
+        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNO磁力计", "失败", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for Fail button failed");
             return false;

diff --git a/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp b/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp
index 8add170..b1676b0 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp
@@ -171,7 +171,7 @@ namespace OHOS
                 /* ---------------------------------- 开始录音 ---------------------------------- */
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " AudioCaptureSample(6, (const char **)args); ");
                 AudioCaptureSample(6, (const char **)args);
-                button->SetText("stop mic");
+                button->SetText("停止录音");
 #else
                 ret = uapi_start_audio_test(volume);
                 if(ret != ERRCODE_SUCC)
@@ -180,7 +180,7 @@ namespace OHOS
                     uapi_stop_audio_test();
                 }
                 else
-                    button[0]->SetText("stop");
+                    button[0]->SetText("停止");
 #endif
                 makphone_falg = 1;
             }
@@ -191,7 +191,7 @@ namespace OHOS
                 int32_t argc = 1;
                 uint8_t *argv = (uint8_t*)"stop";
                 AudioCaptureSample(argc, (const char **)&argv);
-                button->SetText("play mic");
+                button->SetText("播放录音");
                 makphone_falg = 2;
 
                 FILE *file =fopen("/user/userdata/microphone.mp3","rb");
@@ -203,7 +203,7 @@ namespace OHOS
 #endif
 #else
                 uapi_stop_audio_test();
-                button[0]->SetText("start");
+                button[0]->SetText("开始");
                 makphone_falg = 0;
 #endif
             }
@@ -211,14 +211,14 @@ namespace OHOS
 #ifdef CUSTOM_ZHIHUI
             else if(makphone_falg==2)
             {
-                button->SetText("stop play");
+                button->SetText("停止播放");
                 FindWatchViewEventListener::GetInstance().setVolumeVal(100);
                 FindWatchViewEventListener::GetInstance().PopInterPlayMusic(Path);
                 makphone_falg = 3;
             }
             else if(makphone_falg==3)
             {
-                button->SetText("start mic");
+                button->SetText("开始录音");
                 FindWatchViewEventListener::GetInstance().PopInterCancelMusic();
                 makphone_falg = 0;
             }
@@ -266,7 +266,7 @@ namespace OHOS
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=30;
         buttonconfig.ViewId="testmicrohoneView";
-        buttonconfig.str="start";
+        buttonconfig.str="开始";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
         button[0]=SetTheButton_ext(buttonconfig);
         testmakephoneScrollView->Add(button[0]);
@@ -280,7 +280,7 @@ namespace OHOS
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=30;
         buttonconfig.ViewId="addvolume";
-        buttonconfig.str="+volume";
+        buttonconfig.str="加音量";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
         button[1]=SetTheButton_ext(buttonconfig);
         testmakephoneScrollView->Add(button[1]);
@@ -296,7 +296,7 @@ namespace OHOS
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=30;
         buttonconfig.ViewId="testmicrohoneView";
-        buttonconfig.str="start mic";
+        buttonconfig.str="开始录音";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
         button=SetTheButton_ext(buttonconfig);
         testmakephoneScrollView->Add(button);
@@ -314,7 +314,7 @@ namespace OHOS
         labelButton_next= testAboutView::GetInstance()->init_button_next(50,278,Test_ViewMapper_t[id].viewid_str_next);
         testmakephoneScrollView->Add(labelButton_next);
 
-        Title= testAboutView::GetInstance()->init_title(99,45,"MICRPPHONE_TEST");
+        Title= testAboutView::GetInstance()->init_title(99,45,"麦克风测试");
         testmakephoneScrollView->Add(Title);
 
 
@@ -327,15 +327,15 @@ namespace OHOS
         // 获取麦克风测试界面的按钮推荐位置
         int okX, okY, failX, failY;
         bool isScrollable;
-        testView::GetInstance()->GetTestButtonPosition("Microphone", okX, okY, failX, failY, isScrollable);
+        testView::GetInstance()->GetTestButtonPosition("麦克风", okX, okY, failX, failY, isScrollable);
         
-        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOKMicrophone", "成功", 30))
+        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOK麦克风", "成功", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for OK button failed");
             return false;
         }
         
-        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNOMicrophone", "失败", 30))
+        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNO麦克风", "失败", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for Fail button failed");
             return false;

diff --git a/code/sdk/zhihui/UI/producttest/src/testmotor.cpp b/code/sdk/zhihui/UI/producttest/src/testmotor.cpp
index bb659e7..8b4c89d 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testmotor.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testmotor.cpp
@@ -190,7 +190,7 @@ namespace OHOS
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=30;
         buttonconfig.ViewId="MOTOR_play";
-        buttonconfig.str="start";
+        buttonconfig.str="开始";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
         button[0]=SetTheButton_ext(buttonconfig);
         tesMOTORScrollView->Add(button[0]);
@@ -221,7 +221,7 @@ namespace OHOS
         labelButton_next= testAboutView::GetInstance()->init_button_next(267,278,Test_ViewMapper_t[id].viewid_str_next);
         tesMOTORScrollView->Add(labelButton_next);
 
-        Title= testAboutView::GetInstance()->init_title(136,45,"MOTOR_TEST");
+        Title= testAboutView::GetInstance()->init_title(136,45,"马达测试");
         tesMOTORScrollView->Add(Title);
 
 #if ENABLE_TEST_RESULT_BUTTONS
@@ -229,15 +229,15 @@ namespace OHOS
         // 获取马达测试界面的按钮推荐位置
         int okX, okY, failX, failY;
         bool isScrollable;
-        testView::GetInstance()->GetTestButtonPosition("Motor", okX, okY, failX, failY, isScrollable);
+        testView::GetInstance()->GetTestButtonPosition("马达", okX, okY, failX, failY, isScrollable);
         
-        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOKMotor", "成功", 30))
+        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOK马达", "成功", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for OK button failed");
             return false;
         }
         
-        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNOMotor", "失败", 30))
+        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNO马达", "失败", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for Fail button failed");
             return false;

diff --git a/code/sdk/zhihui/UI/producttest/src/testold.cpp b/code/sdk/zhihui/UI/producttest/src/testold.cpp
index 5b80d7d..ddd3645 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testold.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testold.cpp
@@ -572,27 +572,27 @@ namespace OHOS
         
 
         labelButton_shut= testAboutView::GetInstance()->init_button_next(300,500,Test_ViewMapper_t[id].viewid_str_next);
-        labelButton_shut->SetText("shut");
+        labelButton_shut->SetText("关机");
         labelButton_shut->SetViewId("shutdown");
         testoldScrollView->Add(labelButton_shut);
 
         labelButton_deep= testAboutView::GetInstance()->init_button_next(300,400,Test_ViewMapper_t[id].viewid_str_next);
-        labelButton_deep->SetText("deep");
+        labelButton_deep->SetText("深睡");
         labelButton_deep->SetViewId("deep");
         testoldScrollView->Add(labelButton_deep);
 
         labelButton_exit= testAboutView::GetInstance()->init_button_next(300,300,Test_ViewMapper_t[id].viewid_str_next);
-        labelButton_exit->SetText("exit");
+        labelButton_exit->SetText("退出");
         labelButton_exit->SetViewId("exit");
         testoldScrollView->Add(labelButton_exit);
 
         labelButton_start= testAboutView::GetInstance()->init_button_next(300,100,Test_ViewMapper_t[id].viewid_str_next);
-        labelButton_start->SetText("start");
+        labelButton_start->SetText("开始");
         labelButton_start->SetViewId("start");
         testoldScrollView->Add(labelButton_start);
 
         labelButton_stop= testAboutView::GetInstance()->init_button_next(300,200,Test_ViewMapper_t[id].viewid_str_next);
-        labelButton_stop->SetText("stop");
+        labelButton_stop->SetText("停止");
         labelButton_stop->SetViewId("stop");
         testoldScrollView->Add(labelButton_stop);
         

diff --git a/code/sdk/zhihui/UI/producttest/src/testspeak.cpp b/code/sdk/zhihui/UI/producttest/src/testspeak.cpp
index 1731905..cbc5efa 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testspeak.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testspeak.cpp
@@ -215,7 +215,7 @@ namespace OHOS
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=30;
         buttonconfig.ViewId="speak_play";
-        buttonconfig.str="play";
+        buttonconfig.str="播放";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
         button[0]=SetTheButton_ext(buttonconfig);
         testSPEAKScrollView->Add(button[0]);
@@ -228,7 +228,7 @@ namespace OHOS
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=30; 
         buttonconfig.ViewId="speak_puase";
-        buttonconfig.str="puase";
+        buttonconfig.str="暂停";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
         button[1]=SetTheButton_ext(buttonconfig);
         testSPEAKScrollView->Add(button[1]);
@@ -244,7 +244,7 @@ namespace OHOS
         labelButton_next= testAboutView::GetInstance()->init_button_next(267,220,Test_ViewMapper_t[id].viewid_str_next);
         testSPEAKScrollView->Add(labelButton_next);
         
-        Title= testAboutView::GetInstance()->init_title(120,45,"SPEAK_TEST");
+        Title= testAboutView::GetInstance()->init_title(120,45,"喇叭测试");
         testSPEAKScrollView->Add(Title);
 
 
@@ -256,15 +256,15 @@ namespace OHOS
         // 获取扬声器测试界面的按钮推荐位置
         int okX, okY, failX, failY;
         bool isScrollable;
-        testView::GetInstance()->GetTestButtonPosition("Speaker", okX, okY, failX, failY, isScrollable);
+        testView::GetInstance()->GetTestButtonPosition("喇叭", okX, okY, failX, failY, isScrollable);
         
-        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOKSpeaker", "成功", 30))
+        if (!InitLabelButton(oktestBtn, okX, okY, 135, 88, "TestOK喇叭", "成功", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for OK button failed");
             return false;
         }
         
-        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNOSpeaker", "失败", 30))
+        if (!InitLabelButton(failtestBtn, failX, failY, 135, 88, "TestNO喇叭", "失败", 30))
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelButton for Fail button failed");
             return false;