1.修改Android RedAnt Mobile实现RA Image图片上传。

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

@@ -36,6 +36,7 @@ import com.usai.redant.redantmobile.LoginActivity;
 import com.usai.redant.redantmobile.R;
 import com.usai.redant.redantmobile.RedAntApplication;
 import com.usai.redant.util.Network;
+import com.usai.redant.util.RAUtil;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -147,22 +148,11 @@ 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) {
-        String appName = getApplicationName();
+        String appName = RAUtil.getApplicationName(this);
         if (appName.equals("RedAnt Mobile")) {
 
             return super.onCreateOptionsMenu(menu);

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

@@ -284,7 +284,7 @@ public class TaskActivity extends AppCompatActivity {
                     status="warning";
                     break;
             }
-            double percent = item.getDouble("progress",(double)item.getInt("progress",0));
+            double percent = item.getDouble("progress",(double)item.getDouble("progress",0.0));
             String err = item.getString("msg");
             String name = item.getString("file","");
 

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

@@ -454,6 +454,7 @@ public class LoginActivity extends AppCompatActivity {
 
         m_etServer.setText(s);
         RedAntApplication.server = pref.getString("serverAddress",null);
+        RedAntApplication.active_address = RedAntApplication.server;
 
         m_etPassword
                 .setOnEditorActionListener(new TextView.OnEditorActionListener()

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

@@ -156,7 +156,7 @@ public class ServerSettingActivity extends Activity
 										}
 
 										RedAntApplication.server = url;
-
+										RedAntApplication.active_address = url;
 
 										SharedPreferences pref = RedAntApplication.getInstance().getSharedPreferences("redant mobile", 0);
 										SharedPreferences.Editor editor = pref.edit();

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

@@ -247,14 +247,20 @@ public class Network
 			// 传递自定义参数
 //			connection.setRequestProperty("MyProperty", "this is me!");
 
-			if(!TextUtils.isEmpty(RedAntApplication.user)) {
+			if (parms.getString("user") == null) {
+				if(!TextUtils.isEmpty(RedAntApplication.user)) {
 //				parms.putString("user", AES.encrypt("usai", RedAntApplication.user));
-				parms.putString("user", AES.encrypt("Usai2010", RedAntApplication.user));
+					parms.putString("user", AES.encrypt("Usai2010", RedAntApplication.user));
 
+				}
 			}
+
 			if(!TextUtils.isEmpty(RedAntApplication.password)) {
 //				parms.putString("password", AES.encrypt("usai", RedAntApplication.password));
 				parms.putString("pwd", AES.encrypt("Usai2010", RedAntApplication.password));
+				if (parms.getString("password") == null) {
+					parms.putString("password", AES.encrypt("usai", RedAntApplication.password));
+				}
 			}
 
 			parms.putString("app_ver", RedAntApplication.getInstance()
@@ -914,8 +920,12 @@ public class Network
 
 		}
 		Params.putString("_operate","handset_get_manufacturer");
-		String jstr = getJson(RedAntApplication.active_address
-				+ Network.URL_QUERY_MANUFACTURER,Params);
+//		String jstr = getJson(RedAntApplication.active_address
+//				+ Network.URL_QUERY_MANUFACTURER,Params);
+
+		Params.putString("_action","handset_new");
+		String jstr = getJson(RedAntApplication.active_address,Params);
+
 //		file.delete();
 		if (jstr == null || jstr.length() <= 0)
 		{
@@ -972,8 +982,12 @@ public class Network
 
 		}
 		Params.putString("_operate","valid_upload");
-		String jstr = getJson(RedAntApplication.active_address
-                + Network.URL_VERIFY_CODE,Params);
+		Params.putString("_action","handset_new");
+		String url;
+
+//		String jstr = getJson(RedAntApplication.active_address
+//                + Network.URL_VERIFY_CODE,Params);
+		String jstr = getJson(RedAntApplication.active_address, Params);
 //		file.delete();
 		if (jstr == null || jstr.length() <= 0)
 		{
@@ -1082,6 +1096,8 @@ public class Network
 //			dbgUtil.fileLog(e.toString());
 //			return RESULT_LOCALFILE_ERROR;
 //		}
+
+		Params.putString("_action","handset_new");
 		String jstr = UploadFile(path,server, Params,listener);
 //		file.delete();
 		if (jstr == null || jstr.length() <= 0)

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

@@ -193,7 +193,8 @@ public class RAUploadManager {
                 boolean ret = false;
                 String path = taskinfo.getString("path");
                 taskinfo.putInt("status", TaskStatus.TaskStatusStart.ordinal());
-                String url = taskinfo.getString("url") + "" + URL_UPLOAD;
+//                String url = taskinfo.getString("url") + "" + URL_UPLOAD;
+                String url = taskinfo.getString("url");
 
                 int waiting = taskinfo.getInt("retry_waiting", 0);
 

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

@@ -2,6 +2,8 @@ package com.usai.redant.util;
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
@@ -609,4 +611,18 @@ public class RAUtil {
 
     }
 
+    public static String getApplicationName(Context context) {
+
+        PackageManager packageManager = null;
+        ApplicationInfo applicationInfo = null;
+        try {
+            packageManager = context.getPackageManager();
+            applicationInfo = packageManager.getApplicationInfo(context.getPackageName(), 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            applicationInfo = null;
+        }
+        String applicationName = (String) packageManager.getApplicationLabel(applicationInfo);
+        return applicationName;
+    }
+
 }