From: luozheng <1732036298@qq.com> Date: Fri, 12 Dec 2025 10:45:46 +0000 (+0800) Subject: fd272:1.解决下拉界面连接状态图标,2.添加星历文件下载协议 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=1639e4b53f5e82d3d8c6694f86add16bcf77ae59;p=mirrors%2FFD230.git fd272:1.解决下拉界面连接状态图标,2.添加星历文件下载协议 --- diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadPresenter.cpp index 27272f13e..0e3d28aed 100644 --- a/code/sdk/application/wearable/n9/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadPresenter.cpp +++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadPresenter.cpp @@ -12,6 +12,10 @@ #include "NativeRegisterManager.h" #include "wearable_log.h" +#ifdef SUPPORT_BLE_SERVICE +#include "bleEvent.h" +#endif + namespace OHOS { REGIST_SLICE(VIEW_EPHEMERIS_DOWNLOAD, EphemerisDownloadView, EphemerisDownloadPresenter); @@ -43,7 +47,10 @@ bool EphemerisDownloadPresenter::OnClick(UIView &view, //点击下载按键 if (strcmp(view.GetViewId(), DOWNLOAD_ID) == 0) { //进行下载 - EphemerisDownloadModel::GetInstance().DownloadEphemeris(); + // EphemerisDownloadModel::GetInstance().DownloadEphemeris(); + #ifdef SUPPORT_BLE_SERVICE + ble_request_epo_file(); + #endif } //点击返回按键 else if (strcmp(view.GetViewId(), BACK_ID) == 0) { diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/main/src/PullUpDownView.cpp index 73b07813b..9a39bcc9f 100644 --- a/code/sdk/application/wearable/n9/nativeapp/nativeui/main/src/PullUpDownView.cpp +++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/main/src/PullUpDownView.cpp @@ -200,7 +200,11 @@ namespace OHOS // showPhoneConnectedStatus->SetSrc(status ? DROPDOWN_PHONECONNECTED_IMAGE : DROPDOWN_PHONEDISCONNECTED_IMAGE); // showPhoneConnectedStatus->Invalidate(); + if (status) + showPhoneConnectedStatus->SetSrc(DROPDOWN_PHONECONNECTED_IMAGE); + else showPhoneConnectedStatus->SetSrc(DROPDOWN_PHONEDISCONNECTED_IMAGE); + SetPhoneConnectedIsVisible(status); if (GetConnectedStatusView() != nullptr) diff --git a/code/sdk/application/wearable/n9/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/n9/service/msg_center/src/msg_center_customer.cpp index 06cf214f1..1463e8c42 100644 --- a/code/sdk/application/wearable/n9/service/msg_center/src/msg_center_customer.cpp +++ b/code/sdk/application/wearable/n9/service/msg_center/src/msg_center_customer.cpp @@ -97,7 +97,9 @@ #include "cywee_service.h" #endif + #ifdef SUPPORT_CAT1_SERVICE #include "cat1_pub_api.h" + #endif #include "uiservice/include/ui_service.h" #include "goal_notification.h" @@ -556,37 +558,37 @@ void MsgCenterNotifybleTransmit(const Topic topic, Request* req) { - #ifdef SUPPORT_BLE_SERVICE - unused(topic); - uint8_t* data=(uint8_t*)req->data; + #ifdef SUPPORT_BLE_SERVICE + unused(topic); + uint8_t* data=(uint8_t*)req->data; + WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "MsgCenterNotifybleTransmit:%d",data[0]); + - - if(data[0]==TRANS_FREE) - { - if(transmittingISShow()) - NotificationManager::GetInstance()->StopNotify(); - } - else if (data[0]==IS_NEED_CAT1_OTA) - { - - NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_ONE); - - // NotificationManager::GetInstance()->ShowNotify(showCat1UpdataNotify, (uint16_t)topic, true); - } - else if (data[0]==FILE_IS_DONE) - { - set_transmittingShow_falg(data[0]); - } - else - { - set_transmittingShow_falg(data[0]); - - NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_ONE); - - NotificationManager::GetInstance()->ShowNotify(showtransmitNotify, (uint16_t)topic, true); - } - // unused(req); - #endif + if(data[0]==TRANS_FREE) + { + if(transmittingISShow()) + NotificationManager::GetInstance()->StopNotify(); + } + else if (data[0]==IS_NEED_CAT1_OTA) + { + + NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_ONE); + + // NotificationManager::GetInstance()->ShowNotify(showCat1UpdataNotify, (uint16_t)topic, true); + } + else if (data[0]==FILE_IS_DONE) + { + set_transmittingShow_falg(data[0]); + } + else + { + set_transmittingShow_falg(data[0]); + + NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_ONE); + + NotificationManager::GetInstance()->ShowNotify(showtransmitNotify, (uint16_t)topic, true); + } + #endif } void MsgCenterNotifyChargePlugProc(const Topic topic, Request* req) @@ -921,11 +923,15 @@ return; } + #ifdef SUPPORT_CAT1_SERVICE cat1_cmd_send(CMD_4G_MAKE_CALL,call_data,strlen(call_data)); - + #endif CallerLogModel::GetInstance()->SetoperateNumber(call_data,req->len); + + #ifdef SUPPORT_CAT1_SERVICE cat1_phone_state_change_cb(OPERATE_DIALING); - + #endif + #ifdef SUPPORT_CAT1_HFP_AG_SERV if(uapi_dev_runtime_get_earphone_connect_stat()) { diff --git a/code/sdk/application/wearable/n9/service/msg_center/src/notify/transmitting.cpp b/code/sdk/application/wearable/n9/service/msg_center/src/notify/transmitting.cpp index ad60d724e..dd7685f01 100644 --- a/code/sdk/application/wearable/n9/service/msg_center/src/notify/transmitting.cpp +++ b/code/sdk/application/wearable/n9/service/msg_center/src/notify/transmitting.cpp @@ -5,7 +5,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_label_ext.h" -#include "components/ui_label_button_ext.h" +#include "components/ui_label_button_ext.h" #ifdef SUPPORT_BLE_SERVICE // #include "battery_service.h" #include "bleEvent.h" @@ -30,42 +30,39 @@ namespace OHOS { static UIImageView *imageCharge = nullptr; - static UIViewGroup *UIViewGroup_transmitting=nullptr; + static UIViewGroup *UIViewGroup_transmitting = nullptr; - static UIImageView *transmitting_img=nullptr; + static UIImageView *transmitting_img = nullptr; - static UISlider *updatasider=nullptr; + static UISlider *updatasider = nullptr; - static UILabelExt *Title=nullptr; + static UILabelExt *Title = nullptr; - static UILabelExt *label_=nullptr; + static UILabelExt *label_ = nullptr; - static UIImageAnimatorView *downImageAnimatorView=nullptr; + static UIImageAnimatorView *downImageAnimatorView = nullptr; - static constexpr char *ShutDownPaths = "/user/res/down/"; - static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 24; // 图片帧数 - static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_TIME = 150; // 图片更新间隔 + static constexpr char *ShutDownPaths = "/user/res/down/"; + static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 24; // 图片帧数 + static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_TIME = 150; // 图片更新间隔 static ImageAnimatorInfo ImageInfo_animator[SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES]; // 关机图像的信息 static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_X = 183; static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_Y = 140; static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_W = 100; static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_H = 100; - const ImageInfo **imageInfo_dwon{nullptr}; // 关机图片路径数组 + const ImageInfo **imageInfo_dwon{nullptr}; // 关机图片路径数组 - #define TRANSMITTING_SUCC_PATH PNG_SUCC_IMAGE; - #define TRANSMITTING_FAIL_PATH PNG_ATTENTION_IMAGE; - #define TRANSMITTING_OTA_DOWN "/user/res/system/KUMILOGO.bin" - +#define TRANSMITTING_SUCC_PATH PNG_SUCC_IMAGE; +#define TRANSMITTING_FAIL_PATH PNG_ATTENTION_IMAGE; +#define TRANSMITTING_OTA_DOWN "/user/res/system/FOOINGLOGO.bin" +#define LOW_POWER_BUTTON "LOW_POWER_BUTTON" - #define LOW_POWER_BUTTON "LOW_POWER_BUTTON" - - - - static void CreatetransmittingAnimator(void) + static void CreatetransmittingAnimator(void) { - imageInfo_dwon = CreateImageInfoArray(ShutDownPaths,SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES, "bin"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShutDownAnimatorView::ShowUpShutDownAnimatorView"); + imageInfo_dwon = CreateImageInfoArray(ShutDownPaths, SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES, "bin"); if (downImageAnimatorView == nullptr) { @@ -90,105 +87,102 @@ namespace OHOS downImageAnimatorView->SetImageAnimatorSrc(ImageInfo_animator, SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES, 100); downImageAnimatorView->SetRepeat(true); downImageAnimatorView->SetRepeatTimes(1); - } downImageAnimatorView->SetVisible(true); downImageAnimatorView->Start(); - //downImageAnimatorView->Start(); - - return ; - } - + // downImageAnimatorView->Start(); - + return; + } - static uint8_t Transmitting_falg=1; + static uint8_t Transmitting_falg = 1; void set_transmittingShow_falg(uint8_t falg) { - Transmitting_falg=falg; + Transmitting_falg = falg; } - static osTimerId_t transmitting_timer= NULL; + static osTimerId_t transmitting_timer = NULL; - void Freetransmitting(void) + void Freetransmitting(void) { - if (UIViewGroup_transmitting != nullptr) - { - UIViewGroup_transmitting->RemoveAll(); - - if(transmitting_img) - { - delete transmitting_img; - transmitting_img = nullptr; - } - if(Title) - { - delete Title; - Title = nullptr; - } - if(label_) - { - delete label_; - label_ = nullptr; - } - if(downImageAnimatorView) + if (UIViewGroup_transmitting != nullptr) { - FreeImageInfoArray(imageInfo_dwon,ShutDownPaths, SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES,"bin"); - delete downImageAnimatorView; - downImageAnimatorView = nullptr; - } - if(updatasider) - { - delete updatasider; - updatasider = nullptr; - } - if(transmitting_timer) - { - - osTimerStop(transmitting_timer); - osStatus_t ret = osTimerDelete(transmitting_timer); - if (ret != osOK) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Disatransmitting_timer failed ret = %lx!", ret); - //return; + UIViewGroup_transmitting->RemoveAll(); + + if (transmitting_img) + { + delete transmitting_img; + transmitting_img = nullptr; } - transmitting_timer = nullptr; - } + if (Title) + { + delete Title; + Title = nullptr; + } + if (label_) + { + delete label_; + label_ = nullptr; + } + if (downImageAnimatorView) + { + FreeImageInfoArray(imageInfo_dwon, ShutDownPaths, SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES, "bin"); + delete downImageAnimatorView; + downImageAnimatorView = nullptr; + } + if (updatasider) + { + delete updatasider; + updatasider = nullptr; + } + if (transmitting_timer) + { + + osTimerStop(transmitting_timer); + osStatus_t ret = osTimerDelete(transmitting_timer); + if (ret != osOK) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Disatransmitting_timer failed ret = %lx!", ret); + // return; + } + transmitting_timer = nullptr; + } + + const power_display_svr_api_t *display_api = power_display_svr_get_api(); + if (display_api->get_screen_state() != SCREEN_ON) + { + display_api->turn_on_screen(); + } + display_api->set_auto_timeout_function(true); - const power_display_svr_api_t *display_api = power_display_svr_get_api(); - if (display_api->get_screen_state() != SCREEN_ON) - { - display_api->turn_on_screen(); - } - display_api->set_auto_timeout_function(true); - #ifdef SUPPORT_CYWEE_SERVICE - cywee_hand_wake_switch(1); // 关闭抬腕亮屏,和息屏 + cywee_hand_wake_switch(1); // 关闭抬腕亮屏,和息屏 #endif - RootView::GetInstance()->Remove(UIViewGroup_transmitting); - delete UIViewGroup_transmitting; - UIViewGroup_transmitting = nullptr; + RootView::GetInstance()->Remove(UIViewGroup_transmitting); + delete UIViewGroup_transmitting; + UIViewGroup_transmitting = nullptr; - uapi_dev_runtime_set_transmitting_status(0); + uapi_dev_runtime_set_transmitting_status(0); } } - static uint8_t timer_falg_low_power=5; + static uint8_t timer_falg_low_power = 5; - static uint8_t test_flag=0; + static uint8_t test_flag = 0; static void OTATimerCallBackProc(int data) - { - #ifdef SUPPORT_BLE_SERVICE - #if 0 + { +#ifdef SUPPORT_BLE_SERVICE +#if 0 if(updatasider) updatasider->SetValue(test_flag++); - #else - if(updatasider) +#else + if (updatasider) updatasider->SetValue(get_OTA_recv_value()); - #endif - if(updatasider) +#endif + if (updatasider) updatasider->Invalidate(); - #endif +#endif } void OTATimerCallBack(int data) @@ -198,39 +192,36 @@ namespace OHOS void dialtimerCallBack(int data) { - NotificationManager::GetInstance()->StopNotify(); + NotificationManager::GetInstance()->StopNotify(); } - - - void creat_down_OTA() - { - if (Title == nullptr) { - Title = new UILabelExt(); + void creat_down_OTA() + { + if (Title == nullptr) + { + Title = new UILabelExt(); } - Title->SetPosition(83, 50); // widget's left position and top position - Title->Resize(300, 35); // widget's width and height - Title->SetViewId("label1");// Set style + Title->SetPosition(83, 50); // widget's left position and top position + Title->Resize(300, 35); // widget's width and height + Title->SetViewId("label1"); // Set style Title->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property Title->SetText("OTA下载中"); - Title->SetTextId (STR_OTA_DOWNLOAD); - + Title->SetTextId(STR_OTA_DOWNLOAD); + Title->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); Title->SetRollSpeed(0); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - // Add to rootView UIViewGroup_transmitting->Add(Title); - + if (updatasider == nullptr) { updatasider = new UISlider(); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView new fail"); - } updatasider->SetSliderColor(Color::Gray(), Color::Silver()); @@ -248,13 +239,13 @@ namespace OHOS updatasider->SetValue(0); UIViewGroup_transmitting->Add(updatasider); - - if (label_ == nullptr) { - label_ = new UILabelExt(); + if (label_ == nullptr) + { + label_ = new UILabelExt(); } - label_->SetPosition(60, 220); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style + label_->SetPosition(60, 220); // widget's left position and top position + label_->Resize(345, 101); // widget's width and height + label_->SetViewId("label2"); // Set style label_->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property @@ -269,81 +260,84 @@ namespace OHOS // Add to rootView UIViewGroup_transmitting->Add(label_); - //Add ImageView to App - - // if (transmitting_img == nullptr) - // { - // transmitting_img = new UIImageView(); - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + // Add ImageView to App - // } - // transmitting_img->SetPosition(117, 87, 230, 160); - // const char *imagesPath = TRANSMITTING_OTA_DOWN; - // transmitting_img->SetSrc(imagesPath); - // UIViewGroup_transmitting->Add(transmitting_img); + if (transmitting_img == nullptr) + { + transmitting_img = new UIImageView(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); + } + transmitting_img->SetPosition(117, 87, 230, 160); + const char *imagesPath = TRANSMITTING_OTA_DOWN; + transmitting_img->SetSrc(imagesPath); + UIViewGroup_transmitting->Add(transmitting_img); uint32_t tick; osStatus_t retTimer; - - #ifdef SUPPORT_BLE_SERVICE + +#ifdef SUPPORT_BLE_SERVICE Set_OTA_recv_value(); - #endif - if(transmitting_timer!=NULL) +#endif + if (transmitting_timer != NULL) { osTimerStop(transmitting_timer); osTimerDelete(transmitting_timer); transmitting_timer = NULL; } transmitting_timer = osTimerNew((osTimerFunc_t)OTATimerCallBack, osTimerPeriodic, NULL, NULL); - tick =500;// osMs2Tick(1000); + tick = 500; // osMs2Tick(1000); retTimer = osTimerStart(transmitting_timer, tick); - if (retTimer != osOK && transmitting_timer != NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"StartCallTimer osTimerStart failed, ret = %lx!!", retTimer); + if (retTimer != osOK && transmitting_timer != NULL) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StartCallTimer osTimerStart failed, ret = %lx!!", retTimer); osTimerDelete(transmitting_timer); transmitting_timer = NULL; - return ; + return; } } - static upg_result_t upg_result; - static uint32_t last_image_index; + static upg_result_t upg_result; + static uint32_t last_image_index; - static char updata_fail_str[32]={0}; + static char updata_fail_str[32] = {0}; static uint8_t TRANSMIT_DATA; void get_updatafail_data(void) { - #ifdef SUPPORT_BLE_SERVICE +#ifdef SUPPORT_BLE_SERVICE errcode_t ret; ret = uapi_upg_get_result(&upg_result, &last_image_index); - if (ret != ERRCODE_SUCC) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"uapi_upg_get_result error = 0x%x\r\n", ret); - } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"upg_result = %d, last_image_index:%d\r\n", upg_result, last_image_index); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"uapi_upg_get_result OK!!\r\n"); - if(upg_result!=UPG_RESULT_UPDATE_SUCCESS) - { - sprintf_s(updata_fail_str,32,"%d_%d",(int)upg_result,last_image_index); - TRANSMIT_DATA=OTA_UPDATA_FAIL; - if(ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_OTA_UPGRADE)) + if (ret != ERRCODE_SUCC) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uapi_upg_get_result error = 0x%x\r\n", ret); + } + else + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "upg_result = %d, last_image_index:%d\r\n", upg_result, last_image_index); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uapi_upg_get_result OK!!\r\n"); + if (upg_result != UPG_RESULT_UPDATE_SUCCESS) + { + sprintf_s(updata_fail_str, 32, "%d_%d", (int)upg_result, last_image_index); + TRANSMIT_DATA = OTA_UPDATA_FAIL; + if (ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_OTA_UPGRADE)) { - CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1); - ConfigModel::GetInstance()->set_condigData_Int(ConfigModel::CONFIGMODEL_ITEM_OTA_UPGRADE,0); + CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT, &TRANSMIT_DATA, 1); + ConfigModel::GetInstance()->set_condigData_Int(ConfigModel::CONFIGMODEL_ITEM_OTA_UPGRADE, 0); } - } - + } } - #endif +#endif } void Creat_OTA_Updata_FAIL() { - if (Title == nullptr) { - Title = new UILabelExt(); + if (Title == nullptr) + { + Title = new UILabelExt(); } - Title->SetPosition(83, 50); // widget's left position and top position - Title->Resize(300, 35); // widget's width and height - Title->SetViewId("label1");// Set style + Title->SetPosition(83, 50); // widget's left position and top position + Title->Resize(300, 35); // widget's width and height + Title->SetViewId("label1"); // Set style Title->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property @@ -355,17 +349,18 @@ namespace OHOS UIViewGroup_transmitting->Add(Title); - if (label_ == nullptr) { - label_ = new UILabelExt(); + if (label_ == nullptr) + { + label_ = new UILabelExt(); } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style + label_->SetPosition(60, 281); // widget's left position and top position + label_->Resize(345, 101); // widget's width and height + label_->SetViewId("label2"); // Set style label_->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property - char fail_str[128]={0}; - sprintf_s(fail_str,128,"ota升级失败,请尝试重启设备"); + char fail_str[128] = {0}; + sprintf_s(fail_str, 128, "ota升级失败,请尝试重启设备"); label_->SetText(fail_str); label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); @@ -376,27 +371,28 @@ namespace OHOS UIViewGroup_transmitting->Add(label_); - //Add ImageView to App - - // if (transmitting_img == nullptr) - // { - // transmitting_img = new UIImageView(); - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); - // } - // transmitting_img->SetPosition(193, 150,80, 80); - // const char *imagesPath = TRANSMITTING_FAIL_PATH; - // transmitting_img->SetSrc(imagesPath); - // UIViewGroup_transmitting->Add(transmitting_img); + // Add ImageView to App + + if (transmitting_img == nullptr) + { + transmitting_img = new UIImageView(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); + } + transmitting_img->SetPosition(193, 150, 80, 80); + const char *imagesPath = TRANSMITTING_FAIL_PATH; + transmitting_img->SetSrc(imagesPath); + UIViewGroup_transmitting->Add(transmitting_img); } void Creat_CAT1_OTA_Updata() { - if (Title == nullptr) { - Title = new UILabelExt(); + if (Title == nullptr) + { + Title = new UILabelExt(); } - Title->SetPosition(83, 50); // widget's left position and top position - Title->Resize(300, 35); // widget's width and height - Title->SetViewId("label1");// Set style + Title->SetPosition(83, 50); // widget's left position and top position + Title->Resize(300, 35); // widget's width and height + Title->SetViewId("label1"); // Set style Title->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property @@ -408,16 +404,16 @@ namespace OHOS UIViewGroup_transmitting->Add(Title); - if (label_ == nullptr) { - label_ = new UILabelExt(); + if (label_ == nullptr) + { + label_ = new UILabelExt(); } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style + label_->SetPosition(60, 281); // widget's left position and top position + label_->Resize(345, 101); // widget's width and height + label_->SetViewId("label2"); // Set style label_->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property - label_->SetText("4G模块OTA升级中,请勿操作,升级成功后会自动重启"); label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); @@ -429,49 +425,46 @@ namespace OHOS UIViewGroup_transmitting->Add(label_); // Add ImageView to App - + if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } - transmitting_img->SetPosition(193, 150,80, 80); + transmitting_img->SetPosition(193, 150, 80, 80); const char *imagesPath = TRANSMITTING_FAIL_PATH; transmitting_img->SetSrc(imagesPath); UIViewGroup_transmitting->Add(transmitting_img); } - - - - void creat_down_OTA_FAIL() - { - if (Title == nullptr) { - Title = new UILabelExt(); + { + if (Title == nullptr) + { + Title = new UILabelExt(); } - Title->SetPosition(143, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style + Title->SetPosition(143, 51); // widget's left position and top position + Title->Resize(800, 88); // widget's width and height + Title->SetViewId("label1"); // Set style Title->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property Title->SetText("OTA下载失败"); - Title->SetTextId (STR_OTA_DOWNLOADFIAL); + Title->SetTextId(STR_OTA_DOWNLOADFIAL); Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); Title->SetRollSpeed(0); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - // Add to rootView UIViewGroup_transmitting->Add(Title); - if (label_ == nullptr) { - label_ = new UILabelExt(); + if (label_ == nullptr) + { + label_ = new UILabelExt(); } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style + label_->SetPosition(60, 281); // widget's left position and top position + label_->Resize(345, 101); // widget's width and height + label_->SetViewId("label2"); // Set style label_->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property @@ -486,47 +479,48 @@ namespace OHOS UIViewGroup_transmitting->Add(label_); - //Add ImageView to App - - // if (transmitting_img == nullptr) - // { - // transmitting_img = new UIImageView(); - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); - // } - // transmitting_img->SetPosition(117, 87, 230, 160); - // const char *imagesPath = TRANSMITTING_OTA_DOWN; - // transmitting_img->SetSrc(imagesPath); - // UIViewGroup_transmitting->Add(transmitting_img); + // Add ImageView to App + + if (transmitting_img == nullptr) + { + transmitting_img = new UIImageView(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); + } + transmitting_img->SetPosition(117, 87, 230, 160); + const char *imagesPath = TRANSMITTING_OTA_DOWN; + transmitting_img->SetSrc(imagesPath); + UIViewGroup_transmitting->Add(transmitting_img); } void creat_down_OTA_SUCC() - { - if (Title == nullptr) { - Title = new UILabelExt(); + { + if (Title == nullptr) + { + Title = new UILabelExt(); } - Title->SetPosition(143, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style + Title->SetPosition(143, 51); // widget's left position and top position + Title->Resize(800, 88); // widget's width and height + Title->SetViewId("label1"); // Set style Title->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property Title->SetText("OTA下载成功"); - Title->SetTextId (STR_OTA_DOWNLOADSUCC); + Title->SetTextId(STR_OTA_DOWNLOADSUCC); Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); Title->SetRollSpeed(0); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - // Add to rootView UIViewGroup_transmitting->Add(Title); - if (label_ == nullptr) { - label_ = new UILabelExt(); + if (label_ == nullptr) + { + label_ = new UILabelExt(); } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style + label_->SetPosition(60, 281); // widget's left position and top position + label_->Resize(345, 101); // widget's width and height + label_->SetViewId("label2"); // Set style label_->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property @@ -540,38 +534,34 @@ namespace OHOS // Add to rootView UIViewGroup_transmitting->Add(label_); - - - //Add ImageView to App - - // if (transmitting_img == nullptr) - // { - // transmitting_img = new UIImageView(); - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); - - // } - // transmitting_img->SetPosition(117, 87, 230, 160); - // const char *imagesPath = TRANSMITTING_OTA_DOWN; - // transmitting_img->SetSrc(imagesPath); - // UIViewGroup_transmitting->Add(transmitting_img); - } + // Add ImageView to App + + if (transmitting_img == nullptr) + { + transmitting_img = new UIImageView(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); + } + transmitting_img->SetPosition(117, 87, 230, 160); + const char *imagesPath = TRANSMITTING_OTA_DOWN; + transmitting_img->SetSrc(imagesPath); + UIViewGroup_transmitting->Add(transmitting_img); + } - - void creat_down_Dial() { - if (Title == nullptr) { - Title = new UILabelExt(); + if (Title == nullptr) + { + Title = new UILabelExt(); } - Title->SetPosition(158, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style + Title->SetPosition(158, 51); // widget's left position and top position + Title->Resize(800, 88); // widget's width and height + Title->SetViewId("label1"); // Set style Title->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property Title->SetText("表盘安装中"); - Title->SetTextId (STR_DIAL_DOWNLOADING_TITLE); + Title->SetTextId(STR_DIAL_DOWNLOADING_TITLE); Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); Title->SetRollSpeed(0); @@ -581,13 +571,13 @@ namespace OHOS UIViewGroup_transmitting->Add(Title); Title->SetVisible(true); - - if (label_ == nullptr) { - label_ = new UILabelExt(); + if (label_ == nullptr) + { + label_ = new UILabelExt(); } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style + label_->SetPosition(60, 281); // widget's left position and top position + label_->Resize(345, 101); // widget's width and height + label_->SetViewId("label2"); // Set style label_->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property @@ -605,24 +595,24 @@ namespace OHOS CreatetransmittingAnimator(); // UIViewGroup_transmitting->Add(updatasider); - + UIViewGroup_transmitting->Add(downImageAnimatorView); } - void creat_down_MP3() { - if (Title == nullptr) { - Title = new UILabelExt(); + if (Title == nullptr) + { + Title = new UILabelExt(); } - Title->SetPosition(158, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style + Title->SetPosition(158, 51); // widget's left position and top position + Title->Resize(800, 88); // widget's width and height + Title->SetViewId("label1"); // Set style Title->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property Title->SetText("音乐传输中"); - Title->SetTextId (STR_MUSIC_TRANSMIT); + Title->SetTextId(STR_MUSIC_TRANSMIT); Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -633,13 +623,13 @@ namespace OHOS UIViewGroup_transmitting->Add(Title); Title->SetVisible(true); - - if (label_ == nullptr) { - label_ = new UILabelExt(); + if (label_ == nullptr) + { + label_ = new UILabelExt(); } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style + label_->SetPosition(60, 281); // widget's left position and top position + label_->Resize(345, 101); // widget's width and height + label_->SetViewId("label2"); // Set style label_->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property @@ -657,18 +647,19 @@ namespace OHOS CreatetransmittingAnimator(); // UIViewGroup_transmitting->Add(updatasider); - + UIViewGroup_transmitting->Add(downImageAnimatorView); } void creat_down_BIN() { - if (Title == nullptr) { - Title = new UILabelExt(); + if (Title == nullptr) + { + Title = new UILabelExt(); } - Title->SetPosition(158, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style + Title->SetPosition(158, 51); // widget's left position and top position + Title->Resize(800, 88); // widget's width and height + Title->SetViewId("label1"); // Set style Title->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property @@ -684,13 +675,13 @@ namespace OHOS UIViewGroup_transmitting->Add(Title); Title->SetVisible(true); - - if (label_ == nullptr) { - label_ = new UILabelExt(); + if (label_ == nullptr) + { + label_ = new UILabelExt(); } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style + label_->SetPosition(60, 281); // widget's left position and top position + label_->Resize(345, 101); // widget's width and height + label_->SetViewId("label2"); // Set style label_->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property @@ -708,24 +699,24 @@ namespace OHOS CreatetransmittingAnimator(); // UIViewGroup_transmitting->Add(updatasider); - + UIViewGroup_transmitting->Add(downImageAnimatorView); } - void creat_down_MP3_succ() { - if (Title == nullptr) { - Title = new UILabelExt(); + if (Title == nullptr) + { + Title = new UILabelExt(); } - Title->SetPosition(173, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style + Title->SetPosition(173, 51); // widget's left position and top position + Title->Resize(800, 88); // widget's width and height + Title->SetViewId("label1"); // Set style Title->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property Title->SetText("传输成功"); - Title->SetTextId (STR_MP3_SUCC_TITLE); + Title->SetTextId(STR_MP3_SUCC_TITLE); Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); Title->SetRollSpeed(0); @@ -735,52 +726,51 @@ namespace OHOS UIViewGroup_transmitting->Add(Title); Title->SetVisible(true); - - if (label_ == nullptr) { - label_ = new UILabelExt(); + if (label_ == nullptr) + { + label_ = new UILabelExt(); } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style + label_->SetPosition(60, 281); // widget's left position and top position + label_->Resize(345, 101); // widget's width and height + label_->SetViewId("label2"); // Set style label_->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property label_->SetText("音乐传输成功正在校验,请稍等"); - label_->SetTextId(STR_MUSIC_TRANSMIT_SUCCESS_NOTE); + label_->SetTextId(STR_MUSIC_TRANSMIT_SUCCESS_NOTE); label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label_->SetRollSpeed(0); label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } - transmitting_img->SetPosition(193, 150,80, 80); + transmitting_img->SetPosition(193, 150, 80, 80); const char *imagesPath = TRANSMITTING_SUCC_PATH; transmitting_img->SetSrc(imagesPath); UIViewGroup_transmitting->Add(transmitting_img); uint32_t tick; osStatus_t retTimer; - if(transmitting_timer!=NULL) + if (transmitting_timer != NULL) { osTimerStop(transmitting_timer); osTimerDelete(transmitting_timer); transmitting_timer = NULL; } transmitting_timer = osTimerNew((osTimerFunc_t)dialtimerCallBack, osTimerPeriodic, NULL, NULL); - tick =2000;// osMs2Tick(1000); + tick = 2000; // osMs2Tick(1000); retTimer = osTimerStart(transmitting_timer, tick); - if (retTimer != osOK && transmitting_timer != NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"StartCallTimer osTimerStart failed, ret = %lx!!", retTimer); + if (retTimer != osOK && transmitting_timer != NULL) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StartCallTimer osTimerStart failed, ret = %lx!!", retTimer); osTimerDelete(transmitting_timer); transmitting_timer = NULL; - return ; + return; } // Add to rootView @@ -788,15 +778,15 @@ namespace OHOS label_->SetVisible(true); } - void creat_down_BIN_succ() { - if (Title == nullptr) { - Title = new UILabelExt(); + if (Title == nullptr) + { + Title = new UILabelExt(); } - Title->SetPosition(173, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style + Title->SetPosition(173, 51); // widget's left position and top position + Title->Resize(800, 88); // widget's width and height + Title->SetViewId("label1"); // Set style Title->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property @@ -811,13 +801,13 @@ namespace OHOS UIViewGroup_transmitting->Add(Title); Title->SetVisible(true); - - if (label_ == nullptr) { - label_ = new UILabelExt(); + if (label_ == nullptr) + { + label_ = new UILabelExt(); } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style + label_->SetPosition(60, 281); // widget's left position and top position + label_->Resize(345, 101); // widget's width and height + label_->SetViewId("label2"); // Set style label_->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property @@ -829,34 +819,33 @@ namespace OHOS label_->SetRollSpeed(0); label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } - transmitting_img->SetPosition(193, 150,80, 80); + transmitting_img->SetPosition(193, 150, 80, 80); const char *imagesPath = TRANSMITTING_SUCC_PATH; transmitting_img->SetSrc(imagesPath); UIViewGroup_transmitting->Add(transmitting_img); uint32_t tick; osStatus_t retTimer; - if(transmitting_timer!=NULL) + if (transmitting_timer != NULL) { osTimerStop(transmitting_timer); osTimerDelete(transmitting_timer); transmitting_timer = NULL; } transmitting_timer = osTimerNew((osTimerFunc_t)dialtimerCallBack, osTimerPeriodic, NULL, NULL); - tick =2000;// osMs2Tick(1000); + tick = 2000; // osMs2Tick(1000); retTimer = osTimerStart(transmitting_timer, tick); - if (retTimer != osOK && transmitting_timer != NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"StartCallTimer osTimerStart failed, ret = %lx!!", retTimer); + if (retTimer != osOK && transmitting_timer != NULL) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StartCallTimer osTimerStart failed, ret = %lx!!", retTimer); osTimerDelete(transmitting_timer); transmitting_timer = NULL; - return ; + return; } // Add to rootView @@ -864,21 +853,20 @@ namespace OHOS label_->SetVisible(true); } - - void creat_down_Dial_succ() { - if (Title == nullptr) { - Title = new UILabelExt(); + if (Title == nullptr) + { + Title = new UILabelExt(); } - Title->SetPosition(173, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style + Title->SetPosition(173, 51); // widget's left position and top position + Title->Resize(800, 88); // widget's width and height + Title->SetViewId("label1"); // Set style Title->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property Title->SetText("安装成功"); - Title->SetTextId (STR_DIAL_SUCC_TITLE); + Title->SetTextId(STR_DIAL_SUCC_TITLE); Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); Title->SetRollSpeed(0); @@ -888,52 +876,51 @@ namespace OHOS UIViewGroup_transmitting->Add(Title); Title->SetVisible(true); - - if (label_ == nullptr) { - label_ = new UILabelExt(); + if (label_ == nullptr) + { + label_ = new UILabelExt(); } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style + label_->SetPosition(60, 281); // widget's left position and top position + label_->Resize(345, 101); // widget's width and height + label_->SetViewId("label2"); // Set style label_->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property label_->SetText("表盘安装成功正在更新表盘,请稍等"); - label_->SetTextId(STR_DIAL_SUCC_LABEL); + label_->SetTextId(STR_DIAL_SUCC_LABEL); label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label_->SetRollSpeed(0); label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } - transmitting_img->SetPosition(193, 150,80, 80); + transmitting_img->SetPosition(193, 150, 80, 80); const char *imagesPath = TRANSMITTING_SUCC_PATH; transmitting_img->SetSrc(imagesPath); UIViewGroup_transmitting->Add(transmitting_img); uint32_t tick; osStatus_t retTimer; - if(transmitting_timer!=NULL) + if (transmitting_timer != NULL) { osTimerStop(transmitting_timer); osTimerDelete(transmitting_timer); transmitting_timer = NULL; } transmitting_timer = osTimerNew((osTimerFunc_t)dialtimerCallBack, osTimerPeriodic, NULL, NULL); - tick =2000;// osMs2Tick(1000); + tick = 2000; // osMs2Tick(1000); retTimer = osTimerStart(transmitting_timer, tick); - if (retTimer != osOK && transmitting_timer != NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"StartCallTimer osTimerStart failed, ret = %lx!!", retTimer); + if (retTimer != osOK && transmitting_timer != NULL) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StartCallTimer osTimerStart failed, ret = %lx!!", retTimer); osTimerDelete(transmitting_timer); transmitting_timer = NULL; - return ; + return; } // Add to rootView @@ -941,20 +928,20 @@ namespace OHOS label_->SetVisible(true); } - - void creat_down_max_Dial_fail() + void creat_down_max_Dial_fail() { - if (Title == nullptr) { - Title = new UILabelExt(); + if (Title == nullptr) + { + Title = new UILabelExt(); } - Title->SetPosition(173, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style + Title->SetPosition(173, 51); // widget's left position and top position + Title->Resize(800, 88); // widget's width and height + Title->SetViewId("label1"); // Set style Title->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property - Title->SetTextId(STR_OPERAT_FAIL);//TODO:多国语言 - //Title->SetTextId (STR_DIAL_FAIL_TITLE); + Title->SetTextId(STR_OPERAT_FAIL); // TODO:多国语言 + // Title->SetTextId (STR_DIAL_FAIL_TITLE); Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); Title->SetRollSpeed(0); @@ -964,33 +951,31 @@ namespace OHOS UIViewGroup_transmitting->Add(Title); Title->SetVisible(true); - - if (label_ == nullptr) { - label_ = new UILabelExt(); + if (label_ == nullptr) + { + label_ = new UILabelExt(); } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style + label_->SetPosition(60, 281); // widget's left position and top position + label_->Resize(345, 101); // widget's width and height + label_->SetViewId("label2"); // Set style label_->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property - - label_->SetTextId(STR_DIAL_NOTE);//TODO:多国语言 - + + label_->SetTextId(STR_DIAL_NOTE); // TODO:多国语言 + label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label_->SetRollSpeed(0); label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } - transmitting_img->SetPosition(193, 150,80, 80); + transmitting_img->SetPosition(193, 150, 80, 80); const char *imagesPath = TRANSMITTING_FAIL_PATH; transmitting_img->SetSrc(imagesPath); UIViewGroup_transmitting->Add(transmitting_img); @@ -998,24 +983,22 @@ namespace OHOS // Add to rootView UIViewGroup_transmitting->Add(label_); label_->SetVisible(true); - - - } - void creat_down_max_MP3_fail() + void creat_down_max_MP3_fail() { - if (Title == nullptr) { - Title = new UILabelExt(); + if (Title == nullptr) + { + Title = new UILabelExt(); } - Title->SetPosition(173, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style + Title->SetPosition(173, 51); // widget's left position and top position + Title->Resize(800, 88); // widget's width and height + Title->SetViewId("label1"); // Set style Title->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property - Title->SetTextId(STR_OPERAT_FAIL);//TODO:多国语言 - //Title->SetTextId (STR_DIAL_FAIL_TITLE); + Title->SetTextId(STR_OPERAT_FAIL); // TODO:多国语言 + // Title->SetTextId (STR_DIAL_FAIL_TITLE); Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); Title->SetRollSpeed(0); @@ -1025,18 +1008,18 @@ namespace OHOS UIViewGroup_transmitting->Add(Title); Title->SetVisible(true); - - if (label_ == nullptr) { - label_ = new UILabelExt(); + if (label_ == nullptr) + { + label_ = new UILabelExt(); } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style + label_->SetPosition(60, 281); // widget's left position and top position + label_->Resize(345, 101); // widget's width and height + label_->SetViewId("label2"); // Set style label_->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property - - // label_->SetTextId(STR_DIAL_NOTE);//TODO:多国语言 + + // label_->SetTextId(STR_DIAL_NOTE);//TODO:多国语言 // // // if(ConfigModel::GetInstance()->GetLanguage() == ZH_CN) @@ -1046,23 +1029,18 @@ namespace OHOS // "The storage capacity of locally downloaded music has reached the upper limit.\ // Please delete some songs before uploading"); - - - label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label_->SetRollSpeed(0); label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } - transmitting_img->SetPosition(193, 150,80, 80); + transmitting_img->SetPosition(193, 150, 80, 80); const char *imagesPath = TRANSMITTING_FAIL_PATH; transmitting_img->SetSrc(imagesPath); UIViewGroup_transmitting->Add(transmitting_img); @@ -1070,24 +1048,22 @@ namespace OHOS // Add to rootView UIViewGroup_transmitting->Add(label_); label_->SetVisible(true); - - - } void creat_down_Dial_fail() { - if (Title == nullptr) { - Title = new UILabelExt(); + if (Title == nullptr) + { + Title = new UILabelExt(); } - Title->SetPosition(173, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style + Title->SetPosition(173, 51); // widget's left position and top position + Title->Resize(800, 88); // widget's width and height + Title->SetViewId("label1"); // Set style Title->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property Title->SetText("安装失败"); - Title->SetTextId (STR_DIAL_FAIL_TITLE); + Title->SetTextId(STR_DIAL_FAIL_TITLE); Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); Title->SetRollSpeed(0); @@ -1097,35 +1073,31 @@ namespace OHOS UIViewGroup_transmitting->Add(Title); Title->SetVisible(true); - - if (label_ == nullptr) { - label_ = new UILabelExt(); + if (label_ == nullptr) + { + label_ = new UILabelExt(); } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style + label_->SetPosition(60, 281); // widget's left position and top position + label_->Resize(345, 101); // widget's width and height + label_->SetViewId("label2"); // Set style label_->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property - - + label_->SetTextId(STR_DIAL_FAIL_LABEL); - - + label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label_->SetRollSpeed(0); label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } - transmitting_img->SetPosition(193, 150,80, 80); + transmitting_img->SetPosition(193, 150, 80, 80); const char *imagesPath = TRANSMITTING_FAIL_PATH; transmitting_img->SetSrc(imagesPath); UIViewGroup_transmitting->Add(transmitting_img); @@ -1133,24 +1105,22 @@ namespace OHOS // Add to rootView UIViewGroup_transmitting->Add(label_); label_->SetVisible(true); - - - } void creat_down_MP3_fail() { - if (Title == nullptr) { - Title = new UILabelExt(); + if (Title == nullptr) + { + Title = new UILabelExt(); } - Title->SetPosition(173, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style + Title->SetPosition(173, 51); // widget's left position and top position + Title->Resize(800, 88); // widget's width and height + Title->SetViewId("label1"); // Set style Title->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property Title->SetText("传输失败"); - Title->SetTextId (STR_MP3_FAIL_TITL); + Title->SetTextId(STR_MP3_FAIL_TITL); Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); Title->SetRollSpeed(0); @@ -1160,13 +1130,13 @@ namespace OHOS UIViewGroup_transmitting->Add(Title); Title->SetVisible(true); - - if (label_ == nullptr) { - label_ = new UILabelExt(); + if (label_ == nullptr) + { + label_ = new UILabelExt(); } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style + label_->SetPosition(60, 281); // widget's left position and top position + label_->Resize(345, 101); // widget's width and height + label_->SetViewId("label2"); // Set style label_->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property @@ -1178,14 +1148,12 @@ namespace OHOS label_->SetRollSpeed(0); label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } - transmitting_img->SetPosition(193, 150,80, 80); + transmitting_img->SetPosition(193, 150, 80, 80); const char *imagesPath = TRANSMITTING_FAIL_PATH; transmitting_img->SetSrc(imagesPath); UIViewGroup_transmitting->Add(transmitting_img); @@ -1193,19 +1161,17 @@ namespace OHOS // Add to rootView UIViewGroup_transmitting->Add(label_); label_->SetVisible(true); - - - } void creat_down_BIN_fail() { - if (Title == nullptr) { - Title = new UILabelExt(); + if (Title == nullptr) + { + Title = new UILabelExt(); } - Title->SetPosition(173, 51); // widget's left position and top position - Title->Resize(800, 88); // widget's width and height - Title->SetViewId("label1");// Set style + Title->SetPosition(173, 51); // widget's left position and top position + Title->Resize(800, 88); // widget's width and height + Title->SetViewId("label1"); // Set style Title->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property @@ -1220,13 +1186,13 @@ namespace OHOS UIViewGroup_transmitting->Add(Title); Title->SetVisible(true); - - if (label_ == nullptr) { - label_ = new UILabelExt(); + if (label_ == nullptr) + { + label_ = new UILabelExt(); } - label_->SetPosition(60, 281); // widget's left position and top position - label_->Resize(345, 101); // widget's width and height - label_->SetViewId("label2");// Set style + label_->SetPosition(60, 281); // widget's left position and top position + label_->Resize(345, 101); // widget's width and height + label_->SetViewId("label2"); // Set style label_->SetStyle(STYLE_TEXT_FONT, 30); // Set additional property @@ -1238,14 +1204,12 @@ namespace OHOS label_->SetRollSpeed(0); label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!"); } - transmitting_img->SetPosition(193, 150,80, 80); + transmitting_img->SetPosition(193, 150, 80, 80); const char *imagesPath = TRANSMITTING_FAIL_PATH; transmitting_img->SetSrc(imagesPath); UIViewGroup_transmitting->Add(transmitting_img); @@ -1253,106 +1217,273 @@ namespace OHOS // Add to rootView UIViewGroup_transmitting->Add(label_); label_->SetVisible(true); - - + } + + void creat_down_EPO() + { + printf("creat_down_EPO\n"); + if (Title == nullptr) + { + Title = new UILabelExt(); + } + Title->SetPosition(158, 51); + Title->Resize(800, 88); + Title->SetViewId("label1"); + Title->SetStyle(STYLE_TEXT_FONT, 30); + + Title->SetText("星历下载中"); + Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + Title->SetRollSpeed(0); + Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + + // Add to rootView + UIViewGroup_transmitting->Add(Title); + Title->SetVisible(true); + + if (label_ == nullptr) + { + label_ = new UILabelExt(); + } + label_->SetPosition(60, 281); + label_->Resize(345, 101); + label_->SetStyle(STYLE_TEXT_FONT, 30); + // Set additional property + label_->SetText("正在下载星历,请不要做其他操作或关闭手表"); + label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); + label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); + label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + label_->SetRollSpeed(0); + label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + + // Add to rootView + UIViewGroup_transmitting->Add(label_); + label_->SetVisible(true); + + CreatetransmittingAnimator(); + + UIViewGroup_transmitting->Add(downImageAnimatorView); + } + + void creat_down_EPO_succ() + { + printf("creat_down_EPO_succ\n"); + if (Title == nullptr) + { + Title = new UILabelExt(); + } + Title->SetPosition(173, 51); + Title->Resize(800, 88); + Title->SetStyle(STYLE_TEXT_FONT, 30); + + Title->SetText("星历下载成功"); + Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + Title->SetRollSpeed(0); + Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + + Title->SetX((466 - Title->GetWidth()) / 2); + + // Add to rootView + UIViewGroup_transmitting->Add(Title); + Title->SetVisible(true); + + if (label_ == nullptr) + { + label_ = new UILabelExt(); + } + label_->SetPosition(60, 281); + label_->Resize(345, 101); + label_->SetViewId("label2"); + label_->SetStyle(STYLE_TEXT_FONT, 30); + + // Set additional property + label_->SetText("星历下载成功,请稍等..."); + label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); + label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); + label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + label_->SetRollSpeed(0); + label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + + if (transmitting_img == nullptr) + { + transmitting_img = new UIImageView(); + } + transmitting_img->SetPosition(193, 150, 80, 80); + const char *imagesPath = TRANSMITTING_SUCC_PATH; + transmitting_img->SetSrc(imagesPath); + UIViewGroup_transmitting->Add(transmitting_img); + uint32_t tick; + osStatus_t retTimer; + if (transmitting_timer != NULL) + { + osTimerStop(transmitting_timer); + osTimerDelete(transmitting_timer); + transmitting_timer = NULL; + } + transmitting_timer = osTimerNew((osTimerFunc_t)dialtimerCallBack, osTimerPeriodic, NULL, NULL); + tick = 3000; // osMs2Tick(1000); + retTimer = osTimerStart(transmitting_timer, tick); + if (retTimer != osOK && transmitting_timer != NULL) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StartCallTimer osTimerStart failed, ret = %lx!!", retTimer); + osTimerDelete(transmitting_timer); + transmitting_timer = NULL; + return; + } + + // Add to rootView + UIViewGroup_transmitting->Add(label_); + label_->SetVisible(true); } + void creat_down_EPO_fail() + { + printf("creat_down_EPO_fail\n"); + if (Title == nullptr) + { + Title = new UILabelExt(); + } + Title->SetPosition(173, 51); + Title->Resize(800, 88); + Title->SetViewId("label1"); + Title->SetStyle(STYLE_TEXT_FONT, 30); + + // Set additional property + Title->SetText("星历下载失败"); + Title->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + Title->SetRollSpeed(0); + Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + Title->SetX((466 - Title->GetWidth()) / 2); + + // Add to rootView + UIViewGroup_transmitting->Add(Title); + Title->SetVisible(true); + + if (label_ == nullptr) + { + label_ = new UILabelExt(); + } + label_->SetPosition(60, 281); + label_->Resize(345, 101); + label_->SetStyle(STYLE_TEXT_FONT, 30); + Title->SetText("星历下载失败,请重新下载"); + + label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); + label_->SetTextColor(Color::GetColorFromRGBA(0xAA, 0xAA, 0xAA, 0xff)); + label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + label_->SetRollSpeed(0); + label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + + UIViewGroup_transmitting->Add(label_); + label_->SetVisible(true); + } bool transmittingISShow(void) { - if(uapi_dev_runtime_get_transmitting_status()) - return true; - else - return false; + if (uapi_dev_runtime_get_transmitting_status()) + return true; + else + return false; } UIViewGroup *transmittingShow() { - - if (UIViewGroup_transmitting == nullptr) { + + if (UIViewGroup_transmitting == nullptr) + { UIViewGroup_transmitting = new UIViewGroup(); UIViewGroup_transmitting->SetPosition(0, 0, 466, 466); - //UIViewGroup_transmitting->SetStyle(STYLE_BACKGROUND_OPA, 0); + // UIViewGroup_transmitting->SetStyle(STYLE_BACKGROUND_OPA, 0); } else { UIViewGroup_transmitting->RemoveAll(); } - uapi_dev_runtime_set_transmitting_status(1); - - #ifdef SUPPORT_BLE_SERVICE + uapi_dev_runtime_set_transmitting_status(1); + printf("Transmitting_falg:%d", Transmitting_falg); +#ifdef SUPPORT_BLE_SERVICE switch (Transmitting_falg) { - case TRANS_DIAL_TRANSMITTING: - creat_down_Dial(); - break; - case TRANS_DIAL_SUCC: - creat_down_Dial_succ(); - break; - case TRANS_DIAL_FAIL: - creat_down_Dial_fail(); - break; - case TRANS_DIAL_MAX_FAIL: - creat_down_max_Dial_fail(); - break; - - case TRANS_OTA_TRANSMITTING: - creat_down_OTA(); - break; - case TRANS_OTA_SUCC: - creat_down_OTA_SUCC(); - break; - case TRANS_OTA_FAIL: - creat_down_OTA_FAIL(); - break; - case TRANS_MP3_TRANSMITTING: - creat_down_MP3(); - break; - case TRANS_MP3_SUCC: - creat_down_MP3_succ(); - break; - case TRANS_MP3_FAIL: - creat_down_MP3_fail(); - break; - case OTA_UPDATA_FAIL: - Creat_OTA_Updata_FAIL(); - break; - case START_CAT1_OTA: - Creat_CAT1_OTA_Updata(); - break; - case TRANS_MP3_MAX_FAIL: - creat_down_max_MP3_fail(); - break; - case TRANS_BIN_TRANSMITTING: - creat_down_BIN(); - break; - case TRANS_BIN_SUCC: - creat_down_BIN_succ(); - break; - case TRANS_BIN_FAIL: - creat_down_BIN_fail(); - break; - + case TRANS_DIAL_TRANSMITTING: + creat_down_Dial(); + break; + case TRANS_DIAL_SUCC: + creat_down_Dial_succ(); + break; + case TRANS_DIAL_FAIL: + creat_down_Dial_fail(); + break; + case TRANS_DIAL_MAX_FAIL: + creat_down_max_Dial_fail(); + break; + + case TRANS_OTA_TRANSMITTING: + creat_down_OTA(); + break; + case TRANS_OTA_SUCC: + creat_down_OTA_SUCC(); + break; + case TRANS_OTA_FAIL: + creat_down_OTA_FAIL(); + break; + case TRANS_MP3_TRANSMITTING: + creat_down_MP3(); + break; + case TRANS_MP3_SUCC: + creat_down_MP3_succ(); + break; + case TRANS_MP3_FAIL: + creat_down_MP3_fail(); + break; + case OTA_UPDATA_FAIL: + Creat_OTA_Updata_FAIL(); + break; + case START_CAT1_OTA: + Creat_CAT1_OTA_Updata(); + break; + case TRANS_MP3_MAX_FAIL: + creat_down_max_MP3_fail(); + break; + case TRANS_BIN_TRANSMITTING: + creat_down_BIN(); + break; + case TRANS_BIN_SUCC: + creat_down_BIN_succ(); + break; + case TRANS_BIN_FAIL: + creat_down_BIN_fail(); + break; + case TRANS_EPO_TRANSMITTING: + creat_down_EPO(); + break; + case TRANS_EPO_SUCC: + creat_down_EPO_succ(); + break; + case TRANS_EPO_FAIL: + creat_down_EPO_fail(); + break; + default: break; } - if(Transmitting_falg==TRANS_DIAL_TRANSMITTING || Transmitting_falg==TRANS_OTA_TRANSMITTING || Transmitting_falg==TRANS_MP3_TRANSMITTING) + if (Transmitting_falg == TRANS_DIAL_TRANSMITTING || Transmitting_falg == TRANS_OTA_TRANSMITTING || Transmitting_falg == TRANS_MP3_TRANSMITTING) { // if(uapi_hfp_connect_state()) // { // uapi_hfp_disconnect(); // } } - else if(Transmitting_falg!=OTA_UPDATA_FAIL) + else if (Transmitting_falg != OTA_UPDATA_FAIL) { // if(uapi_dev_runtime_get_bt_powerstat() && cm_get_HFP_switch()) // { // uapi_hfp_connect(); // } - } - #endif +#endif UIView::OnClickListener *button1Click = static_cast(transmittingViewEventListener::GetInstance()); UIViewGroup_transmitting->SetOnClickListener(button1Click); @@ -1360,15 +1491,14 @@ namespace OHOS const power_display_svr_api_t *display_api = power_display_svr_get_api(); if (display_api->get_screen_state() != SCREEN_ON) - { - display_api->turn_on_screen(); - } + { + display_api->turn_on_screen(); + } display_api->set_auto_timeout_function(false); #ifdef SUPPORT_CYWEE_SERVICE cywee_hand_wake_switch(0); // 关闭抬腕亮屏,和息屏 #endif - NotificationManager::GetInstance()->RegisterNotifyCleanupFunction(Freetransmitting); return UIViewGroup_transmitting; } @@ -1389,20 +1519,15 @@ namespace OHOS return &lowppowrViewEventListene_t; } - - bool transmittingViewEventListener::OnClick(UIView& view, const ClickEvent& event) + bool transmittingViewEventListener::OnClick(UIView &view, const ClickEvent &event) { - #ifdef SUPPORT_BLE_SERVICE +#ifdef SUPPORT_BLE_SERVICE WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnClick"); - if(Transmitting_falg!=TRANS_DIAL_TRANSMITTING - && Transmitting_falg!=TRANS_OTA_TRANSMITTING - && Transmitting_falg!=TRANS_MP3_TRANSMITTING - && Transmitting_falg!=START_CAT1_OTA - && Transmitting_falg!=TRANS_BIN_TRANSMITTING) + if (Transmitting_falg != TRANS_DIAL_TRANSMITTING && Transmitting_falg != TRANS_OTA_TRANSMITTING && Transmitting_falg != TRANS_MP3_TRANSMITTING && Transmitting_falg != START_CAT1_OTA && Transmitting_falg != TRANS_BIN_TRANSMITTING && Transmitting_falg != TRANS_EPO_TRANSMITTING) { NotificationManager::GetInstance()->StopNotify(); } - #endif +#endif return true; UNUSED(event); }