修复开机黑屏的问题

i18n/zh_CN.tr

@@ -127,7 +127,7 @@
     <string name="PanelCancelKeys">面板取消按键测试</string>
     <string name="RecordTest">录音测试</string>
     <string name="RecordText">点击录音测试按钮，测试麦克风</string>
-    <string name="RecordStart">录音开始，录制时间10秒</string>
+    <string name="RecordStart">录音开始，录制时间5秒</string>
     <string name="RecordPlay">录音结束，开始播放</string>
     <string name="RecordStop">录音播放结束</string>
     <!-- 错误界面 -->

jni/logic/mainLogic.cc

@@ -294,7 +294,8 @@ public:
 			mMainPainterPtr->setBackgroundColor(redLightColour);
 
 			// 房间
-			mPainterInfoPtr->setBackgroundPic("/main/title_red.jpg");
+//			mPainterInfoPtr->setBackgroundPic("/main/title_red.png");
+			mPainterInfoPtr->setBackgroundColor(redDeepColour);
 
 			// 用户
 			mCustomerNameTextViewPtr->setTextColor(redDeepColour);
@@ -410,7 +411,8 @@ public:
 			mMainPainterPtr->setBackgroundColor(buleLightColour);
 
 			// 房间
-			mPainterInfoPtr->setBackgroundPic("/main/title_blue.jpg");
+//			mPainterInfoPtr->setBackgroundPic("/main/title_blue.png");
+			mPainterInfoPtr->setBackgroundColor(buleDeepColour);
 
 			// 用户
 			mCustomerNameTextViewPtr->setTextColor(buleDeepColour);

jni/logic/sipTestLogic.cc

@@ -65,7 +65,7 @@ class RecordTest : public Thread {
         buf[0] = (uint8_t*)malloc(buf_len);
         buf[1] = (uint8_t*)malloc(buf_len);
 
-        time_t deadline = time(NULL) + 10;
+        time_t deadline = time(NULL) + 5;
         int n = 0;
         while (time(NULL) < deadline) {
         	zk_audio_input_get_frame((uint8_t**)buf);
@@ -175,12 +175,12 @@ static S_ACTIVITY_TIMEER REGISTER_ACTIVITY_TIMER_TAB[] = {
 static void onUI_init(){
     //Tips :添加 UI初始化的显示代码到这里,如:mText1Ptr->setText("123");
 	mEditTextDestURIPtr->setText(StoragePreferences::getString(SIP_REG_DOOR_ACCOUNT, SIP_REG_DOOR_ACCOUNT_DEFAULT));
-
 }
 
 /**
  * 当切换到该界面时触发
  */
+
 static void onUI_intent(const Intent *intentPtr) {
     if (intentPtr != NULL) {
         //TODO

jni/logic/startLogic.cc

@@ -184,7 +184,7 @@ void handleMsg(byte* inBytes){
 			LOGD("transfered time ： %s", pDate);
 			TimeHelper::setDateTime(pDate);
 
-			dataRefresh();
+//			dataRefresh();
 		}
 	} else if (tcpModel.type == TcpType::REINFORCE){
 		if (tcpModel.action == ReinforceAction::RESPONSED){

jni/logic/ui3Logic.cc

@@ -15,6 +15,7 @@
 #include "core/jhws.h"
 #include "manager/LanguageManager.h"
 
+
 #define ETHERNETMANAGER		NETMANAGER->getEthernetManager()
 #define WIFIMANAGER			NETMANAGER->getWifiManager()
 /*

jni/net/tcp_model.h

@@ -65,7 +65,7 @@ public:
 	inline static std::string APP_UPDATE = "APP_UPDATE";
 	inline static std::string DEVICE_REFRESH = "DEVICE_REFRESH";
 	inline static std::string SYSTEM_SETTING = "SYSTEM_SETTING";
-	inline static std::string SERVER_CHANGE = "SERVER_CHANGE";		// ip地址更换
+	inline static std::string SERVER_CHANGE = "SERVER_CHANGE";
 };
 
 class DataAction {

jni/service/BusinessConfig.h

@@ -51,8 +51,8 @@
 #define STORE_SCREEN_LIGHT "screen_light"
 #define SIGNAL_TYPE "TCP" //TCP,SIP
 
-static std::string version = "v1.0.20";
-static int versionNo = 20;
+static std::string version = "v1.0.22";
+static int versionNo = 22;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;