Merge branch 'wangyanan' into 'dev'

Wangyanan

See merge request !69

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -2949,23 +2949,59 @@ static void AMT630H_GUI_TIME(uint16_t Hour, uint16_t Minute)
     }
 }
 
-/*手机号显示函数*/
-// uint16_t Telephone[] = {1,2,3,4,5,6,7,8,9,1,1};
-// static void AMT630H_GUI_Telephone(uint16_t Telephone[])
+/*
+*NAME : AMT630H_GUI_Telephone
+*PARAMETER : Tele_State-手机通话状态  _BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing/Phone_Incoming/Phone_Talking
+*            Telephone-手机号
+*            Instrument_State 仪表目前状态（主界面/投屏状态）g_u8Cursor_Posittion
+*            Connectperson_Name 联系人名称 
+*RETURN : NULL
+*/
+//uint16_t Telephone[] = {1,2,3,4,5,6,7,8,9,1,1};
+// static void AMT630H_GUI_Telephone(uint8_t Instrument_State,uint8_t Tele_State,uint16_t Telephone,uint16_t Connectperson_Name)
 // {
-//     DISPLAY_NUM_ST DisplayNumPara;
-//     SetPagePic(GRAPHICS_PAGE_0, Pic_0548_62_401); /*电话图标*/
-//     /*预留来电人显示*/
-//     for(int i=0;i<11;i++)
+//     // /*Instrument_State 仪表目前状态（主界面/投屏状态）g_u8Cursor_Posittion*/
+//     // if(Instrument_State == MENU_ITEM_MAIN_ITEM)
+//     // {
+        
+//     // }
+//     // else
+//     // {
+
+//     // }
+//     if(Tele_State == Phone_Outgoing)
 //     {
-//         DisplayNumPara.NumList = NumbeList_Telephone;
-//         DisplayNumPara.x = XList_Telephone[i];
-//         DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT |0;
-//         DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
-//         DisplayNumPara.DecimalNum = 0;
-//         DisplayNumPara.MinDigits = 1;
-//         DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara,Telephone[i]);
+//         //SetPagePic(GRAPHICS_PAGE_0, );
 //     }
+//     else if(Tele_State == Phone_Talking)
+//     {
+//         //SetPagePic(GRAPHICS_PAGE_0, );
+//     }
+//     else if(Tele_State == Phone_Incoming)
+//     {
+//         SetPagePic(GRAPHICS_PAGE_0, Pic_0548_62_401);
+//     }
+//     else
+//     {
+//         ;
+//     }
+//     PackedTransfer_LabelsList(10000, TEXT_NUM_BLUETOOTH_PHONENAME, 22);
+//     SetPageText(GRAPHICS_PAGE_0, 10000, int16_t 200, int16_t 200, int16_t 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF));
+
+
+//     // DISPLAY_NUM_ST DisplayNumPara;
+//     // SetPagePic(GRAPHICS_PAGE_0, Pic_0548_62_401); /*电话图标*/
+//     // /*预留来电人显示*/
+//     // for(int i=0;i<11;i++)
+//     // {
+//     //     DisplayNumPara.NumList = NumbeList_Telephone;
+//     //     DisplayNumPara.x = XList_Telephone[i];
+//     //     DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT |0;
+//     //     DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
+//     //     DisplayNumPara.DecimalNum = 0;
+//     //     DisplayNumPara.MinDigits = 1;
+//     //     DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara,Telephone[i]);
+//     // }
 // }
 
 /*燃油显示函数*/
@@ -3990,7 +4026,7 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
     SetPagePic(GRAPHICS_PAGE_0, Pic_0740_682_21);/*蓝牙*/
     SetPagePic(GRAPHICS_PAGE_0, Pic_0748_194_26);/*E*/
     
-    // AMT630H_GUI_Telephone(Telephone);
+    //AMT630H_GUI_Telephone(Telephone);
     AMT630H_GUI_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time());
     if(KL30_VOLTAGE_time < 10)
     {