开发新的首页ui

.cproject

@@ -18,12 +18,12 @@
 					<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.566211490." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1424090603" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1275454578" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
-							<builder arguments="-j2" buildPath="${ProjDirPath}/jni" command="make" id="cdt.managedbuild.target.gnu.builder.exe.debug.2033377817" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
+							<builder arguments="-j2" buildPath="${ProjDirPath}/jni" command="make" id="cdt.managedbuild.target.gnu.builder.exe.debug.2033377817" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GNU Make 构建器" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1728273503" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1305165402" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
-								<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.696779789" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.2070456324" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1154080955" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
+								<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.696779789" name="优化级别" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
+								<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.2070456324" name="调试级别" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1154080955" name="包含路径（-I）" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${ZKSW_REAL_TOOLCHAIN}/arm-pc-linux-gnueabihf/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ZKSW_REAL_TOOLCHAIN}/arm-pc-linux-gnueabihf/include/c++/8.3.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ZKSW_REAL_TOOLCHAIN}/arm-pc-linux-gnueabihf/include/c++/8.3.0/arm-pc-linux-gnueabihf&quot;"/>
@@ -36,10 +36,10 @@
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1947386254" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1376883262" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
-								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.1226597662" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
-								<option id="gnu.c.compiler.exe.debug.option.debugging.level.1368223028" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.max" valueType="enumerated"/>
+								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.1226597662" name="优化级别" superClass="gnu.c.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
+								<option id="gnu.c.compiler.exe.debug.option.debugging.level.1368223028" name="调试级别" superClass="gnu.c.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.max" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.dialect.std.1052180836" name="Language standard" superClass="gnu.c.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.c.compiler.dialect.default" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.include.paths.465865736" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.include.paths.465865736" name="包含路径（-I）" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${ZKSW_REAL_TOOLCHAIN}/arm-pc-linux-gnueabihf/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ZKSW_REAL_TOOLCHAIN}/arm-pc-linux-gnueabihf/sysroot/usr/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${ZKSW_REAL_TOOLCHAIN}/lib/gcc/arm-pc-linux-gnueabihf/8.3.0/include&quot;"/>
@@ -86,16 +86,16 @@
 					<folderInfo id="cdt.managedbuild.config.gnu.exe.release.1001661297." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.1656558982" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.2006651292" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
-							<builder buildPath="${workspace_loc:/linux_door}/Release" id="cdt.managedbuild.target.gnu.builder.exe.release.1408509441" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
+							<builder buildPath="${workspace_loc:/linux_door}/Release" id="cdt.managedbuild.target.gnu.builder.exe.release.1408509441" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="GNU Make 构建器" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.820667868" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.745370985" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
-								<option id="gnu.cpp.compiler.exe.release.option.optimization.level.1989544089" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.exe.release.option.debugging.level.1603679444" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
+								<option id="gnu.cpp.compiler.exe.release.option.optimization.level.1989544089" name="优化级别" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
+								<option id="gnu.cpp.compiler.exe.release.option.debugging.level.1603679444" name="调试级别" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1060602816" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.17032854" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
-								<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.1098801577" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
-								<option id="gnu.c.compiler.exe.release.option.debugging.level.230670025" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.none" valueType="enumerated"/>
+								<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.1098801577" name="优化级别" superClass="gnu.c.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
+								<option id="gnu.c.compiler.exe.release.option.debugging.level.230670025" name="调试级别" superClass="gnu.c.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.none" valueType="enumerated"/>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1929257441" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.242574966" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release">

.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="908325126562" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1323444668616" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +16,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1685337175238" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="778827895260" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

jni/activity/mainActivity.cpp

@@ -4,28 +4,8 @@
 #include "mainActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
-static ZKButton* mCallBedCancelPtr;
-static ZKListView* mCallBedListViewPtr;
-static ZKPainter* mCallBedPainterPtr;
-static ZKWindow* mCallBebWinPtr;
-static ZKButton* mFunctionBackPtr;
-static ZKButton* mFunctionButtonPtr;
-static ZKTextView* mFunctionTextViewPtr;
-static ZKPainter* mPainter1Ptr;
-static ZKWindow* mFunctionWinPtr;
-static ZKButton* mMoreButtonPtr;
-static ZKButton* mNursingButtonPtr;
-static ZKButton* mCallCencelButtonPtr;
-static ZKButton* mHelpButtonPtr;
-static ZKButton* mCallNurseButtonPtr;
-static ZKButton* mCallBedButtonPtr;
-static ZKListView* mBedListViewPtr;
-static ZKTextView* mRoomNamePtr;
-static ZKTextView* mTextInfoPtr;
-static ZKTextView* mNurseNamePtr;
-static ZKTextView* mNurseTextPtr;
-static ZKTextView* mDoctorTextPtr;
-static ZKPainter* mPainterInfoPtr;
+static ZKPainter* mRoomPainterPtr;
+static ZKPainter* mMainPainterPtr;
 static mainActivity* mActivityPtr;
 
 /*register activity*/
@@ -63,15 +43,6 @@ typedef struct {
 
 /*TAG:ButtonCallbackTab按键映射表*/
 static S_ButtonCallback sButtonCallbackTab[] = {
-    ID_MAIN_CallBedCancel, onButtonClick_CallBedCancel,
-    ID_MAIN_FunctionBack, onButtonClick_FunctionBack,
-    ID_MAIN_FunctionButton, onButtonClick_FunctionButton,
-    ID_MAIN_MoreButton, onButtonClick_MoreButton,
-    ID_MAIN_NursingButton, onButtonClick_NursingButton,
-    ID_MAIN_CallCencelButton, onButtonClick_CallCencelButton,
-    ID_MAIN_HelpButton, onButtonClick_HelpButton,
-    ID_MAIN_CallNurseButton, onButtonClick_CallNurseButton,
-    ID_MAIN_CallBedButton, onButtonClick_CallBedButton,
 };
 /***************/
 
@@ -97,8 +68,6 @@ typedef struct {
 }S_ListViewFunctionsCallback;
 /*TAG:ListViewFunctionsCallback*/
 static S_ListViewFunctionsCallback SListViewFunctionsCallbackTab[] = {
-    ID_MAIN_CallBedListView, getListItemCount_CallBedListView, obtainListItemData_CallBedListView, onListItemClick_CallBedListView,
-    ID_MAIN_BedListView, getListItemCount_BedListView, obtainListItemData_BedListView, onListItemClick_BedListView,
 };
 
 
@@ -145,28 +114,8 @@ mainActivity::~mainActivity() {
     EASYUICONTEXT->unregisterGlobalTouchListener(this);
     onUI_quit();
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
-    mCallBedCancelPtr = NULL;
-    mCallBedListViewPtr = NULL;
-    mCallBedPainterPtr = NULL;
-    mCallBebWinPtr = NULL;
-    mFunctionBackPtr = NULL;
-    mFunctionButtonPtr = NULL;
-    mFunctionTextViewPtr = NULL;
-    mPainter1Ptr = NULL;
-    mFunctionWinPtr = NULL;
-    mMoreButtonPtr = NULL;
-    mNursingButtonPtr = NULL;
-    mCallCencelButtonPtr = NULL;
-    mHelpButtonPtr = NULL;
-    mCallNurseButtonPtr = NULL;
-    mCallBedButtonPtr = NULL;
-    mBedListViewPtr = NULL;
-    mRoomNamePtr = NULL;
-    mTextInfoPtr = NULL;
-    mNurseNamePtr = NULL;
-    mNurseTextPtr = NULL;
-    mDoctorTextPtr = NULL;
-    mPainterInfoPtr = NULL;
+    mRoomPainterPtr = NULL;
+    mMainPainterPtr = NULL;
     mActivityPtr = NULL;
 }
 
@@ -177,28 +126,8 @@ const char* mainActivity::getAppName() const{
 //TAG:onCreate
 void mainActivity::onCreate() {
 	Activity::onCreate();
-    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);
-    mCallBebWinPtr = (ZKWindow*)findControlByID(ID_MAIN_CallBebWin);
-    mFunctionBackPtr = (ZKButton*)findControlByID(ID_MAIN_FunctionBack);
-    mFunctionButtonPtr = (ZKButton*)findControlByID(ID_MAIN_FunctionButton);
-    mFunctionTextViewPtr = (ZKTextView*)findControlByID(ID_MAIN_FunctionTextView);
-    mPainter1Ptr = (ZKPainter*)findControlByID(ID_MAIN_Painter1);
-    mFunctionWinPtr = (ZKWindow*)findControlByID(ID_MAIN_FunctionWin);
-    mMoreButtonPtr = (ZKButton*)findControlByID(ID_MAIN_MoreButton);
-    mNursingButtonPtr = (ZKButton*)findControlByID(ID_MAIN_NursingButton);
-    mCallCencelButtonPtr = (ZKButton*)findControlByID(ID_MAIN_CallCencelButton);
-    mHelpButtonPtr = (ZKButton*)findControlByID(ID_MAIN_HelpButton);
-    mCallNurseButtonPtr = (ZKButton*)findControlByID(ID_MAIN_CallNurseButton);
-    mCallBedButtonPtr = (ZKButton*)findControlByID(ID_MAIN_CallBedButton);
-    mBedListViewPtr = (ZKListView*)findControlByID(ID_MAIN_BedListView);if(mBedListViewPtr!= NULL){mBedListViewPtr->setListAdapter(this);mBedListViewPtr->setItemClickListener(this);}
-    mRoomNamePtr = (ZKTextView*)findControlByID(ID_MAIN_RoomName);
-    mTextInfoPtr = (ZKTextView*)findControlByID(ID_MAIN_TextInfo);
-    mNurseNamePtr = (ZKTextView*)findControlByID(ID_MAIN_NurseName);
-    mNurseTextPtr = (ZKTextView*)findControlByID(ID_MAIN_NurseText);
-    mDoctorTextPtr = (ZKTextView*)findControlByID(ID_MAIN_DoctorText);
-    mPainterInfoPtr = (ZKPainter*)findControlByID(ID_MAIN_PainterInfo);
+    mRoomPainterPtr = (ZKPainter*)findControlByID(ID_MAIN_RoomPainter);
+    mMainPainterPtr = (ZKPainter*)findControlByID(ID_MAIN_MainPainter);
 	mActivityPtr = this;
 	onUI_init();
     registerProtocolDataUpdateListener(onProtocolDataUpdate); 

jni/activity/mainActivity.h

@@ -27,53 +27,8 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
-#define ID_MAIN_BedFrameTextView    24028
-#define ID_MAIN_CallBedBtn    24027
-#define ID_MAIN_CallBedName    24026
-#define ID_MAIN_CallBedCancel    20009
-#define ID_MAIN_CallBedListView    80002
-#define ID_MAIN_CallBedPainter    52002
-#define ID_MAIN_CallBebWin    110001
-#define ID_MAIN_FunctionBack    20008
-#define ID_MAIN_FunctionButton    20007
-#define ID_MAIN_FunctionTextView    50006
-#define ID_MAIN_Painter1    52004
-#define ID_MAIN_FunctionWin    110003
-#define ID_MAIN_MoreButton    20006
-#define ID_MAIN_NursingButton    20005
-#define ID_MAIN_CallCencelButton    20003
-#define ID_MAIN_HelpButton    20004
-#define ID_MAIN_CallNurseButton    20002
-#define ID_MAIN_CallBedButton    20001
-#define ID_MAIN_DoctorName    24023
-#define ID_MAIN_NurseName    24025
-#define ID_MAIN_NurseText    24024
-#define ID_MAIN_DoctorText    24022
-#define ID_MAIN_CustomerAge    24021
-#define ID_MAIN_CustomerSex    24020
-#define ID_MAIN_CustomerName    24019
-#define ID_MAIN_CustomerPortrait    24018
-#define ID_MAIN_NursePortrait    24017
-#define ID_MAIN_DoctorPortrait    24016
-#define ID_MAIN_NurseOption5    24015
-#define ID_MAIN_NurseOption4    24013
-#define ID_MAIN_NurseOption3    24011
-#define ID_MAIN_NurseOption2    24009
-#define ID_MAIN_NurseOption1    24007
-#define ID_MAIN_NurseConfig5    24014
-#define ID_MAIN_NurseConfig4    24012
-#define ID_MAIN_NurseConfig3    24010
-#define ID_MAIN_NurseConfig2    24008
-#define ID_MAIN_NurseConfig1    24006
-#define ID_MAIN_NurseConfigColor5    24005
-#define ID_MAIN_NurseConfigColor4    24004
-#define ID_MAIN_NurseConfigColor3    24003
-#define ID_MAIN_NurseConfigColor2    24002
-#define ID_MAIN_NurseConfigColor1    24001
-#define ID_MAIN_BedListView    80001
-#define ID_MAIN_RoomName    50001
-#define ID_MAIN_TextInfo    50012
-#define ID_MAIN_PainterInfo    52001
+#define ID_MAIN_RoomPainter    52002
+#define ID_MAIN_MainPainter    52001
 /*TAG:Macro宏ID END*/
 
 class mainActivity : public Activity,