sos修改

diff --git a/code/sdk/application/wearable/evb/service/msg_center/src/notify/makephone_notification.cpp b/code/sdk/application/wearable/evb/service/msg_center/src/notify/makephone_notification.cpp
index c0929b0..1c150c2 100644 (file)
--- a/code/sdk/application/wearable/evb/service/msg_center/src/notify/makephone_notification.cpp
+++ b/code/sdk/application/wearable/evb/service/msg_center/src/notify/makephone_notification.cpp
@@ -769,6 +769,10 @@ bool CallViewEventListener::OnClick(UIView& view, const ClickEvent& event)
             return false;\r
         }\r
     }\r
+    if (strcmp(view.GetViewId(), "SOS_FAIL") == 0) {\r
+        NotificationManager::GetInstance()->StopNotify();\r
+    }\r
+\r
     return true;\r
 }\r
 }  // namespace OHOS\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
index a6b37cd..590bfd3 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
@@ -14,9 +14,9 @@
 #include "rebootandshutdown/include/RebootAndShutdownView.h"
 #include "rebootandshutdown/include/RebootAndShutdownModel.h"
 
-#ifdef FD230_650
+// #ifdef FD230_650
 #include "dial_sos_c.h"
-#endif
+// #endif
 
 
 #include "vibrator_service.h"
@@ -121,9 +121,9 @@ namespace OHOS
         }
         else if (strcmp(view.GetViewId(), SOS_BUTTON_VIEWID) == 0)
         {
-            #ifdef FD230_650
+            // #ifdef FD230_650
             start_SOS_phone_dail();
-            #endif
+            // #endif
         }
 
         return true;

diff --git a/code/sdk/application/wearable/fd230/service/msg_center/src/notify/makephone_notification.cpp b/code/sdk/application/wearable/fd230/service/msg_center/src/notify/makephone_notification.cpp
index 118bb32..8d3b492 100644 (file)
--- a/code/sdk/application/wearable/fd230/service/msg_center/src/notify/makephone_notification.cpp
+++ b/code/sdk/application/wearable/fd230/service/msg_center/src/notify/makephone_notification.cpp
@@ -774,6 +774,9 @@ bool CallViewEventListener::OnClick(UIView& view, const ClickEvent& event)
             return false;\r
         }\r
     }\r
+    if (strcmp(view.GetViewId(), "SOS_FAIL") == 0) {\r
+        NotificationManager::GetInstance()->StopNotify();\r
+    }\r
     return true;\r
 }\r
 }  // namespace OHOS\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
index a6b37cd..590bfd3 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
@@ -14,9 +14,9 @@
 #include "rebootandshutdown/include/RebootAndShutdownView.h"
 #include "rebootandshutdown/include/RebootAndShutdownModel.h"
 
-#ifdef FD230_650
+// #ifdef FD230_650
 #include "dial_sos_c.h"
-#endif
+// #endif
 
 
 #include "vibrator_service.h"
@@ -121,9 +121,9 @@ namespace OHOS
         }
         else if (strcmp(view.GetViewId(), SOS_BUTTON_VIEWID) == 0)
         {
-            #ifdef FD230_650
+            // #ifdef FD230_650
             start_SOS_phone_dail();
-            #endif
+            // #endif
         }
 
         return true;

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/makephone_notification.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/makephone_notification.cpp
index 118bb32..8d3b492 100644 (file)
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/makephone_notification.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/makephone_notification.cpp
@@ -774,6 +774,9 @@ bool CallViewEventListener::OnClick(UIView& view, const ClickEvent& event)
             return false;\r
         }\r
     }\r
+    if (strcmp(view.GetViewId(), "SOS_FAIL") == 0) {\r
+        NotificationManager::GetInstance()->StopNotify();\r
+    }\r
     return true;\r
 }\r
 }  // namespace OHOS\r

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
index a6b37cd..590bfd3 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
@@ -14,9 +14,9 @@
 #include "rebootandshutdown/include/RebootAndShutdownView.h"
 #include "rebootandshutdown/include/RebootAndShutdownModel.h"
 
-#ifdef FD230_650
+// #ifdef FD230_650
 #include "dial_sos_c.h"
-#endif
+// #endif
 
 
 #include "vibrator_service.h"
@@ -121,9 +121,9 @@ namespace OHOS
         }
         else if (strcmp(view.GetViewId(), SOS_BUTTON_VIEWID) == 0)
         {
-            #ifdef FD230_650
+            // #ifdef FD230_650
             start_SOS_phone_dail();
-            #endif
+            // #endif
         }
 
         return true;

diff --git a/code/sdk/application/wearable/n9/service/msg_center/src/notify/makephone_notification.cpp b/code/sdk/application/wearable/n9/service/msg_center/src/notify/makephone_notification.cpp
index 118bb32..8d3b492 100644 (file)
--- a/code/sdk/application/wearable/n9/service/msg_center/src/notify/makephone_notification.cpp
+++ b/code/sdk/application/wearable/n9/service/msg_center/src/notify/makephone_notification.cpp
@@ -774,6 +774,9 @@ bool CallViewEventListener::OnClick(UIView& view, const ClickEvent& event)
             return false;\r
         }\r
     }\r
+    if (strcmp(view.GetViewId(), "SOS_FAIL") == 0) {\r
+        NotificationManager::GetInstance()->StopNotify();\r
+    }\r
     return true;\r
 }\r
 }  // namespace OHOS\r

diff --git a/code/sdk/application/wearable/n9/service/msg_center/src/notify/phone_crt.cpp b/code/sdk/application/wearable/n9/service/msg_center/src/notify/phone_crt.cpp
index ada010a..b562c35 100644 (file)
--- a/code/sdk/application/wearable/n9/service/msg_center/src/notify/phone_crt.cpp
+++ b/code/sdk/application/wearable/n9/service/msg_center/src/notify/phone_crt.cpp
@@ -872,7 +872,8 @@ void phone_VibratorFunc(void)
         custom_VibratorFunc_int(0);
     }
 }
- 
+
+