T555_V03023

* 修改录音提交等界面
* 去掉网络模式菜单和卡菜单
* 添加本机密码菜单
* 超长待机模式改为超长省电模式

Released/releasenote.txt

@@ -83,4 +83,10 @@ V03021
 3、评分界面修改为三个评分:设备评分，速度评分和音量评分
 
 V03022
-1、优化速度及音量评分算法
+1、优化速度及音量评分算法
+
+V03023
+1、修改录音提交等界面
+2、去掉网络模式菜单和卡菜单
+3、添加本机密码菜单
+4、超长待机模式改为超长省电模式

app/learn/learnTask.c

@@ -1100,15 +1100,15 @@ void learnRecSetVol(unsigned char newVol){
 }
 static void learnShowResult(void);
 static void learnShowStartScreen(void){
-	const char *repeatListen="[F1]重听";
-	if(usr.type==1) uiMenuShowBottomIndacitor("[OK]录音", repeatListen);
+	const char *repeatListen="[PTT]录音";
+	if(usr.type==1) uiMenuShowBottomIndacitor("[OK]重听", repeatListen);
 	else uiMenuShowBottomIndacitor(NULL, repeatListen);
 }
 /*播放录音中止/完成后，返回原定界面及操作*/
 void learnRetrunStatus(void){
 	if(0==learnGetAudioType()){//返回原定界面及操作
 		learnRecSetStatus(LEARN_REC_DONE);
-		uiMenuShowBottomIndacitor("[OK]提交","[F1]播放");//选择提交还是播放
+		uiMenuShowBottomIndacitor("[OK]播放","[F1]提交");//选择提交还是播放
 		learnShowResult();
 	}else{//返回原定界面及操作
 		learnRecSetStatus(LEARN_REC_IDLE);
@@ -1200,7 +1200,7 @@ void learnRecordVolShow(unsigned char volLev){
 	unsigned short y1,y2,x,i;
 	unsigned int colorID;
 	static unsigned char lashVel=99;
-	unsigned char width=10;//一格音量宽度
+	unsigned char width=8;//一格音量宽度
 	unsigned char tx=1;//音量柱间隔
 	unsigned char sx=0;//音量柱开始坐标
 	if(lashVel == volLev) return;
@@ -1233,12 +1233,6 @@ void uiShowLearnTaskDetailResponse(void){
 				learnRecordBufRelease();
 				learnDetailBackToTaskListMenu();
 				break;
-			case LEARN_REC_BUSY://正在录音，选择停止
-				learnRecordDoneProcess();
-			#ifdef SAVE_PCM_SD
-				pcmFileClose();
-			#endif
-				break;
 			case LEARN_REC_DONE://刚录音完成，选择放弃而返回到任务详情
 				learnRecordBufRelease();
 				learnShowStartScreen();
@@ -1249,8 +1243,11 @@ void uiShowLearnTaskDetailResponse(void){
 				learnStopPlaying();
 				learnRetrunStatus();
 				break;
+			case LEARN_UPLOAD_CONFIRM://取消提交
+				learnRetrunStatus();
+				break;
 		}
-	}else if(MKEY_VALUE_MENU==key){
+	}else if(MKEY_VALUE_PTT==key){
 		switch(learnRecordStatus){
 			case LEARN_REC_IDLE://选择了录音做作业
 				if(usr.type != 1){
@@ -1268,10 +1265,29 @@ void uiShowLearnTaskDetailResponse(void){
 			#ifdef SAVE_PCM_SD
 				pcmFileOpen();
 			#endif
-				uiMenuShowBottomIndacitor(NULL, "停止");
+				uiMenuShowBottomIndacitor(NULL, "[PTT]停止");
 				learnRecSetStatus(LEARN_REC_BUSY);
 				break;
-			case LEARN_REC_DONE://选择提交录音(临时)
+			case LEARN_REC_BUSY://正在录音，选择停止
+				learnRecordDoneProcess();
+			#ifdef SAVE_PCM_SD
+				pcmFileClose();
+			#endif
+				break;
+		}
+	}else if(MKEY_VALUE_MENU==key){
+		switch(learnRecordStatus){
+			case LEARN_REC_IDLE://选择回放已提交的录音
+				learnPlayAudio(1, tidString);
+				learnRecSetStatus(LEARN_REC_PLY);
+				uiMenuShowBottomIndacitor(NULL, "停止");
+				break;
+			case LEARN_REC_DONE://选择播放录音(临时)
+				learnPlayAudio(0, NULL);
+				learnRecSetStatus(LEARN_REC_PLY);
+				uiMenuShowBottomIndacitor(NULL, "停止");
+				break;
+			case LEARN_UPLOAD_CONFIRM://确定提交
 				//暂时不做上传操作，将临时录音保存为.rec文件
 				httpPostResetUserTimer(0);
 				uiMenuShowBottomIndacitor(NULL, "取消");
@@ -1290,15 +1306,10 @@ void uiShowLearnTaskDetailResponse(void){
 		}
 	}else if(MKEY_VALUE_P1==key){
 		switch(learnRecordStatus){
-			case LEARN_REC_IDLE://选择回放已提交的录音
-				learnPlayAudio(1, tidString);
-				learnRecSetStatus(LEARN_REC_PLY);
-				uiMenuShowBottomIndacitor(NULL, "停止");
-				break;
-			case LEARN_REC_DONE://选择播放录音(临时)
-				learnPlayAudio(0, NULL);
-				learnRecSetStatus(LEARN_REC_PLY);
-				uiMenuShowBottomIndacitor(NULL, "停止");
+			case LEARN_REC_DONE://选择提交录音(临时)
+				learnRecSetStatus(LEARN_UPLOAD_CONFIRM);
+				guiShowMessageBox("确定提交?");
+				uiMenuShowBottomIndacitor("[ok]确定", "取消");
 				break;
 		}
 	}
@@ -1328,7 +1339,7 @@ static void learnRecordDoneProcess(void){
 	learnRecordFree();
 	learnStopRecord();
 	learnRecSetStatus(LEARN_REC_DONE);
-	uiMenuShowBottomIndacitor("[OK]提交","[F1]播放");//选择提交还是播放
+	uiMenuShowBottomIndacitor("[OK]播放","[F1]提交");//选择提交还是播放
 	learnShowResult();
 }
 

app/learn/learnTask.h

@@ -12,7 +12,8 @@ typedef enum{
 	LEARN_REC_BUSY,
 	LEARN_REC_OT,
 	LEARN_REC_DONE,
-	LEARN_REC_PLY
+	LEARN_REC_PLY,
+	LEARN_UPLOAD_CONFIRM
 }LEARN_REC_STATUS;
 
 void uiShowLearnTask(char update);

app/ohpoc.h

@@ -7,7 +7,7 @@
 #define OHPOC_APP_NAME "T555"
 //#define OHPOC_APP_NAME "RTL-TEST"
 
-#define OHPOC_VERSION "03022"  //外部OCPU 应用维护
+#define OHPOC_VERSION "03023"  //外部OCPU 应用维护
 #define OHPOC_MODLE	"N58" //作为OPEN时，此值用于FOTA升级标识使用
 #define OHPOC_CUST OHPOC_APP_NAME //作为OPEN时，此值用于FOTA升级标识使用
 

app/uiBlock.c

@@ -726,15 +726,14 @@ static void ReFlashItemGU(char type){
 void uiShowMenuSysSetup(char flash){
 	static const char *apcPtr[]={
 		"1,LCD设置",
-		"2,网络设置",
-		"3,SIM选择",
-		"4,功耗模式设置",
-		"5,服务器设置",
-		"6,版本升级",
-		"7,提示音设置",
-		"8,终端信息",
-		"9,SD卡检测",
-		"10,留音记录",
+		"2,本机密码",
+		"3,功耗模式设置",
+		"4,服务器设置",
+		"5,版本升级",
+		"6,提示音设置",
+		"7,终端信息",
+		"8,SD卡检测",
+		"9,留音记录",
 		""
 	};
 	if(flash){
@@ -756,35 +755,32 @@ void sysTemSetResponse(void){
 			case 0://LCD设置
 				uISetNextStatus(UIS_MENU_SYS_LCD);
 				break;
-			case 1://网络设置
-				uISetNextStatus(UIS_MENU_SYS_NET);
+			case 1://本机密码
+				uISetNextStatus(UIS_MENU_SYS_PASS);
 				break;
-			case 2://SIM选择
-				uISetNextStatus(UIS_MENU_SYS_SIM);
-				break;
-			case 3://功耗模式设置
+			case 2://功耗模式设置
 				uISetNextStatus(UIS_MENU_SYS_PWR);
 				break;
-			case 4://服务器设置
+			case 3://服务器设置
 				uISetNextStatus(UIS_MENU_SYS_SERVERPASS);
 				break;
-			case 5://版本升级
+			case 4://版本升级
 				uISetNextStatus(UIS_MENU_SYS_VERSION);
 				break;
-			case 6://提示音设置
+			case 5://提示音设置
 				uISetNextStatus(UIS_MENU_SYS_NOTE);
 				break;
-			case 7://终端信息
+			case 6://终端信息
 				uISetNextStatus(UIS_MENU_SYS_INFO);
 				break;
-			case 8://SD卡检测
+			case 7://SD卡检测
 				uISetNextStatus(UIS_MENU_SYS_SD);
 				break;
-			case 9://留音记录设置
+			case 8://留音记录设置
 				uISetNextStatus(UIS_MENU_SYS_VOICE);
 				break;
 		}
-		if(sutMenuSysSetup.handle<=9) uiPushStack(sutMenuSysSetup.handle);
+		if(sutMenuSysSetup.handle<=8) uiPushStack(sutMenuSysSetup.handle);
 	}else if(MKEY_VALUE_ESC==key) uISetNextStatus(UIS_MENU_MAIN);
 }
 /*****************************系统设置部分结束*********************************/
@@ -1292,7 +1288,7 @@ void pwrModeAckHandler(unsigned char seg1, unsigned char seg2){
 void uiShowPwrSel(char StatusUpdate){
 	static const char *pwrMode[PWR_MODE_NUM+1]={
 		"低功耗模式",
-		"超长待机模式",
+		"超长省电模式",
 		"常规模式",
 		"",
 	};
@@ -1545,4 +1541,23 @@ void uiShowNoteSelResponse(void){
 		switchFlash();
 	}
 }
-/*****************************提示音设置结束********************************/
+/*****************************提示音设置结束********************************/
+
+void uiShowPassword(char StatusUpdate){
+	int len,x,y=GLCD_HEIGHT/2;
+	char info[60];
+	if(StatusUpdate){
+		guiClearAll(guiGetBackColor());
+		guiShowCaption(0,"本机密码",UI_STATUS_ITEM_Y+1,guiGetBackColor(),guiGetForeColor(),FONT_MODE_12X12);
+		uiMenuShowBottomLine();
+		snprintf(info, sizeof(info), "%s",sutApp.account.password);
+		len=guiGetStrXLen(info,FONT_MODE_12X12);
+		x=(GLCD_WIDTH-len)/2;
+		guiShowStr(x,y-8,info,FONT_MODE_12X12,REVERSED_NO,COLOR_BLACK,guiGetBackColor());
+		uiMenuShowBottomIndacitor(NULL, "返回");
+	}
+}
+void uiShowPasswordResponse(void){
+	unsigned short key=getKeyValue();
+	if(MKEY_VALUE_ESC==key) uISetNextStatus(UIS_MENU_SYS_SEL);
+}

app/uiEntry.c

@@ -143,6 +143,9 @@ void uiLoop(unsigned int exeInterval){
 		case UIS_MENU_SYS_VOICE:
 			uiShowVoiceInfo(StatusUpdate);
 			break;
+		case UIS_MENU_SYS_PASS:
+			uiShowPassword(StatusUpdate);
+			break;
 			
 		/****************1.1.1(学习任务)任务查看*/
 		case UIS_MENU_TASK_QUERY:
@@ -293,6 +296,9 @@ void uiResponse(unsigned int exeInterval){
 		case UIS_MENU_SYS_VOICE:
 			uiShowVoiceInfoResponse();
 			break;
+		case UIS_MENU_SYS_PASS:
+			uiShowPasswordResponse();
+			break;
 			
 		/****************1.1.1(学习任务)任务查看*/
 		case UIS_MENU_TASK_QUERY:

app/uiEntry.h

@@ -31,6 +31,7 @@ typedef enum{
 	UIS_MENU_SYS_INFO,		//1.4.8:终端信息菜单
 	UIS_MENU_SYS_SD,		//1.4.9:终端设置SD卡检测
 	UIS_MENU_SYS_VOICE,		//1.4.10:留音记录菜单
+	UIS_MENU_SYS_PASS,
 	
 	UIS_MENU_TASK_QUERY,	//1.1.1:(学习任务)查看任务内容