From: luozheng <1732036298@qq.com> Date: Thu, 23 Oct 2025 08:56:25 +0000 (+0800) Subject: 272:下拉界面优化，根据设计图修改 X-Git-Tag: V1.0.9_20251128_194606_LN~180^2~5 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=00b3f617becf8c0c7a5d7805faeec21329aa591a;p=mirrors%2FFD230.git 272:下拉界面优化，根据设计图修改 --- diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp index cb2ff0975..1213671cd 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp @@ -133,20 +133,6 @@ namespace OHOS return true; } - // if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true && SettingModel::GetInstance().GetPhoneConnectStatus() == false) - // { - // NativeAbility::GetInstance().EnterSlice(VIEW_WATCH_QR_CODE); - // } - // else if(ConfigModel::GetInstance()->GetisFirstTimeStart() == true && SettingModel::GetInstance().GetPhoneConnectStatus() == true) - // { - // if (ConfigModel::GetInstance()->GetLanguage() == -1) - // { - // uapi_set_screen_on_api(); - // NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); - // ConfigModel::GetInstance()->SetisFirstTimeStart(false); - // NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN); - // } - // } /* -------------------------------------------------------------------------- */ LanguageId currentLanguageId = LanguageManager::GetInstance().GetLanguageIdByCode(id); if (is_load_languages(currentLanguageId)) diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/ConnectedStatusView.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/ConnectedStatusView.h index cb0b68c6a..ab1a0695a 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/ConnectedStatusView.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/include/ConnectedStatusView.h @@ -54,8 +54,8 @@ namespace OHOS int y; int width; int height; - uint32_t connectedImage; - uint32_t disconnectedImage; + const char * connectedImage; + const char * disconnectedImage; bool isConnected; } StatusImageParams; @@ -64,8 +64,8 @@ namespace OHOS UIImageView *statusImage; UILabelExt *statusLabel; int status; - uint32_t connectedImage; - uint32_t disconnectedImage; + const char * connectedImage; + const char * disconnectedImage; uint16_t connectedText; uint16_t disconnectedText; OHOS::ColorType connectedColor; diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/ConnectedStatusView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/ConnectedStatusView.cpp index 9bc59a5cb..7771d5866 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/ConnectedStatusView.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/ConnectedStatusView.cpp @@ -10,12 +10,24 @@ namespace OHOS { static OHOS::ColorType connectedColor[MAX_CONNECTEDSTATUS_ID] = { - Color::GetColorFromRGBA(0xff, 0x8f, 0x00, 0xff), + Color::GetColorFromRGBA(0xff, 0x8a, 0x36, 0xff), Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff), - Color::GetColorFromRGBA(0x01, 0x76, 0xff, 0xff), + Color::GetColorFromRGBA(0x0d, 0x62, 0xff, 0xff), }; static OHOS::ColorType disconnectedColor = Color::GetColorFromRGBA(0x66, 0x66, 0x66, 0xff); + //手机蓝牙 + static const char *DROPDOWN_PHONECONNECTED_ = "/user/res/connectstatus/phone_bt_connected.bin"; + static const char *DROPDOWN_PHONEDISCONNECTED_ = "/user/res/connectstatus/phone_bt_disconnected.bin"; + + //耳机 + static const char *DROPDOWN_EARPHONESCONNECTED_ = "/user/res/connectstatus/earphone_connected.bin"; + static const char *DROPDOWN_EARPHONESDISCONNECTED_ = "/user/res/connectstatus/earphone_disconnected.bin"; + + //蓝牙 + static const char *DROPDOWN_BLUETOOTHCONNECTED_ = "/user/res/connectstatus/bt_connected.bin"; + static const char *DROPDOWN_BLUETOOTHDISCONNECTED_ = "/user/res/connectstatus/bt_disconnected.bin"; + static ConnectedStatusView *g_pConnectedStatusView = nullptr; ConnectedStatusView::ConnectedStatusView() { @@ -111,14 +123,7 @@ namespace OHOS statusImage->SetResizeMode(UIImageView::CENTER); statusImage->SetStyle(STYLE_BORDER_RADIUS, 30); - if (params.isConnected) - { - ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, statusImage, params.connectedImage); - } - else - { - ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, statusImage, params.disconnectedImage); - } + statusImage->SetSrc(params.isConnected ? params.connectedImage : params.disconnectedImage); return statusImage; } @@ -131,7 +136,8 @@ namespace OHOS return; } - ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, params.statusImage, (params.status ? params.connectedImage : params.disconnectedImage)); + // ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, params.statusImage, (params.status ? params.connectedImage : params.disconnectedImage)); + params.statusImage->SetSrc(params.status ? params.connectedImage : params.disconnectedImage); params.statusLabel->SetTextId(params.status ? params.connectedText : params.disconnectedText); params.statusLabel->SetTextColor(params.status ? params.connectedColor : params.disconnectedColor); @@ -209,8 +215,8 @@ namespace OHOS .y = 135, .width = 60, .height = 60, - .connectedImage = DROPDOWN_PHONECONNECTED, - .disconnectedImage = DROPDOWN_PHONEDISCONNECTED, + .connectedImage = DROPDOWN_PHONECONNECTED_, + .disconnectedImage = DROPDOWN_PHONEDISCONNECTED_, .isConnected = pullUpDownView->GetPhoneConnectedStatus(), }; PhoneConnectedStatusImage = InitStatusImage(params); @@ -221,8 +227,8 @@ namespace OHOS .y = 135, .width = 60, .height = 60, - .connectedImage = DROPDOWN_EARPHONESCONNECTED, - .disconnectedImage = DROPDOWN_EARPHONESDISCONNECTED, + .connectedImage = DROPDOWN_EARPHONESCONNECTED_, + .disconnectedImage = DROPDOWN_EARPHONESDISCONNECTED_, .isConnected = pullUpDownView->GetEarPhoneConnectedStatus(), }; EarPhoneConnectedStatusImage = InitStatusImage(params); @@ -233,8 +239,8 @@ namespace OHOS .y = 135, .width = 60, .height = 60, - .connectedImage = DROPDOWN_BLUETOOTHCONNECTED, - .disconnectedImage = DROPDOWN_BLUETOOTHDISCONNECTED, + .connectedImage = DROPDOWN_BLUETOOTHCONNECTED_, + .disconnectedImage = DROPDOWN_BLUETOOTHDISCONNECTED_, .isConnected = pullUpDownView->GetBlueToothConnectedStatus(), }; BluetoothConnectedStatusImage = InitStatusImage(params); @@ -334,8 +340,8 @@ namespace OHOS .statusImage = PhoneConnectedStatusImage, .statusLabel = ConnectedStatusLabel[PHONECONNECTEDSTATUS_ID], .status = status, - .connectedImage = DROPDOWN_PHONECONNECTED, - .disconnectedImage = DROPDOWN_PHONEDISCONNECTED, + .connectedImage = DROPDOWN_PHONECONNECTED_, + .disconnectedImage = DROPDOWN_PHONEDISCONNECTED_, .connectedText = STR_CONNECTED, .disconnectedText = STR_DISCONNECTED, .connectedColor = connectedColor[PHONECONNECTEDSTATUS_ID], @@ -354,8 +360,8 @@ namespace OHOS .statusImage = EarPhoneConnectedStatusImage, .statusLabel = ConnectedStatusLabel[EARPHONECONNECTESTATUS_ID], .status = status, - .connectedImage = DROPDOWN_EARPHONESCONNECTED, - .disconnectedImage = DROPDOWN_EARPHONESDISCONNECTED, + .connectedImage = DROPDOWN_EARPHONESCONNECTED_, + .disconnectedImage = DROPDOWN_EARPHONESDISCONNECTED_, .connectedText = STR_CONNECTED, .disconnectedText = STR_DISCONNECTED, .connectedColor = connectedColor[EARPHONECONNECTESTATUS_ID], @@ -374,8 +380,8 @@ namespace OHOS .statusImage = BluetoothConnectedStatusImage, .statusLabel = ConnectedStatusLabel[BLUETOOTHCONNECTEDSTATUS], .status = status, - .connectedImage = DROPDOWN_BLUETOOTHCONNECTED, - .disconnectedImage = DROPDOWN_BLUETOOTHDISCONNECTED, + .connectedImage = DROPDOWN_BLUETOOTHCONNECTED_, + .disconnectedImage = DROPDOWN_BLUETOOTHDISCONNECTED_, .connectedText = STR_CONNECTED, .disconnectedText = STR_DISCONNECTED, .connectedColor = connectedColor[BLUETOOTHCONNECTEDSTATUS], diff --git a/code/sdk/files/fd272/fs/user/res/connectstatus/bt_connected.bin b/code/sdk/files/fd272/fs/user/res/connectstatus/bt_connected.bin new file mode 100644 index 000000000..9c5f6c386 Binary files /dev/null and b/code/sdk/files/fd272/fs/user/res/connectstatus/bt_connected.bin differ diff --git a/code/sdk/files/fd272/fs/user/res/connectstatus/bt_disconnected.bin b/code/sdk/files/fd272/fs/user/res/connectstatus/bt_disconnected.bin new file mode 100644 index 000000000..d7d08679a Binary files /dev/null and b/code/sdk/files/fd272/fs/user/res/connectstatus/bt_disconnected.bin differ diff --git a/code/sdk/files/fd272/fs/user/res/connectstatus/earphone_connected.bin b/code/sdk/files/fd272/fs/user/res/connectstatus/earphone_connected.bin new file mode 100644 index 000000000..3bd609200 Binary files /dev/null and b/code/sdk/files/fd272/fs/user/res/connectstatus/earphone_connected.bin differ diff --git a/code/sdk/files/fd272/fs/user/res/connectstatus/earphone_disconnected.bin b/code/sdk/files/fd272/fs/user/res/connectstatus/earphone_disconnected.bin new file mode 100644 index 000000000..2abaa4f2f Binary files /dev/null and b/code/sdk/files/fd272/fs/user/res/connectstatus/earphone_disconnected.bin differ diff --git a/code/sdk/files/fd272/fs/user/res/connectstatus/phone_bt_connected.bin b/code/sdk/files/fd272/fs/user/res/connectstatus/phone_bt_connected.bin new file mode 100644 index 000000000..ac7521d37 Binary files /dev/null and b/code/sdk/files/fd272/fs/user/res/connectstatus/phone_bt_connected.bin differ diff --git a/code/sdk/files/fd272/fs/user/res/connectstatus/phone_bt_disconnected.bin b/code/sdk/files/fd272/fs/user/res/connectstatus/phone_bt_disconnected.bin new file mode 100644 index 000000000..c7a18e6ce Binary files /dev/null and b/code/sdk/files/fd272/fs/user/res/connectstatus/phone_bt_disconnected.bin differ