增加按键测试功能

i18n/en_US.tr

@@ -201,10 +201,15 @@
 	<string name="OtherDevicesTestMsg">Please check if external devices are connected before starting the test</string>
 	<string name="ChangeToRtc">Switch to RTC Call</string>
 	<string name="ChangeToSip">Switch to SIP Call</string>
-	<string name="HandleKeys">Handle Button Test</string>
-	<string name="PanelCallKeys">Panel Call Button Test</string>
-	<string name="PanelCancelKeys">Panel Cancel Button Test</string>
-	<string name="SosKeys">SOS Button Test</string>
+	<string name="PanelKeys1">Panel Key 1 Test</string>
+	<string name="PanelKeys2">Panel Key 2 Test</string>
+	<string name="PanelKeys3">Panel Key 3 Test</string>
+	<string name="PanelKeys4">Panel Key 4 Test</string>
+	<string name="SosKeys">SOS Key Test</string>
+	<string name="SosKeys2">SOS Cancel Key Test</string>
+	<string name="HandleKeys1">Handle Key 1 Test</string>
+	<string name="HandleKeys2">Handle Key 2 Test</string>
+	<string name="HandleKeys3">Handle Key 3 Test</string>
 	<string name="RecordTest">Recording Test</string>
 	<string name="RecordText">Click the recording test button to test the microphone</string>
 	<string name="RecordStart">Recording started, recording time 5 seconds</string>

i18n/es_ES-西班牙语.tr

@@ -201,10 +201,15 @@
 	<string name="OtherDevicesTestMsg">Por favor, compruebe si los dispositivos externos están conectados antes de comenzar la prueba</string>
 	<string name="ChangeToRtc">Cambiar a llamada RTC</string>
 	<string name="ChangeToSip">Cambiar a llamada SIP</string>
-	<string name="HandleKeys">Prueba de botones del mando</string>
-	<string name="PanelCallKeys">Prueba de botones de llamada del panel</string>
-	<string name="PanelCancelKeys">Prueba de botones de cancelación del panel</string>
-	<string name="SosKeys">Prueba de botones SOS</string>
+	<string name="PanelKeys1">Prueba de Tecla del Panel 1</string>
+	<string name="PanelKeys2">Prueba de Tecla del Panel 2</string>
+	<string name="PanelKeys3">Prueba de Tecla del Panel 3</string>
+	<string name="PanelKeys4">Prueba de Tecla del Panel 4</string>
+	<string name="SosKeys">Prueba de Tecla SOS</string>
+	<string name="SosKeys2">Prueba de Tecla de Cancelación SOS</string>
+	<string name="HandleKeys1">Prueba de Tecla de Mango 1</string>
+	<string name="HandleKeys2">Prueba de Tecla de Mango 2</string>
+	<string name="HandleKeys3">Prueba de Tecla de Mango 3</string>
 	<string name="RecordTest">Prueba de grabación</string>
 	<string name="RecordText">Haga clic en el botón de prueba de grabación para probar el micrófono</string>
 	<string name="RecordStart">Grabación iniciada, tiempo de grabación 5 segundos</string>

i18n/zh_CN.tr

@@ -201,10 +201,15 @@
     <string name="OtherDevicesTestMsg">请检查外接设备是否已连接再开始测试</string>
     <string name="ChangeToRtc">切换成RTC通话</string>
     <string name="ChangeToSip">切换成SIP通话</string>
-    <string name="HandleKeys">手柄按键测试</string>
-    <string name="PanelCallKeys">面板呼叫按键测试</string>
-    <string name="PanelCancelKeys">面板取消按键测试</string>
+    <string name="PanelKeys1">面板按键1测试</string>
+    <string name="PanelKeys2">面板按键2测试</string>
+    <string name="PanelKeys3">面板按键3测试</string>
+    <string name="PanelKeys4">面板按键4测试</string>
     <string name="SosKeys">SOS按键测试</string>
+    <string name="SosKeys2">SOS取消按键测试</string>
+    <string name="HandleKeys1">手柄按键1测试</string>
+    <string name="HandleKeys2">手柄按键2测试</string>
+    <string name="HandleKeys3">手柄按键3测试</string>
     <string name="RecordTest">录音测试</string>
     <string name="RecordText">点击录音测试按钮，测试麦克风</string>
     <string name="RecordStart">录音开始，录制时间5秒</string>

jni/activity/sipTestActivity.cpp

@@ -4,11 +4,17 @@
 #include "sipTestActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKCheckBox* mHandleKeys1CheckboxPtr;
+static ZKCheckBox* mPanelKeys1CheckboxPtr;
+static ZKCheckBox* mPanelKeys2CheckboxPtr;
+static ZKCheckBox* mPanelKeys4CheckboxPtr;
+static ZKCheckBox* mSosKeys2CheckboxPtr;
+static ZKCheckBox* mHandleKeys3CheckboxPtr;
+static ZKCheckBox* mPanelKeys3CheckboxPtr;
+static ZKCheckBox* mHandleKeys2CheckboxPtr;
 static ZKButton* mDoorLightTestButtonPtr;
 static ZKCheckBox* mSosKeysCheckboxPtr;
 static ZKButton* mColorTestButtonPtr;
-static ZKCheckBox* mPanelCancelKeysCheckboxPtr;
-static ZKCheckBox* mHandleKeysCheckboxPtr;
 static ZKTextView* mDebugPromptTextViewPtr;
 static ZKTextView* mDebugTextViewPtr;
 static ZKTextView* mSipInputTextViewPtr;
@@ -18,7 +24,6 @@ static ZKPainter* mDebugPainterPtr;
 static ZKPainter* mSipPainterPtr;
 static ZKTextView* mTitleTextViewPtr;
 static ZKButton* msip_backPtr;
-static ZKCheckBox* mPanelCallKeysCheckboxPtr;
 static ZKButton* mRecordTestButtonPtr;
 static ZKTextView* mInputSipTextViewPtr;
 static ZKButton* mCallButtonPtr;
@@ -132,10 +137,15 @@ typedef struct {
 }S_CheckboxCallback;
 /*TAG:CheckboxCallbackTab*/
 static S_CheckboxCallback SCheckboxCallbackTab[] = {
+    ID_SIPTEST_HandleKeys1Checkbox, onCheckedChanged_HandleKeys1Checkbox,
+    ID_SIPTEST_PanelKeys1Checkbox, onCheckedChanged_PanelKeys1Checkbox,
+    ID_SIPTEST_PanelKeys2Checkbox, onCheckedChanged_PanelKeys2Checkbox,
+    ID_SIPTEST_PanelKeys4Checkbox, onCheckedChanged_PanelKeys4Checkbox,
+    ID_SIPTEST_SosKeys2Checkbox, onCheckedChanged_SosKeys2Checkbox,
+    ID_SIPTEST_HandleKeys3Checkbox, onCheckedChanged_HandleKeys3Checkbox,
+    ID_SIPTEST_PanelKeys3Checkbox, onCheckedChanged_PanelKeys3Checkbox,
+    ID_SIPTEST_HandleKeys2Checkbox, onCheckedChanged_HandleKeys2Checkbox,
     ID_SIPTEST_SosKeysCheckbox, onCheckedChanged_SosKeysCheckbox,
-    ID_SIPTEST_PanelCancelKeysCheckbox, onCheckedChanged_PanelCancelKeysCheckbox,
-    ID_SIPTEST_HandleKeysCheckbox, onCheckedChanged_HandleKeysCheckbox,
-    ID_SIPTEST_PanelCallKeysCheckbox, onCheckedChanged_PanelCallKeysCheckbox,
 };
 
 sipTestActivity::sipTestActivity() {
@@ -150,11 +160,17 @@ sipTestActivity::~sipTestActivity() {
     EASYUICONTEXT->unregisterGlobalTouchListener(this);
     onUI_quit();
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
+    mHandleKeys1CheckboxPtr = NULL;
+    mPanelKeys1CheckboxPtr = NULL;
+    mPanelKeys2CheckboxPtr = NULL;
+    mPanelKeys4CheckboxPtr = NULL;
+    mSosKeys2CheckboxPtr = NULL;
+    mHandleKeys3CheckboxPtr = NULL;
+    mPanelKeys3CheckboxPtr = NULL;
+    mHandleKeys2CheckboxPtr = NULL;
     mDoorLightTestButtonPtr = NULL;
     mSosKeysCheckboxPtr = NULL;
     mColorTestButtonPtr = NULL;
-    mPanelCancelKeysCheckboxPtr = NULL;
-    mHandleKeysCheckboxPtr = NULL;
     mDebugPromptTextViewPtr = NULL;
     mDebugTextViewPtr = NULL;
     mSipInputTextViewPtr = NULL;
@@ -164,7 +180,6 @@ sipTestActivity::~sipTestActivity() {
     mSipPainterPtr = NULL;
     mTitleTextViewPtr = NULL;
     msip_backPtr = NULL;
-    mPanelCallKeysCheckboxPtr = NULL;
     mRecordTestButtonPtr = NULL;
     mInputSipTextViewPtr = NULL;
     mCallButtonPtr = NULL;
@@ -179,11 +194,17 @@ const char* sipTestActivity::getAppName() const{
 //TAG:onCreate
 void sipTestActivity::onCreate() {
 	Activity::onCreate();
+    mHandleKeys1CheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_HandleKeys1Checkbox);if(mHandleKeys1CheckboxPtr!= NULL){mHandleKeys1CheckboxPtr->setCheckedChangeListener(this);}
+    mPanelKeys1CheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_PanelKeys1Checkbox);if(mPanelKeys1CheckboxPtr!= NULL){mPanelKeys1CheckboxPtr->setCheckedChangeListener(this);}
+    mPanelKeys2CheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_PanelKeys2Checkbox);if(mPanelKeys2CheckboxPtr!= NULL){mPanelKeys2CheckboxPtr->setCheckedChangeListener(this);}
+    mPanelKeys4CheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_PanelKeys4Checkbox);if(mPanelKeys4CheckboxPtr!= NULL){mPanelKeys4CheckboxPtr->setCheckedChangeListener(this);}
+    mSosKeys2CheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_SosKeys2Checkbox);if(mSosKeys2CheckboxPtr!= NULL){mSosKeys2CheckboxPtr->setCheckedChangeListener(this);}
+    mHandleKeys3CheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_HandleKeys3Checkbox);if(mHandleKeys3CheckboxPtr!= NULL){mHandleKeys3CheckboxPtr->setCheckedChangeListener(this);}
+    mPanelKeys3CheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_PanelKeys3Checkbox);if(mPanelKeys3CheckboxPtr!= NULL){mPanelKeys3CheckboxPtr->setCheckedChangeListener(this);}
+    mHandleKeys2CheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_HandleKeys2Checkbox);if(mHandleKeys2CheckboxPtr!= NULL){mHandleKeys2CheckboxPtr->setCheckedChangeListener(this);}
     mDoorLightTestButtonPtr = (ZKButton*)findControlByID(ID_SIPTEST_DoorLightTestButton);
     mSosKeysCheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_SosKeysCheckbox);if(mSosKeysCheckboxPtr!= NULL){mSosKeysCheckboxPtr->setCheckedChangeListener(this);}
     mColorTestButtonPtr = (ZKButton*)findControlByID(ID_SIPTEST_ColorTestButton);
-    mPanelCancelKeysCheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_PanelCancelKeysCheckbox);if(mPanelCancelKeysCheckboxPtr!= NULL){mPanelCancelKeysCheckboxPtr->setCheckedChangeListener(this);}
-    mHandleKeysCheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_HandleKeysCheckbox);if(mHandleKeysCheckboxPtr!= NULL){mHandleKeysCheckboxPtr->setCheckedChangeListener(this);}
     mDebugPromptTextViewPtr = (ZKTextView*)findControlByID(ID_SIPTEST_DebugPromptTextView);
     mDebugTextViewPtr = (ZKTextView*)findControlByID(ID_SIPTEST_DebugTextView);
     mSipInputTextViewPtr = (ZKTextView*)findControlByID(ID_SIPTEST_SipInputTextView);
@@ -193,7 +214,6 @@ void sipTestActivity::onCreate() {
     mSipPainterPtr = (ZKPainter*)findControlByID(ID_SIPTEST_SipPainter);
     mTitleTextViewPtr = (ZKTextView*)findControlByID(ID_SIPTEST_TitleTextView);
     msip_backPtr = (ZKButton*)findControlByID(ID_SIPTEST_sip_back);
-    mPanelCallKeysCheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_PanelCallKeysCheckbox);if(mPanelCallKeysCheckboxPtr!= NULL){mPanelCallKeysCheckboxPtr->setCheckedChangeListener(this);}
     mRecordTestButtonPtr = (ZKButton*)findControlByID(ID_SIPTEST_RecordTestButton);
     mInputSipTextViewPtr = (ZKTextView*)findControlByID(ID_SIPTEST_InputSipTextView);
     mCallButtonPtr = (ZKButton*)findControlByID(ID_SIPTEST_CallButton);

jni/activity/sipTestActivity.h

@@ -28,11 +28,17 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
-#define ID_SIPTEST_DoorLightTestButton    20005
+#define ID_SIPTEST_HandleKeys1Checkbox    21008
+#define ID_SIPTEST_PanelKeys1Checkbox    21001
+#define ID_SIPTEST_ColorTestButton    20005
+#define ID_SIPTEST_PanelKeys2Checkbox    21005
+#define ID_SIPTEST_DoorLightTestButton    20004
+#define ID_SIPTEST_PanelKeys4Checkbox    21002
+#define ID_SIPTEST_SosKeys2Checkbox    21006
+#define ID_SIPTEST_HandleKeys3Checkbox    21009
+#define ID_SIPTEST_PanelKeys3Checkbox    21003
+#define ID_SIPTEST_HandleKeys2Checkbox    21007
 #define ID_SIPTEST_SosKeysCheckbox    21004
-#define ID_SIPTEST_ColorTestButton    20004
-#define ID_SIPTEST_PanelCancelKeysCheckbox    21003
-#define ID_SIPTEST_HandleKeysCheckbox    21001
 #define ID_SIPTEST_DebugPromptTextView    50010
 #define ID_SIPTEST_DebugTextView    50009
 #define ID_SIPTEST_SipInputTextView    50008
@@ -42,7 +48,6 @@
 #define ID_SIPTEST_SipPainter    52001
 #define ID_SIPTEST_TitleTextView    50006
 #define ID_SIPTEST_sip_back    20003
-#define ID_SIPTEST_PanelCallKeysCheckbox    21002
 #define ID_SIPTEST_RecordTestButton    20002
 #define ID_SIPTEST_InputSipTextView    50001
 #define ID_SIPTEST_CallButton    20001

jni/logic/sipTestLogic.cc

@@ -44,28 +44,38 @@ void setSipTestTheme() {
     	msip_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_bule.png");
     	mSipPicPainterPtr->setBackgroundPic("/medicalCare/dianhua.png");
     	mEditTextDestURIPtr->setBackgroundPic("/function/input.png");
-    	mCallButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
-    	mHandleKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
-    	mPanelCallKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
-    	mPanelCancelKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
-    	mSosKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
-    	mRecordTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
-    	mDoorLightTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
-    	mColorTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
+    	mCallButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_190_52.png");
+    	mHandleKeys1CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_190_52.png");
+    	mHandleKeys2CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_190_52.png");
+    	mHandleKeys3CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_190_52.png");
+    	mPanelKeys1CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_190_52.png");
+    	mPanelKeys2CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_190_52.png");
+    	mPanelKeys3CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_190_52.png");;
+    	mPanelKeys4CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_190_52.png");
+    	mSosKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_190_52.png");
+    	mSosKeys2CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_190_52.png");
+    	mRecordTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_190_52.png");
+    	mDoorLightTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_190_52.png");
+    	mColorTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_190_52.png");
 
     }
     else if (sipTestThemeInt == 2) {
     	msip_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_pink.png");
     	mSipPicPainterPtr->setBackgroundPic("/medicalCare/dianhua-pink.png");
     	mEditTextDestURIPtr->setBackgroundPic("/function/input-pink.png");
-    	mCallButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
-    	mHandleKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
-    	mPanelCallKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
-    	mPanelCancelKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
-    	mSosKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
-    	mRecordTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
-    	mDoorLightTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
-    	mColorTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
+    	mCallButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190x52.png");
+    	mHandleKeys1CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190_52.png");
+    	mHandleKeys2CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190_52.png");
+    	mHandleKeys3CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190_52.png");
+    	mPanelKeys1CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190_52.png");
+    	mPanelKeys2CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190_52.png");
+    	mPanelKeys3CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190_52.png");
+    	mPanelKeys4CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190_52.png");
+    	mSosKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190_52.png");
+    	mSosKeys2CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190_52.png");
+    	mRecordTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190_52.png");
+    	mDoorLightTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190_52.png");
+    	mColorTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190_52.png");
     }
 }
 
@@ -172,50 +182,85 @@ static RecordTest recordTest;
 }
 
 
-static bool panelCallKeysCheckbox = false;
-static bool handleKeysCheckbox = false;
-static bool panelCancelKeysCheckbox = false;
+static bool panelKeys1Checkbox = false;
+static bool panelKeys2Checkbox = false;
+static bool panelKeys3Checkbox = false;
+static bool panelKeys4Checkbox = false;
+static bool handleKeys1Checkbox = false;
+static bool handleKeys2Checkbox = false;
+static bool handleKeys3Checkbox = false;
 static bool sosKeysCheckbox = false;
+static bool sosKeys2Checkbox = false;
 
 void setCheckbox(std::string check) {
 	if (check == "KEY5") {
-		if (panelCallKeysCheckbox) {
-			panelCallKeysCheckbox = false;
-			mPanelCallKeysCheckboxPtr->setChecked(false);
+		if (panelKeys1Checkbox) {
+			panelKeys1Checkbox = false;
+			mPanelKeys1CheckboxPtr->setChecked(false);
 		}
 		else {
-			panelCallKeysCheckbox = true;
-			mPanelCallKeysCheckboxPtr->setChecked(true);
+			panelKeys1Checkbox = true;
+			mPanelKeys1CheckboxPtr->setChecked(true);
+		}
+	}
+	if (check == "KEY;") {
+		if (panelKeys2Checkbox) {
+			panelKeys2Checkbox = false;
+			mPanelKeys2CheckboxPtr->setChecked(false);
+		}
+		else {
+			panelKeys2Checkbox = true;
+			mPanelKeys2CheckboxPtr->setChecked(true);
+		}
+	}
+	if (check == "KEY<") {
+		if (panelKeys3Checkbox) {
+			panelKeys3Checkbox = false;
+			mPanelKeys3CheckboxPtr->setChecked(false);
+		}
+		else {
+			panelKeys3Checkbox = true;
+			mPanelKeys3CheckboxPtr->setChecked(true);
+		}
+	}
+	if (check == "KEY>") {
+		if (panelKeys4Checkbox) {
+			panelKeys4Checkbox = false;
+			mPanelKeys4CheckboxPtr->setChecked(false);
+		}
+		else {
+			panelKeys4Checkbox = true;
+			mPanelKeys4CheckboxPtr->setChecked(true);
 		}
 	}
 	else if (check == "KEY6") {
-		if (handleKeysCheckbox) {
-			handleKeysCheckbox = false;
-			mHandleKeysCheckboxPtr->setChecked(false);
+		if (handleKeys1Checkbox) {
+			handleKeys1Checkbox = false;
+			mHandleKeys1CheckboxPtr->setChecked(false);
 		}
 		else {
-			handleKeysCheckbox = true;
-			mHandleKeysCheckboxPtr->setChecked(true);
+			handleKeys1Checkbox = true;
+			mHandleKeys1CheckboxPtr->setChecked(true);
 		}
 	}
-	else if (check == "KEY>") {
-		if (panelCancelKeysCheckbox) {
-			panelCancelKeysCheckbox = false;
-			mPanelCancelKeysCheckboxPtr->setChecked(false);
+	else if (check == "KEY=") {
+		if (handleKeys2Checkbox) {
+			handleKeys2Checkbox = false;
+			mHandleKeys2CheckboxPtr->setChecked(false);
 		}
 		else {
-			panelCancelKeysCheckbox = true;
-			mPanelCancelKeysCheckboxPtr->setChecked(true);
+			handleKeys2Checkbox = true;
+			mHandleKeys2CheckboxPtr->setChecked(true);
 		}
 	}
-	if (check == "KEY<") {
-		if (panelCallKeysCheckbox) {
-			panelCallKeysCheckbox = false;
-			mPanelCallKeysCheckboxPtr->setChecked(false);
+	else if (check == "KEY?") {
+		if (handleKeys3Checkbox) {
+			handleKeys3Checkbox = false;
+			mHandleKeys3CheckboxPtr->setChecked(false);
 		}
 		else {
-			panelCallKeysCheckbox = true;
-			mPanelCallKeysCheckboxPtr->setChecked(true);
+			handleKeys3Checkbox = true;
+			mHandleKeys3CheckboxPtr->setChecked(true);
 		}
 	}
 	else if (check == "KEY7") {
@@ -227,7 +272,16 @@ void setCheckbox(std::string check) {
 			sosKeysCheckbox = true;
 			mSosKeysCheckboxPtr->setChecked(true);
 		}
-
+	}
+	else if (check == "KEY@") {
+		if (sosKeys2Checkbox) {
+			sosKeys2Checkbox = false;
+			mSosKeys2CheckboxPtr->setChecked(false);
+		}
+		else {
+			sosKeys2Checkbox = true;
+			mSosKeys2CheckboxPtr->setChecked(true);
+		}
 	}
 }
 
@@ -358,13 +412,6 @@ static bool onButtonClick_CallButton(ZKButton *pButton) {
     return false;
 }
 
-static void onCheckedChanged_Checkbox1(ZKCheckBox* pCheckBox, bool isChecked) {
-    LOGD(" Checkbox Checkbox1 checked %d", isChecked);
-}
-static void onCheckedChanged_HandleKeysCheckbox(ZKCheckBox* pCheckBox, bool isChecked) {
-    LOGD(" Checkbox HandleKeysCheckbox checked %d", isChecked);
-}
-
 static bool onButtonClick_RecordTestButton(ZKButton *pButton) {
     LOGD(" ButtonClick RecordTestButton !!!\n");
 
@@ -378,14 +425,43 @@ static bool onButtonClick_RecordTestButton(ZKButton *pButton) {
 	recordTest.Record();
     return false;
 }
-static void onCheckedChanged_PanelCallKeysCheckbox(ZKCheckBox* pCheckBox, bool isChecked) {
-    LOGD(" Checkbox PanelCallKeysCheckbox checked %d", isChecked);
-}
 
 static void onCheckedChanged_SosKeysCheckbox(ZKCheckBox* pCheckBox, bool isChecked) {
     LOGD(" Checkbox SosKeysCheckbox checked %d", isChecked);
 }
 
+static void onCheckedChanged_HandleKeys2Checkbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox HandleKeys2Checkbox checked %d", isChecked);
+}
+
+static void onCheckedChanged_PanelKeys3Checkbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox PanelKeys3Checkbox checked %d", isChecked);
+}
+
+static void onCheckedChanged_HandleKeys3Checkbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox HandleKeys3Checkbox checked %d", isChecked);
+}
+
+static void onCheckedChanged_SosKeys2Checkbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox SosKeys2Checkbox checked %d", isChecked);
+}
+
+static void onCheckedChanged_PanelKeys4Checkbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox PanelKeys4Checkbox checked %d", isChecked);
+}
+
+static void onCheckedChanged_PanelKeys2Checkbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox PanelKeys2Checkbox checked %d", isChecked);
+}
+
+static void onCheckedChanged_PanelKeys1Checkbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox PanelKeys1Checkbox checked %d", isChecked);
+}
+
+static void onCheckedChanged_HandleKeys1Checkbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox HandleKeys1Checkbox checked %d", isChecked);
+}
+
 static bool onButtonClick_sip_back(ZKButton *pButton) {
     LOGD(" ButtonClick sip_back !!!\n");
     EASYUICONTEXT->goBack();