增加按钮测试

i18n/es_ES-西班牙语.tr

@@ -342,18 +342,22 @@
 	<string name="OtherDevicesTestMsg">Compruebe conexión dispositivo externo</string>
 	<string name="ChangeToRtc">Cambiar a llamada RTC</string>
 	<string name="ChangeToSip">Cambiar a llamada SIP</string>
-	<string name="HandleKeys">Prueba de pulsador de cama</string>
-	<string name="PanelCallKeys">Prueba del panel</string>
-	<string name="PanelCancelKeys">Prueba de cancelación del panel</string>
-	<string name="SosKeys">Comprobación boton emergencia</string>
-	<string name="RecordTest">Prueba de grabación</string>
+	<string name="PanelKeys1">Prueba Panel 1</string>
+	<string name="PanelKeys2">Prueba Panel 2</string>
+	<string name="PanelKeys3">Prueba Panel 3</string>
+	<string name="PanelKeys4">Prueba Panel 4</string>
+	<string name="SosKeys">Prueba Tecla SOS</string>
+	<string name="SosKeys2">Prueba Cancelar SOS</string>
+	<string name="HandleKeys1">Prueba Mango 1</string>
+	<string name="HandleKeys2">Prueba Mango 2</string>
+	<string name="HandleKeys3">Prueba Mango 3</string>
 	<string name="RecordTest">Grabando comprobación</string>
-	<string name="RecordText">Pulse botón para comprobación del micrófono</string>
-	<string name="RecordStart">La comprobación comenzará en 5 segundos</string>
-	<string name="RecordPlay">Grabación finalizada, pulse play</string>
-	<string name="RecordStop">Finalizar grabación</string>
+	<string name="RecordText">Pulse para comprobar micrófono</string>
+	<string name="RecordStart">Comienza en 5 segundos</string>
+	<string name="RecordPlay">Grabación terminada, pulse play</string>
+	<string name="RecordStop">Terminar grabación</string>
 	<string name="RecordFailed">Grabación fallida</string>
-	<string name="DoorLightTest">Comprobación lámpara de pasillo</string>
+	<string name="DoorLightTest">Comprobar luz de pasillo</string>
 	<string name="ColorTest">Prueba de color</string>
     <!-- 颜色测试界面 -->
 	<string name="ColorMsg">Pulse para cambiar color</string>

i18n/zh_CN.tr

@@ -280,10 +280,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* mSosKeys2CheckboxPtr;
+static ZKCheckBox* mPanelKeys4CheckboxPtr;
+static ZKCheckBox* mPanelKeys3CheckboxPtr;
+static ZKCheckBox* mPanelKeys2CheckboxPtr;
+static ZKCheckBox* mPanelKeys1CheckboxPtr;
+static ZKCheckBox* mHandleKeys3CheckboxPtr;
+static ZKCheckBox* mHandleKeys2CheckboxPtr;
+static ZKCheckBox* mHandleKeys1CheckboxPtr;
 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_SosKeys2Checkbox, onCheckedChanged_SosKeys2Checkbox,
+    ID_SIPTEST_PanelKeys4Checkbox, onCheckedChanged_PanelKeys4Checkbox,
+    ID_SIPTEST_PanelKeys3Checkbox, onCheckedChanged_PanelKeys3Checkbox,
+    ID_SIPTEST_PanelKeys2Checkbox, onCheckedChanged_PanelKeys2Checkbox,
+    ID_SIPTEST_PanelKeys1Checkbox, onCheckedChanged_PanelKeys1Checkbox,
+    ID_SIPTEST_HandleKeys3Checkbox, onCheckedChanged_HandleKeys3Checkbox,
+    ID_SIPTEST_HandleKeys2Checkbox, onCheckedChanged_HandleKeys2Checkbox,
+    ID_SIPTEST_HandleKeys1Checkbox, onCheckedChanged_HandleKeys1Checkbox,
     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);
+    mSosKeys2CheckboxPtr = NULL;
+    mPanelKeys4CheckboxPtr = NULL;
+    mPanelKeys3CheckboxPtr = NULL;
+    mPanelKeys2CheckboxPtr = NULL;
+    mPanelKeys1CheckboxPtr = NULL;
+    mHandleKeys3CheckboxPtr = NULL;
+    mHandleKeys2CheckboxPtr = NULL;
+    mHandleKeys1CheckboxPtr = 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();
+    mSosKeys2CheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_SosKeys2Checkbox);if(mSosKeys2CheckboxPtr!= NULL){mSosKeys2CheckboxPtr->setCheckedChangeListener(this);}
+    mPanelKeys4CheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_PanelKeys4Checkbox);if(mPanelKeys4CheckboxPtr!= NULL){mPanelKeys4CheckboxPtr->setCheckedChangeListener(this);}
+    mPanelKeys3CheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_PanelKeys3Checkbox);if(mPanelKeys3CheckboxPtr!= NULL){mPanelKeys3CheckboxPtr->setCheckedChangeListener(this);}
+    mPanelKeys2CheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_PanelKeys2Checkbox);if(mPanelKeys2CheckboxPtr!= NULL){mPanelKeys2CheckboxPtr->setCheckedChangeListener(this);}
+    mPanelKeys1CheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_PanelKeys1Checkbox);if(mPanelKeys1CheckboxPtr!= NULL){mPanelKeys1CheckboxPtr->setCheckedChangeListener(this);}
+    mHandleKeys3CheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_HandleKeys3Checkbox);if(mHandleKeys3CheckboxPtr!= NULL){mHandleKeys3CheckboxPtr->setCheckedChangeListener(this);}
+    mHandleKeys2CheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_HandleKeys2Checkbox);if(mHandleKeys2CheckboxPtr!= NULL){mHandleKeys2CheckboxPtr->setCheckedChangeListener(this);}
+    mHandleKeys1CheckboxPtr = (ZKCheckBox*)findControlByID(ID_SIPTEST_HandleKeys1Checkbox);if(mHandleKeys1CheckboxPtr!= NULL){mHandleKeys1CheckboxPtr->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_ColorTestButton    20005
+#define ID_SIPTEST_DoorLightTestButton    20004
+#define ID_SIPTEST_SosKeys2Checkbox    21006
+#define ID_SIPTEST_PanelKeys4Checkbox    21002
+#define ID_SIPTEST_PanelKeys3Checkbox    21003
+#define ID_SIPTEST_PanelKeys2Checkbox    21005
+#define ID_SIPTEST_PanelKeys1Checkbox    21001
+#define ID_SIPTEST_HandleKeys3Checkbox    21009
+#define ID_SIPTEST_HandleKeys2Checkbox    21007
+#define ID_SIPTEST_HandleKeys1Checkbox    21008
 #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,37 @@ 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_190x52.png");
+        mHandleKeys2CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190x52.png");
+        mHandleKeys3CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190x52.png");
+        mPanelKeys1CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190x52.png");
+        mPanelKeys2CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190x52.png");
+        mPanelKeys3CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190x52.png");;
+        mPanelKeys4CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190x52.png");
+        mSosKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190x52.png");
+        mSosKeys2CheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190x52.png");
+        mRecordTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190x52.png");
+        mDoorLightTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190x52.png");
+        mColorTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_190x52.png");
     }
 }
 
@@ -171,51 +180,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 {
+			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 {
-			panelCallKeysCheckbox = true;
-			mPanelCallKeysCheckboxPtr->setChecked(true);
+			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 +270,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);
+		}
 	}
 }
 
@@ -378,22 +430,13 @@ 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 bool onButtonClick_sip_back(ZKButton *pButton) {
     LOGD(" ButtonClick sip_back !!!\n");
     EASYUICONTEXT->goBack();
     return false;
 }
-static void onCheckedChanged_PanelCancelKeysCheckbox(ZKCheckBox* pCheckBox, bool isChecked) {
-    LOGD(" Checkbox PanelCancelKeysCheckbox checked %d", isChecked);
-}
+
 static bool onButtonClick_ColorTestButton(ZKButton *pButton) {
     LOGD(" ButtonClick ColorTestButton !!!\n");
     EASYUICONTEXT->openActivity("colorActivity");
@@ -451,3 +494,39 @@ static bool onButtonClick_DoorLightTestButton(ZKButton *pButton) {
     }
     return false;
 }
+
+static void onCheckedChanged_HandleKeys1Checkbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox HandleKeys1Checkbox checked %d", isChecked);
+}
+
+static void onCheckedChanged_HandleKeys2Checkbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox HandleKeys2Checkbox checked %d", isChecked);
+}
+
+static void onCheckedChanged_HandleKeys3Checkbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox HandleKeys3Checkbox checked %d", isChecked);
+}
+
+static void onCheckedChanged_PanelKeys1Checkbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox PanelKeys1Checkbox checked %d", isChecked);
+}
+
+static void onCheckedChanged_PanelKeys2Checkbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox PanelKeys2Checkbox checked %d", isChecked);
+}
+
+static void onCheckedChanged_PanelKeys3Checkbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox PanelKeys3Checkbox checked %d", isChecked);
+}
+
+static void onCheckedChanged_PanelKeys4Checkbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox PanelKeys4Checkbox checked %d", isChecked);
+}
+
+static void onCheckedChanged_SosKeysCheckbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox SosKeysCheckbox checked %d", isChecked);
+}
+
+static void onCheckedChanged_SosKeys2Checkbox(ZKCheckBox* pCheckBox, bool isChecked) {
+    LOGD(" Checkbox SosKeys2Checkbox checked %d", isChecked);
+}

jni/logic/startLogic.cc

@@ -58,6 +58,7 @@ static bool isTriggerKey9 = false;
 static bool isTriggerKey10 = false;
 static bool isTriggerKey11 = false;
 static bool isTriggerKey12 = false;
+static bool isTriggerKey13 = false;
 
 static bool isTriggerHandle1 = false;
 static bool isTriggerHandle2 = false;
@@ -89,18 +90,19 @@ static bool isTriggerOutKey6 = false;
 #define KEY10_TRIGGER_TIME_HANDLE 20
 #define KEY11_TRIGGER_TIME_HANDLE 21
 #define KEY12_TRIGGER_TIME_HANDLE 22
+#define KEY13_TRIGGER_TIME_HANDLE 23
 
-#define HANDLE1_TRIGGER_TIME_HANDLE 23
-#define HANDLE2_TRIGGER_TIME_HANDLE 24
-#define HANDLE3_TRIGGER_TIME_HANDLE 25
-#define HANDLE4_TRIGGER_TIME_HANDLE 26
+#define HANDLE1_TRIGGER_TIME_HANDLE 24
+#define HANDLE2_TRIGGER_TIME_HANDLE 25
+#define HANDLE3_TRIGGER_TIME_HANDLE 26
+#define HANDLE4_TRIGGER_TIME_HANDLE 27
 
-#define OUTKYE1_TRIGGER_TIME_HANDLE 27
-#define OUTKYE2_TRIGGER_TIME_HANDLE 28
-#define OUTKYE3_TRIGGER_TIME_HANDLE 29
-#define OUTKYE4_TRIGGER_TIME_HANDLE 30
-#define OUTKYE5_TRIGGER_TIME_HANDLE 31
-#define OUTKYE6_TRIGGER_TIME_HANDLE 32
+#define OUTKYE1_TRIGGER_TIME_HANDLE 28
+#define OUTKYE2_TRIGGER_TIME_HANDLE 29
+#define OUTKYE3_TRIGGER_TIME_HANDLE 30
+#define OUTKYE4_TRIGGER_TIME_HANDLE 31
+#define OUTKYE5_TRIGGER_TIME_HANDLE 32
+#define OUTKYE6_TRIGGER_TIME_HANDLE 33
 
 //#define HANDLE_TRIGGER_TIME_HANDLE 15
 //#define SOS_TRIGGER_TIME_HANDLE 16
@@ -955,7 +957,7 @@ void getDeviceButtonFunction(string key) {
 		DeviceButtonFunctionTypeAndValue typeAndValue = deviceButtonFunction[key];
 		LOGD("typeAndValue.type: %s     typeAndValue.value: %s", typeAndValue.type.c_str(), typeAndValue.value.c_str());
 		if (typeAndValue.type == "SOS") {
-			handleSos(key);
+			handleSos(typeAndValue.value);
 		}
 		else if (typeAndValue.type == "VOICE") {
 			handleCall(key, typeAndValue.value);
@@ -1284,6 +1286,10 @@ static void onProtocolDataUpdate(const SProtocolData &data) {
 			isTriggerKey12 = true;
 			mActivityPtr->registerUserTimer(KEY12_TRIGGER_TIME_HANDLE, 3 * 1000);
 		}
+		else if (data.cmd == "KEY@") {
+			isTriggerKey13 = true;
+			mActivityPtr->registerUserTimer(KEY13_TRIGGER_TIME_HANDLE, 3 * 1000);
+		}
 		else if (data.cmd == "HANDKEY00") {
 			isTriggerHandle1 = true;
 			mActivityPtr->registerUserTimer(HANDLE1_TRIGGER_TIME_HANDLE, 3 * 1000);
@@ -1334,6 +1340,7 @@ static void onProtocolDataUpdate(const SProtocolData &data) {
 				(data.cmd == "KEY;" && isTriggerKey10) ||
 				(data.cmd == "KEY?" && isTriggerKey11) ||
 				(data.cmd == "KEY=" && isTriggerKey12) ||
+				(data.cmd == "KEY@" && isTriggerKey13) ||
 				(data.cmd == "HANDKEY00" && isTriggerHandle1) ||
 				(data.cmd == "HANDKEY10" && isTriggerHandle2) ||
 				(data.cmd == "HANDKEY20" && isTriggerHandle3) ||
@@ -1828,6 +1835,11 @@ static bool onUI_Timer(int id){
     	return false;
     }
     	break;
+    case KEY13_TRIGGER_TIME_HANDLE: {
+    	isTriggerKey13 = false;
+    	return false;
+    }
+    	break;
     case HANDLE1_TRIGGER_TIME_HANDLE: {
     	isTriggerHandle1 = false;
     	return false;