1.优化地图相关代码，提高运行效率和可读性。 2.添加修改密码功能。 3.优化列表和详情页展示。

zuoxiao

2024-12-24 6a44973461e2a91f62f7eed681b4db3abb026289

 app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java

@@ -1,17 +1,33 @@
package com.dayu.pipirrapp.net;

import static com.luck.picture.lib.thread.PictureThreadUtils.runOnUiThread;

import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.util.Log;

import com.dayu.pipirrapp.MyApplication;
import com.dayu.pipirrapp.activity.LoginActivity;
import com.dayu.pipirrapp.bean.net.CodeResult;
import com.dayu.pipirrapp.bean.net.UplodFileState;
import com.dayu.pipirrapp.bean.net.WeatherResponse;
import com.dayu.pipirrapp.net.subscribers.BaseProgressSubscriber;
import com.dayu.pipirrapp.net.subscribers.CodeListener;
import com.dayu.pipirrapp.net.subscribers.ProgressSubscriber;
import com.dayu.pipirrapp.net.subscribers.SubscriberListener;
import com.dayu.pipirrapp.net.upload.ProgressListener;
import com.dayu.pipirrapp.net.upload.ProgressRequestBody;
import com.dayu.pipirrapp.net.upload.UploadFileListener;
import com.dayu.pipirrapp.utils.CleanDataUtils;
import com.dayu.pipirrapp.utils.MapJpgUtils;
import com.dayu.pipirrapp.utils.MyJsonParser;
import com.dayu.pipirrapp.utils.MyLog;
import com.dayu.pipirrapp.utils.NetUtils;
import com.google.gson.Gson;
import com.google.gson.internal.LinkedTreeMap;

import java.io.File;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -21,9 +37,13 @@
import io.reactivex.rxjava3.disposables.CompositeDisposable;
import io.reactivex.rxjava3.functions.Function;
import io.reactivex.rxjava3.schedulers.Schedulers;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
import okhttp3.ResponseBody;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;


/**
@@ -41,7 +61,8 @@
    int uplodFilerepeatSize = 3;

    ApiService apiService;
    private CompositeDisposable compositeDisposable = new CompositeDisposable(); // 管理订阅事件
    // 管理订阅事件
    private CompositeDisposable compositeDisposable = new CompositeDisposable();

    /**
     * 初始化通信框架
@@ -78,6 +99,10 @@
        request(context, false, path, true, tClass, params, listener);
    }

    public <T> void requestGetHideLoading(final Context context, final String path, final Class<T> tClass, final Map<String, Object> params, final SubscriberListener listener) {
        request(context, true, path, true, tClass, params, listener);
    }

    /**
     * 发送请求
     *
@@ -97,10 +122,9 @@

        if (isGet) {
            if (params == null) {
                observable = apiService.requestGet(path);
                observable = apiService.requestGet(path, MyApplication.myApplication.token);
            } else {

                observable = apiService.requestGet(path, params);
                observable = apiService.requestGet(path, params, MyApplication.myApplication.token);
            }
        } else {
            observable = apiService.requestPost(path, params);
@@ -113,6 +137,12 @@
                    public BaseResponse<T> apply(Object o) {
                        if (o instanceof BaseResponse) {
                            BaseResponse tem = (BaseResponse) o;
                            if (tem.getCode().equals(Constants.TOKEN_INVALID)) {
                                //当code为0000是跳转到登录界面
                                tem.setMsg("登录失效请重新登录");
                                redirectToLogin();
                                return tem;
                            }
                            BaseResponse<T> response = new BaseResponse<>();
                            response.setCode(tem.getCode());
                            response.setMsg(tem.getMsg());
@@ -161,6 +191,7 @@
        }
    }


    /**
     * 获取天气
     *
@@ -182,21 +213,27 @@

    /**
     * 获取验证码
     *
     * @param params
     * @param listener
     * @param <T>
     */
    public <T> void getCode( Map<String, Object> params, CodeListener listener) {
        Observable observable;
        observable = apiService.getCode(params);
        observable.subscribeOn(Schedulers.io())
                .unsubscribeOn(Schedulers.newThread())
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(responseBody -> {
                    listener.onNext((CodeResult) responseBody);
                }, throwable -> {
                    listener.error((Throwable) throwable);
                });
    public <T> void getCode(Map<String, Object> params, CodeListener listener) {
        if (NetUtils.isNetworkAvailable(MyApplication.myApplication)) {
            Observable observable;
            observable = apiService.getCode(params);
            observable.subscribeOn(Schedulers.io())
                    .unsubscribeOn(Schedulers.newThread())
                    .observeOn(AndroidSchedulers.mainThread())
                    .subscribe(responseBody -> {
                        listener.onNext((CodeResult) responseBody);
                    }, throwable -> {
                        listener.error((Throwable) throwable);
                    });
        } else {
            listener.onNext(null);
        }

    }


@@ -205,33 +242,34 @@
     *
     * @param urlPath
     */
    public void donwLoadTile(String urlPath) {
        Observable<ResponseBody> observable;
        observable = apiService.downloadTile(urlPath);
    @SuppressLint("CheckResult")
    public void donwLoadTile(Context context, String urlPath) {
        if (NetUtils.isNetworkAvailable(context)) {
            Observable<ResponseBody> observable;
            observable = apiService.downloadTile(urlPath);
            observable
                    // 网络请求在 I/O 线程中进行
                    .subscribeOn(Schedulers.io())
                    // 回调处理也在 I/O 线程
                    .observeOn(Schedulers.io())
                    .subscribe(
                            responseBody -> {


//        compositeDisposable.add(
        observable
                .subscribeOn(Schedulers.io())  // 网络请求在 I/O 线程中进行
                .observeOn(Schedulers.io())    // 回调处理也在 I/O 线程
                .subscribe(
                        responseBody -> {

                            boolean success = false;
                            if (!MapJpgUtils.getInsatance().isHasFiles(urlPath)) {
                                success = MapJpgUtils.getInsatance().saveTileToCache(urlPath, responseBody);
                            }
                            if (success) {
                                Log.d(TAG, "Download success for tile: " + urlPath);
                            } else {
                                Log.e(TAG, "Failed to save tile to disk: " + urlPath);
                            }
                        },
                        throwable -> Log.e(TAG, "Download failed for tile: " + urlPath)
                );
//        );


                                boolean success = false;
                                if (!MapJpgUtils.getInsatance().isHasFiles(urlPath)) {
                                    success = MapJpgUtils.getInsatance().saveTileToCache(urlPath, responseBody);
                                }
                                if (success) {
                                    Log.d(TAG, "Download success for tile: " + urlPath);
                                } else {
                                    Log.e(TAG, "Failed to save tile to disk: " + urlPath);
                                }
                            },
                            throwable -> Log.e(TAG, "Download failed for tile: " + urlPath)
                    );
        } else {
            Log.e(TAG, "没有网络不下载: " + urlPath);
        }
    }

    // 停止线程池，释放资源
@@ -241,4 +279,81 @@
        }
    }


    /**
     * 上传文件
     *
     * @param context
     * @param uplodData
     * @param listener
     */
    public void uploadFile(final Context context, final UplodFileState uplodData, final UploadFileListener listener) {

        File file = new File(uplodData.getFilePath());
        RequestBody requestBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
        ProgressRequestBody progressRequestBody = new ProgressRequestBody(requestBody, new ProgressListener() {
            @Override
            public void onProgress(long bytesWritten, long contentLength, boolean done) {
                // 更新进度条或进行其他操作
                int progress = (int) (100 * bytesWritten / contentLength);
                // 例如：更新 ProgressBar 或显示进度
                runOnUiThread(() -> {
                    // 进度条更新代码
                    // progressBar.setProgress(progress);
                    MyLog.d("progressRequestBody>>>" + "上传进度: " + progress + "%");
                });
            }
        });
        MultipartBody.Part body = MultipartBody.Part.createFormData("file", file.getName(), progressRequestBody);
        RequestBody description = RequestBody.create(MediaType.parse("text/plain"), "file description");
        Call<BaseResponse> uploadFile = apiService.uploadFile(body, description);
        uplodData.setThisCall(uploadFile);
        uploadFile.enqueue(new Callback<BaseResponse>() {
            @Override
            public void onResponse(Call<BaseResponse> call, Response<BaseResponse> response) {
                if (response.body() != null) {
                    if (response.body().isSuccess()) {
                        uplodData.setState(1);
                        uplodData.setId(((LinkedTreeMap) response.body().getContent()).get("id").toString());
                        uplodData.setWebPath(((LinkedTreeMap) response.body().getContent()).get("webPath").toString());
                        listener.onBack(uplodData);
                    } else {
                        if (uplodData.getNumber() <= uplodFilerepeatSize) {
                            uplodData.setNumber(uplodData.getNumber() + 1);
                            uplodData.setState(2);
                            uploadFile(context, uplodData, listener);
                        } else {
                            listener.onBack(uplodData);
                        }
                    }
                }
            }

            @Override
            public void onFailure(Call<BaseResponse> call, Throwable t) {
                if (uplodData.getNumber() <= uplodFilerepeatSize) {
                    uplodData.setNumber(uplodData.getNumber() + 1);
                    uplodData.setState(2);
                    uploadFile(context, uplodData, listener);
                } else {
                    listener.onBack(uplodData);
                }
            }
        });

    }



    /**
     * 当code为“0000”时跳转到登录界面
     */
    private void redirectToLogin() {

        Context context = MyApplication.myApplication.getApplicationContext();
        CleanDataUtils.cleanUserData(context);
        Intent intent = new Intent(context, LoginActivity.class); // Assuming LoginActivity is your login screen
        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); // Clear task stack
        context.startActivity(intent);
    }
}