1.修改Android Apex Drivers Update Order成功提示。

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/upload/RAUploadManager.java

@@ -181,14 +181,14 @@ public class RAUploadManager {
             autoStart = UMSetting.getBoolean("auto_upload",false);
             removeFinish = UMSetting.getBoolean("auto_rm_finish",false);
             removeError = UMSetting.getBoolean("auto_rm_error",false);
-            maxRetry = UMSetting.getInt("retry_count", 5);
-            newtaskStatus = TaskStatus.values()[UMSetting.getInt("newtask_status", TaskStatus.TaskStatusWait.ordinal())];
+            wifiOnly = UMSetting.getBoolean("wifi_only", false);
 
+            maxRetry = UMSetting.getInt("retry_count", 5);
             maxThread = UMSetting.getInt("max_thread", 3);
 
-            wifiOnly = UMSetting.getBoolean("wifi_only", false);
-
+            newtaskStatus = TaskStatus.values()[UMSetting.getInt("newtask_status", TaskStatus.TaskStatusWait.ordinal())];
         }
+        
         operation_queue = new RAOperationQueue(applicationContext);
         operation_queue.setCallback(new RAOperationQueue.OperationCallback() {
             @Override

ApexDrivers/apexdriverslib/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
     <uses-permission android:name="android.alarm.permission.SET_ALARM"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <!-- 调用硬件相机权限 -->
     <uses-feature android:name="android.hardware.camera"/>

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/network/Network.java

@@ -23,8 +23,8 @@ import static java.lang.Thread.sleep;
 
 public class Network extends com.usai.redant.rautils.utils.Network {
 
-    private static final String URL_HOST = "http://192.168.0.124:8080/t";
-//    private static final String URL_HOST = "https://ra.apexshipping.com/t";
+//    private static final String URL_HOST = "http://192.168.0.124:8080/t";
+    private static final String URL_HOST = "https://ra.apexshipping.com/t";
 
 
     public static final String URL_LOGIN = URL_HOST  + "/mobile/login.mo/";

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/update/UpdateActivity.java

@@ -653,7 +653,7 @@ public class UpdateActivity extends BasicActivity implements UpdateAdapter.Updat
                                 }
 
                                 dismissProgressDialog();
-                                goHome();
+                                submitSuccessWithPhoto(photoArr.size() > 0);
 
                             } else {
                                 dismissProgressDialog();
@@ -784,6 +784,28 @@ public class UpdateActivity extends BasicActivity implements UpdateAdapter.Updat
         sendBroadcast(new Intent(HomeFragment.HomeReloadBroadcastAction));
     }
 
+    private void submitSuccessWithPhoto(boolean photo) {
+
+        String msg = null;
+        if (photo) {
+            msg = getString(R.string.update_photo_success);
+        } else {
+            msg = getString(R.string.update_success);
+        }
+
+        new AlertDialog.Builder(mCtx)
+                .setTitle(getString(R.string.message))
+                .setMessage(msg)
+                .setPositiveButton(getString(R.string.btn_ok), new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+
+                        goHome();
+                    }
+                })
+                .show();
+    }
+
     private void backgroundUpload(ArrayList<UpdateImageBaseModel> photos, final JSONObject json) {
 
         if (photos == null || (photos != null && photos.size() == 0) || json == null) {

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/upload/TaskActivity.java

@@ -63,7 +63,7 @@ public class TaskActivity extends BasicActivity {
         ActionBar mActionBar = getSupportActionBar();
         mActionBar.setHomeButtonEnabled(true);
         mActionBar.setDisplayHomeAsUpEnabled(true);
-        mActionBar.setTitle("Apex Drivers");
+        mActionBar.setTitle(getString(R.string.upload_title));
 
 
 
@@ -182,17 +182,17 @@ public class TaskActivity extends BasicActivity {
     private void clearUploadList() {
         if (task_arr.size() == 0) {
             new AlertDialog.Builder(this)
-                    .setTitle("Warning")
-                    .setMessage("Upload list is empty.")
-                    .setPositiveButton("OK",null)
+                    .setTitle(getString(R.string.warning))
+                    .setMessage(getString(R.string.upload_empty))
+                    .setPositiveButton(getString(R.string.btn_ok),null)
                     .show();
             return;
         }
 
         new AlertDialog.Builder(this)
-                .setTitle("Clear upload list")
-                .setMessage("Are you sure remove all error/finish task?")
-                .setPositiveButton("YES", new DialogInterface.OnClickListener() {
+                .setTitle(getString(R.string.clear_title))
+                .setMessage(getString(R.string.clear_ask))
+                .setPositiveButton(getString(R.string.btn_ok), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         // clear
@@ -203,7 +203,7 @@ public class TaskActivity extends BasicActivity {
 
                     }
                 })
-                .setNegativeButton("NO", new DialogInterface.OnClickListener() {
+                .setNegativeButton(getString(R.string.btn_cancel), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
 
@@ -319,9 +319,14 @@ public class TaskActivity extends BasicActivity {
                                         "Current Network info",
                                         "can not get Active NetworkInfo!");
 //                                canstart = false;
+//                                Toast toast = Toast.makeText(getApplicationContext(),
+//                                        "No available network. Please try upload manually later.",
+//                                        Toast.LENGTH_LONG);
+
                                 Toast toast = Toast.makeText(getApplicationContext(),
-                                        "No available network. Please try upload manually later.",
+                                        getString(R.string.upload_no_network),
                                         Toast.LENGTH_LONG);
+
                                 toast.setGravity(Gravity.CENTER, 0, 0);
                                 toast.show();
                                 return;
@@ -338,9 +343,14 @@ public class TaskActivity extends BasicActivity {
                                                     + netState);
 //                                    canstart = false;
 
+//                                    Toast toast = Toast.makeText(getApplicationContext(),
+//                                            "App network connection. Please try upload manually later.",
+//                                            Toast.LENGTH_LONG);
+
                                     Toast toast = Toast.makeText(getApplicationContext(),
-                                            "App network connection. Please try upload manually later.",
+                                            getString(R.string.upload_no_network),
                                             Toast.LENGTH_LONG);
+
                                     toast.setGravity(Gravity.CENTER, 0, 0);
                                     toast.show();
                                     return;
@@ -356,9 +366,14 @@ public class TaskActivity extends BasicActivity {
                                     if(wifi_only == true && iconntype != ConnectivityManager.TYPE_WIFI && iconntype != 9)
                                     {
 
+//                                        Toast toast = Toast.makeText(getApplicationContext(),
+//                                                "App is set to upload via WIFI only. Please change your setting or try upload manually later.",
+//                                                Toast.LENGTH_LONG);
+
                                         Toast toast = Toast.makeText(getApplicationContext(),
-                                                "App is set to upload via WIFI only. Please change your setting or try upload manually later.",
+                                                getString(R.string.upload_wifi_only),
                                                 Toast.LENGTH_LONG);
+
                                         toast.setGravity(Gravity.CENTER, 0, 0);
                                         toast.show();
                                         return;

ApexDrivers/apexdriverslib/src/main/res/layout/setting_action_cell.xml

@@ -36,7 +36,7 @@
 
     <TextView
         android:id="@+id/setting_action_detail_tv"
-        android:layout_width="30dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignLeft="@id/setting_action_indicator_view"
         android:layout_centerVertical="true"

ApexDrivers/apexdriverslib/src/main/res/values-zh/strings.xml

@@ -151,11 +151,16 @@
     <string name="allow_camera">请检查相机权限是否打开</string>
     <string name="allow_camera_and_storage">请检查相机权限和存储权限是否打开</string>
     <string name="btn_update">提交</string>
+    <string name="update_success">提交成功</string>
+    <string name="update_photo_success">提交成功，照片和签名将在后台上传，你可以在上传列表中找到它们。</string>
+    <string name="upload_no_network">无网络连接，请稍后再试</string>
+    <string name="upload_wifi_only">应用只能使用WIFI上传文件，请打开WIFI后重新启动上传</string>
 
     <!--Preview-->
     <string name="photo_delete">删除</string>
 
     <!--Upload List-->
+    <string name="upload_title">上传列表</string>
     <string name="upload_menu_clear">清除</string>
     <string name="upload_empty">上传列表为空</string>
     <string name="clear_title">清空上传列表</string>

ApexDrivers/apexdriverslib/src/main/res/values/strings.xml

@@ -149,11 +149,16 @@
     <string name="allow_camera">please allow app use camera</string>
     <string name="allow_camera_and_storage">please allow app use camera and storage</string>
     <string name="btn_update">Update</string>
+    <string name="update_success">Update successful</string>
+    <string name="update_photo_success">Status update successful, the photos and signatures will upload in the background, you can check them from upload list.</string>
+    <string name="upload_no_network">No available network. Please try upload manually later.</string>
+    <string name="upload_wifi_only">App is set to upload via WIFI only. Please change your setting or try upload manually later.</string>
 
     <!--Preview-->
     <string name="photo_delete">Delete</string>
 
     <!--Upload List-->
+    <string name="upload_title">Upload List</string>
     <string name="upload_menu_clear">Clear</string>
     <string name="upload_empty">Upload list is empty.</string>
     <string name="clear_title">Clear upload list</string>