绑定弹窗优化，解决绑定弹窗有概率不出现问题，272，230，n9同步修改

diff --git a/code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp
index 9e00b75..3f96bdf 100644 (file)
--- a/code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp
@@ -477,6 +477,10 @@ void MsgCenterNotifyDeviceBindProc(const Topic topic, Request* req)
                 }else{
                     PairingViewEventListener::GetInstance().SetDeviceName(NULL);
                 }
+                if(NotificationManager::GetInstance()->HasNotifyShowing())
+                {
+                    NotificationManager::GetInstance()->StopNotify();
+                }
                 NotificationManager::GetInstance()->ShowNotify(showDeviceBindingNotify, (uint16_t)topic, true);
                 break;
             case DEVICEUNBIND:

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/msg_center_customer.cpp
index f8c18b7..eb15c2b 100644 (file)
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/msg_center_customer.cpp
@@ -472,6 +472,10 @@ void MsgCenterNotifyDeviceBindProc(const Topic topic, Request* req)
                 }else{
                     PairingViewEventListener::GetInstance().SetDeviceName(NULL);
                 }
+                if(NotificationManager::GetInstance()->HasNotifyShowing())
+                {
+                    NotificationManager::GetInstance()->StopNotify();
+                }
                 NotificationManager::GetInstance()->ShowNotify(showDeviceBindingNotify, (uint16_t)topic, true);
                 break;
             case DEVICEUNBIND:

diff --git a/code/sdk/application/wearable/n9/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/n9/service/msg_center/src/msg_center_customer.cpp
index 37f7369..ab4e8b4 100644 (file)
--- a/code/sdk/application/wearable/n9/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/n9/service/msg_center/src/msg_center_customer.cpp
@@ -472,6 +472,10 @@ void MsgCenterNotifyDeviceBindProc(const Topic topic, Request* req)
                 }else{
                     PairingViewEventListener::GetInstance().SetDeviceName(NULL);
                 }
+                if(NotificationManager::GetInstance()->HasNotifyShowing())
+                {
+                    NotificationManager::GetInstance()->StopNotify();
+                }
                 NotificationManager::GetInstance()->ShowNotify(showDeviceBindingNotify, (uint16_t)topic, true);
                 break;
             case DEVICEUNBIND: