소스 검색

修改文字

vothin 1 년 전
부모
커밋
a520bf37a1

+ 1 - 1
i18n/zh_CN.tr

@@ -42,7 +42,7 @@
     <string name="Voice">语音</string>
     <!-- 首页 -->
     <string name="Room">房间</string>
-    <string name="InBedNum">房人数</string>
+    <string name="InBedNum">房人数</string>
     <string name="EmptyBedNum">空余床位</string>
     <string name="EmptyBed">空床</string>
     <string name="EmptyCustomer">暂无入住</string>

+ 0 - 1
jni/logic/sipTestLogic.cc

@@ -435,7 +435,6 @@ static bool onButtonClick_DoorLightTestButton(ZKButton *pButton) {
 		doorLignt = 0;
     }
     return false;
-    return false;
 }
 
 static bool onButtonClick_ColorTestButton(ZKButton *pButton) {

+ 2 - 2
jni/service/BusinessConfig.h

@@ -73,8 +73,8 @@ static uint32_t buleDeepColour = 0x3A78EF;
 static uint32_t whiteColour = 0xFFFFFF;
 static int defaultThemeInt = 1;
 
-static std::string versionCode = "v1.0.40";
-static int versionNo = 40;
+static std::string versionCode = "v1.0.41";
+static int versionNo = 41;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;

BIN
libs/armeabi/libzkgui.so


BIN
obj/activity/callActivity.o


BIN
obj/activity/deviceInfoActivity.o


BIN
obj/activity/functionActivity.o


BIN
obj/activity/mainActivity.o


BIN
obj/activity/medicalCareActivity.o


BIN
obj/activity/moreActivity.o


BIN
obj/activity/navibar.o


BIN
obj/activity/promptActivity.o


BIN
obj/activity/settingActivity.o


BIN
obj/activity/sipTestActivity.o


BIN
obj/activity/startActivity.o


BIN
obj/activity/statusbar.o


BIN
obj/activity/updateActivity.o


BIN
obj/core/update_assistant.o


BIN
obj/net/tcp_client.o


BIN
obj/net/tcp_model.o


BIN
obj/server/http_server.o


BIN
obj/service/BusinessConfig.o


BIN
obj/service/time.o


BIN
obj/uart/UartContext.o