1.修改Android RedAnt Mobile Logout功能，屏蔽RA Image模块Logout。

2.修改Android RedAnt Mobile Upload Setting界面布局失效。
3.修改Android RedAnt Mobile Network，增加结果为空处理。

RedAnt Mobile/app/src/main/java/com/usai/redant/Result/SearchResultActivity.java

@@ -278,7 +278,7 @@ public class SearchResultActivity extends AppCompatActivity implements AbsListVi
                             } else {
 
                                 String msg = resultData.optString("msg");
-                                if (msg == null) {
+                                if (msg == null || msg.isEmpty()) {
                                     msg = "Sorry,some error occurred";
                                 }
 

RedAnt Mobile/app/src/main/java/com/usai/redant/raimage/ModeActivity.java

@@ -2,6 +2,8 @@ package com.usai.redant.raimage;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.os.Bundle;
@@ -145,11 +147,30 @@ public class ModeActivity extends AppCompatActivity {
         });
     }
 
+    public String getApplicationName() {
+        PackageManager packageManager = null;
+        ApplicationInfo applicationInfo = null;
+        try {
+            packageManager = getApplicationContext().getPackageManager();
+            applicationInfo = packageManager.getApplicationInfo(getPackageName(), 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            applicationInfo = null;
+        }
+        String applicationName = (String) packageManager.getApplicationLabel(applicationInfo);
+        return applicationName;
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.logout_menu,menu);
+        String appName = getApplicationName();
+        if (appName.equals("RedAnt Mobile")) {
 
-        return true;
+            return super.onCreateOptionsMenu(menu);
+
+        } else {
+            getMenuInflater().inflate(R.menu.logout_menu,menu);
+            return true;
+        }
     }
 
     @Override

RedAnt Mobile/app/src/main/java/com/usai/redant/redantmobile/LoginActivity.java

@@ -162,6 +162,7 @@ public class LoginActivity extends AppCompatActivity {
 
                 Intent intent = new Intent();
                 intent.setClass(LoginActivity.this, ModeListActivity.class);
+                intent.putExtra("isRoot",true);
 //                intent.putExtra("mode_list",)
                 JSONArray mode_list = json.optJSONArray("mode_list");
                 String mode_list_str = mode_list.toString();

RedAnt Mobile/app/src/main/java/com/usai/redant/redantmobile/ModeListActivity.java

@@ -11,6 +11,8 @@ import android.text.style.AbsoluteSizeSpan;
 import android.text.style.ForegroundColorSpan;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -35,12 +37,16 @@ public class ModeListActivity extends AppCompatActivity {
     private ListView mListView;
     private ModeAdapter mAdapter;
     private Context mContext;
+    private boolean isRoot;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_mode_list);
         mContext = this;
 
+        isRoot = getIntent().getBooleanExtra("isRoot",false);
+
+
         String modeList_string;
         String title;
         if (savedInstanceState == null) {
@@ -99,6 +105,29 @@ public class ModeListActivity extends AppCompatActivity {
         });
     }
 
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        if (isRoot) {
+            getMenuInflater().inflate(R.menu.logout_menu,menu);
+
+            return true;
+        } else {
+            return super.onCreateOptionsMenu(menu);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.logout_item: {
+                logout();
+            }
+            break;
+        }
+        return true;
+    }
+
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -114,6 +143,16 @@ public class ModeListActivity extends AppCompatActivity {
     }
 
 
+    void logout() {
+        RedAntApplication.user = null;
+        RedAntApplication.password = null;
+        RedAntApplication.server_info = null;
+        Intent intent = new Intent(mContext,LoginActivity.class);
+        startActivity(intent);
+        finish();
+    }
+
+
     private void processPredefQuery(JSONObject modeInfo) {
         try {
             String query_id = modeInfo.getString("query_id");

RedAnt Mobile/app/src/main/java/com/usai/redant/util/Network.java

@@ -1658,7 +1658,7 @@ public class Network
 		String json_string = getJson(request_url,params);
 
 		if (json_string == null || json_string.isEmpty()) {
-			return null;
+			json_string = "{\"result\" : \"1\"}";
 		}
 
 		try {
@@ -1732,7 +1732,7 @@ public class Network
 			String json_string = getJson(url,bundle);
 
 			if (json_string == null || json_string.isEmpty()) {
-				return null;
+				json_string = "{\"result\" : \"1\"}";
 			}
 
 			return new JSONObject(json_string);
@@ -1751,7 +1751,7 @@ public class Network
 		String json_string = getJson(RedAntApplication.server,params);
 
 		if (json_string == null || json_string.isEmpty()) {
-			return null;
+			json_string = "{\"result\" : \"1\"}";
 		}
 
 		try {
@@ -1774,7 +1774,7 @@ public class Network
 		String json_string = getJson(RedAntApplication.server,upparams);
 
 		if (json_string == null || json_string.isEmpty()) {
-			return null;
+			json_string = "{\"result\" : \"1\"}";
 		}
 
 		try {
@@ -1793,7 +1793,7 @@ public class Network
 		String json_string = getJson(RedAntApplication.server,upparams);
 
 		if (json_string == null || json_string.isEmpty()) {
-			return null;
+			json_string = "{\"result\" : \"1\"}";
 		}
 
 		try {

RedAnt Mobile/app/src/main/res/layout/activity_upload_setting.xml

@@ -11,7 +11,6 @@
         android:id="@+id/compress_swt"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="10dp"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         android:layout_marginTop="32dp"
@@ -22,7 +21,7 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:layout_constraintRight_creator="1"
-        tools:layout_constraintTop_creator="1" />
+        tools:layout_constraintTop_creator="1"/>
 
     <TextView
         android:id="@+id/retry_text"
@@ -43,8 +42,6 @@
         android:id="@+id/retry_waiting"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="0dp"
-        android:layout_marginStart="10dp"
         android:layout_marginTop="24dp"
         android:text="Retry waiting"
         android:textColor="@android:color/black"
@@ -52,7 +49,7 @@
         app:layout_constraintLeft_toLeftOf="@+id/compress_swt"
         app:layout_constraintTop_toBottomOf="@+id/retry_text"
         tools:layout_constraintLeft_creator="1"
-        tools:layout_constraintTop_creator="1" />
+        tools:layout_constraintTop_creator="1"/>
 
     <EditText
         android:id="@+id/retry_et"
@@ -73,26 +70,18 @@
         android:id="@+id/waiting_et"
         android:layout_width="50dp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="0dp"
-        android:layout_marginEnd="30dp"
-        android:layout_marginRight="0dp"
-        android:layout_marginTop="0dp"
         android:inputType="number"
         app:layout_constraintBottom_toBottomOf="@+id/retry_waiting"
         app:layout_constraintRight_toRightOf="@+id/compress_swt"
         app:layout_constraintTop_toTopOf="@+id/retry_waiting"
+        app:layout_constraintVertical_bias="0.517"
         tools:layout_constraintRight_creator="1"
-        tools:layout_constraintTop_creator="1"
-        app:layout_constraintVertical_bias="0.517" />
+        tools:layout_constraintTop_creator="1"/>
 
     <Switch
         android:id="@+id/sw_wifyonly"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginLeft="0dp"
-        android:layout_marginRight="0dp"
-        android:layout_marginStart="8dp"
         android:layout_marginTop="24dp"
         android:text="Only upload via WIFI"
         android:textSize="18sp"
@@ -103,7 +92,7 @@
         tools:layout_constraintBottom_creator="1"
         tools:layout_constraintLeft_creator="1"
         tools:layout_constraintRight_creator="1"
-        tools:layout_constraintTop_creator="1" />
+        tools:layout_constraintTop_creator="1"/>
 
 
 </android.support.constraint.ConstraintLayout>