弹窗增加优先级判定

diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
index d2866b9..0738afc 100644 (file)
--- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
@@ -373,7 +373,10 @@ void MsgCenterNotifyChargePlugProc(const Topic topic, Request* req)
     }
     else
     {
-        NotificationManager::GetInstance()->ShowNotify(ShowChargeingNotify, (uint16_t)topic, true);
+        if (CheckPriority(topic))
+        {
+            NotificationManager::GetInstance()->ShowNotify(ShowChargeingNotify, (uint16_t)topic, true);
+        }
     }
    
 }
@@ -433,8 +436,11 @@ void MsgCenterNotifyLowPowerAlarmProc(const Topic topic, Request* req)
         display_api->set_screen_set_keepon_timeout(1000*5);
 
         set_lowpower_falg(0);
-        NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_TWO);
-        NotificationManager::GetInstance()->ShowNotify(showlowpowerNotify, (uint16_t)topic, true);
+        if (CheckPriority(topic))
+        {
+            NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_TWO);
+            NotificationManager::GetInstance()->ShowNotify(showlowpowerNotify, (uint16_t)topic, true);
+        }
     }
     else
     {
@@ -448,9 +454,11 @@ void MsgCenterNotifyLowPowerAlarmProc(const Topic topic, Request* req)
         set_lowpower_falg(1);
         if (NotificationManager::GetInstance()->HasNotifyShowing())
         NotificationManager::GetInstance()->StopNotify();
-
+        if (CheckPriority(topic))
+        {
         NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_ONE);
         NotificationManager::GetInstance()->ShowNotify(showlowpowerNotify, (uint16_t)topic, true);
+        }
 
     }
 
@@ -708,6 +716,7 @@ void MsgCenterNotifyMessageProc(const Topic topic, Request* req)
     unused(req);
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "MsgCenterNotifyMessageProc !");
     if (CheckPriority(topic)) {
+        NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_THREE);
         NotificationManager::GetInstance()->ShowNotify(showMessageNotify, (uint16_t)topic, true);
     }
 }
@@ -730,8 +739,10 @@ void MsgCenterNotifySleepProc(const Topic topic, Request* req)
     {
         NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_THREE);
     }
- 
-    NotificationManager::GetInstance()->ShowNotify(showSleepNotify, (uint16_t)topic, true);
+    if (CheckPriority(topic))
+    {
+        NotificationManager::GetInstance()->ShowNotify(showSleepNotify, (uint16_t)topic, true);
+    }
     
 }
 #endif
@@ -1151,8 +1162,12 @@ void MsgCenterNotifyArAlertProc(const Topic topic, Request* req)
     {
         return;
     }
-    MotionRecognitionViewEventListener::GetInstance().SetMotionTypeId(*motionType);
-    NotificationManager::GetInstance()->ShowNotify(showMotionRecognitionNotify, (uint16_t)topic, true);
+    if (CheckPriority(topic))
+    {
+        MotionRecognitionViewEventListener::GetInstance().SetMotionTypeId(*motionType);
+        NotificationManager::GetInstance()->ShowNotify(showMotionRecognitionNotify, (uint16_t)topic, true);
+    }
+   
 }
 
 void MsgCenterNotifyInactivityProc(const Topic topic, Request *req)
@@ -1195,7 +1210,10 @@ void MsgCenterNotifyInactivityProc(const Topic topic, Request *req)
         case INACTIVITY_MODE_SEDENTARY_OUTPUT:
             if(cywee_Inactivity_Info->status == 1)
             {
-                NotificationManager::GetInstance()->ShowNotify(showSedentaryReminderNotify, (uint16_t)topic, true);
+                if (CheckPriority(topic))
+                {
+                    NotificationManager::GetInstance()->ShowNotify(showSedentaryReminderNotify, (uint16_t)topic, true);
+                }
             } 
             else if(cywee_Inactivity_Info->status==9)
             {