产测修改

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testPresenter.h
index 5e14ddb..d3e76ad 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testPresenter.h
@@ -38,7 +38,9 @@ namespace OHOS
         SEChipTest,\r
         OLDTEST,\r
         DEEPSLEEP,\r
+        \r
         shutdown,\r
+        FACTORYRESE,\r
         TEST_1,\r
         \r
         MAX_TESTVIEWID,\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testcat1.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testcat1.h
index a02cd9f..60046d0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testcat1.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testcat1.h
@@ -64,6 +64,7 @@ namespace OHOS
         {
             char * modem_version;  
             char * cat1appver;
+            char  calibration[1];
         };
 
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp
index 2c77354..235669d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp
@@ -57,6 +57,7 @@ namespace OHOS
         {OLDTEST,"oldtestbutton","oldtestexit",true},\r
         {DEEPSLEEP,"deepsleep","xxxxxxxxx",true},\r
         {shutdown,"shutdown","xxxxxxxxx",true},\r
+        {FACTORYRESE,"FactoryReset","xxxxxxxxx",true},\r
         };\r
         // {FACTORYRESETVIEW,"FactoryResetButton",true},\r
         // {SYSTEMLUPGRADE,"systemupgread",true},\r
@@ -213,6 +214,14 @@ namespace OHOS
             mcu_pm_lcd_off(NULL,NULL);\r
             return true;\r
         }\r
+\r
+        if(strcmp(view.GetViewId(),"FactoryReset") == 0)\r
+        {\r
+            //TODO: close bt and cat1 , then deepsleep\r
+            do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_RESTORE_FACTORY_SETTING, NULL, 0);\r
+            return true;\r
+        }\r
+\r
         for(int i=0;i<len;i++)\r
         {\r
             if(strcmp(view.GetViewId(),ViewMapper_t[i].viewid_str) == 0)\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp
index 4436d9c..f78493d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp
@@ -43,9 +43,8 @@ namespace OHOS
 \r
         {OLDTEST,"oldtestbutton","aging" ,&testView::ChangeoldTESTView},\r
         {DEEPSLEEP,"deepsleep","DeepSleepCurrent" ,&testView::ChangeoldTESTView},\r
-\r
         {shutdown,"shutdown","shutdown" ,&testView::ChangeoldTESTView},\r
-        // {FACTORYRESETVIEW,"FactoryResetButton","恢复出厂", &testView::ChangeSystemAboutView},\r
+        {FACTORYRESE,"FactoryReset","FactoryReset", &testView::ChangeoldTESTView},\r
         // {SYSTEMLUPGRADE,"systemupgread","系统升级",&testView::ChangeSystemAboutView},\r
         // {TEST,"testButton","测试模式", &testView::ChangeSystemAboutView},\r
         \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbt.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbt.cpp
index 25645b2..da73e93 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbt.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testbt.cpp
@@ -26,8 +26,6 @@ extern "C"
 #endif
 #endif
 
-
-
 namespace OHOS
 {
     // #define BLE_scan
@@ -152,7 +150,11 @@ namespace OHOS
             #ifdef BLE_scan
             srv_ble_start_scan();
             #else
-            uint32_t device_classes = DEVICE_MAJOR_CLASS_AUDIO_VIDEO|DEVICE_MAJOR_CLASS_PHONE|SERVICE_AUDIO;
+            uint32_t device_classes = 
+            DEVICE_MAJOR_CLASS_AUDIO_VIDEO|DEVICE_MAJOR_CLASS_PHONE|SERVICE_AUDIO
+            |SERVICE_LIMITED_DISCOVERABILITY|SERVICE_POSITIONING|SERVICE_NETWORKING
+            |SERVICE_RENDER|SERVICE_CAPTURE|SERVICE_OBJECT_TRANSFER|SERVICE_TELEPHONY
+            |SERVICE_INFORMATION;
             // errcode_t err = gap_br_set_inquiry_paramters(device_classes, 5);
             errcode_t err = gap_br_set_inquiry_paramters(0,20);
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"gap_br_set_inquiry_paramters errcode_t %d!\n",err);
@@ -275,9 +277,10 @@ namespace OHOS
         char buf[128]={0};
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "rssi %d",rssi);
 
-        sprintf_s(buf,128,"name:%s\naddr:%02X%02X%02X%02X%02X%02X\nRssi:%d",name,addr[0],addr[1],addr[2],addr[3],addr[4],addr[5],rssi);
+        sprintf_s(buf,128,"addr:%02X%02X%02X%02X%02X%02X\nRssi:%d",name,addr[0],addr[1],addr[2],addr[3],addr[4],addr[5],rssi);
         label_BR_SCAN[i]->SetText(buf);
         RootView::GetInstance()->Invalidate();
+        
         return true;
     }
 //    void uapi_cat1_remove_cat1_vote(void)
@@ -334,7 +337,7 @@ namespace OHOS
 
         for(int i=0 ;i<5;i++)
         {
-            Config.top+=180;
+            Config.top+=100;
             label_BR_SCAN[i]= InitLabel(Config);
             testBTScrollView->Add(label_BR_SCAN[i]);
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testcat1.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testcat1.cpp
index 0991f14..c26491b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testcat1.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testcat1.cpp
@@ -105,7 +105,7 @@ namespace OHOS
         if(label_1_cat1vison!=nullptr)
         {
             char buf[124]={0};
-            sprintf(buf,"appver:%s\nmodem_ver:%s\n",t.cat1appver,t.modem_version);
+            sprintf(buf,"appver:%s\nmodem_ver:%s\ncalibration:%s",t.cat1appver,t.modem_version,t.calibration);
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s",buf);
             label_1_cat1vison->SetText(buf);
             RootView::GetInstance()->Invalidate();
@@ -189,6 +189,8 @@ namespace OHOS
    
         msgver.cat1appver = uapi_dev_runtime_get_cat1_pyver();
         msgver.modem_version = uapi_dev_runtime_get_cat1_modemver();
+       
+        ble_get_cat1_at_msg(msgver.calibration,1);
 
         OHOS::testcat1View::cat1_msg msg={0};
         msg.imei = uapi_dev_runtime_get_cat1_imei();
@@ -279,6 +281,9 @@ namespace OHOS
 
         cat1_getsignal();
         cat1_getver();
+
+        cat1_at_cmd("at*mrd_cdf=Q,LteCalData.nvm");
+       
         /* -------------------------------------------------------------------------- */
         // ButtonConfig_ext_t buttonconfig;
         // buttonconfig.x = 100;