n9产测中文修改

diff --git a/code/sdk/zhihui/UI/producttest/src/testA5133.cpp b/code/sdk/zhihui/UI/producttest/src/testA5133.cpp
index 40d7a21..5b06652 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,"A5133测试");
         testa5133ScrollView->Add(Title);
 
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testGPS.cpp b/code/sdk/zhihui/UI/producttest/src/testGPS.cpp
index 98dc41e..45698c6 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testGPS.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testGPS.cpp
@@ -264,7 +264,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, "GPS测试");
         mainContainer->Add(Title);
         
         // 固定元素：GPS状态显示（顶部固定，居中）

diff --git a/code/sdk/zhihui/UI/producttest/src/testLCD.cpp b/code/sdk/zhihui/UI/producttest/src/testLCD.cpp
index 205aabe..f724c66 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testLCD.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testLCD.cpp
@@ -185,7 +185,7 @@ namespace OHOS
         }
 
 
-        Title= testAboutView::GetInstance()->init_title(163,45,"LCD_TEST");
+        Title= testAboutView::GetInstance()->init_title(163,45,"LCD测试");
         testLCDScrollView->Add(Title);
 
         //  uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);

diff --git a/code/sdk/zhihui/UI/producttest/src/testModel.cpp b/code/sdk/zhihui/UI/producttest/src/testModel.cpp
index a70ae57..3ed226a 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testModel.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testModel.cpp
@@ -19,21 +19,21 @@ 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"},
+        {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, "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"},
+        {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, "GPS"},
     };
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testPing.cpp b/code/sdk/zhihui/UI/producttest/src/testPing.cpp
index 4949baf..d4801c3 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testPing.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testPing.cpp
@@ -203,7 +203,7 @@ namespace OHOS
             .height = 35,
             .fontSize = 40,
             .lineHeigh = 35,
-            .text = "connecting ...",
+            .text = "连接中...",
             .lineBreakMode = UILabel::LINE_BREAK_WRAP,
         };
         label_result= InitLabel(Config);
@@ -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,"网络测试");
         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..b5b84ff 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

diff --git a/code/sdk/zhihui/UI/producttest/src/testTP.cpp b/code/sdk/zhihui/UI/producttest/src/testTP.cpp
index fde7665..ff8b70d 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);

diff --git a/code/sdk/zhihui/UI/producttest/src/testView.cpp b/code/sdk/zhihui/UI/producttest/src/testView.cpp
index 56aff6e..73399cc 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},
-        {LCD, "LCDButton", "LCD", "LCDButton_next", &testView::ChangeLCDTESTView, true},
-        {TP, "TPButton", "TP", "TPButton_next", &testView::ChangeTPTESTView, true},
+        {QRCODE, "QRCodeButton", "二维码", "QRCodeButton_next", &testView::ChangeQRCodeTESTView, true},
+        {VISON, "AboutTheWatchButton", "版本信息", "AboutTheWatchButton_next", &testView::ChangeSystemAboutView, true},
+        {LCD, "LCDButton", "屏幕", "LCDButton_next", &testView::ChangeLCDTESTView, 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},
 #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", "GPS", "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
@@ -274,7 +274,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("产测");
         SystemLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
         SystemLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         SystemLabel->SetRollSpeed(6);

diff --git a/code/sdk/zhihui/UI/producttest/src/testabout.cpp b/code/sdk/zhihui/UI/producttest/src/testabout.cpp
index 7ac4650..b02c747 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..aca5825 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);
 
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testbutton.cpp b/code/sdk/zhihui/UI/producttest/src/testbutton.cpp
index 22574cb..cdb0b89 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testbutton.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testbutton.cpp
@@ -129,12 +129,12 @@ namespace OHOS
                     if(falg==true)
                     {
                         button[0]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Red().full);
-                        button[0]->SetText("POWER_KEY::\npress");
+                        button[0]->SetText("电源键：\n按下");
                     }
                     else
                     {
                         button[0]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full);
-                        button[0]->SetText("POWER_KEY::\nraise");
+                        button[0]->SetText("电源键：\n松开");
 
                     }
                     
@@ -145,12 +145,12 @@ namespace OHOS
                     if(falg==true)
                     {
                         button[1]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Red().full);
-                        button[1]->SetText("FUNC_KEY::\npress");
+                        button[1]->SetText("功能键：\n按下");
                     }
                     else
                     {
                         button[1]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full);
-                        button[1]->SetText("FUNC_KEY::\nraise");
+                        button[1]->SetText("功能键：\n松开");
                     }
                 }
 
@@ -160,12 +160,12 @@ namespace OHOS
                     if(falg==true)
                     {
                         button[2]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Red().full);
-                        button[2]->SetText("FUNC_KEY2::\npress");
+                        button[2]->SetText("功能键2：\n按下");
                     }
                     else
                     {
                         button[2]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full);
-                        button[2]->SetText("FUNC_KEY2::\nraise");
+                        button[2]->SetText("功能键2：\n松开");
                     }
                 }
 #endif
@@ -188,13 +188,13 @@ namespace OHOS
         if(falg)
         {
             button[index]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Red().full);
-            button[index]->SetText("crown::spin");
+            button[index]->SetText("表冠：旋转");
             
         }
         else
         {
             button[index]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full);
-            button[index]->SetText("crown::raise");
+            button[index]->SetText("表冠：松开");
         }
         RootView::GetInstance()->Invalidate();
         
@@ -257,8 +257,8 @@ namespace OHOS
         buttonconfig.label_x=40;
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=25;
-        buttonconfig.ViewId="POWER_KEY:";
-        buttonconfig.str="POWER_KEY:";
+        buttonconfig.ViewId="电源键:";
+        buttonconfig.str="电源键:";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
         button[0]=SetTheButton_ext(buttonconfig);
         testBUTTONScrollView->Add(button[0]);
@@ -270,8 +270,8 @@ namespace OHOS
         buttonconfig.label_x=40;
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=25; 
-        buttonconfig.ViewId="FUNC_KEY:";
-        buttonconfig.str="FUNC_KEY:";
+        buttonconfig.ViewId="功能键:";
+        buttonconfig.str="功能键:";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
         button[1]=SetTheButton_ext(buttonconfig);
         testBUTTONScrollView->Add(button[1]);
@@ -284,8 +284,8 @@ namespace OHOS
         buttonconfig.label_x=40;
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=25; 
-        buttonconfig.ViewId="FUNC_KEY2:";
-        buttonconfig.str="FUNC_KEY2:";
+        buttonconfig.ViewId="功能键2:";
+        buttonconfig.str="功能键2:";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
         button[2]=SetTheButton_ext(buttonconfig);
         testBUTTONScrollView->Add(button[2]);
@@ -297,8 +297,8 @@ namespace OHOS
         buttonconfig.label_x=40;
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=25; 
-        buttonconfig.ViewId="crown::";
-        buttonconfig.str="crown::";
+        buttonconfig.ViewId="表冠:";
+        buttonconfig.str="表冠:";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
         button[3]=SetTheButton_ext(buttonconfig);
         testBUTTONScrollView->Add(button[3]);
@@ -312,8 +312,8 @@ namespace OHOS
         buttonconfig.label_x=40;
         buttonconfig.label_y=0;
         buttonconfig.Fontsize=25; 
-        buttonconfig.ViewId="crown::";
-        buttonconfig.str="crown::";
+        buttonconfig.ViewId="表冠:";
+        buttonconfig.str="表冠:";
         buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
         button[2]=SetTheButton_ext(buttonconfig);
         testBUTTONScrollView->Add(button[2]);
@@ -337,7 +337,7 @@ namespace OHOS
             buttonconfig.Fontsize=25; 
             char buf[16]={0};
             sprintf(buf,"%d",buttonconfig.y );
-            buttonconfig.ViewId="crown::";
+            buttonconfig.ViewId="表冠:";
             buttonconfig.str=buf;
             buttonconfig.ALIGN=TEXT_ALIGNMENT_LEFT;
             button[i]=SetTheButton_ext(buttonconfig);
@@ -367,7 +367,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..387b3c5 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,"CAT1测试");
         testcat1ScrollView->Add(Title);
 
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testchanging.cpp b/code/sdk/zhihui/UI/producttest/src/testchanging.cpp
index 1f58c02..b673406 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testchanging.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testchanging.cpp
@@ -116,7 +116,7 @@ namespace OHOS
         button->SetStyleForState(STYLE_BORDER_RADIUS,0, UIButton::PRESSED);
         button->SetTouchable(false);
 
-        button->SetText("usb::stat");
+        button->SetText("USB状态");
         button->SetAlign(TEXT_ALIGNMENT_LEFT);
         button->SetLabelPosition(buttonconfig.label_x,buttonconfig.label_y );
         button->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, buttonconfig.Fontsize);
@@ -141,12 +141,12 @@ namespace OHOS
             if(falg==true)
             {
                 button->SetStyle(STYLE_BACKGROUND_COLOR, Color::Red().full);
-                button->SetText("usb::1");
+                button->SetText("USB:已连接");
             }
             else
             {
                 button->SetStyle(STYLE_BACKGROUND_COLOR, Color::Blue().full);
-                button->SetText("usb::0");
+                button->SetText("USB:未连接");
             }
             RootView::GetInstance()->Invalidate();
            
@@ -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);
 
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp b/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp
index b359656..29e041b 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp
@@ -262,7 +262,7 @@ namespace OHOS
             .height = 35,
             .fontSize = 30,
             .lineHeigh = 35,
-            .text = "GSENSOR_TEST",
+            .text = "加速度计测试",
             .lineBreakMode = UILabel::LINE_BREAK_ADAPT,
         };
         title = InitLabel(Config);

diff --git a/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp b/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp
index d4227f0..8ca66da 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp
@@ -232,7 +232,7 @@ namespace OHOS
             .height = 35,
             .fontSize = 30,
             .lineHeigh = 35,
-            .text = "green:\nred:\nir:",
+            .text = "绿:\n红:\n红外:",
             .lineBreakMode = UILabel::LINE_BREAK_ADAPT,
         };
         label_hrsenson_value_vison= InitLabel(Config);
@@ -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);
 
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testluminance.cpp b/code/sdk/zhihui/UI/producttest/src/testluminance.cpp
index ab68b65..27dcf1a 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

diff --git a/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp b/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp
index 14d7b9d..0a1587c 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp
@@ -246,7 +246,7 @@ namespace OHOS
             .height = 35,
             .fontSize = 30,
             .lineHeigh = 35,
-            .text = "MAGNETIC_TEST",
+            .text = "磁力计测试",
             .lineBreakMode = UILabel::LINE_BREAK_ADAPT,
         };
         title = InitLabel(Config);

diff --git a/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp b/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp
index 8add170..3695d3a 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);
 
 

diff --git a/code/sdk/zhihui/UI/producttest/src/testmotor.cpp b/code/sdk/zhihui/UI/producttest/src/testmotor.cpp
index bb659e7..3194989 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

diff --git a/code/sdk/zhihui/UI/producttest/src/testold.cpp b/code/sdk/zhihui/UI/producttest/src/testold.cpp
index 55ee56b..aea969d 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testold.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testold.cpp
@@ -564,27 +564,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..ef478ce 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);