Merge #1408 into sdk602patch0911 from refs/changes/1408/head

优化cat1产测界面刷新，优化电量存储

* refs/changes/1408/head: (1 commits squashed)

  - 优化cat1产测界面刷新，优化电量存储

Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1408

diff --git a/code/sdk/application/battery/service/battery_service.cpp b/code/sdk/application/battery/service/battery_service.cpp
index d749936..0cf34f7 100644 (file)
--- a/code/sdk/application/battery/service/battery_service.cpp
+++ b/code/sdk/application/battery/service/battery_service.cpp
@@ -159,10 +159,6 @@ static void battery_save_percent(void)
 {
     float voltage;
     uint8_t percent = batteryservice_get_voltage(&voltage);
-    if(!percent)
-    {
-        return;
-    }
     uapi_save_file_data("/user/userdata/battery.bin",&percent,1,"wb");
     PRINT("battery_save_percent : %d",percent);
 }

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 91898da..2fd939f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testcat1.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testcat1.cpp
@@ -182,6 +182,7 @@ namespace OHOS
 
     static void  mgdataTimerCallBack(int data)
     {
+        cat1_at_cmd("at*mrd_cdf=Q,LteCalData.nvm");
         cat1_getsignal();
         cat1_getver();
         OHOS::testcat1View *pview = OHOS::testcat1View::GetInstance();
@@ -190,14 +191,13 @@ 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();
         msg.sim = uapi_dev_runtime_get_cat1_simstat();
         msg.signal = uapi_dev_runtime_get_cat1_signal();
         msg.oper = uapi_dev_runtime_get_cat1_operator();
-   
+        ble_get_cat1_at_msg(msgver.calibration,1);
+        
         if(pview !=NULL)
         {
             pview->setcat1vermsg(msgver);
@@ -341,7 +341,7 @@ namespace OHOS
         uint32_t tick;
         osStatus_t retTimer;
         Gsenson_TEST_timer = osTimerNew((osTimerFunc_t)mgdataTimerCallBack, osTimerPeriodic, NULL, NULL);
-        tick =3000;// osMs2Tick(1000);
+        tick =2000;// osMs2Tick(1000);
         retTimer = osTimerStart(Gsenson_TEST_timer, tick);
         if (retTimer != osOK && Gsenson_TEST_timer != NULL) {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"StartCallTimer osTimerStart failed, ret = %lx!!", retTimer);