From 5a4cbc1d37ab9d5f54854991c86442a9ed726649 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Thu, 5 Feb 2026 17:15:41 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96ota=E4=BC=A0=E8=BE=93=E7=95=8C?= =?utf8?q?=E9=9D=A2=EF=BC=9A=E9=81=BF=E5=85=8Dapp=E9=95=BF=E6=97=B6?= =?utf8?q?=E9=97=B4=E4=B8=8D=E4=BC=A0=E8=BE=93=E5=AF=BC=E8=87=B4=E6=89=8B?= =?utf8?q?=E8=A1=A8=E5=8D=A1=E5=9C=A8=E4=BC=A0=E8=BE=93=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../msg_center/src/notify/transmitting.cpp | 775 +++++++++--------- 1 file changed, 377 insertions(+), 398 deletions(-) diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/transmitting.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/transmitting.cpp index adb32dd78..a41b08ae6 100644 --- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/transmitting.cpp +++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/transmitting.cpp @@ -175,20 +175,56 @@ namespace OHOS } static uint8_t timer_falg_low_power=5; - static uint8_t test_flag=0; + static uint8_t transmitting_ota_timeout = 10; // 10秒超时计数（每秒减1） + static uint32_t cur_recv_value = 0; // 当前接收值 + static uint32_t last_recv_value = 0; // 上一次接收值 + static bool is_ota_data_stop = false; // 标记是否停止传输 + static bool is_first_check = true; // 首次检测标记（避免初始值误判） static void OTATimerCallBackProc(int data) { #ifdef SUPPORT_BLE_SERVICE - #if 0 - if(updatasider) - updatasider->SetValue(test_flag++); - #else - if(updatasider) - updatasider->SetValue(get_OTA_recv_value()); - #endif if(updatasider) + { + cur_recv_value = get_OTA_recv_value(); // 获取当前接收值 + updatasider->SetValue(cur_recv_value); updatasider->Invalidate(); + + // ===== 核心检测逻辑 ===== + // 首次检测：初始化上一次值，不做判断 + if (is_first_check) + { + last_recv_value = cur_recv_value; + is_first_check = false; + return; + } + + // 非首次检测：对比当前值与上一次值 + if (cur_recv_value == last_recv_value) + { + // 值无变化，超时计数减1 + transmitting_ota_timeout--; + if (transmitting_ota_timeout == 0) + { + // 10秒值未变化，判定APP停止传输 + is_ota_data_stop = true; + transmitting_ota_timeout = 10; // 重置计数（可选，根据业务需求） + is_first_check = true; // 重置首次检测标记（可选） + + // 【此处添加停止传输后的业务逻辑】 + // 示例：打印日志、停止OTA定时器、通知上层等 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OTA传输停止：10秒未收到新数据"); + NotificationManager::GetInstance()->StopNotify(); + } + } + else + { + // 值有变化，重置超时计数和上一次值 + transmitting_ota_timeout = 10; + last_recv_value = cur_recv_value; + is_ota_data_stop = false; + } + } #endif } @@ -234,7 +270,7 @@ namespace OHOS Title = new UILabelExt(); if(Title == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView new fail"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); } } Title->SetPosition(83, 50); @@ -252,7 +288,7 @@ namespace OHOS updatasider = new UISlider(); if(updatasider == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView new fail"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "updatasider new fail"); } } updatasider->SetSliderColor(Color::Gray(), Color::Silver()); @@ -274,7 +310,7 @@ namespace OHOS label_ = new UILabelExt(); if(label_ == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView new fail"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); } } label_->SetPosition(60, 220); @@ -294,7 +330,7 @@ namespace OHOS transmitting_img = new UIImageView(); if(transmitting_img == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView new fail"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "transmitting_img new fail"); } } transmitting_img->SetPosition(193, 130, 80, 88); @@ -364,7 +400,7 @@ namespace OHOS Title = new UILabelExt(); if(Title == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView new fail"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); } } Title->SetPosition(83, 50); @@ -382,7 +418,7 @@ namespace OHOS label_ = new UILabelExt(); if(label_ == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView new fail"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); } } label_->SetPosition(60, 281); @@ -415,7 +451,7 @@ namespace OHOS Title = new UILabelExt(); if(Title == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView new fail"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); } } Title->SetPosition(83, 50); @@ -433,7 +469,7 @@ namespace OHOS label_ = new UILabelExt(); if(label_ == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView new fail"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); } } label_->SetPosition(60, 281); @@ -452,7 +488,7 @@ namespace OHOS transmitting_img = new UIImageView(); if(transmitting_img == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "transmitting_img is nullptr"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "transmitting_img new fail"); } } transmitting_img->SetPosition(193, 150,80, 80); @@ -468,7 +504,7 @@ namespace OHOS Title = new UILabelExt(); if(Title == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView new fail"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); } } Title->SetPosition(143, 51); @@ -488,7 +524,7 @@ namespace OHOS label_ = new UILabelExt(); if(label_ == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView new fail"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); } } label_->SetPosition(60, 281); @@ -519,7 +555,7 @@ namespace OHOS Title = new UILabelExt(); if(Title == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView new fail"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); } } Title->SetPosition(143, 51); @@ -538,7 +574,7 @@ namespace OHOS label_ = new UILabelExt(); if(label_ == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView new fail"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); } } label_->SetPosition(60, 281); @@ -557,7 +593,7 @@ namespace OHOS transmitting_img = new UIImageView(); if(transmitting_img == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView new fail"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "transmitting_img new fail"); } } transmitting_img->SetPosition(193, 130, 80, 88); @@ -568,36 +604,37 @@ namespace OHOS void creat_down_Dial() { - if (Title == nullptr) { - Title = new UILabelExt(); + if (Title == nullptr) + { + Title = new UILabelExt(); + if(Title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); + } } - 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); + Title->Resize(800, 88); Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property Title->SetText("表盘安装中"); Title->SetTextId (STR_DIAL_DOWNLOADING_TITLE); 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(); + /* -------------------------------------------------------------------------- */ + if (label_ == nullptr) + { + label_ = new UILabelExt(); + if(label_ == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); + } } - 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); + label_->Resize(345, 101); label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property label_->SetText("正在安装表盘，请不要做其他操作或关闭手表"); label_->SetTextId(STR_DIAL_DOWNLOADING_LABEL); label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); @@ -605,51 +642,46 @@ namespace OHOS 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(updatasider); - UIViewGroup_transmitting->Add(downImageAnimatorView); } void creat_down_MP3() { - if (Title == nullptr) { - Title = new UILabelExt(); + if (Title == nullptr) + { + Title = new UILabelExt(); + if(Title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); + } } - 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); + Title->Resize(800, 88); 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); 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(); + UIViewGroup_transmitting->Add(Title); + /* -------------------------------------------------------------------------- */ + if (label_ == nullptr) + { + label_ = new UILabelExt(); + if(label_ == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); + } } - 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); + label_->Resize(345, 101); label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property label_->SetText("正在传输音乐，请不要做其他操作或关闭手表"); label_->SetTextId(STR_MUSIC_TRANSMIT_NOTE); label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); @@ -657,50 +689,45 @@ namespace OHOS 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); - + UIViewGroup_transmitting->Add(label_); 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(); + if(Title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); + } } - 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); + Title->Resize(800, 88); Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property Title->SetText("数据传输中"); // Title->SetTextId (STR_MUSIC_TRANSMIT); - 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(); + UIViewGroup_transmitting->Add(Title); + /* -------------------------------------------------------------------------- */ + if (label_ == nullptr) + { + label_ = new UILabelExt(); + if(label_ == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); + } } - 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); + label_->Resize(345, 101); label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property label_->SetText("正在下载应用，请不要做其他操作或关闭手表"); // label_->SetTextId(STR_MUSIC_TRANSMIT_NOTE); label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); @@ -708,69 +735,68 @@ namespace OHOS 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); - + UIViewGroup_transmitting->Add(label_); 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(); + if(Title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); + } } - 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); + Title->Resize(800, 88); 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); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - UIViewGroup_transmitting->Add(Title); Title->SetVisible(true); - - - if (label_ == nullptr) { - label_ = new UILabelExt(); + UIViewGroup_transmitting->Add(Title); + if (label_ == nullptr) + { + label_ = new UILabelExt(); + if(label_ == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); + } } - 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); + label_->Resize(345, 101); 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); - - - + label_->SetVisible(true); + UIViewGroup_transmitting->Add(label_); + /* -------------------------------------------------------------------------- */ if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); + if(transmitting_img == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "transmitting_img new fail"); + } } 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) @@ -788,10 +814,6 @@ namespace OHOS transmitting_timer = NULL; return ; } - - // Add to rootView - UIViewGroup_transmitting->Add(label_); - label_->SetVisible(true); } @@ -800,33 +822,29 @@ namespace OHOS 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); + Title->Resize(800, 88); Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property Title->SetText("传输成功"); // Title->SetTextId (STR_MP3_SUCC_TITLE); 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(); + UIViewGroup_transmitting->Add(Title); + /* -------------------------------------------------------------------------- */ + if (label_ == nullptr) + { + label_ = new UILabelExt(); + if(label_ == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); + } } - 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); + label_->Resize(345, 101); label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property label_->SetText("应用安装中，请稍等"); // label_->SetTextId(STR_MUSIC_TRANSMIT_SUCCESS_NOTE); label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); @@ -834,9 +852,9 @@ namespace OHOS label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label_->SetRollSpeed(0); label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - - + label_->SetVisible(true); + UIViewGroup_transmitting->Add(label_); + /* -------------------------------------------------------------------------- */ if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); @@ -845,7 +863,7 @@ namespace OHOS 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) @@ -863,65 +881,64 @@ namespace OHOS transmitting_timer = NULL; return ; } - - // Add to rootView - UIViewGroup_transmitting->Add(label_); - label_->SetVisible(true); } - - void creat_down_Dial_succ() { - if (Title == nullptr) { - Title = new UILabelExt(); + if (Title == nullptr) + { + Title = new UILabelExt(); + if(Title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); + } } - 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); + Title->Resize(800, 88); 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); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - UIViewGroup_transmitting->Add(Title); Title->SetVisible(true); - - - if (label_ == nullptr) { - label_ = new UILabelExt(); + UIViewGroup_transmitting->Add(Title); + /* -------------------------------------------------------------------------- */ + if (label_ == nullptr) + { + label_ = new UILabelExt(); + if(label_ == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); + } } - 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); + label_->Resize(345, 101); 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); - - - + label_->SetVisible(true); + UIViewGroup_transmitting->Add(label_); + /* -------------------------------------------------------------------------- */ if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); + if(transmitting_img == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "transmitting_img new fail"); + } } 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) @@ -939,56 +956,49 @@ namespace OHOS transmitting_timer = NULL; return ; } - - // Add to rootView - UIViewGroup_transmitting->Add(label_); - 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(); + if(Title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); + } } - 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); + Title->Resize(800, 88); Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property 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); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - UIViewGroup_transmitting->Add(Title); Title->SetVisible(true); - - - if (label_ == nullptr) { - label_ = new UILabelExt(); + UIViewGroup_transmitting->Add(Title); + /* -------------------------------------------------------------------------- */ + if (label_ == nullptr) + { + label_ = new UILabelExt(); + if(label_ == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); + } } - 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); + label_->Resize(345, 101); label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - 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); - - - + label_->SetVisible(true); + UIViewGroup_transmitting->Add(label_); + /* -------------------------------------------------------------------------- */ if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); @@ -997,162 +1007,135 @@ namespace OHOS const char *imagesPath = TRANSMITTING_FAIL_PATH; transmitting_img->SetSrc(imagesPath); UIViewGroup_transmitting->Add(transmitting_img); - - // 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(); + if(Title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); + } } - 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); + Title->Resize(800, 88); Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property 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); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - UIViewGroup_transmitting->Add(Title); Title->SetVisible(true); - - - if (label_ == nullptr) { - label_ = new UILabelExt(); + UIViewGroup_transmitting->Add(Title); + /* -------------------------------------------------------------------------- */ + if (label_ == nullptr) + { + label_ = new UILabelExt(); + if(label_ == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); + } } - 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); + label_->Resize(345, 101); label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property - - // label_->SetTextId(STR_DIAL_NOTE);//TODO:多国语言 - // - // - // if(ConfigModel::GetInstance()->GetLanguage() == ZH_CN) label_->SetText("本地下载音乐已达到存储上限；请先删除部分歌曲再进行上传"); - // else - // label_->SetText( - // "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); - - - + label_->SetVisible(true); + UIViewGroup_transmitting->Add(label_); + /* -------------------------------------------------------------------------- */ if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); + if(transmitting_img == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "transmitting_img 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 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(); + if(Title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); + } } - 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); + Title->Resize(800, 88); Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property if(ConfigModel::GetInstance()->GetLanguage() == 0) Title->SetText("安装失败"); else Title->SetText("Install Failed"); - 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); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - UIViewGroup_transmitting->Add(Title); Title->SetVisible(true); - - - if (label_ == nullptr) { - label_ = new UILabelExt(); + UIViewGroup_transmitting->Add(Title); + /* -------------------------------------------------------------------------- */ + if (label_ == nullptr) + { + label_ = new UILabelExt(); + if(label_ == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); + } } - 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); + label_->Resize(345, 101); 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); - - - + label_->SetVisible(true); + UIViewGroup_transmitting->Add(label_); + /* -------------------------------------------------------------------------- */ if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); + if(transmitting_img == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "transmitting_img 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 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(); + if(Title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); + } } - 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); + Title->Resize(800, 88); Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property if(ConfigModel::GetInstance()->GetLanguage() == 0) Title->SetText("传输失败"); else @@ -1162,21 +1145,20 @@ namespace OHOS 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(); + UIViewGroup_transmitting->Add(Title); + /* -------------------------------------------------------------------------- */ + if (label_ == nullptr) + { + label_ = new UILabelExt(); + if(label_ == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); + } } - 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); + label_->Resize(345, 101); label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property label_->SetText("音乐传输失败，请退出或重新安装"); label_->SetTextId(STR_MP3_FAIL_LABEL); label_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); @@ -1184,9 +1166,9 @@ namespace OHOS label_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label_->SetRollSpeed(0); label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - - + label_->SetVisible(true); + UIViewGroup_transmitting->Add(label_); + /* -------------------------------------------------------------------------- */ if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); @@ -1195,26 +1177,21 @@ namespace OHOS const char *imagesPath = TRANSMITTING_FAIL_PATH; transmitting_img->SetSrc(imagesPath); UIViewGroup_transmitting->Add(transmitting_img); - - // 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(); + if(Title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); + } } - 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); + Title->Resize(800, 88); Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property if(ConfigModel::GetInstance()->GetLanguage() == 0) Title->SetText("传输失败"); else @@ -1224,21 +1201,20 @@ namespace OHOS 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(); + /* -------------------------------------------------------------------------- */ + if (label_ == nullptr) + { + label_ = new UILabelExt(); + if(label_ == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); + } } - 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); + label_->Resize(345, 101); label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property if(ConfigModel::GetInstance()->GetLanguage() == 0) label_->SetText("app安装失败，请退出或重新安装"); else @@ -1249,38 +1225,38 @@ namespace OHOS 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); + /* -------------------------------------------------------------------------- */ if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); + if(transmitting_img == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "transmitting_img 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 to rootView - UIViewGroup_transmitting->Add(label_); - label_->SetVisible(true); - - - } void creat_down_EPO() { - printf("creat_down_EPO\n"); - if (Title == nullptr) { - Title = new UILabelExt(); + if (Title == nullptr) + { + Title = new UILabelExt(); + if(Title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); + } } Title->SetPosition(108, 51); Title->Resize(300, 88); Title->SetViewId("label1"); Title->SetStyle(STYLE_TEXT_FONT, 30); - if(ConfigModel::GetInstance()->GetLanguage() == 0) Title->SetText("正在优化定位速度"); else @@ -1290,19 +1266,20 @@ namespace OHOS 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(); + UIViewGroup_transmitting->Add(Title); + /* -------------------------------------------------------------------------- */ + if (label_ == nullptr) + { + label_ = new UILabelExt(); + if(label_ == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); + } } label_->SetPosition(60, 281); label_->Resize(345, 101); label_->SetStyle(STYLE_TEXT_FONT, 30); - // Set additional property if(ConfigModel::GetInstance()->GetLanguage() == 0) label_->SetText("请稍等..."); else @@ -1312,21 +1289,22 @@ namespace OHOS 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(); + if (Title == nullptr) + { + Title = new UILabelExt(); + if(Title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); + } } Title->SetPosition(173, 51); Title->Resize(800, 88); @@ -1340,23 +1318,22 @@ namespace OHOS 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(); + /* -------------------------------------------------------------------------- */ + if (label_ == nullptr) + { + label_ = new UILabelExt(); + if(label_ == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); + } } label_->SetPosition(60, 281); label_->Resize(345, 101); label_->SetViewId("label2"); label_->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property if(ConfigModel::GetInstance()->GetLanguage() == 0) label_->SetText("优化成功，请稍等..."); else @@ -1366,16 +1343,21 @@ namespace OHOS 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); + /* -------------------------------------------------------------------------- */ if (transmitting_img == nullptr) { transmitting_img = new UIImageView(); + if(transmitting_img == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "transmitting_img new fail"); + } } 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) @@ -1394,25 +1376,21 @@ namespace OHOS 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(); + if(Title == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail"); + } } Title->SetPosition(173, 51); Title->Resize(800, 88); - Title->SetViewId("label1"); Title->SetStyle(STYLE_TEXT_FONT, 30); - - // Set additional property if(ConfigModel::GetInstance()->GetLanguage() == 0) Title->SetText("优化失败"); else @@ -1422,15 +1400,16 @@ namespace OHOS 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(); + if(label_ == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label_ new fail"); + } } label_->SetPosition(60, 281); label_->Resize(345, 101); @@ -1440,14 +1419,11 @@ namespace OHOS else label_->SetText("Opt Failed, Please try again"); label_->SetX((466 - label_->GetWidth()) / 2); - - 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); } @@ -1465,8 +1441,11 @@ namespace OHOS if (UIViewGroup_transmitting == nullptr) { UIViewGroup_transmitting = new UIViewGroup(); + if(UIViewGroup_transmitting == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UIViewGroup_transmitting new fail"); + } UIViewGroup_transmitting->SetPosition(0, 0, 466, 466); - //UIViewGroup_transmitting->SetStyle(STYLE_BACKGROUND_OPA, 0); } else { -- 2.17.1