gengxin
authorCCC <2393524978@qq.com>
Wed, 15 Nov 2023 08:23:16 +0000 (16:23 +0800)
committerCCC <2393524978@qq.com>
Wed, 15 Nov 2023 08:23:16 +0000 (16:23 +0800)
2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_sensor_interface.c
2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.c
2.sdk/sdk/gui/lv_watch/lv_apps/lowbattery/lowbattery.c
2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c
2.sdk/sdk/gui/lv_watch/mmi_location/mmi_location.c

index ddb0638..d923b3d 100644 (file)
@@ -47,11 +47,15 @@ void asl_pedometer_poweron_on_init(void)
     Hal_Rtc_Gettime(&today);
 
     nv_pedometer_step_data_get(&s_pedometer_data);
-    if (today.tm_mday != s_pedometer_data.date.tm_mday) 
+    if(today.tm_year != s_pedometer_data.date.tm_year
+               || today.tm_mon != s_pedometer_data.date.tm_mon
+               || today.tm_mday != s_pedometer_data.date.tm_mday
+               ) 
        {
-        memset(&s_pedometer_data, 0x0, sizeof(nv_watch_pedometer_step_t));
-               memcpy(&(s_pedometer_data.date), &today, sizeof(hal_rtc_t));
-        nv_pedometer_step_data_save(&s_pedometer_data);
+        //memset(&s_pedometer_data, 0x0, sizeof(nv_watch_pedometer_step_t));
+               //memcpy(&(s_pedometer_data.date), &today, sizeof(hal_rtc_t));
+        //nv_pedometer_step_data_save(&s_pedometer_data);
+               asl_pedometer_steps_clear();
     }
 }
 
@@ -96,7 +100,14 @@ void asl_pedometer_steps_clear(void)
 
 void mmi_pedometer_steps_mission(hal_rtc_t cur_time)
 {
-    if(0 == cur_time.tm_min && 0 == cur_time.tm_hour)
+    if(cur_time.tm_year != s_pedometer_data.date.tm_year 
+               || cur_time.tm_mon != s_pedometer_data.date.tm_mon 
+               || cur_time.tm_mday != s_pedometer_data.date.tm_mday
+               )
+       {
+               asl_pedometer_steps_clear();
+       }
+    else if(0 == cur_time.tm_min && 0 == cur_time.tm_hour)
        {
                if(0 == s_step_clear_flag)
                {
index f773d07..d3a46a0 100644 (file)
@@ -82,6 +82,22 @@ void mmi_ui_msg_action_charging_prompt(uint32_t chg_status)
                return;
        }
 #endif
+
+       if(true == voip_connect_check_req())
+       {
+               return;
+       }
+
+#ifdef __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__
+       if(true == mmi_health_measure_state_is_ui_measure())
+               return;
+#endif
+
+       if(NULL != lv_watch_get_activity_obj(ACT_ID_FACTORY_MODE_MAIN))
+               return;
+       
+       if(NULL != lv_watch_get_activity_obj(ACT_ID_FACTORY_MODE_TEST))
+               return;
        
        mmi_msg_charging_prompt_t * msg_info = (mmi_msg_charging_prompt_t *)Hal_Mem_Alloc(sizeof(mmi_msg_charging_prompt_t));
 
@@ -99,6 +115,12 @@ void mmi_ui_msg_action_do_not_disturb(uint8_t flag)
 
        if(0 == Hal_Pm_Get_State())
                return;
+
+       if(NULL != lv_watch_get_activity_obj(ACT_ID_FACTORY_MODE_MAIN))
+               return;
+       
+       if(NULL != lv_watch_get_activity_obj(ACT_ID_FACTORY_MODE_TEST))
+               return;
        
        mmi_msg_do_not_disturb_t * msg_info = (mmi_msg_do_not_disturb_t *)Hal_Mem_Alloc(sizeof(mmi_msg_do_not_disturb_t));
 
index 6d707b2..0714ae4 100644 (file)
@@ -61,16 +61,22 @@ void lowbattery_task(lv_task_t * task)
             lowbattery_destory();
         }
     } else {
-        if(Hal_Battery_Get_Status() < ENTER_LOWBATTERY_MODE_LEVEL) {
+        if(Hal_Battery_Get_Status() < ENTER_LOWBATTERY_MODE_LEVEL)
+               {
             if((NULL == lv_watch_get_activity_obj(ACT_ID_LOWBATTERY))
-                    && (NULL == lv_watch_get_activity_obj(ACT_ID_PHONE))) {
+                && (NULL == lv_watch_get_activity_obj(ACT_ID_PHONE))
+                )
+            {
                 // enter low battery mode
                 printf("enter low battery mode\n");
                 lowbattery_create_btn_action(NULL);
                        #if USE_LV_WATCH_AUDIO_PLAYER != 0
                 audio_player_lowbattery_process();
                        #endif
-            } else {
+                               voip_activity_destroy_req();
+            }
+                       else
+                       {
                 // update time
                 if(NULL == lv_watch_get_activity_obj(ACT_ID_PHONE)) {
                     lv_lowbattery_ext_t * ext = lv_obj_get_ext_attr(lv_watch_get_activity_obj(ACT_ID_LOWBATTERY));
@@ -87,7 +93,9 @@ void lowbattery_task(lv_task_t * task)
                     shutdown_confirm_btn_action(NULL, LV_EVENT_CLICKED);
                 }
             }
-        } else {
+        } 
+               else
+               {
             // exit low battery mode
             if(NULL != lv_watch_get_activity_obj(ACT_ID_LOWBATTERY)) {
                 printf("[@CHENG_DEBUG][%s][%d]: exit low battery mode\n", __FUNCTION__, __LINE__);
index 21965a0..2e42394 100644 (file)
@@ -1217,6 +1217,7 @@ static lv_obj_t * ring_off_content_create(lv_obj_t * par)
 //    } else {
 //        lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -12);
 //    }
+    lv_obj_set_style_local_radius(content, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 15);
     lv_obj_set_size(content, LV_HOR_RES - 40, 50);
        lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -10);
     lv_cont_set_layout(content, LV_LAYOUT_CENTER);
index cb93bbb..8bcbef9 100644 (file)
@@ -101,7 +101,6 @@ void mmi_watch_location_mission_list_data_send(void)
 
 #if 1
 
-       // for debug
        uint8_t t_total = _lv_ll_get_len(&s_watch_location_mission_ll);
        uint8_t t_counter = 0;
        
@@ -194,6 +193,7 @@ void mmi_watch_location_mission_list_data_send(void)
 
 void mmi_watch_location_gps_data_get(void)
 {
+#if USE_GPS
        double gpsLon = 0, gpsLat = 0;
        gpsNmeaDataT gpsNmeaData = {0};
 
@@ -231,10 +231,12 @@ void mmi_watch_location_gps_data_get(void)
         gps2wgs84(pBuf.NmeaGgaData.latitude, pBuf.NmeaGgaData.longitude, &gpsLat, &gpsLon);
     }
        */
+#endif
 }
 
 void mmi_watch_location_gps_finsh_cb(void *param)
 {
+#if USE_GPS
        LOCATION_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
        
        if(NULL != param)
@@ -263,22 +265,27 @@ void mmi_watch_location_gps_finsh_cb(void *param)
                        s_watch_location_gps_state = MMI_WATCH_LOCATION_STATE_SUCCESS;
                }
        }
+#endif
 }
 
 void mmi_watch_location_gps_stop(void)
 {
+#if USE_GPS
        LOCATION_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
        
        gps_request_locate_stop();
+#endif
 }
 
 void mmi_watch_location_gps_start(void)
 {
+#if USE_GPS
        LOCATION_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
        
        s_watch_location_gps_state = MMI_WATCH_LOCATION_STATE_PROCESS;
        
        gps_request_locate_start(mmi_watch_location_gps_finsh_cb);
+#endif
 }
 
 void mmi_watch_location_cell_stop(void)
@@ -419,7 +426,11 @@ static void mmi_watch_location_mission_timer_cb(uint32_t para)
        else
        {
                if(MMI_WATCH_LOCATION_STATE_SUCCESS == s_watch_location_cell_state
+                       #if USE_GPS
                        && MMI_WATCH_LOCATION_STATE_SUCCESS == s_watch_location_gps_state
+                       #else
+                       && MMI_WATCH_LOCATION_STATE_SUCCESS == s_watch_location_wifi_state
+                       #endif
                        )
                {
                        LOCATION_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);