Skip to content

H
haoJin750TFT
Commit a63c7aa5 authored by 张金硕's avatar 张金硕
Browse files
Options

Merge branch 'jinshuo' into 'dev' 

🐞 fix:解决合并冲突

See merge request !85
parents 1cb64f87 e40c7dda
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 64 deletions
Firmware/Source/Application/BlueTooth.c
View file @ a63c7aa5
...@@ -113,10 +113,10 @@ void BlueToothService(void) ...@@ -113,10 +113,10 @@ void BlueToothService(void)
QRCode_Rect.height = 240; QRCode_Rect.height = 240;
QRCode_Rect.width = 240; QRCode_Rect.width = 240;
SetScreenType(QRCode_TYPE, QRCode_Rect); SetScreenType(QRCode_TYPE, QRCode_Rect);
if(Menu_Get_Current_Cursor_Information() != MENU_ITEM_FAULT_INFORMATION) // if(Menu_Get_Current_Cursor_Information() != MENU_ITEM_FAULT_INFORMATION)
{ // {
OTA_Update_Flag = 0; // OTA_Update_Flag = 0;
} // }
if(OTA_Update_Flag == 1) if(OTA_Update_Flag == 1)
{ {
if(OTA_Update_Count_Open < 5) if(OTA_Update_Count_Open < 5)
...@@ -138,25 +138,15 @@ void BlueToothService(void) ...@@ -138,25 +138,15 @@ void BlueToothService(void)
SetTaskbarHeight(150); SetTaskbarHeight(150);
SetBlueToothName((uint8_t *)HJBlueToothName, sizeof(HJBlueToothName)); SetBlueToothName((uint8_t *)HJBlueToothName, sizeof(HJBlueToothName));
TextService(); TextService();
}
else
{
GetBlueToothVaild =0;
OTA_Update_Flag = 0;
SetBluetoothTurnXX(0);
SetUpdateCtrl(0,QRCode_Rect);
}
// 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] = TEXT_STRUCT TextPara[TEXT_NUM_TOTAL] =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment