hyl595138788 3 years ago
parent
commit
56a41ed313
7 changed files with 78 additions and 23 deletions
  1. BIN
      LC_LS_D29V.PFI
  2. BIN
      LC_LS_D29V.PO
  3. BIN
      LC_LS_D29V.PS
  4. BIN
      LC_LS_D29V.WK3
  5. 47 17
      app/uiBlock.c
  6. 14 5
      app/xinbiao.c
  7. 17 1
      app/xinbiao.h

BIN
LC_LS_D29V.PFI


BIN
LC_LS_D29V.PO


BIN
LC_LS_D29V.PS


BIN
LC_LS_D29V.WK3


+ 47 - 17
app/uiBlock.c

@@ -2755,24 +2755,56 @@ void uiShowXINBIAOStationUpdateResponse(void){
 
 /*****************************信标详情开始********************************/
 
+void uiShowXINBIAOPageShow(char dir){
+
+	short y=0;
+	char Showbuf[22];
+	y=LIST_TOPY; //LIST_ITEM_HEGH
+	if(dir==0)UserTempIndex=0;
+	else if(dir==1){
+		if(++UserTempIndex>sut_xinbiao_info.Max_id)UserTempIndex=0;
+	}else if(dir==2){
+		if(--UserTempIndex==0)UserTempIndex=sut_xinbiao_info.Max_id-1;
+	}
+	snprintf(Showbuf,sizeof(Showbuf),"ID号:%03d",sut_xinbiaopage.xb_id);
+	guiShowStr(0,y,Showbuf,FONT_MODE_16X16,REVERSED_NO,COLOR_BLACK,guiGetBackColor());
+	y+=LIST_ITEM_HEGH;
+	snprintf(Showbuf,sizeof(Showbuf),"名字:%s",sut_xinbiaopage.xb_CallName);
+	guiShowStr(0,y,Showbuf,FONT_MODE_16X16,REVERSED_NO,COLOR_BLACK,guiGetBackColor());
+	y+=LIST_ITEM_HEGH;
+	//guiClearRect(0, y,GLCD_WIDTH-1, y+12+5+12,guiGetBackColor());
+	snprintf(Showbuf, sizeof(Showbuf), "纬度 S:%d.%05d",sut_xinbiaopage.xb_latitue/1000000,sut_xinbiaopage.xb_latitue%1000000);
+	guiShowStr(30,y, buf,FONT_MODE_16X16, REVERSED_NO, COLOR_BLACK, guiGetBackColor());
+	y+=LIST_ITEM_HEGH;
+	snprintf(Showbuf, sizeof(Showbuf), "经度 W:%d.%05d",sut_xinbiaopage.xb_longitue/1000000,sut_xinbiaopage.xb_longitue%1000000);
+	guiShowStr(30,y, Showbuf,FONT_MODE_16X16, REVERSED_NO, COLOR_BLACK, guiGetBackColor());
+	y+=LIST_ITEM_HEGH;
+	snprintf(Showbuf,sizeof(Showbuf),"航向:%s",sut_xinbiaopage.xb_heading);
+	guiShowStr(0,y,Showbuf,FONT_MODE_16X16,REVERSED_NO,COLOR_BLACK,guiGetBackColor());
+	y+=LIST_ITEM_HEGH;
+	snprintf(Showbuf,sizeof(Showbuf),"方向:%s",sut_xinbiaopage.xb_dir);
+	guiShowStr(0,y,Showbuf,FONT_MODE_16X16,REVERSED_NO,COLOR_BLACK,guiGetBackColor());
+	y+=LIST_ITEM_HEGH;
+	snprintf(Showbuf,sizeof(Showbuf),"海拔:%s",sut_xinbiaopage.xb_elevation);
+	guiShowStr(0,y,Showbuf,FONT_MODE_16X16,REVERSED_NO,COLOR_BLACK,guiGetBackColor());
+	y+=LIST_ITEM_HEGH;
+	
+}
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+void uiShowXINBIAOInfoUpdate(char StatusUpdate){
+	char Features[NORMAL_BOOL_NUM];
+	unsigned char i;
+	if(StatusUpdate){
+		guiClearAll(guiGetBackColor());
+		guiShowCaption(0,"信标详情",UI_STATUS_ITEM_Y+1,guiGetBackColor(),guiGetForeColor(),FONT_MODE_16X16);
+		uiMenuShowBottomLine();
+		UserTempIndex=0;
+		uiShowXINBIAOPageShow(0);
+		uiMenuShowBottomIndacitor("详情", "返回");
+	}
+}
 /*****************************信标详情结束********************************/
 
 
@@ -2785,8 +2817,6 @@ void uiShowXINBIAOStationUpdateResponse(void){
 
 
 
-
-
 /*****************************实时信标开关开始********************************/
 
 void uiShowXINBIAOEnableLive(char StatusUpdate){

+ 14 - 5
app/xinbiao.c

@@ -1,9 +1,10 @@
 
 #include "xinbiao.h"
 
-SUT_XINBIAO sut_xinbiao[XINBIAO_NUM];
+SUT_XINBIAO_PAGE sut_xinbiaopage[XINBIAO_NUM];
+SUT_XINBIAO_PAGE Self_xinbiaopage;
+SUT_XINBIAO_INFO sut_xinbiao_info;
 
-SUT_XINBIAO Self_xinbiao;
 
 /*
 	»ñµÃеÄÐűêÒ³
@@ -39,15 +40,23 @@ void PushXinbiao()
 
 void ReadXbFile()
 {
-	int fd;
-
+	int fd,i=0;
 	fd=LSAPI_FS_Open(XINBIAO_FILE, LSAPI_FS_O_RDWR,0);
 	if(fd<0){
 		MSG_ERR(1,"%s open read failed", XINBIAO_FILE);
 		return;
 	}
 	LSAPI_FS_Seek(fd, 0L, LSAPI_FS_SEEK_SET);
-	LSAPI_FS_Read(fd, (unsigned char *)&sut_xinbiao, sizeof(sut_xinbiao)*XINBIAO_NUM);
+	LSAPI_FS_Read(fd, (unsigned char *)&sut_xinbiaopage, sizeof(sut_xinbiaopage)*XINBIAO_NUM);
+
+	for(i=0;i<XINBIAO_NUM;i++){
+		if(sut_xinbiaopage[i].xb_id==0){
+			if(i!=0)sut_xinbiao_info.Max_id=sut_xinbiaopage[i-1].xb_id;
+				break;
+		}
+	}
+
+	
 }
 
 

+ 17 - 1
app/xinbiao.h

@@ -15,10 +15,26 @@ typedef struct{
 	unsigned short xb_elevation;//海拔
 	unsigned short xb_dir;//相对方向
 	unsigned short xb_distance; //相对距离
-}SUT_XINBIAO;
+}SUT_XINBIAO_PAGE;
 
 
 
+extern SUT_XINBIAO_PAGE sut_xinbiaopage[XINBIAO_NUM];
+
+extern SUT_XINBIAO_PAGE Self_xinbiaopage;
+
+
+typedef struct{
+	
+	unsigned char Max_id;//最大值
+	
+
+
+
+}SUT_XINBIAO_INFO;
+
+
+extern SUT_XINBIAO_INFO sut_xinbiao_info;