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

Code review from 胡传军

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

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

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

  - Merge branch 'sdk602patch0911' 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>
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 d793d98..80dc7e8 100644 (file)
--- 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);\r
                     if(SCOConnected)\r
                     {\r
-                        std::string Text = connectStateLabel.GetText();\r
-                        \r
+                        connectStateLabel.SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff));\r
+                        if(ConfigModel::GetInstance()->GetLanguage() == ZH_CN)\r
+                        {\r
+                            connectStateLabel.SetText("蓝牙耳机通话已连接");\r
+                        }\r
+                        else\r
+                        {\r
+                            connectStateLabel.SetText("Bluetooth headset call connected");\r
+                        }\r
+                              \r
+                    }\r
+                    else\r
+                    {\r
+                        connectStateLabel.SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x7f));\r
                         if(ConfigModel::GetInstance()->GetLanguage() == ZH_CN)\r
                         {\r
-                            Text+="  播放中";\r
+                            connectStateLabel.SetText("蓝牙耳机通话未连接");\r
                         }\r
                         else\r
                         {\r
-                            Text+="  In play";\r
+                            connectStateLabel.SetText("Bluetooth headset call is not connected");\r
                         }\r
-                        connectStateLabel.SetText(Text.c_str());\r
+                        \r
                     }\r
                    \r
                 }\r