修复无法打开更新界面的问题

jni/activity/DeviceUpdateActivity.cpp

@@ -1,7 +1,7 @@
 /***********************************************
 /gen auto by zuitools
 ***********************************************/
-#include "DeviceUpdateActivity.h"
+#include "deviceUpdateActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
 static ZKTextView* mTextPwdInfoPtr;
@@ -9,46 +9,46 @@ static ZKButton* mBtnPwdConfirmPtr;
 static ZKTextView* mPasswordTextViewPtr;
 static ZKEditText* mEditTextPwdPtr;
 static ZKWindow* mWindowPwdPtr;
+static ZKTextView* mTextViewProgressMessagePtr;
+static ZKTextView* mTextViewProgressLoadingPtr;
+static ZKTextView* mTextView4Ptr;
+static ZKWindow* mWindowProgressPtr;
 static ZKButton* mBackButtonPtr;
 static ZKListView* mDeviceTypeListViewPtr;
 static ZKWindow* mWindowInitPtr;
-static ZKButton* mFindBackButtonPtr;
-static ZKButton* mButtonInitPtr;
-static ZKButton* msys_backPtr;
-static ZKWindow* mWindow1Ptr;
-static ZKTextView* mVersionNoNewPtr;
-static ZKTextView* mTextView8Ptr;
-static ZKTextView* mVersionNewPtr;
-static ZKTextView* mVersionNoPtr;
-static ZKTextView* mTextView7Ptr;
-static ZKTextView* mVersionPtr;
 static ZKButton* mButtonDialog1Ptr;
 static ZKTextView* mTextViewDialog1Ptr;
 static ZKTextView* mTextView6Ptr;
 static ZKWindow* mWindowDialog1Ptr;
-static ZKTextView* mTextViewProgressMessagePtr;
-static ZKTextView* mTextViewProgressLoadingPtr;
-static ZKTextView* mTextView4Ptr;
-static ZKWindow* mWindowProgressPtr;
+static ZKButton* mFindBackButtonPtr;
+static ZKTextView* mVersionNoNewPtr;
+static ZKTextView* mTextView8Ptr;
 static ZKButton* mButtonInstantlyPtr;
 static ZKTextView* mTextView3Ptr;
+static ZKTextView* mVersionNewPtr;
 static ZKTextView* mTextView5Ptr;
 static ZKWindow* mWindowFindPtr;
+static ZKButton* mButtonInitPtr;
+static ZKButton* msys_backPtr;
+static ZKTextView* mVersionNoPtr;
+static ZKTextView* mTextView7Ptr;
 static ZKTextView* mTextViewTitlePtr;
+static ZKTextView* mVersionPtr;
 static ZKTextView* mTextView1Ptr;
 static ZKButton* mButtonUpdatePtr;
 static ZKTextView* mTextView2Ptr;
-static DeviceUpdateActivity* mActivityPtr;
+static ZKWindow* mWindow1Ptr;
+static deviceUpdateActivity* mActivityPtr;
 
 /*register activity*/
-REGISTER_ACTIVITY(DeviceUpdateActivity);
+REGISTER_ACTIVITY(deviceUpdateActivity);
 
 typedef struct {
 	int id; // 定时器ID ， 不能重复
 	int time; // 定时器  时间间隔  单位 毫秒
 }S_ACTIVITY_TIMEER;
 
-#include "logic/DeviceUpdateLogic.cc"
+#include "../logic/deviceUpdateLogic.cc"
 
 /***********/
 typedef struct {
@@ -77,11 +77,11 @@ typedef struct {
 static S_ButtonCallback sButtonCallbackTab[] = {
     ID_DEVICEUPDATE_BtnPwdConfirm, onButtonClick_BtnPwdConfirm,
     ID_DEVICEUPDATE_BackButton, onButtonClick_BackButton,
+    ID_DEVICEUPDATE_ButtonDialog1, onButtonClick_ButtonDialog1,
     ID_DEVICEUPDATE_FindBackButton, onButtonClick_FindBackButton,
+    ID_DEVICEUPDATE_ButtonInstantly, onButtonClick_ButtonInstantly,
     ID_DEVICEUPDATE_ButtonInit, onButtonClick_ButtonInit,
     ID_DEVICEUPDATE_sys_back, onButtonClick_sys_back,
-    ID_DEVICEUPDATE_ButtonDialog1, onButtonClick_ButtonDialog1,
-    ID_DEVICEUPDATE_ButtonInstantly, onButtonClick_ButtonInstantly,
     ID_DEVICEUPDATE_ButtonUpdate, onButtonClick_ButtonUpdate,
 };
 /***************/
@@ -144,103 +144,103 @@ static S_VideoViewCallback SVideoViewCallbackTab[] = {
 };
 
 
-DeviceUpdateActivity::DeviceUpdateActivity() {
+deviceUpdateActivity::deviceUpdateActivity() {
 	//todo add init code here
 	mVideoLoopIndex = -1;
 	mVideoLoopErrorCount = 0;
 }
 
-DeviceUpdateActivity::~DeviceUpdateActivity() {
+deviceUpdateActivity::~deviceUpdateActivity() {
   //todo add init file here
   // 退出应用时需要反注册
     EASYUICONTEXT->unregisterGlobalTouchListener(this);
-    onUI_quit();
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
+    onUI_quit();
+    mActivityPtr = NULL;
     mTextPwdInfoPtr = NULL;
     mBtnPwdConfirmPtr = NULL;
     mPasswordTextViewPtr = NULL;
     mEditTextPwdPtr = NULL;
     mWindowPwdPtr = NULL;
+    mTextViewProgressMessagePtr = NULL;
+    mTextViewProgressLoadingPtr = NULL;
+    mTextView4Ptr = NULL;
+    mWindowProgressPtr = NULL;
     mBackButtonPtr = NULL;
     mDeviceTypeListViewPtr = NULL;
     mWindowInitPtr = NULL;
-    mFindBackButtonPtr = NULL;
-    mButtonInitPtr = NULL;
-    msys_backPtr = NULL;
-    mWindow1Ptr = NULL;
-    mVersionNoNewPtr = NULL;
-    mTextView8Ptr = NULL;
-    mVersionNewPtr = NULL;
-    mVersionNoPtr = NULL;
-    mTextView7Ptr = NULL;
-    mVersionPtr = NULL;
     mButtonDialog1Ptr = NULL;
     mTextViewDialog1Ptr = NULL;
     mTextView6Ptr = NULL;
     mWindowDialog1Ptr = NULL;
-    mTextViewProgressMessagePtr = NULL;
-    mTextViewProgressLoadingPtr = NULL;
-    mTextView4Ptr = NULL;
-    mWindowProgressPtr = NULL;
+    mFindBackButtonPtr = NULL;
+    mVersionNoNewPtr = NULL;
+    mTextView8Ptr = NULL;
     mButtonInstantlyPtr = NULL;
     mTextView3Ptr = NULL;
+    mVersionNewPtr = NULL;
     mTextView5Ptr = NULL;
     mWindowFindPtr = NULL;
+    mButtonInitPtr = NULL;
+    msys_backPtr = NULL;
+    mVersionNoPtr = NULL;
+    mTextView7Ptr = NULL;
     mTextViewTitlePtr = NULL;
+    mVersionPtr = NULL;
     mTextView1Ptr = NULL;
     mButtonUpdatePtr = NULL;
     mTextView2Ptr = NULL;
-    mActivityPtr = NULL;
+    mWindow1Ptr = NULL;
 }
 
-const char* DeviceUpdateActivity::getAppName() const{
-	return "DeviceUpdate.ftu";
+const char* deviceUpdateActivity::getAppName() const{
+	return "deviceUpdate.ftu";
 }
 
 //TAG:onCreate
-void DeviceUpdateActivity::onCreate() {
+void deviceUpdateActivity::onCreate() {
 	Activity::onCreate();
     mTextPwdInfoPtr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextPwdInfo);
     mBtnPwdConfirmPtr = (ZKButton*)findControlByID(ID_DEVICEUPDATE_BtnPwdConfirm);
     mPasswordTextViewPtr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_PasswordTextView);
     mEditTextPwdPtr = (ZKEditText*)findControlByID(ID_DEVICEUPDATE_EditTextPwd);if(mEditTextPwdPtr!= NULL){mEditTextPwdPtr->setTextChangeListener(this);}
     mWindowPwdPtr = (ZKWindow*)findControlByID(ID_DEVICEUPDATE_WindowPwd);
+    mTextViewProgressMessagePtr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextViewProgressMessage);
+    mTextViewProgressLoadingPtr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextViewProgressLoading);
+    mTextView4Ptr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextView4);
+    mWindowProgressPtr = (ZKWindow*)findControlByID(ID_DEVICEUPDATE_WindowProgress);
     mBackButtonPtr = (ZKButton*)findControlByID(ID_DEVICEUPDATE_BackButton);
     mDeviceTypeListViewPtr = (ZKListView*)findControlByID(ID_DEVICEUPDATE_DeviceTypeListView);if(mDeviceTypeListViewPtr!= NULL){mDeviceTypeListViewPtr->setListAdapter(this);mDeviceTypeListViewPtr->setItemClickListener(this);}
     mWindowInitPtr = (ZKWindow*)findControlByID(ID_DEVICEUPDATE_WindowInit);
-    mFindBackButtonPtr = (ZKButton*)findControlByID(ID_DEVICEUPDATE_FindBackButton);
-    mButtonInitPtr = (ZKButton*)findControlByID(ID_DEVICEUPDATE_ButtonInit);
-    msys_backPtr = (ZKButton*)findControlByID(ID_DEVICEUPDATE_sys_back);
-    mWindow1Ptr = (ZKWindow*)findControlByID(ID_DEVICEUPDATE_Window1);
-    mVersionNoNewPtr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_VersionNoNew);
-    mTextView8Ptr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextView8);
-    mVersionNewPtr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_VersionNew);
-    mVersionNoPtr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_VersionNo);
-    mTextView7Ptr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextView7);
-    mVersionPtr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_Version);
     mButtonDialog1Ptr = (ZKButton*)findControlByID(ID_DEVICEUPDATE_ButtonDialog1);
     mTextViewDialog1Ptr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextViewDialog1);
     mTextView6Ptr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextView6);
     mWindowDialog1Ptr = (ZKWindow*)findControlByID(ID_DEVICEUPDATE_WindowDialog1);
-    mTextViewProgressMessagePtr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextViewProgressMessage);
-    mTextViewProgressLoadingPtr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextViewProgressLoading);
-    mTextView4Ptr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextView4);
-    mWindowProgressPtr = (ZKWindow*)findControlByID(ID_DEVICEUPDATE_WindowProgress);
+    mFindBackButtonPtr = (ZKButton*)findControlByID(ID_DEVICEUPDATE_FindBackButton);
+    mVersionNoNewPtr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_VersionNoNew);
+    mTextView8Ptr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextView8);
     mButtonInstantlyPtr = (ZKButton*)findControlByID(ID_DEVICEUPDATE_ButtonInstantly);
     mTextView3Ptr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextView3);
+    mVersionNewPtr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_VersionNew);
     mTextView5Ptr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextView5);
     mWindowFindPtr = (ZKWindow*)findControlByID(ID_DEVICEUPDATE_WindowFind);
+    mButtonInitPtr = (ZKButton*)findControlByID(ID_DEVICEUPDATE_ButtonInit);
+    msys_backPtr = (ZKButton*)findControlByID(ID_DEVICEUPDATE_sys_back);
+    mVersionNoPtr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_VersionNo);
+    mTextView7Ptr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextView7);
     mTextViewTitlePtr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextViewTitle);
+    mVersionPtr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_Version);
     mTextView1Ptr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextView1);
     mButtonUpdatePtr = (ZKButton*)findControlByID(ID_DEVICEUPDATE_ButtonUpdate);
     mTextView2Ptr = (ZKTextView*)findControlByID(ID_DEVICEUPDATE_TextView2);
+    mWindow1Ptr = (ZKWindow*)findControlByID(ID_DEVICEUPDATE_Window1);
 	mActivityPtr = this;
 	onUI_init();
-    registerProtocolDataUpdateListener(onProtocolDataUpdate); 
-    rigesterActivityTimer();
+  registerProtocolDataUpdateListener(onProtocolDataUpdate);
+  rigesterActivityTimer();
 }
 
-void DeviceUpdateActivity::onClick(ZKBase *pBase) {
+void deviceUpdateActivity::onClick(ZKBase *pBase) {
 	//TODO: add widget onClik code 
     int buttonTablen = sizeof(sButtonCallbackTab) / sizeof(S_ButtonCallback);
     for (int i = 0; i < buttonTablen; ++i) {
@@ -264,30 +264,30 @@ void DeviceUpdateActivity::onClick(ZKBase *pBase) {
 	Activity::onClick(pBase);
 }
 
-void DeviceUpdateActivity::onResume() {
+void deviceUpdateActivity::onResume() {
 	Activity::onResume();
 	EASYUICONTEXT->registerGlobalTouchListener(this);
 	startVideoLoopPlayback();
 	onUI_show();
 }
 
-void DeviceUpdateActivity::onPause() {
+void deviceUpdateActivity::onPause() {
 	Activity::onPause();
 	EASYUICONTEXT->unregisterGlobalTouchListener(this);
 	stopVideoLoopPlayback();
 	onUI_hide();
 }
 
-void DeviceUpdateActivity::onIntent(const Intent *intentPtr) {
+void deviceUpdateActivity::onIntent(const Intent *intentPtr) {
 	Activity::onIntent(intentPtr);
 	onUI_intent(intentPtr);
 }
 
-bool DeviceUpdateActivity::onTimer(int id) {
+bool deviceUpdateActivity::onTimer(int id) {
 	return onUI_Timer(id);
 }
 
-void DeviceUpdateActivity::onProgressChanged(ZKSeekBar *pSeekBar, int progress){
+void deviceUpdateActivity::onProgressChanged(ZKSeekBar *pSeekBar, int progress){
 
     int seekBarTablen = sizeof(SZKSeekBarCallbackTab) / sizeof(S_ZKSeekBarCallback);
     for (int i = 0; i < seekBarTablen; ++i) {
@@ -298,7 +298,7 @@ void DeviceUpdateActivity::onProgressChanged(ZKSeekBar *pSeekBar, int progress){
     }
 }
 
-int DeviceUpdateActivity::getListItemCount(const ZKListView *pListView) const{
+int deviceUpdateActivity::getListItemCount(const ZKListView *pListView) const{
     int tablen = sizeof(SListViewFunctionsCallbackTab) / sizeof(S_ListViewFunctionsCallback);
     for (int i = 0; i < tablen; ++i) {
         if (SListViewFunctionsCallbackTab[i].id == pListView->getID()) {
@@ -309,7 +309,7 @@ int DeviceUpdateActivity::getListItemCount(const ZKListView *pListView) const{
     return 0;
 }
 
-void DeviceUpdateActivity::obtainListItemData(ZKListView *pListView,ZKListView::ZKListItem *pListItem, int index){
+void deviceUpdateActivity::obtainListItemData(ZKListView *pListView,ZKListView::ZKListItem *pListItem, int index){
     int tablen = sizeof(SListViewFunctionsCallbackTab) / sizeof(S_ListViewFunctionsCallback);
     for (int i = 0; i < tablen; ++i) {
         if (SListViewFunctionsCallbackTab[i].id == pListView->getID()) {
@@ -319,7 +319,7 @@ void DeviceUpdateActivity::obtainListItemData(ZKListView *pListView,ZKListView::
     }
 }
 
-void DeviceUpdateActivity::onItemClick(ZKListView *pListView, int index, int id){
+void deviceUpdateActivity::onItemClick(ZKListView *pListView, int index, int id){
     int tablen = sizeof(SListViewFunctionsCallbackTab) / sizeof(S_ListViewFunctionsCallback);
     for (int i = 0; i < tablen; ++i) {
         if (SListViewFunctionsCallbackTab[i].id == pListView->getID()) {
@@ -329,7 +329,7 @@ void DeviceUpdateActivity::onItemClick(ZKListView *pListView, int index, int id)
     }
 }
 
-void DeviceUpdateActivity::onSlideItemClick(ZKSlideWindow *pSlideWindow, int index) {
+void deviceUpdateActivity::onSlideItemClick(ZKSlideWindow *pSlideWindow, int index) {
     int tablen = sizeof(SSlideWindowItemClickCallbackTab) / sizeof(S_SlideWindowItemClickCallback);
     for (int i = 0; i < tablen; ++i) {
         if (SSlideWindowItemClickCallbackTab[i].id == pSlideWindow->getID()) {
@@ -339,11 +339,11 @@ void DeviceUpdateActivity::onSlideItemClick(ZKSlideWindow *pSlideWindow, int ind
     }
 }
 
-bool DeviceUpdateActivity::onTouchEvent(const MotionEvent &ev) {
-    return onDeviceUpdateActivityTouchEvent(ev);
+bool deviceUpdateActivity::onTouchEvent(const MotionEvent &ev) {
+    return ondeviceUpdateActivityTouchEvent(ev);
 }
 
-void DeviceUpdateActivity::onTextChanged(ZKTextView *pTextView, const std::string &text) {
+void deviceUpdateActivity::onTextChanged(ZKTextView *pTextView, const std::string &text) {
     int tablen = sizeof(SEditTextInputCallbackTab) / sizeof(S_EditTextInputCallback);
     for (int i = 0; i < tablen; ++i) {
         if (SEditTextInputCallbackTab[i].id == pTextView->getID()) {
@@ -353,7 +353,7 @@ void DeviceUpdateActivity::onTextChanged(ZKTextView *pTextView, const std::strin
     }
 }
 
-void DeviceUpdateActivity::rigesterActivityTimer() {
+void deviceUpdateActivity::rigesterActivityTimer() {
     int tablen = sizeof(REGISTER_ACTIVITY_TIMER_TAB) / sizeof(S_ACTIVITY_TIMEER);
     for (int i = 0; i < tablen; ++i) {
         S_ACTIVITY_TIMEER temp = REGISTER_ACTIVITY_TIMER_TAB[i];
@@ -362,7 +362,7 @@ void DeviceUpdateActivity::rigesterActivityTimer() {
 }
 
 
-void DeviceUpdateActivity::onVideoPlayerMessage(ZKVideoView *pVideoView, int msg) {
+void deviceUpdateActivity::onVideoPlayerMessage(ZKVideoView *pVideoView, int msg) {
     int tablen = sizeof(SVideoViewCallbackTab) / sizeof(S_VideoViewCallback);
     for (int i = 0; i < tablen; ++i) {
         if (SVideoViewCallbackTab[i].id == pVideoView->getID()) {
@@ -377,7 +377,7 @@ void DeviceUpdateActivity::onVideoPlayerMessage(ZKVideoView *pVideoView, int msg
     }
 }
 
-void DeviceUpdateActivity::videoLoopPlayback(ZKVideoView *pVideoView, int msg, size_t callbackTabIndex) {
+void deviceUpdateActivity::videoLoopPlayback(ZKVideoView *pVideoView, int msg, size_t callbackTabIndex) {
 
 	switch (msg) {
 	case ZKVideoView::E_MSGTYPE_VIDEO_PLAY_STARTED:
@@ -417,7 +417,7 @@ void DeviceUpdateActivity::videoLoopPlayback(ZKVideoView *pVideoView, int msg, s
 	}
 }
 
-void DeviceUpdateActivity::startVideoLoopPlayback() {
+void deviceUpdateActivity::startVideoLoopPlayback() {
     int tablen = sizeof(SVideoViewCallbackTab) / sizeof(S_VideoViewCallback);
     for (int i = 0; i < tablen; ++i) {
     	if (SVideoViewCallbackTab[i].loop) {
@@ -432,7 +432,7 @@ void DeviceUpdateActivity::startVideoLoopPlayback() {
     }
 }
 
-void DeviceUpdateActivity::stopVideoLoopPlayback() {
+void deviceUpdateActivity::stopVideoLoopPlayback() {
     int tablen = sizeof(SVideoViewCallbackTab) / sizeof(S_VideoViewCallback);
     for (int i = 0; i < tablen; ++i) {
     	if (SVideoViewCallbackTab[i].loop) {
@@ -448,7 +448,7 @@ void DeviceUpdateActivity::stopVideoLoopPlayback() {
     }
 }
 
-bool DeviceUpdateActivity::parseVideoFileList(const char *pFileListPath, std::vector<string>& mediaFileList) {
+bool deviceUpdateActivity::parseVideoFileList(const char *pFileListPath, std::vector<string>& mediaFileList) {
 	mediaFileList.clear();
 	if (NULL == pFileListPath || 0 == strlen(pFileListPath)) {
         LOGD("video file list is null!");
@@ -480,7 +480,7 @@ bool DeviceUpdateActivity::parseVideoFileList(const char *pFileListPath, std::ve
 	return true;
 }
 
-int DeviceUpdateActivity::removeCharFromString(string& nString, char c) {
+int deviceUpdateActivity::removeCharFromString(string& nString, char c) {
     string::size_type   pos;
     while(1) {
         pos = nString.find(c);
@@ -493,14 +493,14 @@ int DeviceUpdateActivity::removeCharFromString(string& nString, char c) {
     return (int)nString.size();
 }
 
-void DeviceUpdateActivity::registerUserTimer(int id, int time) {
+void deviceUpdateActivity::registerUserTimer(int id, int time) {
 	registerTimer(id, time);
 }
 
-void DeviceUpdateActivity::unregisterUserTimer(int id) {
+void deviceUpdateActivity::unregisterUserTimer(int id) {
 	unregisterTimer(id);
 }
 
-void DeviceUpdateActivity::resetUserTimer(int id, int time) {
+void deviceUpdateActivity::resetUserTimer(int id, int time) {
 	resetTimer(id, time);
 }

jni/activity/DeviceUpdateActivity.h

@@ -31,40 +31,40 @@
 #define ID_DEVICEUPDATE_PasswordTextView    50017
 #define ID_DEVICEUPDATE_EditTextPwd    51001
 #define ID_DEVICEUPDATE_WindowPwd    110006
+#define ID_DEVICEUPDATE_TextViewProgressMessage    50012
+#define ID_DEVICEUPDATE_TextViewProgressLoading    50008
+#define ID_DEVICEUPDATE_TextView4    50007
+#define ID_DEVICEUPDATE_WindowProgress    110002
 #define ID_DEVICEUPDATE_BackButton    20004
 #define ID_DEVICEUPDATE_IntervalSubItem    24002
 #define ID_DEVICEUPDATE_DownSubItem    24001
 #define ID_DEVICEUPDATE_DeviceTypeListView    80001
 #define ID_DEVICEUPDATE_WindowInit    110005
-#define ID_DEVICEUPDATE_FindBackButton    20005
-#define ID_DEVICEUPDATE_ButtonInit    20003
-#define ID_DEVICEUPDATE_sys_back   100
-#define ID_DEVICEUPDATE_Window1    110004
-#define ID_DEVICEUPDATE_VersionNoNew    50016
-#define ID_DEVICEUPDATE_TextView8    50015
-#define ID_DEVICEUPDATE_VersionNew    50004
-#define ID_DEVICEUPDATE_VersionNo    50014
-#define ID_DEVICEUPDATE_TextView7    50013
-#define ID_DEVICEUPDATE_Version    50002
 #define ID_DEVICEUPDATE_ButtonDialog1    20006
 #define ID_DEVICEUPDATE_TextViewDialog1    50011
 #define ID_DEVICEUPDATE_TextView6    50010
 #define ID_DEVICEUPDATE_WindowDialog1    110003
-#define ID_DEVICEUPDATE_TextViewProgressMessage    50012
-#define ID_DEVICEUPDATE_TextViewProgressLoading    50008
-#define ID_DEVICEUPDATE_TextView4    50007
-#define ID_DEVICEUPDATE_WindowProgress    110002
+#define ID_DEVICEUPDATE_FindBackButton    20005
+#define ID_DEVICEUPDATE_VersionNoNew    50016
+#define ID_DEVICEUPDATE_TextView8    50015
 #define ID_DEVICEUPDATE_ButtonInstantly    20002
 #define ID_DEVICEUPDATE_TextView3    50003
+#define ID_DEVICEUPDATE_VersionNew    50004
 #define ID_DEVICEUPDATE_TextView5    50005
 #define ID_DEVICEUPDATE_WindowFind    110001
+#define ID_DEVICEUPDATE_ButtonInit    20003
+#define ID_DEVICEUPDATE_sys_back   100
+#define ID_DEVICEUPDATE_VersionNo    50014
+#define ID_DEVICEUPDATE_TextView7    50013
 #define ID_DEVICEUPDATE_TextViewTitle    50009
+#define ID_DEVICEUPDATE_Version    50002
 #define ID_DEVICEUPDATE_TextView1    50001
 #define ID_DEVICEUPDATE_ButtonUpdate    20001
 #define ID_DEVICEUPDATE_TextView2    50006
+#define ID_DEVICEUPDATE_Window1    110004
 /*TAG:Macro宏ID END*/
 
-class DeviceUpdateActivity : public Activity, 
+class deviceUpdateActivity : public Activity, 
                      public ZKSeekBar::ISeekBarChangeListener, 
                      public ZKListView::IItemClickListener,
                      public ZKListView::AbsListAdapter,
@@ -74,8 +74,8 @@ class DeviceUpdateActivity : public Activity,
                      public ZKVideoView::IVideoPlayerMessageListener
 {
 public:
-    DeviceUpdateActivity();
-    virtual ~DeviceUpdateActivity();
+    deviceUpdateActivity();
+    virtual ~deviceUpdateActivity();
 
     /**
      * 注册定时器

jni/logic/DeviceUpdateLogic.cc

@@ -231,7 +231,7 @@ static bool onUI_Timer(int id){
  *         false
  *            触摸事件将继续传递到控件上
  */
-static bool onDeviceUpdateActivityTouchEvent(const MotionEvent &ev) {
+static bool ondeviceUpdateActivityTouchEvent(const MotionEvent &ev) {
     switch (ev.mActionStatus) {
 		case MotionEvent::E_ACTION_DOWN://触摸按下
 			//LOGD("时刻 = %ld 坐标  x = %d, y = %d", ev.mEventTime, ev.mX, ev.mY);

jni/logic/mainLogic.cc

@@ -347,7 +347,7 @@ public:
 			if (currentVersionNo < responseVersionNo) {
 				Intent* intent = new Intent();
 				intent->putExtra(appUpdate, "true");
-				EASYUICONTEXT->openActivity("DeviceUpdateActivity", intent);
+				EASYUICONTEXT->openActivity("deviceUpdateActivity", intent);
 			}
 		}
 

jni/logic/startLogic.cc

@@ -234,7 +234,7 @@ void handleMsg(byte* inBytes){
 			}
 			Intent* intent = new Intent();
 			intent->putExtra(appUpdate, "true");
-			EASYUICONTEXT->openActivity("DeviceUpdateActivity", intent);
+			EASYUICONTEXT->openActivity("deviceUpdateActivity", intent);
 		}
 		else if (tcpModel.action == DeviceAction::RESTART) {	// 重启设备
 			const char* req = "-1";

jni/logic/ui3Logic.cc

@@ -421,7 +421,7 @@ static bool onButtonClick_BtnNetSetting(ZKButton *pButton) {
 
 static bool onButtonClick_BtnSoftVer(ZKButton *pButton) {
     LOGD(" ButtonClick BtnSoftVer !!!\n");
-    EASYUICONTEXT->openActivity("DeviceUpdateActivity");
+    EASYUICONTEXT->openActivity("deviceUpdateActivity");
     return false;
 }
 static bool onButtonClick_sys_back(ZKButton *pButton) {

jni/service/BusinessConfig.h

@@ -62,8 +62,8 @@
 
 #define STORE_MAC_ADDR "mac_addr"
 
-static std::string version = "v1.0.38";
-static int versionNo = 38;
+static std::string version = "v1.0.39";
+static int versionNo = 39;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;