Commit 867b358b authored by 张金硕's avatar 张金硕

feat:新增互联二维码,投屏导航功能

parent 6b079117
...@@ -10,12 +10,9 @@ uint8_t SetUUIDTimes = 0; ...@@ -10,12 +10,9 @@ uint8_t SetUUIDTimes = 0;
_PICID_Struct PicObj; _PICID_Struct PicObj;
_QRCODE_RECT QRCode_Rect; _QRCODE_RECT QRCode_Rect;
const uint8_t HJBlueToothName[9]= {"HJ750"}; const uint8_t HJBlueToothName[9]= {"HJ750"};
uint8_t UUIDConfigBuf[22] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00}; uint8_t UUIDConfigBuf[22] = {"800082024071700000001"};
// 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
// uint8_t sjhja[20] = {0};
// uint8_t PhoneName[100] = {0};
// uint8_t BlueConnectStatus;
// ee_uint16_t juasfha;
void TextService(void); void TextService(void);
...@@ -54,9 +51,18 @@ void BlueToothService() ...@@ -54,9 +51,18 @@ void BlueToothService()
Menu_Change_Branch_To_Item(MENU_BRANCH_ANIMATION,MENU_ITEM_MAIN_ITEM); Menu_Change_Branch_To_Item(MENU_BRANCH_ANIMATION,MENU_ITEM_MAIN_ITEM);
} }
SetUUIDData((char *)UUIDConfigBuf, 22); SetUUIDData((char *)UUIDConfigBuf, 22);
if (OTA_Update_Flag == 1)
QRCode_Rect.x = 650; {
QRCode_Rect.y = 210; QRCode_Rect.x = 650;
QRCode_Rect.y = 210;
}
else
{
QRCode_Rect.x = QRCode_X;
QRCode_Rect.y = QRCode_Y;
}
// QRCode_Rect.x = 650;
// QRCode_Rect.y = 210;
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);
...@@ -82,7 +88,7 @@ void BlueToothService() ...@@ -82,7 +88,7 @@ void BlueToothService()
} }
OTA_Update_Count_Open=0; OTA_Update_Count_Open=0;
} }
// SetTaskbarHeight(150); SetTaskbarHeight(150);
SetBlueToothName((uint8_t *)HJBlueToothName, sizeof(HJBlueToothName)); SetBlueToothName((uint8_t *)HJBlueToothName, sizeof(HJBlueToothName));
TextService(); TextService();
......
...@@ -24,8 +24,8 @@ typedef struct { ...@@ -24,8 +24,8 @@ typedef struct {
}TEXT_STRUCT; }TEXT_STRUCT;
/*QRCode X Y height Width*/ /*QRCode X Y height Width*/
#define QRCode_X 457 #define QRCode_X 178
#define QRCode_Y 134 #define QRCode_Y 130
#define QRCode_HEIGHT 240 #define QRCode_HEIGHT 240
#define QRCode_WIDTH 240 #define QRCode_WIDTH 240
#define QRCode_TYPE Square_Instrument #define QRCode_TYPE Square_Instrument
......
...@@ -4165,7 +4165,7 @@ void AMT630H_GUI_DisplayProc(void) ...@@ -4165,7 +4165,7 @@ void AMT630H_GUI_DisplayProc(void)
PackedTransfer_Page(); PackedTransfer_Page();
} }
uint8_t shuotestflag = 0;
void AMT630H_GUI_ReadPosittion_Display(void) void AMT630H_GUI_ReadPosittion_Display(void)
{ {
switch (g_u8Cursor_Posittion) switch (g_u8Cursor_Posittion)
...@@ -4335,20 +4335,38 @@ void AMT630H_GUI_ReadPosittion_Display(void) ...@@ -4335,20 +4335,38 @@ void AMT630H_GUI_ReadPosittion_Display(void)
AMT630H_GUI_Phone_Connect_Win(); AMT630H_GUI_Phone_Connect_Win();
break; break;
case MENU_ITEM_PHONE_CONNECT_APP: case MENU_ITEM_PHONE_CONNECT_APP:
// PicObj.qr_logo_id = Pic_0234;//小数字9 PicObj.qr_logo_id = 0;//Pic_0234 小数字9 EA
// PicObj.main_pic_id = Pic_0382; //大白背景图 PicObj.main_pic_id = Pic_0382; //大白背景图 17E
// PicObj.qr_pic_id = Pic_0479;//小数字0 PicObj.qr_pic_id = Pic_0479;//小数字0 1DF
// PicObj.update_pic_id = Pic_0233;//小数字8 PicObj.update_pic_id = Pic_0233;//小数字8 E9
// PicObj.second_menu = 0; PicObj.second_menu = 0;
// PicObj.navigation_task_id = Pic_0411;//红色小e PicObj.navigation_task_id = Pic_0411;//红色小e 19B
// PackedTransfer_DisplayPhoneMirrorQRcode(1, PicObj);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0); uint8_t kjdshdfdha = GetPhoneMirrorst();
// SetPagePic(GRAPHICS_PAGE_0, Pic_0476_0_0); if (kjdshdfdha == 0)
// SetPagePic(GRAPHICS_PAGE_0, Pic_0477_178_130); { SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0234_605_289); SetPagePic(GRAPHICS_PAGE_0, Pic_0476_0_0);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0479_242_313); PackedTransfer_DisplayPhoneMirrorQRcode(1, PicObj);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0411_56_533); }
else
{
// SetPagePic(GRAPHICS_PAGE_0, Pic_0476_0_0);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0476_0_0);
PackedTransfer_DisplayPhoneMirrorQRcode(0, PicObj);
}
// SetPagePic(GRAPHICS_PAGE_0, Pic_0477_178_130);
SetPagePic(GRAPHICS_PAGE_0, Pic_0234_605_289);
SetPagePic(GRAPHICS_PAGE_0, Pic_0479_242_313);
if(shuotestflag == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0411_56_533);
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0470_687_486);
}
shuotestflag = !shuotestflag;
break; break;
default: default:
break; break;
......
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