|
@@ -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:
|
|
|
|
|
|
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();
|
|
|
}
|
|
|
|