Commit ddaf2a14 authored by hu's avatar hu

调整菜单显示逻辑

parent dca1a83b
No preview for this file type
This diff is collapsed.
project .intvect 1536 project .intvect 1536
project .text 319964 project .text 320124
project .rodata 411103 project .rodata 411103
project .secinfo 120 project .secinfo 120
project .syscall 6 project .syscall 6
......
This diff is collapsed.
...@@ -835,9 +835,14 @@ void Level3_3Menu_1Exit(void) ...@@ -835,9 +835,14 @@ void Level3_3Menu_1Exit(void)
MenuFlag.Menu_Return = 0u; MenuFlag.Menu_Return = 0u;
if (User_set_Num.User_FDJYLQQ != 0u) if (User_set_Num.User_FDJYLQQ != 0u)
{
State_Flag.User_FDJYLQQ_FLAG = 0u; State_Flag.User_FDJYLQQ_FLAG = 0u;
Data_Clear_Trip(EM_TRIP_JY);
}
else else
{
State_Flag.User_FDJYLQQ_FLAG = 3u; State_Flag.User_FDJYLQQ_FLAG = 3u;
}
} }
} }
...@@ -860,9 +865,14 @@ void Level3_3Menu_2Exit(void) ...@@ -860,9 +865,14 @@ void Level3_3Menu_2Exit(void)
MenuFlag.Menu_Return = 0; MenuFlag.Menu_Return = 0;
if (User_set_Num.User_RYLQQ != 0) if (User_set_Num.User_RYLQQ != 0)
{
State_Flag.User_RYLQQ_FLAG = 0; State_Flag.User_RYLQQ_FLAG = 0;
Data_Clear_Trip(EM_TRIP_RY);
}
else else
{
State_Flag.User_RYLQQ_FLAG = 3; State_Flag.User_RYLQQ_FLAG = 3;
}
} }
} }
...@@ -885,9 +895,14 @@ void Level3_3Menu_3Exit(void) ...@@ -885,9 +895,14 @@ void Level3_3Menu_3Exit(void)
MenuFlag.Menu_Return = 0; MenuFlag.Menu_Return = 0;
if (User_set_Num.User_BSXY != 0) if (User_set_Num.User_BSXY != 0)
{
State_Flag.User_BSXY_FLAG = 0; State_Flag.User_BSXY_FLAG = 0;
Data_Clear_Trip(EM_TRIP_BSX);
}
else else
{
State_Flag.User_BSXY_FLAG = 3; State_Flag.User_BSXY_FLAG = 3;
}
} }
} }
...@@ -910,9 +925,14 @@ void Level3_3Menu_4Exit(void) ...@@ -910,9 +925,14 @@ void Level3_3Menu_4Exit(void)
MenuFlag.Menu_Return = 0; MenuFlag.Menu_Return = 0;
if (User_set_Num.User_CSQY != 0) if (User_set_Num.User_CSQY != 0)
{
State_Flag.User_CSQY_FLAG = 0; State_Flag.User_CSQY_FLAG = 0;
Data_Clear_Trip(EM_TRIP_CSQ);
}
else else
{
State_Flag.User_CSQY_FLAG = 3; State_Flag.User_CSQY_FLAG = 3;
}
} }
} }
...@@ -948,9 +968,14 @@ void Level3_3Menu_6Exit(void) ...@@ -948,9 +968,14 @@ void Level3_3Menu_6Exit(void)
MenuFlag.Menu_Return = 0; MenuFlag.Menu_Return = 0;
if (User_set_Num.User_DLZXY != 0) if (User_set_Num.User_DLZXY != 0)
{
State_Flag.User_DLZXY_FLAG = 0; State_Flag.User_DLZXY_FLAG = 0;
Data_Clear_Trip(EM_TRIP_DLZX);
}
else else
{
State_Flag.User_DLZXY_FLAG = 3; State_Flag.User_DLZXY_FLAG = 3;
}
} }
} }
...@@ -973,9 +998,14 @@ void Level3_3Menu_7Exit(void) ...@@ -973,9 +998,14 @@ void Level3_3Menu_7Exit(void)
MenuFlag.Menu_Return = 0; MenuFlag.Menu_Return = 0;
if (User_set_Num.User_LT != 0) if (User_set_Num.User_LT != 0)
{
State_Flag.User_LT_FLAG = 0; State_Flag.User_LT_FLAG = 0;
Data_Clear_Trip(EM_TRIP_LT);
}
else else
{
State_Flag.User_LT_FLAG = 3; State_Flag.User_LT_FLAG = 3;
}
} }
} }
......
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