From: 胡传军 <1224667075@qq.com>
Date: Sat, 18 Jan 2025 09:31:57 +0000 (+0000)
Subject: Merge #1639 into sdk602patch0911 from refs/changes/1639/head
X-Git-Tag: v1.3.113-repair_tp~18^2~3^2~2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=4b3433a3fc6f3345b3c739d74066c03a2e734265;p=mirrors%2FFD230.git

Merge #1639 into sdk602patch0911 from refs/changes/1639/head

Code review from 胡传军

* refs/changes/1639/head: (4 commits squashed)

  - cat1电话使用蓝牙接听,修改为不允许中途直接操作蓝牙，仅控制SCO链路

  - cat耳机操作 增加语言区别

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

  - 修改电话语言提示

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1639
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothItemView.cpp
index d793d9898..80dc7e8f4 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothItemView.cpp
@@ -175,17 +175,29 @@ namespace OHOS
                     bool SCOConnected = headset_SCO_Is_connect_extend( (bd_addr_t *)&infoData.addr);
                     if(SCOConnected)
                     {
-                        std::string Text = connectStateLabel.GetText();
-                        
+                        connectStateLabel.SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff));
+                        if(ConfigModel::GetInstance()->GetLanguage() == ZH_CN)
+                        {
+                            connectStateLabel.SetText("蓝牙耳机通话已连接");
+                        }
+                        else
+                        {
+                            connectStateLabel.SetText("Bluetooth headset call connected");
+                        }
+                              
+                    }
+                    else
+                    {
+                        connectStateLabel.SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x7f));
                         if(ConfigModel::GetInstance()->GetLanguage() == ZH_CN)
                         {
-                            Text+="  播放中";
+                            connectStateLabel.SetText("蓝牙耳机通话未连接");
                         }
                         else
                         {
-                            Text+="  In play";
+                            connectStateLabel.SetText("Bluetooth headset call is not connected");
                         }
-                        connectStateLabel.SetText(Text.c_str());
+                        
                     }
                    
                 }