🐞 fix:解决合并冲突

Firmware/Source/Application/BlueTooth.c

@@ -85,78 +85,68 @@ void BlueToothService(void)
             GetPhoneBookVaild = 0;
         }
 
-    if((BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing) || (BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming) || (BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking))
-    {
-        if(g_u8Cursor_Posittion == MENU_ITEM_PHONE_CONNECT_APP)/*导航界面*/
+        if((BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing) || (BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming) || (BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking))
         {
-            ;
+            if(g_u8Cursor_Posittion == MENU_ITEM_PHONE_CONNECT_APP)/*导航界面*/
+            {
+                ;
+            }
+            else/*非导航界面*/
+            {
+                Menu_Change_Branch_To_Item(MENU_BRANCH_ANIMATION,MENU_ITEM_MAIN_ITEM);
+            }
+            
         }
-        else/*非导航界面*/
+        SetUUIDData((char *)UUIDConfigBuf, 22);
+        if (OTA_Update_Flag == 1) 
         {
-            Menu_Change_Branch_To_Item(MENU_BRANCH_ANIMATION,MENU_ITEM_MAIN_ITEM);
+            QRCode_Rect.x = 650;
+            QRCode_Rect.y = 210;
         }
-        
-    }
-    SetUUIDData((char *)UUIDConfigBuf, 22);
-    if (OTA_Update_Flag == 1) 
-    {
-        QRCode_Rect.x = 650;
-        QRCode_Rect.y = 210;
-    }
-    else 
-    {
-        QRCode_Rect.x = QRCode_X;
-        QRCode_Rect.y = QRCode_Y;
-    }
-    // QRCode_Rect.x = 650;
-    // QRCode_Rect.y = 210;
-    QRCode_Rect.height = 240;
-    QRCode_Rect.width = 240;
-    SetScreenType(QRCode_TYPE, QRCode_Rect);
-    if(Menu_Get_Current_Cursor_Information() != MENU_ITEM_FAULT_INFORMATION)
-    {
-        OTA_Update_Flag = 0;
-    }
-    if(OTA_Update_Flag == 1)
-    {
-        if(OTA_Update_Count_Open < 5)
+        else 
         {
-            SetUpdateCtrl(1,QRCode_Rect);
-            OTA_Update_Count_Open++;
-        }  
-        OTA_Update_Count_Close = 0;
-    }
+            QRCode_Rect.x = QRCode_X;
+            QRCode_Rect.y = QRCode_Y;
+        }
+        // QRCode_Rect.x = 650;
+        // QRCode_Rect.y = 210;
+        QRCode_Rect.height = 240;
+        QRCode_Rect.width = 240;
+        SetScreenType(QRCode_TYPE, QRCode_Rect);
+        // if(Menu_Get_Current_Cursor_Information() != MENU_ITEM_FAULT_INFORMATION)
+        // {
+        //     OTA_Update_Flag = 0;
+        // }
+        if(OTA_Update_Flag == 1)
+        {
+            if(OTA_Update_Count_Open < 5)
+            {
+                SetUpdateCtrl(1,QRCode_Rect);
+                OTA_Update_Count_Open++;
+            }  
+            OTA_Update_Count_Close = 0;
+        }
+        else
+        {
+            if(OTA_Update_Count_Close < 5)
+            {
+                SetUpdateCtrl(0,QRCode_Rect);
+                OTA_Update_Count_Close++;
+            } 
+            OTA_Update_Count_Open=0;
+        }
+        SetTaskbarHeight(150);
+        SetBlueToothName((uint8_t *)HJBlueToothName, sizeof(HJBlueToothName));
+        TextService();
+    }    
     else
     {
-        if(OTA_Update_Count_Close < 5)
-        {
-            SetUpdateCtrl(0,QRCode_Rect);
-            OTA_Update_Count_Close++;
-        } 
-        OTA_Update_Count_Open=0;
+        GetBlueToothVaild =0;
+        OTA_Update_Flag = 0;
+        SetBluetoothTurnXX(0);
+        SetUpdateCtrl(0,QRCode_Rect);
     }
-    SetTaskbarHeight(150);
-    SetBlueToothName((uint8_t *)HJBlueToothName, sizeof(HJBlueToothName));
-    TextService();
-    
-    // BlueConnectStatus = GetBlueToothPowerSTATE();
-    // juasfha = BlueToothPhoneData.BlueToothPhoneSate;
-    // juasfha = BlueToothPhoneData.PhoneBookTotalCount;
-    // for(i=0;i<20;i++)
-    // {
-    //     sjhja[i] = BlueToothPhoneData.PhoneNumber[i];
-    // }
-    // for(i=0;i<100;i++)
-    // {
-    //     PhoneName[i] = BlueToothPhoneData.BlueToothPhoneName[i];
-    // }
-    
-    // _QRCODE_RECT QRCode_Rect;
-    // QRCode_Rect.x = QRCode_X;
-    // QRCode_Rect.y = QRCode_Y;
-    // QRCode_Rect.height = QRCode_HEIGHT;
-    // QRCode_Rect.width = QRCode_WIDTH;
-    // SetScreenType(QRCode_TYPE, QRCode_Rect);
+
 }
 
 TEXT_STRUCT TextPara[TEXT_NUM_TOTAL] =