V220004版本

app/app.c

@@ -357,8 +357,8 @@ static unsigned char gtModeCnt=0;
 				keyInArow=1;
 				lockCnt++;
 				if(lockCnt==3){
-						keyToneStart(0);
-//						lockProcess(); //舍弃加锁功能
+				keyToneStart(0);
+//					lockProcess(); //舍弃加锁功能
 				} 
 				pwrDetRead(0);
 				break;
@@ -634,6 +634,7 @@ void appRun(void){
 			break;
 		}
 	}
+
 	msgToModem("AT+GMR\r\n");//查询模块版本
 
 	while(sutApp.pocParaDone==0){
@@ -676,6 +677,7 @@ void appRun(void){
 	}
 	newPara.ChangeCard=0;
 	sysIniSave();
+	
 	//msgAtSend("AT+POC=7B00000064\r\n");
 	msgToModem("ATE0\r\n");
 	msgToModem("AT+AUDCH=0,0\r\n");//TEST  因为模块默认 通道为2,0
@@ -691,13 +693,15 @@ for(;;){
 		ledsProCtl();
 		adcRead(APP_SUB_DIV_TIME);
 		uiProcess(APP_SUB_DIV_TIME);
-		gpsProCtl(APP_SUB_DIV_TIME);
-		GpsInternalChange(APP_SUB_DIV_TIME);
+		if(GPS_HADRENABLE==1){
+			gpsProCtl(APP_SUB_DIV_TIME);
+			GpsInternalChange(APP_SUB_DIV_TIME);
+		}
 	#ifndef ANT_TEST
 		pocProCtl(APP_SUB_DIV_TIME);
 	#endif
 		NoteCheck(APP_SUB_DIV_TIME);
-		GpsInternalChange(APP_SUB_DIV_TIME);
+		//GpsInternalChange(APP_SUB_DIV_TIME);
 		ShouHuProcess(APP_SUB_DIV_TIME);
 		//HookGroupUserInfo();
 		HookVolToutCheck();
@@ -877,9 +881,9 @@ void splVolumeSet(unsigned char level){
 	
 //	memset(info, 0, sizeof(info));
 	snprintf(info, sizeof(info), "AT+CLVL=%d\r\n", level);	
-	msgAtSend(info);
-//	snprintf(info, sizeof(info), "AT+CLVL=%d\r\n", level);	
-//	msgAtSend(info);
+	msgToModem(info);
+	snprintf(info, sizeof(info), "AT+CRSL=%d\r\n", level);	
+	msgToModem(info);
 ////	broad_set_vol(BND_VOICE, level/10);
 //	broad_set_vol(BND_TTS, level/12);//10
 //	broad_set_vol(BND_TONE, level/12);	
@@ -902,8 +906,8 @@ void volAdjAction(char direction,unsigned char UIStatus){
 		else goto FLASH;
 	}
 	
-//	splVolumeSet(newPara.spkVol*10);
-//	MSG_INFO(1,"SPK_VOL:%d",newPara.spkVol*10);
+	splVolumeSet(newPara.spkVol*10);
+	MSG_INFO(1,"SPK_VOL:%d",newPara.spkVol*10);
 //	vol=broad_get_vol(BND_VOICE);
 //	MSG_INFO(1,"voice_VO1L:%d",vol);
 //	vol=broad_get_vol(BND_TTS);

app/ohboard.h

@@ -32,7 +32,7 @@ typedef enum{
 #define MKEY_VALUE_DOWN (1<<MKEY_VALUE_a)
 #define MKEY_VALUE_ESC 	(1<<MKEY_VALUE_0)//4
 #define MKEY_VALUE_PWR 	(1<<MKEY_VALUE_b)
-#define MKEY_VALUE_CB_GT (MKEY_VALUE_MENU | MKEY_VALUE_ESC)
+#define MKEY_VALUE_CB_GT (MKEY_VALUE_PTT | MKEY_VALUE_ESC)
 #define MKEY_VALUE_CB_IP (MKEY_VALUE_ESC | MKEY_VALUE_DOWN)
 
 #define MKEY_VALUE_MIC_PTT (1<<MKEY_VALUE_f)

app/ohpoc.h

@@ -7,7 +7,7 @@
 #define OHPOC_APP_NAME "X6"
 
 
-#define OHPOC_VERSION "220002"  //外部OCPU 应用维护
+#define OHPOC_VERSION "220004"  //外部OCPU 应用维护
 #define OHPOC_MODLE	"M5701" //作为OPEN时，此值用于FOTA升级标识使用
 #define OHPOC_CUST OHPOC_APP_NAME //作为OPEN时，此值用于FOTA升级标识使用
 #define OHPOC_POC_PLATFORM "GWSD"
@@ -17,6 +17,8 @@
 
 #define  BND_PSN         1509000001
 
+#define GPS_HADRENABLE  1
+
 
 
 //can not be modify

app/poc.c

@@ -307,8 +307,6 @@ static void pro80Msg(char *msg){
 鍙慉T+POC=0E0000xxxxxxxx鏌ヨ�
 msg:010000,iiii(鎴愬憳鍒楄〃绱㈠紩),dddddddd(鎴愬憳ID),mmmmmmmm(鎴愬憳鍚嶇О)*/
 static void pro81Msg(char *msg){
-
-
 	int index,len,status;
 	char buf[5],*pName;
 	//获取成员状态

app/uiBlock.c

@@ -390,20 +390,6 @@ void uiShowMainInterface(char status,unsigned int exeInterval){
 		//return;
 	}
 
-	#ifndef AUTH_SKIP
-
-		if((poc_clock.year>1970)&&(tempDate.year!=poc_clock.year
-				||tempDate.month!=poc_clock.month
-				||tempDate.day!=poc_clock.day||tmpStatus))
-			{
-				tempDate.year=poc_clock.year;
-				tempDate.month=poc_clock.month;
-				tempDate.day=poc_clock.day;
-				snprintf(info, sizeof(info), "%d-%02d-%02d",poc_clock.year,poc_clock.month,poc_clock.day);
-				MSG_INFO(1,info);
-				guiShowStr(1, UI_BOTTOM_SHOW_Y-3,info, FONT_MODE_16X16, REVERSED_NO,COLOR_STATUS_BAR, guiGetBackColor());	//4
-			}
-	#endif
 
 
 	if(copsStatus != sutApp.copstype || tmpStatus){
@@ -750,6 +736,8 @@ void uiShowGUSel(char StatusUpdate,unsigned int exeInterval,char type){
 		case 1://显示
 			guiClearAll(guiGetBackColor());
 			guiShowMessageBox("请稍候");
+
+			
 			sutPocStatus.ListDetailValid=0;
 			if(type==0){
 				guiShowCaption(0,"群组选择",UI_STATUS_ITEM_Y+1,guiGetBackColor(),guiGetForeColor(),FONT_MODE_12X12); //0
@@ -760,6 +748,7 @@ void uiShowGUSel(char StatusUpdate,unsigned int exeInterval,char type){
 				uiMenuShowBottomIndacitor("单呼", "返回");
 				snprintf(info, sizeof(info),"AT+POC=0E0000%08x\r\n",sutPocStatus.LocalGroup.ID);
 				msgAtSend(info);
+	
 			}
 			thisShowNum=0;
 			SelMachine=3;
@@ -982,13 +971,13 @@ void uiShowMenuLocationSel(char flash){
 		guiClearAll(guiGetBackColor());
 		guiShowCaption(0,"定位设置",UI_STATUS_ITEM_Y+1,guiGetBackColor(),guiGetForeColor(),FONT_MODE_12X12);
 		uiMenuShowBottomLine();
-//		if(newPara.gpsEnable==0){
-//			machine=1;
-//			uiMenuShowBottomIndacitor(NULL, "返回");
-//			guiShowMessageBox("版本不支持");
-//			uTimerStart(&timer, 1000);
-//			return;
-//		}
+		if(GPS_HADRENABLE==0){
+			uiMenuShowBottomIndacitor(NULL, "返回");
+			guiShowMessageBox("版本不支持");
+			uTimerStart(&timer, 1000);
+			return;
+		}
+
 		uiMenuShowBottomIndacitor("保存", "返回");
 		locationTimeFlash(0);
 	}

lib/gwsd/poc_interface.h

@@ -109,4 +109,13 @@ extern void report_encode_data_for_record(unsigned char *data, unsigned int size
  *
  */
 int decode_record_data(char *enc_data, int len, int type, char *pcm_data, int size)
-#endif
+#endif
+
+
+
+
+
+
+
+
+