|
@@ -1860,11 +1860,11 @@ public class iMapServer extends Service {
|
|
|
strUploadFile = uploadfile;
|
|
|
|
|
|
danjiserverType = wallpadDeviceSet.GetNewDanjiServer();
|
|
|
- if(danjiserverType == 1)
|
|
|
+ if(danjiserverType == define.DanjiServer1)
|
|
|
{
|
|
|
bMainServer2dot0 = false;
|
|
|
}
|
|
|
- else if(danjiserverType == 2)
|
|
|
+ else if(danjiserverType == define.DanjiServer2)
|
|
|
{
|
|
|
bMainServer2dot0 = true;
|
|
|
}
|
|
@@ -1895,11 +1895,11 @@ public class iMapServer extends Service {
|
|
|
if (!mFTPManager.isFTPConnected()) {
|
|
|
|
|
|
boolean connect = false;
|
|
|
- if(danjiserverType == 1)
|
|
|
+ if(danjiserverType == define.DanjiServer1)
|
|
|
{
|
|
|
connect = mFTPManager.connectFTP(strRemoteIP);
|
|
|
}
|
|
|
- else if(danjiserverType == 2)
|
|
|
+ else if(danjiserverType == define.DanjiServer2)
|
|
|
{
|
|
|
connect = mFTPManager.connectFTP(strRemoteIP);
|
|
|
}
|
|
@@ -2953,11 +2953,11 @@ public class iMapServer extends Service {
|
|
|
|
|
|
|
|
|
|
|
|
- if(danjiserverType == 1)
|
|
|
+ if(danjiserverType == define.DanjiServer1)
|
|
|
{
|
|
|
svr = new ServerSocket(port);
|
|
|
}
|
|
|
- else if(danjiserverType == 2)
|
|
|
+ else if(danjiserverType == define.DanjiServer2)
|
|
|
{
|
|
|
int svrport = port + 1000;
|
|
|
Log.i(TAG, "============================================");
|
|
@@ -3151,7 +3151,7 @@ public class iMapServer extends Service {
|
|
|
|
|
|
|
|
|
|
|
|
- if (danjiserverType == 1) {
|
|
|
+ if (danjiserverType == define.DanjiServer1) {
|
|
|
while (System.currentTimeMillis() < lSocketConnectionPeriod) {
|
|
|
try {
|
|
|
if (MsgReader.ready()) {
|
|
@@ -11762,13 +11762,13 @@ public class iMapServer extends Service {
|
|
|
wallpadDeviceSet.closeDB();
|
|
|
} catch (RuntimeException re) {
|
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
|
- danjiserverType = 1;
|
|
|
+ danjiserverType = define.DanjiServer1;
|
|
|
}
|
|
|
catch (Exception e) {
|
|
|
Log.e(TAG, "[iMapSverSocket] - GetNewDanjiServer ExceptionError !!!");
|
|
|
|
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
|
- danjiserverType = 1;
|
|
|
+ danjiserverType = define.DanjiServer1;
|
|
|
}
|
|
|
|
|
|
Log.d(TAG, " iMapSverReload - mNewDanjiServer :" + danjiserverType );
|