n9:关闭FD230_650宏

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/callerlog/src/CallerLogModel.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/callerlog/src/CallerLogModel.cpp
index 32801d0..0e6fba8 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/callerlog/src/CallerLogModel.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/callerlog/src/CallerLogModel.cpp
@@ -25,9 +25,7 @@
 
 // #include "PhoneAGService.h"
 
-#ifdef FD230_650
 #include "dial_sos_c.h"
-#endif
 
 #ifdef SUPPORT_CAT1_SERVICE
 #include "cat1_ctl.h"
@@ -169,16 +167,13 @@ void StatusReset(void)
     set_call_hungup_flag(0);
     #endif
 
-    #ifdef FD230_650
     set_TransCallToMobilePhone_falg(0);
-    #endif
 
     OHOS::AlarmClockModel::GetInstance()->AlarmPlayerStop(); 
 
     // If the call is handling in the notification, the slice is not switched
     //if (!CallerLogModel::GetInstance()->GetNotifyFlag())
 
-    // #ifdef FD230_650
     if(CallerLogModel::GetInstance()->GetCallSource()==CallerLogModel::CallSourceCat1)
     {
         #ifdef SUPPORT_CAT1_HFP_AG_SERV
@@ -674,7 +669,6 @@ static void NonWatchFinishHandle(int laststatus)
         }
     }
 
-    #ifdef FD230_650
     
     if (GetCurrCallNum() == 0) {
         g_phoneStatus = PHONE_SINGLE_STATUS;
@@ -689,7 +683,6 @@ static void NonWatchFinishHandle(int laststatus)
         sos_falg_add();
     }
 
-    #endif
 }
 
 static void WatchFinishHandle(void)
@@ -718,9 +711,7 @@ static void WatchFinishHandle(void)
     }
     g_phoneStatus = PHONE_SINGLE_STATUS;
 
-    #ifdef FD230_650
     sos_falg_clean();
-    #endif
     }
 
 void CAT1_ChangeStatusScreendisplay(int lastStatus)
@@ -773,7 +764,6 @@ void UsingPhoneChangeStatusCallback(const PhoneCallInfo *phoneCall)
 
     DisshakeTimer();
 
-    #ifdef FD230_650
      if(phoneCall->operate==OPERATE_INCOMING)
     {
         uapi_SetSpeaker_Mute(true);
@@ -783,7 +773,6 @@ void UsingPhoneChangeStatusCallback(const PhoneCallInfo *phoneCall)
         uapi_SetSpeaker_Mute(false);
         //OHOS::AlarmClockModel::GetInstance()->AlarmPlayerStop(); 
     }
-    #endif
     
     if (phoneCall->operate == OPERATE_WATCH_FINISH && GetCurrCallNum() == 0) {
         g_callOperate = OPERATE_WATCH_FINISH;
@@ -867,15 +856,11 @@ static void ScoConnectHandle(void)
 
     if(g_isCall==HFP_HF_CALL_STATE_INCOMING)
     {
-        #ifdef FD230_650
         uapi_SetSpeaker_Mute(true);
-        #endif
     }
     else
     {
-        #ifdef FD230_650
         uapi_SetSpeaker_Mute(false);
-        #endif
         OHOS::AlarmClockModel::GetInstance()->AlarmPlayerStop(); 
     }
 
@@ -1115,9 +1100,7 @@ void CallerLogModel::SetCallStatus(bool status)
 {
     callStatus = status;
     if(status){
-    #ifdef FD230_650
     sos_falg_clean();
-    #endif
     }
 }
 

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/makephone/src/CallingView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/makephone/src/CallingView.cpp
index 844b1af..a55e4e3 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/makephone/src/CallingView.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/makephone/src/CallingView.cpp
@@ -375,14 +375,12 @@ void CallingView::showdial(bool flag)
 
 void CallingView::text_updata_buf(const char *buf)
 {
-    #ifdef FD230_650
     if (CallerLogModel::GetInstance()->GetCallSource() == CallerLogModel::CallSourceCat1){
     SendDtfmStrNumberToCat1(buf[0]);
     }
     else{
     uapi_hfp_send_DTMF_CODE(buf[0]);
     }
-    #endif
     
     char new_buf[16]={0};
     const char*text_buf=label_number->GetText();

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/makephone/src/MainCallingPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/makephone/src/MainCallingPresenter.cpp
index b75fa2a..9a4ca9f 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/makephone/src/MainCallingPresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/makephone/src/MainCallingPresenter.cpp
@@ -34,9 +34,7 @@
 
 #include "NativeAbility.h"
 
-// #ifdef FD230_650
 #include "dial_sos_c.h"
-// #endif
 
 #include "soundandvibration/include/SoundAndVibrationVolumeSettingC.h"
 namespace OHOS {
@@ -193,7 +191,6 @@ bool MainCallingPresenter::HintsHandupClick()
 
 bool MainCallingPresenter::OnClick(UIView& view, const ClickEvent& event)
 {
-    // #ifdef FD230_650
     UNUSED(event);
      WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s",view.GetViewId());
     if (!InitPointerValue()) {

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/CallLogItem.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/CallLogItem.cpp
index 0544c44..6bae63a 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/CallLogItem.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/CallLogItem.cpp
@@ -190,9 +190,7 @@ namespace OHOS
             button_calllog_status.SetTextId(STR_DIALED_CALLS);
             button_calllog_status.SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff));
         }
-        #ifdef FD230_650
         call_log_type.SetSrc(data->calllogtype?PNG_CALL_LOG_PHONE_IMAGE:PNG_CALL_LOG_WATCH_IMAGE);
-        #endif
     }
 
     void CallLOGListitemView::SetUpChild()

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/DialingMethodPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/DialingMethodPresenter.cpp
index ef0a1fa..5a26a48 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/DialingMethodPresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/DialingMethodPresenter.cpp
@@ -51,7 +51,6 @@ namespace OHOS
 
     bool DialingMethodPresenter::OnClick(UIView &view, const ClickEvent &event)
     {
-// #ifdef FD230_650
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DialingMethodPresenter::OnClick");
         std::string curViewId = view.GetViewId();
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s OnClick", curViewId.c_str());

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/MainPhoneView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/MainPhoneView.cpp
index 5da319f..4b833d5 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/MainPhoneView.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/MainPhoneView.cpp
@@ -337,9 +337,7 @@ namespace OHOS
             button_calllog_status[i]->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff));
         }
 
-        #ifdef FD230_650
         call_log_type[i]->SetSrc(data->calllogtype?PNG_CALL_LOG_PHONE_IMAGE:PNG_CALL_LOG_WATCH_IMAGE);
-        #endif
     }
 
 

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneCallPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneCallPresenter.cpp
index a6112dc..7426a10 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneCallPresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneCallPresenter.cpp
@@ -141,9 +141,7 @@ namespace OHOS
             if(TelephonyInitInterface::DIALINGMETHOD == DIALINGMETHOD_USINGWATCHSIM)\r
             {\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DIALINGMETHOD_USINGWATCHSIM");\r
-                // #ifdef FD230_650\r
                 cat1_UI_call_dial((char *)phoneNumber.c_str());\r
-                // #endif\r
 \r
             }\r
             else if(TelephonyInitInterface::DIALINGMETHOD == DIALINGMETHOD_USINGPHONE)\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..f92836a 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,7 @@
 #include "rebootandshutdown/include/RebootAndShutdownView.h"
 #include "rebootandshutdown/include/RebootAndShutdownModel.h"
 
-#ifdef FD230_650
 #include "dial_sos_c.h"
-#endif
 
 
 #include "vibrator_service.h"
@@ -121,9 +119,7 @@ namespace OHOS
         }
         else if (strcmp(view.GetViewId(), SOS_BUTTON_VIEWID) == 0)
         {
-            #ifdef FD230_650
             start_SOS_phone_dail();
-            #endif
         }
 
         return true;

diff --git a/code/sdk/zhihui/config/src/ConfigModel.cpp b/code/sdk/zhihui/config/src/ConfigModel.cpp
index 43a6cc4..cfeea30 100644 (file)
--- a/code/sdk/zhihui/config/src/ConfigModel.cpp
+++ b/code/sdk/zhihui/config/src/ConfigModel.cpp
@@ -5,8 +5,8 @@
 
 #include "kv_store.h"
 #include "kvstore_env.h"
-#ifdef FD230_650
 #include "player/include/PlayersModelC.h"
+#ifdef FD230_650
 #include "message/include/MessageModel.h"
 #include "../../../../../application/wearable/fd230/nativeapp/nativeui/sleepmode/include/SleepModeModel.h"
 #endif
@@ -1648,9 +1648,7 @@ void cm_set_A2DP_switch(bool value)
 // stop play music
 void mmi_stop_music_play(void)
 {
-    #ifdef FD230_650
     stopPlayingMusic();
-    #endif
 }