version:2.6

fix:更新retrofit,优化请求次数
update:

app/src/main/java/com/aoleyun/sn/jpush/MyJPushReceiver.java

@@ -18,19 +18,19 @@ import android.util.Log;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.aoleyun.sn.R;
 import com.aoleyun.sn.bean.BaseResponse;
 import com.aoleyun.sn.bean.RemoteDebug;
-import com.aoleyun.sn.R;
 import com.aoleyun.sn.comm.CommonConfig;
 import com.aoleyun.sn.comm.JGYActions;
-import com.aoleyun.sn.utils.CacheUtils;
-import com.aoleyun.sn.utils.JGYUtils;
-import com.aoleyun.sn.network.NetInterfaceManager;
 import com.aoleyun.sn.network.HTTPInterface;
+import com.aoleyun.sn.network.NetInterfaceManager;
 import com.aoleyun.sn.service.main.MainService;
 import com.aoleyun.sn.utils.ApkUtils;
+import com.aoleyun.sn.utils.CacheUtils;
 import com.aoleyun.sn.utils.CmdUtil;
 import com.aoleyun.sn.utils.ForegroundAppUtil;
+import com.aoleyun.sn.utils.JGYUtils;
 import com.aoleyun.sn.utils.MySQLData;
 import com.aoleyun.sn.utils.SPUtils;
 import com.aoleyun.sn.utils.SaveListUtils;
@@ -46,13 +46,13 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
-import io.reactivex.Observer;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
@@ -718,99 +718,6 @@ public class MyJPushReceiver extends BroadcastReceiver {
         }
     }
 
-    public void screenshot(String s) {
-        JSONObject jSONObject = JSON.parseObject(s);
-        long createTime = jSONObject.getLong("createTime");
-        if (createTime != 0) {
-            Log.e("createTime", String.valueOf(createTime));
-            doscreenshot(createTime);
-        }
-    }
-
-    public void doscreenshot(final long time) {
-        Observable.create(new ObservableOnSubscribe<Integer>() {
-            @Override
-            public void subscribe(ObservableEmitter<Integer> e) throws Exception {
-                String filepath = mContext.getExternalFilesDir("db").getAbsolutePath();
-                int n = CmdUtil.execute("screencap -p " + filepath + File.separator + time + ".db").code;
-                e.onNext(n);
-            }
-        }).subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<Integer>() {
-                    @Override
-                    public void onSubscribe(Disposable d) {
-
-                    }
-
-                    @Override
-                    public void onNext(Integer integer) {
-                        if (integer == 0) {
-                            uplaodImage(time);
-                        } else {
-                            Log.e("doss", "失败");
-                        }
-                    }
-
-                    @Override
-                    public void onError(Throwable e) {
-                        Log.e("doss", "Throwable=" + e.getMessage());
-                    }
-
-                    @Override
-                    public void onComplete() {
-
-                    }
-                });
-    }
-
-    private void uplaodImage(long time) {
-        String filepath = mContext.getExternalFilesDir("db").getAbsolutePath();
-//        String filepath = mContext.getFileStreamPath("screenshot").getAbsolutePath();
-        //放在app内部data下面
-        File file = new File(filepath + File.separator + time + ".db");
-        //不要直接使用常用图片格式
-        if (!file.exists()) {
-            Log.e("uplaodImage", "File does not exists");
-            return;
-        }
-        //设置图片格式
-//        RequestBody requestFile = RequestBody.create(MediaType.parse("image/jpg"), file);
-        //File转RequestBody
-        MediaType mediaType = MediaType.Companion.parse("image/png");
-        RequestBody fileBody = RequestBody.Companion.create(file, mediaType);
-        //设置一个file文件
-        MultipartBody.Part body = MultipartBody.Part.createFormData("file", file.getName(), fileBody);
-        Map<String, String> params = new HashMap<>();
-        params.put("sn", Utils.getSerial());
-        params.put("createtime", String.valueOf(time));
-        NetInterfaceManager.getInstance().getScreenshotApi()
-                .sendScreenshot(params, body)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<BaseResponse>() {
-                    @Override
-                    public void onSubscribe(Disposable d) {
-                        Log.e("uplaodImage", "onSubscribe: ");
-                    }
-
-                    @Override
-                    public void onNext(BaseResponse baseResponse) {
-                        Log.e("uplaodImage", "onNext: " + baseResponse.msg);
-                    }
-
-                    @Override
-                    public void onError(Throwable e) {
-                        Log.e("uplaodImage", "onError: " + e.getMessage());
-                    }
-
-                    @Override
-                    public void onComplete() {
-                        Log.e("uplaodImage", "onComplete: ");
-                    }
-                });
-    }
-
     private void getTimeControl(Context context, String extras) {
         HTTPInterface.getSnTimeControl(context);
     }