|
|
@@ -4,14 +4,23 @@ import android.content.BroadcastReceiver;
|
|
|
import android.content.Context;
|
|
|
import android.content.Intent;
|
|
|
import android.content.IntentFilter;
|
|
|
+import android.content.SharedPreferences;
|
|
|
import android.net.NetworkInfo;
|
|
|
+import android.os.Bundle;
|
|
|
+import android.util.Base64;
|
|
|
+import android.util.Log;
|
|
|
|
|
|
import com.usai.redant.raimage.RedAntApplication;
|
|
|
|
|
|
import com.usai.redant.rautils.service.RAService;
|
|
|
import com.usai.redant.rautils.upload.RAUploadManager;
|
|
|
+import com.usai.redant.rautils.utils.RAUtil;
|
|
|
import com.usai.redant.rautils.utils.dbgUtil;
|
|
|
|
|
|
+import java.io.ByteArrayOutputStream;
|
|
|
+import java.io.ObjectOutputStream;
|
|
|
+import java.util.ArrayList;
|
|
|
+
|
|
|
|
|
|
public class RAImageBackgroundService extends RAService implements RAService.ServiceUpload{
|
|
|
|
|
|
@@ -58,6 +67,34 @@ public class RAImageBackgroundService extends RAService implements RAService.Ser
|
|
|
}
|
|
|
});
|
|
|
|
|
|
+
|
|
|
+ // 2019.1.2 v1.09 升级,将旧的Task移动到新到xml中
|
|
|
+ SharedPreferences pref = RedAntApplication.getInstance().getSharedPreferences("RA Image", 0);
|
|
|
+ if (pref != null) {
|
|
|
+
|
|
|
+ String task_list = pref.getString("task_list", null);
|
|
|
+ if (task_list != null) {
|
|
|
+
|
|
|
+ SharedPreferences uploadPref = RAUtil.unProtectedPreferences(RedAntApplication.getInstance(),"UploadManager");
|
|
|
+ SharedPreferences.Editor uploadEditor = uploadPref.edit();
|
|
|
+
|
|
|
+ try {
|
|
|
+ // 将旧的移动到新的
|
|
|
+ uploadEditor.putString("task_list", task_list);
|
|
|
+ uploadEditor.apply();
|
|
|
+
|
|
|
+ // 删除旧的
|
|
|
+ SharedPreferences.Editor editor = pref.edit();
|
|
|
+ editor.remove("task_list");
|
|
|
+ editor.apply();
|
|
|
+
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
initServiceUpload(this);
|
|
|
initServiceNetworkReachability(new ServiceNetworkReachabilityCallback() {
|
|
|
@Override
|