1.修改Android Apex Drivers Update恢复与保存。

2.修改Android Apex Drivers加密解密。

ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/ApexDriverApplication.java

@@ -90,14 +90,14 @@ public class ApexDriverApplication extends Application {
         if (string == null) {
             return null;
         }
-        return AESUtil.encrypt(secretKey,string);
+        return AESUtil.encrypt256(secretKey,string);
     }
 
     public String decryptString(String string) {
         if (string == null) {
             return null;
         }
-        return AESUtil.decrypt(secretKey, string);
+        return AESUtil.decrypt256(secretKey, string);
     }
 
     public void logout() {

ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/Network/Network.java

@@ -38,8 +38,8 @@ public class Network extends com.usai.redant.rautils.Utils.Network {
         String password = ApexDriverApplication.sharedApplication().encryptPassword();
 
         if (user != null && user.length() > 0 && password != null && password.length() != 0) {
-            params.putString("name","WMoy059hzweXPSC74plhBA==");
-            params.putString("password","CzADM7u51eNR7ScfQtJw7w==");
+            params.putString("name",user); // "WMoy059hzweXPSC74plhBA=="
+            params.putString("password",password); // "CzADM7u51eNR7ScfQtJw7w=="
         }
 
         params.putString("platform","android");
@@ -113,10 +113,10 @@ public class Network extends com.usai.redant.rautils.Utils.Network {
         password = ApexDriverApplication.sharedApplication().encryptString(password);
 
         if (user != null) {
-            params.putString("name","WMoy059hzweXPSC74plhBA=="); // "WMoy059hzweXPSC74plhBA=="
+            params.putString("name",user); // "WMoy059hzweXPSC74plhBA=="
         }
         if (password != null) {
-            params.putString("password","CzADM7u51eNR7ScfQtJw7w=="); // "CzADM7u51eNR7ScfQtJw7w=="
+            params.putString("password",password); // "CzADM7u51eNR7ScfQtJw7w=="
         }
 
         prepareParams(params);

ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/Update/UpdateActivity.java

@@ -59,6 +59,9 @@ public class UpdateActivity extends AppCompatActivity implements UpdateAdapter.U
     private final static String ActionIDKey = "ActionID";
     private final static String ActionTitleKey = "ActionTitle";
     private final static String SaveDataKey = "UpdateSavedJson";
+    private final static String SaveOrderIDKey = "UpdateSavedOrderID";
+    private final static String SaveActionIDKey = "UpdateSavedActionID";
+    private final static String SaveTitleKey = "UpdateSavedTitle";
 
     private final static int REQUEST_SCANNER_CODE = 0;
     private final static int REQUEST_CAMERA_CODE = 1;
@@ -80,6 +83,7 @@ public class UpdateActivity extends AppCompatActivity implements UpdateAdapter.U
     }
 
     private String mOrderID;
+    private String mTitle;
     private int mActionID;
 
     private Context mCtx = this;
@@ -111,11 +115,13 @@ public class UpdateActivity extends AppCompatActivity implements UpdateAdapter.U
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        String title = getIntent().getStringExtra(ActionTitleKey);
-        setTitle(title);
+        if (getIntent() != null) {
+            mTitle = getIntent().getStringExtra(ActionTitleKey);
+            setTitle(mTitle);
 
-        mOrderID = getIntent().getStringExtra(OrderIDKey);
-        mActionID = getIntent().getIntExtra(ActionIDKey,0);
+            mOrderID = getIntent().getStringExtra(OrderIDKey);
+            mActionID = getIntent().getIntExtra(ActionIDKey,0);
+        }
 
         mHandler = new UpdateHandler(self);
 
@@ -141,6 +147,12 @@ public class UpdateActivity extends AppCompatActivity implements UpdateAdapter.U
 
         if (savedInstanceState != null) {
 
+            mTitle = savedInstanceState.getString(SaveTitleKey);
+            setTitle(mTitle);
+
+            mOrderID = savedInstanceState.getString(SaveOrderIDKey);
+            mActionID = savedInstanceState.getInt(SaveActionIDKey,0);
+
             String jsonStr = savedInstanceState.getString(SaveDataKey);
             if (jsonStr != null) {
                 try {
@@ -169,6 +181,13 @@ public class UpdateActivity extends AppCompatActivity implements UpdateAdapter.U
         if (json != null) {
             outState.putString(SaveDataKey,json.toString());
         }
+        if (mOrderID != null) {
+            outState.putString(SaveOrderIDKey, mOrderID);
+        }
+        if (mTitle != null) {
+            outState.putString(SaveTitleKey, mTitle);
+        }
+        outState.putInt(SaveActionIDKey, mActionID);
 
     }