蓝牙文件取消传输修改

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index d017903..a8b5323 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -7188,13 +7188,45 @@ errcode_t check_header(msg_header_t *header )
 \r
 errcode_t cancel_recv_file(ble_read_data *buffer_handle)\r
 {\r
-\r
     if(BR_TRANSFER_timer)\r
     {\r
-        timer_flie_flag=1;\r
+        timer_flie_flag=0;\r
+        osTimerStop(BR_TRANSFER_timer);\r
+        osTimerDelete(BR_TRANSFER_timer);\r
+        BR_TRANSFER_timer = NULL;\r
     }\r
-    ble_reply_cmd(FILE_RECV_REPLY_STAT_CMD,0);//接收失败\r
-    \r
+\r
+    if(timer_flie_type==1)\r
+    {\r
+        TRANSMIT_DATA=TRANS_OTA_FAIL;\r
+    }\r
+    else if (timer_flie_type==3)\r
+    {\r
+        TRANSMIT_DATA=TRANS_DIAL_FAIL;\r
+    }\r
+    else\r
+    {\r
+        TRANSMIT_DATA=TRANS_FREE;\r
+    }\r
+        \r
+    ble_read_timer_p->receive_file_flag = 0;\r
+    if (ble_read_timer_p->file_recv_stat.recv_file_stat != 2) //已经下载完毕的文件，没有必要cancel了。\r
+    {\r
+        if (ble_read_timer_p->file_recv_stat.file!=NULL)\r
+        {\r
+            fclose(ble_read_timer_p->file_recv_stat.file);\r
+            ble_read_timer_p->file_recv_stat.file = NULL;\r
+        }\r
+        if (ble_read_timer_p->file_recv_stat.file_name != NULL)\r
+        {\r
+            free(ble_read_timer_p->file_recv_stat.file_name);\r
+            ble_read_timer_p->file_recv_stat.file_name=NULL;\r
+        }\r
+        ble_read_timer_p->file_recv_stat.recv_file_stat = -1;\r
+        ble_read_timer_p=NULL;\r
+    }\r
+    CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1);\r
+\r
     return ERRCODE_SUCC;\r
 }\r
 \r

diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
index 0e4f511..f0dfda2 100644 (file)
--- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
@@ -1462,8 +1462,8 @@ void MsgCenterNotifybleTransmit(const Topic topic, Request* req)
     {
         set_transmittingShow_falg(data[0]);
         
-        if(NotificationManager::GetInstance()->HasNotifyShowing())
-        NotificationManager::GetInstance()->StopNotify();
+        // if(NotificationManager::GetInstance()->HasNotifyShowing())
+        // NotificationManager::GetInstance()->StopNotify();
 
         NotificationManager::GetInstance()->ShowNotify(showtransmitNotify, (uint16_t)topic, true);
     }

diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp
index b245d14..1341d74 100644 (file)
--- a/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp
@@ -191,11 +191,12 @@ namespace OHOS
 
         // Add to rootView
         UIViewGroup_transmitting->Add(Title);
-        updatasider = new UISlider();
+       
         if (updatasider == nullptr)
         {
+            updatasider = new UISlider();
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView new fail");
-            return ;
+
         }
 
         updatasider->SetSliderColor(Color::Gray(), Color::Silver());
@@ -234,11 +235,12 @@ namespace OHOS
         UIViewGroup_transmitting->Add(label_);
 
         //Add ImageView to App
-        transmitting_img = new UIImageView();
+      
         if (transmitting_img == nullptr)
         {
+            transmitting_img = new UIImageView();
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!");
-            return ;
+
         }
         transmitting_img->SetPosition(117, 87, 230, 160);
         const char *imagesPath = TRANSMITTING_OTA_DOWN;
@@ -249,6 +251,12 @@ namespace OHOS
         osStatus_t retTimer;
         
         Set_OTA_recv_value();
+        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);
         retTimer = osTimerStart(transmitting_timer, tick);
@@ -301,11 +309,11 @@ namespace OHOS
         UIViewGroup_transmitting->Add(label_);
 
         //Add ImageView to App
-        transmitting_img = new UIImageView();
+        
         if (transmitting_img == nullptr)
         {
+            transmitting_img = new UIImageView();
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!");
-            return ;
         }
         transmitting_img->SetPosition(117, 87, 230, 160);
         const char *imagesPath = TRANSMITTING_OTA_DOWN;
@@ -355,11 +363,12 @@ namespace OHOS
       
 
         //Add ImageView to App
-        transmitting_img = new UIImageView();
+       
         if (transmitting_img == nullptr)
         {
+            transmitting_img = new UIImageView();
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!");
-            return ;
+
         }
         transmitting_img->SetPosition(117, 87, 230, 160);
         const char *imagesPath = TRANSMITTING_OTA_DOWN;
@@ -462,11 +471,11 @@ namespace OHOS
         label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
 
 
-         transmitting_img = new UIImageView();
+        
         if (transmitting_img == nullptr)
         {
+            transmitting_img = new UIImageView();
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!");
-            return ;
         }
         transmitting_img->SetPosition(193, 150,80, 80);
         const char *imagesPath = TRANSMITTING_SUCC_PATH;
@@ -475,7 +484,12 @@ namespace OHOS
 
         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 =2000;// osMs2Tick(1000);
         retTimer = osTimerStart(transmitting_timer, tick);
@@ -530,11 +544,11 @@ namespace OHOS
         label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
 
 
-         transmitting_img = new UIImageView();
+         
         if (transmitting_img == nullptr)
         {
+            transmitting_img = new UIImageView();
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::KUMILOGOImage new fail!");
-            return ;
         }
         transmitting_img->SetPosition(193, 150,80, 80);
         const char *imagesPath = TRANSMITTING_FAIL_PATH;
@@ -560,6 +574,10 @@ namespace OHOS
             UIViewGroup_transmitting->SetPosition(0, 0, 466, 466);
             //UIViewGroup_transmitting->SetStyle(STYLE_BACKGROUND_OPA, 0);
         }
+        else
+        {
+            UIViewGroup_transmitting->RemoveAll();
+        }
 
         switch (Transmitting_falg)
         {