🐞 fix:蓝牙关闭时500ms关一次，解决互联界面时插拔15电二维码在开机动画时显示

Firmware/Source/Application/BlueTooth.c

@@ -8,6 +8,8 @@ uint8_t GetPhoneBookVaild = 0;
 uint8_t TextInit = 0;
 uint8_t SetUUIDTimes = 0;
 uint16_t LastPhoneBookTotalCount = 0;
+uint8_t LastCurIgnSt = POWER_STATE_IGN_OFF;
+uint8_t IOState = 0;
 _PICID_Struct PicObj;
 _QRCODE_RECT QRCode_Rect;
 const uint8_t HJBlueToothName[9]= {"HJ750"};
@@ -51,6 +53,7 @@ void BlueTooth_IGOFF_INIT(void)
 {
     GetBlueToothVaild =0;
     OTA_Update_Flag = 0;
+    SetBluetoothCloseCount = 0;
     SetBluetoothTurnXX(0);
     SetUpdateCtrl(0,QRCode_Rect);
 }
@@ -68,6 +71,7 @@ void BlueToothService(void)
         }
         else
         {
+            SetBluetoothCloseCount++;
             if(GetBlueToothVaild == 1)
             {
                 // if(SetBluetoothCloseCount < 30)
@@ -83,6 +87,15 @@ void BlueToothService(void)
                 SetBluetoothTurnXX(0);
                 GetBlueToothVaild = 0;
             }
+            if(SetBluetoothCloseCount >= 5)
+            {
+                SetBluetoothTurnXX(0);
+                SetBluetoothCloseCount = 0;
+            }
+            else
+            {
+                ;
+            }
         }
 
         if ((BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection)&&(GetPhoneBookVaild == 0))
@@ -157,6 +170,21 @@ void BlueToothService(void)
     {
         ;
     }
+    if (LastCurIgnSt != System_FUN_KL15_Status_Get())
+    {
+        if (SYS_OPR_STAT_IGN_ON)
+        {
+            IOState = IOState & 0x02;
+            PackedTransfer_EasyNavigation(IOState);
+        }
+        else
+        {
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0);
+            IOState = IOState | 0x01;
+            PackedTransfer_EasyNavigation(IOState);
+        }
+        LastCurIgnSt = System_FUN_KL15_Status_Get();
+    }
 
 }
 

Firmware/Source/Application/BlueTooth.h

@@ -25,6 +25,8 @@ typedef struct {
 
 #define INFORMATION_VERSION_DATE   "20241015"
 #define SW_EXTERNAL_VERSION        "100"
+#define POWER_STATE_IGN_OFF 0u
+#define POWER_STATE_IGN_ON 1u
 
 static const uint8_t DATA_Version[8] =  {INFORMATION_VERSION_DATE};
 static const uint8_t SW_Version[3] =  {SW_EXTERNAL_VERSION};
@@ -54,5 +56,6 @@ extern uint8_t TextFaultCodeNum[10];
 extern uint8_t UUIDDisplay[42];
 extern TEXT_STRUCT TextPara[];
 extern uint8_t UUIDConfigBuf[21];
+extern uint8_t IOState;
 
 #endif
\ No newline at end of file

Firmware/Source/Component/AMT630H/AMT630H.c

@@ -132,6 +132,16 @@ void AMT630H_Animation_PlayProc(uint16_t PicIndex)
     uint32_t tmpLen = 0;
     SetPageGuid(GRAPHICS_PAGE_0, 1, 0, 0); 
     SetPageBackground(GRAPHICS_PAGE_0, PicIndex);
+    // if (AMT630H_Animation_DispPic == (AMT630H_ANIMATION_PIC_NUM - 30)) 
+    // {
+    //     IOState = IOState | 0x02;
+    //     PackedTransfer_EasyNavigation(IOState);
+    // }
+    // else 
+    // {
+    //     IOState = IOState & 0x01;
+    //     PackedTransfer_EasyNavigation(IOState);
+    // }
     PackedTransfer_Page();
   //  PackedTransfer_GetSwVer();
 
@@ -424,12 +434,25 @@ void AMT630H_Main(void)
     }
     else
     {
-        AMT630H_Animation_RefreshTime = 0;
+        PicObj.qr_logo_id = 0;//Pic_0234 小数字9  EA
+        PicObj.main_pic_id = Pic_0001; //转速红12
+        PicObj.update_pic_id = Pic_0233;//小数字8   E9
+        PicObj.second_menu = 0;
+        PicObj.navigation_task_id = Pic_0411;//红色小e  19B
+        if(g_u8Display_Mode == ModeDAY)
+        {
+            PicObj.qr_pic_id =  Pic_0494;//请使用猎变APP扫码连接 
+        }
+        else
+        {
+            PicObj.qr_pic_id =  Pic_1031;//请使用猎变APP扫码连接
+        } 
         if(AMT630H_RefreshTime >= AMT630H_REFRESH_TIME)
         {
             AMT630H_RefreshTime = 0;
             //AMT630H_GUI_DisplayProc();
             SetPageGuid(GRAPHICS_PAGE_0, 1, 0, 0);
+            PackedTransfer_DisplayPhoneMirrorQRcode(0, PicObj);
             SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0);
             PackedTransfer_Page();
         }

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -4921,13 +4921,19 @@ uint8_t VechileSpeed = 0;
 uint16_t KL30_VOLTAGE_Value = 0;
 void AMT630H_GUI_BACKGRAND()
 {
-    DISPLAY_NUM_ST DisplayNumPara;
     PicObj.qr_logo_id = 0;//Pic_0234 小数字9  EA
     PicObj.main_pic_id = Pic_0632; //转速红12
-    PicObj.qr_pic_id =  Pic_0411;//请使用猎变APP扫码连接
     PicObj.update_pic_id = Pic_0233;//小数字8   E9
     PicObj.second_menu = 0;
     PicObj.navigation_task_id = Pic_0411;//红色小e  19B
+    if(g_u8Display_Mode == ModeDAY)
+    {
+        PicObj.qr_pic_id =  Pic_0494;//请使用猎变APP扫码连接 
+    }
+    else
+    {
+        PicObj.qr_pic_id =  Pic_1031;//请使用猎变APP扫码连接
+    }
     PackedTransfer_DisplayPhoneMirrorQRcode(0, PicObj); 
     /*背景图*/
     if(g_u8Display_Mode == ModeDAY)
@@ -5221,12 +5227,19 @@ void AMT630H_GUI_SETTING()
 /*进入OTA界面执行刷图和发送图片id*/
 void AMT630H_GUI_Display_OTA_Page_Information(void)
 {
-    PicObj.qr_logo_id = 0;
-    PicObj.main_pic_id = Pic_0382; 
-    PicObj.qr_pic_id = Pic_0316;
-    PicObj.update_pic_id = Pic_0233;
+    PicObj.qr_logo_id = 0;//Pic_0234 小数字9  EA
+    PicObj.main_pic_id = Pic_0632; //转速红12
+    PicObj.update_pic_id = Pic_0233;//小数字8   E9
     PicObj.second_menu = 0;
-    PicObj.navigation_task_id = 0;
+    PicObj.navigation_task_id = Pic_0411;//红色小e  19B
+    if(g_u8Display_Mode == ModeDAY)
+    {
+        PicObj.qr_pic_id =  Pic_0494;//请使用猎变APP扫码连接 
+    }
+    else
+    {
+        PicObj.qr_pic_id =  Pic_1031;//请使用猎变APP扫码连接
+    }
     SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0);/*图层*/
     SetPagePic(GRAPHICS_PAGE_0, Pic_0932_124_85);/*\豪进750TFT（371000 - 7500 - 02TY0000）OTA升级*/
     SetPagePic(GRAPHICS_PAGE_0, Pic_0933_101_210);/*\SSID:  TYW_DASHBOARD*/
@@ -5242,10 +5255,17 @@ void AMT630H_GUI_Display_Navigation_Area(void)
     DISPLAY_NUM_ST DisplayNumPara;
     PicObj.qr_logo_id = 0;//Pic_0234 小数字9  EA
     PicObj.main_pic_id = Pic_0632; //转速红12
-    PicObj.qr_pic_id =  Pic_0411;//红色小e  19B
     PicObj.update_pic_id = Pic_0233;//小数字8   E9
     PicObj.second_menu = 0;
     PicObj.navigation_task_id = Pic_0411;//红色小e  19B
+    if(g_u8Display_Mode == ModeDAY)
+    {
+        PicObj.qr_pic_id =  Pic_0494;//请使用猎变APP扫码连接 
+    }
+    else
+    {
+        PicObj.qr_pic_id =  Pic_1031;//请使用猎变APP扫码连接
+    }
     if (GetPhoneMirrorst() == 0) 
     {   
         //DISPLAY_NUM_ST DisplayNumPara;

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -126,6 +126,7 @@ static void Power_IG_OFF_Init(void)
    Line_In_KL15_OFF_Init();
    BackLight_15_Init();
    BlueTooth_IGOFF_INIT();
+   Menu_Change_Branch_To_Item(MENU_BRANCH_ANIMATION,MENU_ITEM_MAIN_ITEM);
 }
 
 static void Power_IG_ON_Init(void)
@@ -215,7 +216,7 @@ static Power_Status_em Power_Stay_Protect(void)
     /* 关闭所有外设，坪保留AD采集，电溝状思切�? */
     {
         TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 0);
-        //CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Disable);
+        CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Disable);
     }
     u8PowerSts = EM_IGN_OFF_Init;
     /* 电溝模弝正常 */
@@ -229,7 +230,7 @@ static Power_Status_em Power_Stay_Protect(void)
         if ( SYS_OPR_STAT_RUN )
         {
             Amt630hInit();
-            //CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
+            CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
             return u8PowerSts;
         }