增加sos按钮测试和门灯测试

i18n/zh_CN.tr

@@ -189,12 +189,14 @@
     <string name="HandleKeys">手柄按键测试</string>
     <string name="PanelCallKeys">面板呼叫按键测试</string>
     <string name="PanelCancelKeys">面板取消按键测试</string>
+    <string name="SosKeys">SOS按键测试</string>
     <string name="RecordTest">录音测试</string>
     <string name="RecordText">点击录音测试按钮，测试麦克风</string>
     <string name="RecordStart">录音开始，录制时间5秒</string>
     <string name="RecordPlay">录音结束，开始播放</string>
     <string name="RecordStop">录音播放结束</string>
     <string name="RecordFailed">录音失败</string>
+    <string name="DoorLightTest">门灯测试</string>
     <string name="ColorTest">颜色测试</string>
     <!-- 颜色测试界面 -->
     <string name="ColorMsg">点击变换颜色</string>

jni/activity/sipTestActivity.cpp

@@ -4,6 +4,8 @@
 #include "sipTestActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKButton* mDoorLightTestButtonPtr;
+static ZKCheckBox* mSosKeysCheckboxPtr;
 static ZKButton* mColorTestButtonPtr;
 static ZKCheckBox* mPanelCancelKeysCheckboxPtr;
 static ZKCheckBox* mHandleKeysCheckboxPtr;
@@ -58,6 +60,7 @@ typedef struct {
 
 /*TAG:ButtonCallbackTab按键映射表*/
 static S_ButtonCallback sButtonCallbackTab[] = {
+    ID_SIPTEST_DoorLightTestButton, onButtonClick_DoorLightTestButton,
     ID_SIPTEST_ColorTestButton, onButtonClick_ColorTestButton,
     ID_SIPTEST_sip_back, onButtonClick_sip_back,
     ID_SIPTEST_RecordTestButton, onButtonClick_RecordTestButton,
@@ -129,6 +132,7 @@ typedef struct {
 }S_CheckboxCallback;
 /*TAG:CheckboxCallbackTab*/
 static S_CheckboxCallback SCheckboxCallbackTab[] = {
+    ID_SIPTEST_SosKeysCheckbox, onCheckedChanged_SosKeysCheckbox,
     ID_SIPTEST_PanelCancelKeysCheckbox, onCheckedChanged_PanelCancelKeysCheckbox,
     ID_SIPTEST_HandleKeysCheckbox, onCheckedChanged_HandleKeysCheckbox,
     ID_SIPTEST_PanelCallKeysCheckbox, onCheckedChanged_PanelCallKeysCheckbox,
@@ -146,6 +150,8 @@ sipTestActivity::~sipTestActivity() {
     EASYUICONTEXT->unregisterGlobalTouchListener(this);
     onUI_quit();
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
+    mDoorLightTestButtonPtr = NULL;
+    mSosKeysCheckboxPtr = NULL;
     mColorTestButtonPtr = NULL;
     mPanelCancelKeysCheckboxPtr = NULL;
     mHandleKeysCheckboxPtr = NULL;
@@ -173,6 +179,8 @@ const char* sipTestActivity::getAppName() const{
 //TAG:onCreate
 void sipTestActivity::onCreate() {
 	Activity::onCreate();
+    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);}

jni/activity/sipTestActivity.h

@@ -28,6 +28,8 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_SIPTEST_DoorLightTestButton    20005
+#define ID_SIPTEST_SosKeysCheckbox    21004
 #define ID_SIPTEST_ColorTestButton    20004
 #define ID_SIPTEST_PanelCancelKeysCheckbox    21003
 #define ID_SIPTEST_HandleKeysCheckbox    21001

jni/logic/sipTestLogic.cc

@@ -48,7 +48,9 @@ void setSipTestTheme() {
     	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");
 
     }
@@ -60,7 +62,9 @@ void setSipTestTheme() {
     	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");
     }
 }
@@ -171,6 +175,7 @@ static RecordTest recordTest;
 static bool panelCallKeysCheckbox = false;
 static bool handleKeysCheckbox = false;
 static bool panelCancelKeysCheckbox = false;
+static bool sosKeysCheckbox = false;
 
 void setCheckbox(std::string check) {
 	if (check == "KEY5") {
@@ -213,6 +218,17 @@ void setCheckbox(std::string check) {
 			mPanelCallKeysCheckboxPtr->setChecked(true);
 		}
 	}
+	else if (check == "KEY7") {
+		if (sosKeysCheckbox) {
+			sosKeysCheckbox = false;
+			mSosKeysCheckboxPtr->setChecked(false);
+		}
+		else {
+			sosKeysCheckbox = true;
+			mSosKeysCheckboxPtr->setChecked(true);
+		}
+
+	}
 }
 
 /**
@@ -365,6 +381,11 @@ static bool onButtonClick_RecordTestButton(ZKButton *pButton) {
 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();
@@ -378,3 +399,55 @@ static bool onButtonClick_ColorTestButton(ZKButton *pButton) {
     EASYUICONTEXT->openActivity("colorActivity");
     return false;
 }
+static int doorLignt = 0;
+static bool onButtonClick_DoorLightTestButton(ZKButton *pButton) {
+    LOGD(" ButtonClick DoorLightTestButton !!!\n");
+    doorLignt += 1;
+    if (doorLignt == 1) {
+		lightControl("DOORLED", "100F");
+    }
+    else if (doorLignt == 2) {
+		lightControl("DOORLED", "200F");
+    }
+    else if (doorLignt == 3) {
+		lightControl("DOORLED", "010F");
+    }
+    else if (doorLignt == 4) {
+		lightControl("DOORLED", "020F");
+    }
+    else if (doorLignt == 5) {
+		lightControl("DOORLED", "001F");
+    }
+    else if (doorLignt == 6) {
+		lightControl("DOORLED", "002F");
+    }
+    else if (doorLignt == 7) {
+		lightControl("DOORLED", "110F");
+    }
+    else if (doorLignt == 8) {
+		lightControl("DOORLED", "220F");
+    }
+    else if (doorLignt == 9) {
+		lightControl("DOORLED", "101F");
+    }
+    else if (doorLignt == 10) {
+		lightControl("DOORLED", "202F");
+    }
+    else if (doorLignt == 11) {
+		lightControl("DOORLED", "011F");
+    }
+    else if (doorLignt == 12) {
+		lightControl("DOORLED", "022F");
+    }
+    else if (doorLignt == 13) {
+		lightControl("DOORLED", "111F");
+    }
+    else if (doorLignt == 14) {
+		lightControl("DOORLED", "222F");
+    }
+    else if (doorLignt == 15) {
+		lightControl("DOORLED", "000F");
+		doorLignt = 0;
+    }
+    return false;
+}

jni/logic/startLogic.cc

@@ -844,6 +844,10 @@ static void onProtocolDataUpdate(const SProtocolData &data) {
 
 			}
 			else if (data.cmd == "KEY7"){	// key7是紧急按钮
+				if (StoragePreferences::getString(STORE_SIGNAL_TYPE, SIGNAL_TYPE) == "SIP") {
+					setCheckbox("KEY7");
+					return;
+				}
 				if (isSleep) {
 					scrrenOn();
 				}

jni/service/BusinessConfig.h

@@ -72,8 +72,8 @@ static uint32_t buleDeepColour = 0x3A78EF;
 static uint32_t whiteColour = 0xFFFFFF;
 static int defaultThemeInt = 1;
 
-static std::string versionCode = "v2.0.4";
-static int versionNo = 40;
+static std::string versionCode = "v2.0.5";
+static int versionNo = 41;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;