关闭一些FD230_650的宏控制

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordingModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordingModel.cpp
index 5482c79..2247daa 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordingModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordingModel.cpp
@@ -20,10 +20,7 @@
 #include "custom_runtime.h"
 #include "vibrator_service.h"
 #include <string.h>
-
-#ifdef FD230_650
 #include "system/include/SystemLogModel.h"
-#endif
 
 namespace OHOS
 {
@@ -1004,7 +1001,6 @@ namespace OHOS
     // 检查录音空间是否满了
     void RecordingModel::CheckRecordingSpaceOut(void)
     {
-        #ifdef FD230_650
         long long size = SystemLogModel::GetInstance()->getFolderSize(TOTAL_RECORDING_SPACE_PATH);
         if (size >= TOTAL_RECORDING_SPACE)
         {
@@ -1014,7 +1010,6 @@ namespace OHOS
         {
             RecordingSpaceIsOut = false;
         }
-        #endif
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingModel::CheckRecordingSpaceOut:%d", RecordingSpaceIsOut);
     }
 

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationModel.cpp
index fca259d..d7e65e4 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationModel.cpp
@@ -38,9 +38,7 @@ namespace OHOS
         //同步显示音乐的声音进度条
         if(PlayersView::GetInstance())
         {
-            #ifdef FD230_650
            PlayersView::GetInstance()->UpdateVolumeValue();
-           #endif
         }
         return true;
     }

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp
index e22b333..03aa7e4 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp
@@ -238,12 +238,8 @@ extern "C"
     void CallVolumeSet(int32_t sounding)
     {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CallVolumeSet %d", sounding);
-        // Audio::AudioManager::GetInstance().SetVolume(AUDIO_STREAM_VOICE_CALL_BT_SCO, sounding); // 通话音量设置
-        // Audio::AudioManager::GetInstance().SetVolume(AUDIO_STREAM_VOICE_CALL_VOLTE, sounding); // 通话音量设置
-        #ifdef FD230_650 
         set_speaker_volume(sounding,AUDIO_STREAM_VOICE_CALL_BT_SCO);
         set_speaker_volume(sounding,AUDIO_STREAM_VOICE_CALL_VOLTE);
-        #endif
     }
 
     int CallVolumeGet(void)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/WeatherModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/WeatherModel.cpp
index 69592a5..cdf7a35 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/WeatherModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/WeatherModel.cpp
@@ -12,10 +12,8 @@
 #include "ConfigModel.h"
 #include "custom_runtime.h"
 
-#ifdef FD230_650
 #include "main/include/dial/DialModelWeather.h"
-#include "DialModelWeatherStr.h"
-#endif
+#include "main/include/dial/DialModelWeatherStr.h"
 
 namespace OHOS
 {
@@ -360,7 +358,6 @@ namespace OHOS
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "p_WeatherControlView");
             p_WeatherControlView->UpdateWeatherControlViewVisibility();
         }
-        #ifdef FD230_650
         if (DialModelWeather::GetInstance())
         {
             int index;
@@ -379,7 +376,6 @@ namespace OHOS
             const std::string str = GetWeatherTemperature();
             DialModelWeatherStr::GetInstance()->UpdateWeatherStr(str);
         }
-        #endif
     }
 
     /*更新天气界面的时间显示*/

diff --git a/code/sdk/application/wearable/fd230/service/msg_center/include/notify/dial_sos_c.h b/code/sdk/application/wearable/fd230/service/msg_center/include/notify/dial_sos_c.h
new file mode 100644 (file)
index 0000000..60adec1
--- /dev/null
+++ b/code/sdk/application/wearable/fd230/service/msg_center/include/notify/dial_sos_c.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) CompanyNameMagicTag 2023-2023. All rights reserved.
+ * Description: makephone notification api
+ * Author: CompanyName
+ * Create: 2023-08-11
+ */
+
+#ifndef MAKEPHONE_SOS_NOTIFICATION_H
+#define MAKEPHONE_SOS_NOTIFICATION_H
+
+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
+
+void start_SOS_phone_dail(void);
+
+void sos_falg_add(void);
+
+void sos_falg_clean(void);
+
+uint8_t get_falg_SOS(void);
+
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
+#endif /* MAKEPHONE_NOTIFICATION_H */

diff --git a/code/sdk/zhihui/utils/custom_utils_at_cmd.c b/code/sdk/zhihui/utils/custom_utils_at_cmd.c
index a41573d..67ff689 100644 (file)
--- a/code/sdk/zhihui/utils/custom_utils_at_cmd.c
+++ b/code/sdk/zhihui/utils/custom_utils_at_cmd.c
@@ -23,14 +23,9 @@
 #endif
 
 
-#ifdef FD230_650
-#include "PhoneServiceC.h"
-
-#include "Bluetooyhpabpserver.h"
-
+#include "phoneservice/include/PhoneServiceC.h"
+#include "bluetooth/include/Bluetooyhpabpserver.h"
 #include "dial_sos_c.h"
-
-#endif
 // #include "msg_center_customerC.h"
 #ifdef SUPPORT_A5133_SERVICE
 #include "service/a5133_service.h"