From: hcj <1224667075@qq.com> Date: Sat, 22 Jun 2024 04:14:35 +0000 (+0800) Subject: 产测修改 X-Git-Tag: release_V1.2.70_20241020_135402~948^2~15 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=903d7e8d7c44b10af9611969145ccfeb06645189;p=mirrors%2FFD230.git 产测修改 --- 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 5e14ddb52..d3e76ad97 100644 --- 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, OLDTEST, DEEPSLEEP, + shutdown, + FACTORYRESE, TEST_1, MAX_TESTVIEWID, 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 a02cd9f13..60046d0a6 100644 --- 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 2c77354c3..235669df4 100644 --- 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}, {DEEPSLEEP,"deepsleep","xxxxxxxxx",true}, {shutdown,"shutdown","xxxxxxxxx",true}, + {FACTORYRESE,"FactoryReset","xxxxxxxxx",true}, }; // {FACTORYRESETVIEW,"FactoryResetButton",true}, // {SYSTEMLUPGRADE,"systemupgread",true}, @@ -213,6 +214,14 @@ namespace OHOS mcu_pm_lcd_off(NULL,NULL); return true; } + + if(strcmp(view.GetViewId(),"FactoryReset") == 0) + { + //TODO: close bt and cat1 , then deepsleep + do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_RESTORE_FACTORY_SETTING, NULL, 0); + return true; + } + for(int i=0;iSetText(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 0991f1443..c26491bfe 100644 --- 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;