11 tháng trước cách đây · e3302d11e8
--- a/jni/service/BusinessConfig.h
+++ b/jni/service/BusinessConfig.h
@@ -69,7 +69,8 @@
 
				 #define STORE_MAC_ADDR "mac_addr"
			
 
				 
			
 
				 #define STORE_LANG "language"
			
 
				-static std::string defaultLang = "zh_CN";
			
 
				+//static std::string defaultLang = "zh_CN";
			
 
				+static std::string defaultLang = "en_US";
			
 
				 
			
 
				 static uint32_t redLightColour = 0xFFFEB8BF;
			
 
				 static uint32_t redDeepColour = 0xFFF78B8F;
			
--- a/libs/armeabi/libzkgui.so
+++ b/libs/armeabi/libzkgui.so
--- a/obj/activity/callActivity.o
+++ b/obj/activity/callActivity.o
--- a/obj/activity/customerAffairActivity.o
+++ b/obj/activity/customerAffairActivity.o
--- a/obj/activity/deviceAddActivity.o
+++ b/obj/activity/deviceAddActivity.o
--- a/obj/activity/deviceInfoActivity.o
+++ b/obj/activity/deviceInfoActivity.o
--- a/obj/activity/functionActivity.o
+++ b/obj/activity/functionActivity.o
--- a/obj/activity/interactionActivity.o
+++ b/obj/activity/interactionActivity.o
--- a/obj/activity/mainActivity.o
+++ b/obj/activity/mainActivity.o
--- a/obj/activity/medicalCareActivity.o
+++ b/obj/activity/medicalCareActivity.o
--- a/obj/activity/moreActivity.o
+++ b/obj/activity/moreActivity.o
--- a/obj/activity/navibar.o
+++ b/obj/activity/navibar.o
--- a/obj/activity/promptActivity.o
+++ b/obj/activity/promptActivity.o
--- a/obj/activity/settingActivity.o
+++ b/obj/activity/settingActivity.o
--- a/obj/activity/sipTestActivity.o
+++ b/obj/activity/sipTestActivity.o
--- a/obj/activity/startActivity.o
+++ b/obj/activity/startActivity.o
--- a/obj/activity/statusbar.o
+++ b/obj/activity/statusbar.o
--- a/obj/activity/updateActivity.o
+++ b/obj/activity/updateActivity.o
--- a/obj/core/update_assistant.o
+++ b/obj/core/update_assistant.o
--- a/obj/net/tcp_client.o
+++ b/obj/net/tcp_client.o
--- a/obj/net/tcp_model.o
+++ b/obj/net/tcp_model.o
--- a/obj/net/tcp_util.o
+++ b/obj/net/tcp_util.o
--- a/obj/server/http_server.o
+++ b/obj/server/http_server.o
--- a/obj/service/BusinessConfig.o
+++ b/obj/service/BusinessConfig.o
--- a/obj/service/time.o
+++ b/obj/service/time.o
--- a/obj/uart/UartContext.o
+++ b/obj/uart/UartContext.o