vothin 1 سال پیش
والد
کامیت
468f8c5aab

+ 12 - 0
jni/activity/mainActivity.cpp

@@ -4,6 +4,10 @@
 #include "mainActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKTextView* mHeadNurseTextViewPtr;
+static ZKTextView* mHeadNurseTitleTextViewPtr;
+static ZKTextView* mDirectorTextViewPtr;
+static ZKTextView* mDirectorTitleTextViewPtr;
 static ZKButton* mCallBedCancelPtr;
 static ZKListView* mCallBedListViewPtr;
 static ZKPainter* mCallBedPainterPtr;
@@ -143,6 +147,10 @@ mainActivity::~mainActivity() {
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
     onUI_quit();
     mActivityPtr = NULL;
+    mHeadNurseTextViewPtr = NULL;
+    mHeadNurseTitleTextViewPtr = NULL;
+    mDirectorTextViewPtr = NULL;
+    mDirectorTitleTextViewPtr = NULL;
     mCallBedCancelPtr = NULL;
     mCallBedListViewPtr = NULL;
     mCallBedPainterPtr = NULL;
@@ -171,6 +179,10 @@ const char* mainActivity::getAppName() const{
 //TAG:onCreate
 void mainActivity::onCreate() {
 	Activity::onCreate();
+    mHeadNurseTextViewPtr = (ZKTextView*)findControlByID(ID_MAIN_HeadNurseTextView);
+    mHeadNurseTitleTextViewPtr = (ZKTextView*)findControlByID(ID_MAIN_HeadNurseTitleTextView);
+    mDirectorTextViewPtr = (ZKTextView*)findControlByID(ID_MAIN_DirectorTextView);
+    mDirectorTitleTextViewPtr = (ZKTextView*)findControlByID(ID_MAIN_DirectorTitleTextView);
     mCallBedCancelPtr = (ZKButton*)findControlByID(ID_MAIN_CallBedCancel);
     mCallBedListViewPtr = (ZKListView*)findControlByID(ID_MAIN_CallBedListView);if(mCallBedListViewPtr!= NULL){mCallBedListViewPtr->setListAdapter(this);mCallBedListViewPtr->setItemClickListener(this);}
     mCallBedPainterPtr = (ZKPainter*)findControlByID(ID_MAIN_CallBedPainter);

+ 4 - 0
jni/activity/mainActivity.h

@@ -27,6 +27,10 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_MAIN_HeadNurseTextView    50005
+#define ID_MAIN_HeadNurseTitleTextView    50003
+#define ID_MAIN_DirectorTextView    50004
+#define ID_MAIN_DirectorTitleTextView    50002
 #define ID_MAIN_CallBedCancel    20009
 #define ID_MAIN_CallBedBtn    24027
 #define ID_MAIN_CallBedName    24026

+ 30 - 0
jni/logic/mainLogic.cc

@@ -370,6 +370,36 @@ public:
 		}
 	}
 
+	static void getTemplate() {
+		if (StoragePreferences::getInt(STORE_TEMPLATE, 0) == 1) {
+			mDirectorTextViewPtr->setVisible(false);
+			mDirectorTitleTextViewPtr->setVisible(false);
+			mHeadNurseTextViewPtr->setVisible(false);
+			mHeadNurseTitleTextViewPtr->setVisible(false);
+
+			mBedListViewPtr->setPosition(LayoutPosition(6, 90, 855, 465));
+
+		}
+		else if (StoragePreferences::getInt(STORE_TEMPLATE, 0) == 2) {
+			mDirectorTextViewPtr->setVisible(true);
+			mDirectorTitleTextViewPtr->setVisible(true);
+			mHeadNurseTextViewPtr->setVisible(true);
+			mHeadNurseTitleTextViewPtr->setVisible(true);
+
+			mBedListViewPtr->setPosition(LayoutPosition(6, 90, 855, 465));
+		}
+		else {
+
+			mDirectorTextViewPtr->setVisible(false);
+			mDirectorTitleTextViewPtr->setVisible(false);
+			mHeadNurseTextViewPtr->setVisible(false);
+			mHeadNurseTitleTextViewPtr->setVisible(false);
+
+			mBedListViewPtr->setPosition(LayoutPosition(6, 90, 855, 465));
+		}
+
+	}
+
 
 	/**
 	 * 线程创建成功后会调用该函数,可以在该函数中做一些初始化操作

BIN
libs/armeabi/libzkgui.so


BIN
obj/activity/mainActivity.o


BIN
obj/activity/settingActivity.o


BIN
obj/activity/sipTestActivity.o


BIN
obj/activity/startActivity.o


BIN
obj/activity/statusbar.o


BIN
obj/activity/ui3Activity.o


BIN
obj/activity/updateActivity.o


BIN
obj/activity/warnActivity.o


BIN
obj/core/update_assistant.o


BIN
obj/net/tcp_client.o


BIN
obj/server/http_server.o


BIN
obj/service/BusinessConfig.o


BIN
obj/service/time.o


BIN
ui/main.ftu