Merge branch 'wangyanan' into 'dev'

Wangyanan

See merge request !75

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -2972,7 +2972,7 @@ static void AMT630H_GUI_Light()
     {
         SetPagePic(GRAPHICS_PAGE_0, Pic_0737_875_23);
     }
-    if(Get_TelltalesLedSts(em_LED_Bluetooth))
+    if(BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection)
     {
         SetPagePic(GRAPHICS_PAGE_0, Pic_0740_682_21);
     }
@@ -3143,54 +3143,108 @@ static void AMT630H_GUI_PhoneConnect_TIME(uint16_t Hour ,uint16_t Minute)
 */
 static void AMT630H_GUI_Telephone()
 {
-    //if((TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)||(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01))
-        if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing)
+    if(BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection)
+    {    if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing)
         {
             SetPagePic(GRAPHICS_PAGE_0, Pic_0939_62_401);
-            if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
+            if(g_u8Display_Mode == ModeDAY)
             {
-                PackedTransfer_LabelsList( 0x4007,(uint8_t *)CurBlueToothPhoneName, 40);
-                SetPageText(GRAPHICS_PAGE_0, 0x4007, 200, 200, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+                if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
+                {
+                    PackedTransfer_LabelsList( 0x4022,(uint8_t *)CurBlueToothPhoneName, 40);
+                    SetPageText(GRAPHICS_PAGE_0, 0x4022, 53, 463, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+                }
+                if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
+                {
+                    PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40);
+                    SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+                }
             }
-            if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
+            else if(g_u8Display_Mode == ModeNIGHT)
             {
-                PackedTransfer_LabelsList( 0x4007,(uint8_t *)PhoneNumber, 40);
-                SetPageText(GRAPHICS_PAGE_0, 0x4007, 200, 200, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+                if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
+                {
+                    PackedTransfer_LabelsList( 0x4022,(uint8_t *)CurBlueToothPhoneName, 40);
+                    SetPageText(GRAPHICS_PAGE_0, 0x4022, 53, 463, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
+                }
+                if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
+                {
+                    PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40);
+                    SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
+                }
             }
+            
         }
         else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking)
         {
             SetPagePic(GRAPHICS_PAGE_0, Pic_0938_62_399);
-            if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
+            if(g_u8Display_Mode == ModeDAY)
             {
-                PackedTransfer_LabelsList( 0x4007,(uint8_t *)CurBlueToothPhoneName, 40);
-                SetPageText(GRAPHICS_PAGE_0, 0x4007, 200, 200, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+                if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
+                {
+                    PackedTransfer_LabelsList( 0x4022,(uint8_t *)CurBlueToothPhoneName, 40);
+                    SetPageText(GRAPHICS_PAGE_0, 0x4022, 53, 463, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+                }
+                if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
+                {
+                    PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40);
+                    SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+                }
             }
-            if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
+            else if(g_u8Display_Mode == ModeNIGHT)
             {
-                PackedTransfer_LabelsList( 0x4007,(uint8_t *)PhoneNumber, 40);
-                SetPageText(GRAPHICS_PAGE_0, 0x4007, 200, 200, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+                if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
+                {
+                    PackedTransfer_LabelsList( 0x4022,(uint8_t *)CurBlueToothPhoneName, 40);
+                    SetPageText(GRAPHICS_PAGE_0, 0x4022, 53, 463, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
+                }
+                if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
+                {
+                    PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40);
+                    SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
+                }
             }
+            
         }
         else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming)
         {
             SetPagePic(GRAPHICS_PAGE_0, Pic_0548_62_401);
-            if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
+            if(g_u8Display_Mode == ModeDAY)
             {
-                PackedTransfer_LabelsList( 0x4007,(uint8_t *)CurBlueToothPhoneName, 40);
-                SetPageText(GRAPHICS_PAGE_0, 0x4007, 200, 200, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+                if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
+                {
+                    PackedTransfer_LabelsList( 0x4022,(uint8_t *)CurBlueToothPhoneName, 40);
+                    SetPageText(GRAPHICS_PAGE_0, 0x4022, 53, 463, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+                }
+                if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
+                {
+                    PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40);
+                    SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+                }
             }
-            if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
+            else if(g_u8Display_Mode == ModeNIGHT)
             {
-                PackedTransfer_LabelsList( 0x4007,(uint8_t *)PhoneNumber, 40);
-                SetPageText(GRAPHICS_PAGE_0, 0x4007, 200, 200, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
+                if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
+                {
+                    PackedTransfer_LabelsList( 0x4022,(uint8_t *)CurBlueToothPhoneName, 40);
+                    SetPageText(GRAPHICS_PAGE_0, 0x4022, 53, 463, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
+                }
+                if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
+                {
+                    PackedTransfer_LabelsList( 0x4009,(uint8_t *)PhoneNumber, 40);
+                    SetPageText(GRAPHICS_PAGE_0, 0x4009, 54, 499, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
+                }
             }
         }
         else
         {
             ;
         }
-    
+    }
+    else
+    {
+        ;
+    }
 }