gengxin

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c b/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c
index 7306edb..ad21658 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c
@@ -59,15 +59,6 @@ extern phone_call_params_t  call_params;
  *   GLOBAL FUNCTIONS
 ***********************/
 
-#ifdef __MMI_ZHSX_SUPPORT__
-static bool s_is_ACT_ID_PHONE = false;
-
-bool mmi_is_ACT_ID_PHONE(void)
-{
-       return s_is_ACT_ID_PHONE;
-}
-#endif
-
 #ifdef __MMI_ZHSX_SUPPORT__
 
 #define MMI_AUTO_ANSWER_TIMEOUT (1000 * 30) // ms
@@ -341,10 +332,6 @@ lv_obj_t * phone_create(lv_obj_t * activity_obj, phone_ui_t phone_ui_id)
                        return NULL;
        }
 
-#ifdef __MMI_ZHSX_SUPPORT__
-       s_is_ACT_ID_PHONE = true;
-#endif
-
        lv_obj_t * obj = lv_watch_obj_create(activity_obj);
        LV_ASSERT_MEM(obj);
        if(obj == NULL) 
@@ -634,10 +621,6 @@ lv_obj_t * phone_create(lv_obj_t * activity_obj, phone_ui_t phone_ui_id)
                        return NULL;
        }
 
-#ifdef __MMI_ZHSX_SUPPORT__
-       s_is_ACT_ID_PHONE = true;
-#endif
-
        lv_obj_t * obj = lv_watch_obj_create(activity_obj);
        LV_ASSERT_MEM(obj);
        if(obj == NULL) 
@@ -1554,9 +1537,6 @@ static void phone_prepare_destory(lv_obj_t * activity_obj)
 #ifdef __MMI_ZHSX_SUPPORT__
        mmi_incoming_call_auto_answer_timer_stop();
 #endif
-#ifdef __MMI_ZHSX_SUPPORT__
-       s_is_ACT_ID_PHONE = false;
-#endif
 }
 
 static void get_time_elaps(uint32_t last_time, char * str, int8_t size)

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/sos/sos.c b/2.sdk/sdk/gui/lv_watch/lv_apps/sos/sos.c
index d5ff715..12d1757 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/sos/sos.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/sos/sos.c
@@ -137,10 +137,6 @@ void sos_destory(void)
         lv_task_del(ext->gif_task_p);
         lv_obj_del(lv_watch_get_activity_obj(ACT_ID_SOS));
     }
-
-#ifdef __MMI_ZHSX_SUPPORT__
-       s_is_ACT_ID_SOS = false;
-#endif
 }
 
 static void sos_do_dailing_next(void)
@@ -277,10 +273,6 @@ lv_obj_t * sos_create(lv_obj_t * activity_obj)
     if(activity_obj == NULL) 
                return NULL;
 
-#ifdef __MMI_ZHSX_SUPPORT__
-       s_is_ACT_ID_SOS = true;
-#endif
-
     set_sos_status(SOS_GIF_ON);
     lv_sos_ext_t * ext = lv_obj_allocate_ext_attr(activity_obj, sizeof(lv_sos_ext_t));
     if(ext == NULL) 
@@ -304,6 +296,8 @@ lv_obj_t * sos_create(lv_obj_t * activity_obj)
 
 lv_res_t mmi_key_back_sos_btn_action(void)
 {
+       printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+       
        if(false == watch_modem_sim_present_check_req())
        {
                printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
@@ -352,6 +346,9 @@ static void sos_confirm_destory(lv_obj_t * activity_obj)
 {
     lv_watch_png_cache_all_free();
   
+#ifdef __MMI_ZHSX_SUPPORT__
+       s_is_ACT_ID_SOS = false;
+#endif
 }
 TIMER_ID sos=NULL;
 static void sos_confirm_action(lv_obj_t * btn, lv_event_t event)
@@ -426,6 +423,11 @@ lv_obj_t * sos_confirm_create(lv_obj_t * activity_obj)
         LV_ASSERT_MEM(activity_obj);
         if(activity_obj == NULL) return NULL;
     }
+
+#ifdef __MMI_ZHSX_SUPPORT__
+       s_is_ACT_ID_SOS = true;
+#endif
+
     lv_obj_t * obj = lv_watch_obj_create(activity_obj);
     LV_ASSERT_MEM(obj);
     if(obj == NULL) return NULL;

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
index 7483abe..10d6942 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
@@ -9,14 +9,10 @@ bool mmi_active_screen_is_prohibit_interrupted(void)
 {
        if(MMI_MODEM_CALL_STATE_NULL != phone_get_call_state())
        {
+               printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
                return true;
        }
        
-    if(true == mmi_is_ACT_ID_PHONE())
-       {
-               return true;
-       }
-
 //    if(NULL != lv_watch_get_activity_obj(ACT_ID_ANYOBJ))
 //     {
 //             return true;
@@ -24,32 +20,38 @@ bool mmi_active_screen_is_prohibit_interrupted(void)
        
     if(true == mmi_is_ACT_ID_SHUTDOWN())
        {
+               printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
                return true;
        }
 
        if(true == mmi_is_ACT_ID_RESTART())
        {
+               printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
                return true;
        }
 
        if(true == mmi_is_ACT_ID_POWON_LOGO())
        {
+               printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
                return true;
        }
 
        if(true == mmi_is_ACT_ID_WATCH_FACTORY_RESET())
        {
+               printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
                return true;
        }
 
        if(true == mmi_is_ACT_ID_ALARM())
        {
+               printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
                return true;
        }
 
 #if USE_LV_WATCH_SOS != 0
        if(true == mmi_is_ACT_ID_SOS())
        {
+               printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
                return true;
        }
 #endif
@@ -776,7 +778,7 @@ static void mmi_watch_no_sim_power_off_callback(uint32_t para)
        
        if((false == watch_modem_sim_present_check_req())
                && (false == mmi_is_ACT_ID_FACTORY_MODE_MAIN())
-               && (false == mmi_is_ACT_ID_PHONE())
+               && (MMI_MODEM_CALL_STATE_NULL == phone_get_call_state())
                )
        {
                // power off prompt
@@ -813,7 +815,7 @@ void mmi_watch_no_sim_power_off_check_mission(void)
                return;
 
        if((true == mmi_is_ACT_ID_FACTORY_MODE_MAIN())
-               || (true == mmi_is_ACT_ID_PHONE())
+               || (MMI_MODEM_CALL_STATE_NULL != phone_get_call_state())
                )
                return;