From: hcj <1224667075@qq.com>
Date: Fri, 24 Oct 2025 03:09:09 +0000 (+0800)
Subject: sos修改
X-Git-Tag: V1.0.9_20251128_194606_LN~95^2~36^2^2~17
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=519903707c7b2d1c58fbd3a0a2cba95436020a33;p=mirrors%2FFD230.git

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 c0929b0df..1c150c208 100644
--- 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;
         }
     }
+    if (strcmp(view.GetViewId(), "SOS_FAIL") == 0) {
+        NotificationManager::GetInstance()->StopNotify();
+    }
+
     return true;
 }
 }  // namespace OHOS
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 a6b37cd2d..590bfd371 100644
--- 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 118bb320c..8d3b49283 100644
--- 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;
         }
     }
+    if (strcmp(view.GetViewId(), "SOS_FAIL") == 0) {
+        NotificationManager::GetInstance()->StopNotify();
+    }
     return true;
 }
 }  // namespace OHOS
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 a6b37cd2d..590bfd371 100644
--- 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 118bb320c..8d3b49283 100644
--- 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;
         }
     }
+    if (strcmp(view.GetViewId(), "SOS_FAIL") == 0) {
+        NotificationManager::GetInstance()->StopNotify();
+    }
     return true;
 }
 }  // namespace OHOS
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 a6b37cd2d..590bfd371 100644
--- 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 118bb320c..8d3b49283 100644
--- 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;
         }
     }
+    if (strcmp(view.GetViewId(), "SOS_FAIL") == 0) {
+        NotificationManager::GetInstance()->StopNotify();
+    }
     return true;
 }
 }  // namespace OHOS
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 ada010a06..b562c356a 100644
--- 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);
     }
 }
- 
+
+