Commit c6de3392 authored by 张金硕's avatar 张金硕

🐞 fix:OTA界面只有重上KL30\15电或升级成功后可退出

parent 72f99ad8
...@@ -105,10 +105,10 @@ void BlueToothService(void) ...@@ -105,10 +105,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)
...@@ -133,8 +133,10 @@ void BlueToothService(void) ...@@ -133,8 +133,10 @@ void BlueToothService(void)
} }
else else
{ {
SetBluetoothTurnXX(0);
GetBlueToothVaild =0; GetBlueToothVaild =0;
OTA_Update_Flag = 0;
SetBluetoothTurnXX(0);
SetUpdateCtrl(0,QRCode_Rect);
} }
} }
......
...@@ -306,7 +306,7 @@ void Get_Into_OTA_Update_Mode(void) ...@@ -306,7 +306,7 @@ void Get_Into_OTA_Update_Mode(void)
{ {
if(Menu_Get_Current_Cursor_Information() == MENU_ITEM_FAULT_INFORMATION) if(Menu_Get_Current_Cursor_Information() == MENU_ITEM_FAULT_INFORMATION)
{ {
OTA_Update_Flag = ! OTA_Update_Flag; OTA_Update_Flag = 1U;
} }
} }
void KEY_LEFT_EVENT_NONE_Service(void) void KEY_LEFT_EVENT_NONE_Service(void)
...@@ -387,8 +387,8 @@ void Get_DisTime_Service(void) ...@@ -387,8 +387,8 @@ void Get_DisTime_Service(void)
void My_Key_Service(void) void My_Key_Service(void)
{ {
/* 自检时不可操作按键 */ /* 自检和OTA界面时不可操作按键 */
if(g_u8SelfCheck) if((g_u8SelfCheck) && (OTA_Update_Flag == 0))
{ {
if((Get_ActualVechileSpeed() == 0) ||((Get_DispVechileSpeed() >= 1990) && (Get_DispEngineSpeed() >= 12000))) if((Get_ActualVechileSpeed() == 0) ||((Get_DispVechileSpeed() >= 1990) && (Get_DispEngineSpeed() >= 12000)))
{ {
......
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