开发竖版

.settings/com.zksw.flythings.easyui.prefs

@@ -1,5 +1,5 @@
-easyui.cfg.debug={"baud"\:"115200","defBrightness"\:-1,"font"\:"/mnt/extsd/ui/Harmony_231030.ttf","languageCode"\:"zh_CN","languagePath"\:"/mnt/extsd/tr/","resPath"\:"/mnt/extsd/ui/","rotateScreen"\:0,"rotateTouch"\:0,"screensaverTimeOut"\:-1,"startupLibPath"\:"/mnt/extsd/lib/libzkgui.so","startupTouchCalib"\:false,"touchDev"\:"/dev/input/event1","uart"\:"ttyS1","zkdebug"\:false}
-easyui.cfg.release={"baud"\:"115200","defBrightness"\:-1,"font"\:"/res/ui/Harmony_231030.ttf","languageCode"\:"zh_CN","languagePath"\:"/res/tr/","resPath"\:"/res/ui/","rotateScreen"\:0,"rotateTouch"\:0,"screensaverTimeOut"\:-1,"startupLibPath"\:"/res/lib/libzkgui.so","startupTouchCalib"\:false,"touchDev"\:"/dev/input/event1","uart"\:"ttyS1","zkdebug"\:false}
+easyui.cfg.debug={"baud"\:"115200","defBrightness"\:-1,"font"\:"/mnt/extsd/ui/Harmony_231030.ttf","languageCode"\:"zh_CN","languagePath"\:"/mnt/extsd/tr/","resPath"\:"/mnt/extsd/ui/","rotateScreen"\:270,"rotateTouch"\:0,"screensaverTimeOut"\:-1,"startupLibPath"\:"/mnt/extsd/lib/libzkgui.so","startupTouchCalib"\:false,"touchDev"\:"/dev/input/event1","uart"\:"ttyS1","zkdebug"\:false}
+easyui.cfg.release={"baud"\:"115200","defBrightness"\:-1,"font"\:"/res/ui/Harmony_231030.ttf","languageCode"\:"zh_CN","languagePath"\:"/res/tr/","resPath"\:"/res/ui/","rotateScreen"\:270,"rotateTouch"\:0,"screensaverTimeOut"\:-1,"startupLibPath"\:"/res/lib/libzkgui.so","startupTouchCalib"\:false,"touchDev"\:"/dev/input/event1","uart"\:"ttyS1","zkdebug"\:false}
 eclipse.preferences.version=1
 platform={"name"\:"Z21","cprojectTemplateDir"\:"bundle/cproject/z21","internalCode"\:"z21"}
 resolution=800x480

i18n/zh_CN.tr

@@ -139,6 +139,7 @@
     <string name="CallOutTitle">呼叫护士</string>
     <string name="Call">呼叫</string>
     <!-- 更多界面 -->
+    <string name="DeviceInfoText">设备设置</string>
     <string name="DeviceInfo">设备信息</string>
     <string name="DeviceDebug">设备调试</string>
     <string name="Null">无</string>

jni/activity/deviceInfoActivity.cpp

@@ -4,6 +4,8 @@
 #include "deviceInfoActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKTextView* mTitleTextViewPtr;
+static ZKButton* msys_backPtr;
 static ZKTextView* mScanQRCodeTextViewPtr;
 static ZKPainter* mQRCodePicPainterPtr;
 static ZKQRCode* mQRCodePtr;
@@ -81,6 +83,7 @@ typedef struct {
 
 /*TAG:ButtonCallbackTab按键映射表*/
 static S_ButtonCallback sButtonCallbackTab[] = {
+    ID_DEVICEINFO_sys_back, onButtonClick_sys_back,
     ID_DEVICEINFO_RestartButton, onButtonClick_RestartButton,
     ID_DEVICEINFO_VersionButton, onButtonClick_VersionButton,
     ID_DEVICEINFO_NetworkButton, onButtonClick_NetworkButton,
@@ -158,6 +161,8 @@ deviceInfoActivity::~deviceInfoActivity() {
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
     onUI_quit();
     mActivityPtr = NULL;
+    mTitleTextViewPtr = NULL;
+    msys_backPtr = NULL;
     mScanQRCodeTextViewPtr = NULL;
     mQRCodePicPainterPtr = NULL;
     mQRCodePtr = NULL;
@@ -207,6 +212,8 @@ const char* deviceInfoActivity::getAppName() const{
 //TAG:onCreate
 void deviceInfoActivity::onCreate() {
 	Activity::onCreate();
+    mTitleTextViewPtr = (ZKTextView*)findControlByID(ID_DEVICEINFO_TitleTextView);
+    msys_backPtr = (ZKButton*)findControlByID(ID_DEVICEINFO_sys_back);
     mScanQRCodeTextViewPtr = (ZKTextView*)findControlByID(ID_DEVICEINFO_ScanQRCodeTextView);
     mQRCodePicPainterPtr = (ZKPainter*)findControlByID(ID_DEVICEINFO_QRCodePicPainter);
     mQRCodePtr = (ZKQRCode*)findControlByID(ID_DEVICEINFO_QRCode);

jni/activity/deviceInfoActivity.h

@@ -27,6 +27,8 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_DEVICEINFO_TitleTextView    50013
+#define ID_DEVICEINFO_sys_back   100
 #define ID_DEVICEINFO_ScanQRCodeTextView    50028
 #define ID_DEVICEINFO_QRCodePicPainter    52010
 #define ID_DEVICEINFO_QRCode    92001

jni/logic/callLogic.cc

@@ -348,6 +348,8 @@ static void onUI_intent(const Intent *intentPtr) {
  * 当界面显示时触发
  */
 static void onUI_show() {
+    EASYUICONTEXT->hideStatusBar();
+    EASYUICONTEXT->hideNaviBar();
 }
 
 /*
@@ -375,9 +377,6 @@ static void onUI_quit() {
 		}
 	}
 
-	EASYUICONTEXT->showStatusBar();
-	EASYUICONTEXT->showNaviBar();
-
     mediaPlayer.Stop();
 	mActivityPtr->unregisterUserTimer(goBack);
 }

jni/logic/deviceInfoLogic.cc

@@ -280,6 +280,8 @@ static void onUI_intent(const Intent *intentPtr) {
  * 当界面显示时触发
  */
 static void onUI_show() {
+    EASYUICONTEXT->hideStatusBar();
+    EASYUICONTEXT->hideNaviBar();
 
 }
 
@@ -386,3 +388,7 @@ static bool onButtonClick_RestartButton(ZKButton *pButton) {
 	reboot(RB_AUTOBOOT);
     return false;
 }
+static bool onButtonClick_sys_back(ZKButton *pButton) {
+    LOGD(" ButtonClick sys_back !!!\n");
+    return false;
+}

jni/logic/functionLogic.cc

@@ -247,6 +247,8 @@ static void onUI_intent(const Intent *intentPtr) {
  * 当界面显示时触发
  */
 static void onUI_show() {
+    EASYUICONTEXT->hideStatusBar();
+    EASYUICONTEXT->hideNaviBar();
 }
 
 /*
@@ -467,8 +469,8 @@ static bool onButtonClick_PwdConfirmButton(ZKButton *pButton) {
 			mPwdWindowPtr->hideWnd();
 			EASYUICONTEXT->closeActivity("functionActivity");
 			// 打开设置界面
-//			EASYUICONTEXT->openActivity("settingActivity");
-			EASYUICONTEXT->openActivity("sipTestActivity");
+			EASYUICONTEXT->openActivity("settingActivity");
+//			EASYUICONTEXT->openActivity("sipTestActivity");
 			EASYUICONTEXT->closeActivity("deviceInfoActivity");
 		} else {
 			mPwdPromptTextViewPtr->setTextTr("PasswordWrong");

jni/logic/mainLogic.cc

@@ -564,6 +564,8 @@ static void onUI_intent(const Intent *intentPtr) {
  * 当界面显示时触发
  */
 static void onUI_show() {
+    EASYUICONTEXT->showStatusBar();
+    EASYUICONTEXT->showNaviBar();
 
 }
 

jni/logic/medicalCareLogic.cc

@@ -111,7 +111,7 @@ void setPositionButton(bool setPosition) {
 	if (setPosition) {
 		mPositionPainterPtr->setBackgroundPic("medicalCare/ding-y.png");
 
-		mPositionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "medicalCare/yellow_199x281.png");
+		mPositionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "medicalCare/yellow_225x317.png");
 		mPositionButtonPtr->setText(LANGUAGEMANAGER->getValue("Positioned"));
 		mPositionButtonPtr->setTextColor(0xFFFFFFFF);
 		mPositionTextViewPtr->setTextColor(0xFFFFFFFF);
@@ -121,7 +121,7 @@ void setPositionButton(bool setPosition) {
 	else {
 		mPositionPainterPtr->setBackgroundPic("medicalCare/ding.png");
 
-		mPositionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "medicalCare/white_199x281.png");
+		mPositionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "medicalCare/white_225x317.png");
 		mPositionButtonPtr->setText(LANGUAGEMANAGER->getValue("Position"));
 		mPositionButtonPtr->setTextColor(0xFF000000);
 		mPositionTextViewPtr->setTextColor(0xFF7D7D7D);
@@ -176,7 +176,7 @@ void setRoomPatrolButton(bool setRoomPatrol) {
 	if (setRoomPatrol) {
 		mRoomPatrolPainterPtr->setBackgroundPic("medicalCare/xun-y.png");
 
-		mRoomPatrolButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "medicalCare/green_199x281.png");
+		mRoomPatrolButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "medicalCare/green_225x317.png");
 		mRoomPatrolButtonPtr->setText(LANGUAGEMANAGER->getValue("RoomPatrolCompleted"));
 		mRoomPatrolButtonPtr->setTextColor(0xFFFFFFFF);
 		mRoomPatrolTextViewPtr->setTextColor(0xFFFFFFFF);
@@ -186,7 +186,7 @@ void setRoomPatrolButton(bool setRoomPatrol) {
 	else {
 		mRoomPatrolPainterPtr->setBackgroundPic("medicalCare/xun.png");
 
-		mRoomPatrolButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "medicalCare/white_199x281.png");
+		mRoomPatrolButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "medicalCare/white_225x317.png");
 		mRoomPatrolButtonPtr->setText(LANGUAGEMANAGER->getValue("RoomPatrol"));
 		mRoomPatrolButtonPtr->setTextColor(0xFF000000);
 		mRoomPatrolTextViewPtr->setTextColor(0xFF7D7D7D);
@@ -261,7 +261,7 @@ void setNursingButton(bool setNursing) {
 	if (setNursing) {
 		mNursingPainterPtr->setBackgroundPic("medicalCare/hu-y.png");
 
-		mNursingButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "medicalCare/pink_199x281.png");
+		mNursingButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "medicalCare/pink_225x317.png");
 		mNursingButtonPtr->setText(LANGUAGEMANAGER->getValue("InNursing"));
 		mNursingButtonPtr->setTextColor(0xFFFFFFFF);
 		mNursingTextViewPtr->setTextColor(0xFFFFFFFF);
@@ -269,7 +269,7 @@ void setNursingButton(bool setNursing) {
 	else {
 		mNursingPainterPtr->setBackgroundPic("medicalCare/hu.png");
 
-		mNursingButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "medicalCare/white_199x281.png");
+		mNursingButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "medicalCare/white_225x317.png");
 		mNursingButtonPtr->setText(LANGUAGEMANAGER->getValue("Nursing"));
 		mNursingButtonPtr->setTextColor(0xFF000000);
 		mNursingTextViewPtr->setTextColor(0xFF7D7D7D);
@@ -413,6 +413,8 @@ static void onUI_show() {
 		mMedicalCareWindowPtr->hideWnd();
 	}
 
+    EASYUICONTEXT->showStatusBar();
+    EASYUICONTEXT->showNaviBar();
 }
 
 /*

jni/logic/moreLogic.cc

@@ -123,6 +123,8 @@ static void onUI_intent(const Intent *intentPtr) {
  * 当界面显示时触发
  */
 static void onUI_show() {
+    EASYUICONTEXT->showStatusBar();
+    EASYUICONTEXT->showNaviBar();
 
 }
 

jni/logic/navibar.cc

@@ -86,10 +86,10 @@ void callBedButtonSetVisible() {
 		mCallBedButtonPtr->setVisible(roomCallBed);
 		mCallBedPicPainterPtr->setVisible(roomCallBed);
 
-		mHelpButtonPtr->setPosition(LayoutPosition(11, 374, 96, 96));
-		mHelpPicPainterPtr->setPosition(LayoutPosition(46, 396, 27, 27));
-		mCallNurseButtonPtr->setPosition(LayoutPosition(11, 482, 96, 96));
-		mCallNursePicPainterPtr->setPosition(LayoutPosition(45, 504, 29, 27));
+		mHelpButtonPtr->setPosition(LayoutPosition(10, 822, 77, 77));
+		mHelpPicPainterPtr->setPosition(LayoutPosition(35, 834, 32, 26));
+		mCallNurseButtonPtr->setPosition(LayoutPosition(10, 909, 77, 77));
+		mCallNursePicPainterPtr->setPosition(LayoutPosition(34, 919, 27, 27));
 
 	}
 	else {
@@ -97,10 +97,10 @@ void callBedButtonSetVisible() {
 		mCallBedButtonPtr->setVisible(roomCallBed);
 		mCallBedPicPainterPtr->setVisible(roomCallBed);
 
-		mHelpButtonPtr->setPosition(LayoutPosition(11, 265, 96, 96));
-		mHelpPicPainterPtr->setPosition(LayoutPosition(43, 287, 32, 26));
-		mCallNurseButtonPtr->setPosition(LayoutPosition(11, 374, 96, 96));
-		mCallNursePicPainterPtr->setPosition(LayoutPosition(46, 396, 27, 27));
+		mHelpButtonPtr->setPosition(LayoutPosition(10, 735, 77, 77));
+		mHelpPicPainterPtr->setPosition(LayoutPosition(33, 747, 32, 26));
+		mCallNurseButtonPtr->setPosition(LayoutPosition(10, 822, 77, 77));
+		mCallNursePicPainterPtr->setPosition(LayoutPosition(35, 834, 27, 27));
 	}
 }
 /**

jni/logic/promptLogic.cc

@@ -135,6 +135,8 @@ static void onUI_show() {
 
 	chooseId = 0;
 
+    EASYUICONTEXT->hideStatusBar();
+    EASYUICONTEXT->hideNaviBar();
 }
 
 /*

jni/logic/settingLogic.cc

@@ -66,6 +66,8 @@ static void onUI_intent(const Intent *intentPtr) {
  * 当界面显示时触发
  */
 static void onUI_show() {
+    EASYUICONTEXT->hideStatusBar();
+    EASYUICONTEXT->hideNaviBar();
 
 }
 

jni/logic/sipTestLogic.cc

@@ -206,8 +206,6 @@ static void onUI_hide() {
  */
 static void onUI_quit() {
 	LOGD(">>>>>>>>>>> sip test quit !!!\n");
-	EASYUICONTEXT->showStatusBar();
-	EASYUICONTEXT->showNaviBar();
 	// 切换回TCP模式
 	StoragePreferences::putString(STORE_SIGNAL_TYPE, "TCP");
 

jni/logic/statusbar.cc

@@ -447,17 +447,19 @@ static void updateUI_time() {
 	struct tm *t = TimeHelper::getDateTime();
 
 	char timeStr[50];
-	string day[] = {
-			LANGUAGEMANAGER->getValue("Sunday"),
-			LANGUAGEMANAGER->getValue("Monday"),
-			LANGUAGEMANAGER->getValue("Tuesday"),
-			LANGUAGEMANAGER->getValue("Wednesday"),
-			LANGUAGEMANAGER->getValue("Thursday"),
-			LANGUAGEMANAGER->getValue("Friday"),
-			LANGUAGEMANAGER->getValue("Saturday")};
-	string formatStr = "%s %d"+LANGUAGEMANAGER->getValue("Year")+"%02d"+LANGUAGEMANAGER->getValue("Month")+"%02d"+LANGUAGEMANAGER->getValue("Day")+" %02d:%02d:%02d";
+//	string day[] = {
+//			LANGUAGEMANAGER->getValue("Sunday"),
+//			LANGUAGEMANAGER->getValue("Monday"),
+//			LANGUAGEMANAGER->getValue("Tuesday"),
+//			LANGUAGEMANAGER->getValue("Wednesday"),
+//			LANGUAGEMANAGER->getValue("Thursday"),
+//			LANGUAGEMANAGER->getValue("Friday"),
+//			LANGUAGEMANAGER->getValue("Saturday")};
+//	string formatStr = "%s %d"+LANGUAGEMANAGER->getValue("Year")+"%02d"+LANGUAGEMANAGER->getValue("Month")+"%02d"+LANGUAGEMANAGER->getValue("Day")+" %02d:%02d:%02d";
+	string formatStr = "%d-%02d-%02d %02d:%02d:%02d";
 	//string formatStr = "%s %d-%02d-%02d %02d:%02d:%02d";
-	sprintf(timeStr, formatStr.c_str(), day[t->tm_wday].c_str(),1900 + t->tm_year, t->tm_mon + 1, t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);
+//	sprintf(timeStr, formatStr.c_str(), day[t->tm_wday].c_str(),1900 + t->tm_year, t->tm_mon + 1, t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);
+	sprintf(timeStr, formatStr.c_str(),1900 + t->tm_year, t->tm_mon + 1, t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);
 	mDateViewPtr->setText(timeStr); // 注意修改控件名称
 
 	// 如果不是常亮，就能需要去判断

jni/logic/updateLogic.cc

@@ -258,6 +258,8 @@ static void onUI_intent(const Intent *intentPtr) {
  * 当界面显示时触发
  */
 static void onUI_show() {
+    EASYUICONTEXT->hideStatusBar();
+    EASYUICONTEXT->hideNaviBar();
 
 }