18034727885
2026-07-03 0142fb56c25b23989f441d527db348fbd2797b81
修复问题
1个文件已添加
3个文件已修改
302 ■■■■■ 已修改文件
app/src/main/java/com/fangxinxing/xxfxx/base/local/BasePhotoActivity.kt 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/fangxinxing/xxfxx/netUtls/MyUploadObserver.java 182 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/fangxinxing/xxfxx/ui/mine/WithdrawAccountActivity.kt 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/fangxinxing/xxfxx/utils/AudioRecorderUploadManager.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/fangxinxing/xxfxx/base/local/BasePhotoActivity.kt
@@ -23,23 +23,33 @@
import android.widget.TextView
import androidx.loader.content.CursorLoader
import com.fangxinxing.xxfxx.R
import com.fangxinxing.xxfxx.utils.sysErr
import com.fangxinxing.xxfxx.base.Const
import com.fangxinxing.xxfxx.bean.StringBean
import com.fangxinxing.xxfxx.netUtls.Api
import com.fangxinxing.xxfxx.netUtls.HttpManager
import com.fangxinxing.xxfxx.netUtls.MyObserver
import com.fangxinxing.xxfxx.netUtls.MyUploadObserver
import com.fangxinxing.xxfxx.ui.DialogUtil
import com.fangxinxing.xxfxx.utils.BitmapUtil
import com.fangxinxing.xxfxx.utils.sysErr
import com.tbruyelle.rxpermissions2.RxPermissions
import com.ypx.imagepicker.ImagePicker
import com.ypx.imagepicker.bean.MimeType
import com.ypx.imagepicker.bean.SelectMode
import com.ypx.imagepicker.builder.MultiPickerBuilder
import kotlinx.android.synthetic.main.dialog_phone.view.*
import kotlinx.android.synthetic.main.dialog_phone.view.btn_album
import kotlinx.android.synthetic.main.dialog_phone.view.btn_phone
import kotlinx.android.synthetic.main.dialog_phone.view.btn_title
import kotlinx.android.synthetic.main.dialog_phone.view.button_cancel
import org.jetbrains.anko.toast
import top.zibin.luban.Luban
import java.io.*
import java.io.ByteArrayInputStream
import java.io.ByteArrayOutputStream
import java.io.File
import java.io.FileInputStream
import java.io.FileNotFoundException
import java.io.FileOutputStream
import java.io.IOException
import java.io.InputStream
import java.io.OutputStream
abstract class BasePhotoActivity : BaseLoginActivity() {
@@ -239,25 +249,24 @@
                Log.e("mmp==========>","path:${filePath}")
                Log.e("mmp==========>","copyFile path:${copyFile}")
                HttpManager.getInstance().post(Api.upImage, copyFile,object :
                    MyObserver(this){
                    override fun success(responseString: String?) {
                        val fromJson = gson.fromJson<StringBean>(responseString, StringBean::class.java)
                        var url = fromJson.data
                        if (!url.isNullOrEmpty()){
                            showNum--
                            Handler(mainLooper).post {
                                Log.d("showNum==", "showNum==========" + showNum.toString())
                                sysErr(url)
                                if (showNum <= 0)
                                    dismissDialog()
                                getPhoneUrl(url!!, type, copyFile.absolutePath)
                                getPhoneUrl(url, type)
                            }
                        }else{
                            showNum--
                HttpManager.getInstance().post(Api.upImage, copyFile, object :
                    MyUploadObserver(this) {
                    override fun success(responseString: String) {
                        showNum--
                        Handler(mainLooper).post {
                            Log.d("showNum==", "showNum==========$showNum")
                            sysErr(responseString)
                            if (showNum <= 0)
                                dismissDialog()
                            getPhoneUrl(responseString, type, copyFile.absolutePath)
                            getPhoneUrl(responseString, type)
                        }
                    }
                    override fun onError(code: Int, msg: String?, resposeString: String?) {
                        super.onError(code, msg, resposeString)
                        showNum--
                    }
                })
//                val ossUtil = OSSUtil(this)
app/src/main/java/com/fangxinxing/xxfxx/netUtls/MyUploadObserver.java
New file
@@ -0,0 +1,182 @@
package com.fangxinxing.xxfxx.netUtls;
import android.graphics.Bitmap;
import android.util.Log;
import com.fangxinxing.xxfxx.base.MyApplication;
import com.fangxinxing.xxfxx.utils.LogUtils;
import com.google.gson.JsonSyntaxException;
import java.lang.ref.WeakReference;
import java.net.ConnectException;
import java.net.SocketTimeoutException;
import cn.sinata.xldutils.activitys.BaseActivity;
import cn.sinata.xldutils.fragment.BaseFragment;
import cn.sinata.xldutils.net.utils.ResultException;
import cn.sinata.xldutils.utils.StringUtils;
import cn.sinata.xldutils.utils.Toast;
import cn.sinata.xldutils.utils.Utils;
import cn.sinata.xldutils.xldUtils;
import io.reactivex.Observer;
import io.reactivex.annotations.NonNull;
import io.reactivex.disposables.Disposable;
import okhttp3.ResponseBody;
import retrofit2.HttpException;
/**
 * 自定义Observer类处理网络上传文件 返回链接地址数据
 * Created by Administrator on 2018/1/25.
 */
public abstract class MyUploadObserver implements Observer<ResponseBody>, Disposable {
    WeakReference<BaseActivity> activities;
    WeakReference<BaseFragment> fragments;
    public static final String REQUEST_ERROR = "请求出错!";
    public static final String PARSER_ERROR = "数据解析出错!";
    public static final String SERVER_ERROR = "服务器异常,请稍后重试!";
    public static final String NET_ERROR = "未连接到服务器!";
    public static final String NET_TIMEOUT = "链接超时,请稍后再试!";
    public MyUploadObserver(BaseActivity activity) {
        activities = new WeakReference<>(activity);
        if (activity != null) {
            activity.compositeSubscription.add(this);
        }
    }
    public MyUploadObserver(BaseFragment fragment) {
        fragments = new WeakReference<BaseFragment>(fragment);
        if (fragment != null && !fragment.isDetached()) {
            fragment.addDisposable(this);
        }
    }
    public MyUploadObserver() {
    }
    @Override
    public void onSubscribe(@NonNull Disposable d) {
    }
    @Override
    public void onNext(@NonNull ResponseBody responseBody) {
        dismissDialog();
        try {
            String responseString = responseBody.string().replaceAll("\"","");
            LogUtils.e("responseString", "**" + responseString);
            if (StringUtils.isEmpty(responseString)) { //判空
                int code = -1;
                String msg = PARSER_ERROR;
                onError(code, msg, responseString);
                return;
            }
            if (responseString.startsWith("http")) {
                success(responseString);
            } else {
                onError(-1, "上传失败", responseString);
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
    @Override
    public void onError(@NonNull Throwable e) {
        dismissDialog();
        if (xldUtils.DEBUG) {
            e.printStackTrace();
        }
        Utils.systemErr(e);
        Log.e("responseString", "responseString get  " + e.toString());
        int code = -1;
        String msg = REQUEST_ERROR;
        if (e instanceof JsonSyntaxException ||
                e instanceof NumberFormatException ||
                e instanceof IllegalStateException) {
            msg = PARSER_ERROR;
        } else if (e instanceof HttpException) {
            msg = SERVER_ERROR;
        } else if (e instanceof ConnectException) {
            msg = NET_ERROR;
        } else if (e instanceof SocketTimeoutException) {
            msg = NET_TIMEOUT;
        } else if (e instanceof ResultException) {
            code = ((ResultException) e).getCode();
            msg = e.getMessage();
        }
        try {
            onError(code, msg, "");
        } catch (Exception es) {
            es.printStackTrace();
        }
    }
    protected void onError(int code, String msg, String resposeString) {
        if (shouldShowErrorToast()) {
            showToast(msg);
        }
    }
    protected boolean shouldShowErrorToast() {
        return true;
    }
    @Override
    public void onComplete() {
    }
    /**
     * 显示toast
     *
     * @param s 提示文字
     */
    protected void showToast(String s) {
        Toast.create(MyApplication.Companion.getInstance()).show(s);
    }
    /**
     * 访问成功回调抽象方法
     *
     * @param responseString 返回的数据
     */
    public abstract void success(String responseString);
    /**
     * 访问成功回调方法
     *
     * @param bitmap 获取的Bitmap
     */
    public void success(Bitmap bitmap) {
    }
    private void dismissDialog() {
        if (activities != null) {
            BaseActivity activity = activities.get();
            if (activity != null) {
                activity.dismissDialog();
            }
        }
        if (fragments != null) {
            BaseFragment fragment = fragments.get();
            if (fragment != null) {
                fragment.dismissDialog();
            }
        }
    }
    @Override
    public boolean isDisposed() {
        return false;
    }
    @Override
    public void dispose() {
    }
}
app/src/main/java/com/fangxinxing/xxfxx/ui/mine/WithdrawAccountActivity.kt
@@ -313,23 +313,30 @@
                                backImg = ""
                            }
                            showDialog()
                            HttpManager.getInstance().post(Api.upImage, file,object : MyObserver(this@WithdrawAccountActivity){
                                override fun success(responseString: String?) {
                                    val fromJson = gson.fromJson<StringBean>(responseString, StringBean::class.java)
                                    var url = fromJson.data
                                    if (!url.isNullOrEmpty()){
                                        if (requestCode == 2){
                                            frontImg = url
                                            GlideUtil.load(MyApplication.getInstance(), frontImg, iv_front,0)
                            HttpManager.getInstance().post(
                                Api.upImage,
                                file,
                                object : MyUploadObserver(this@WithdrawAccountActivity) {
                                    override fun success(responseString: String) {
                                        if (requestCode == 2) {
                                            frontImg = responseString
                                            GlideUtil.load(
                                                MyApplication.getInstance(),
                                                frontImg,
                                                iv_front,
                                                0
                                            )
                                        } else {
                                            backImg = responseString
                                            GlideUtil.load(
                                                MyApplication.getInstance(),
                                                backImg,
                                                iv_back,
                                                0
                                            )
                                        }
                                        else{
                                            backImg = url
                                            GlideUtil.load(MyApplication.getInstance(), backImg, iv_back,0)
                                        }
                                    }else
                                        toast(fromJson.msg ?: "上传失败")
                                }
                            })
                                    }
                                })
                            upload(true,
                                Api.uploadImg,file){
app/src/main/java/com/fangxinxing/xxfxx/utils/AudioRecorderUploadManager.java
@@ -8,13 +8,12 @@
import android.text.TextUtils;
import android.util.Log;
import com.google.gson.Gson;
import com.tbruyelle.rxpermissions2.RxPermissions;
import com.fangxinxing.xxfxx.bean.StringBean;
import com.fangxinxing.xxfxx.netUtls.Api;
import com.fangxinxing.xxfxx.netUtls.HttpManager;
import com.fangxinxing.xxfxx.netUtls.MyDefaultObserver;
import com.fangxinxing.xxfxx.netUtls.MyUploadObserver;
import com.google.gson.Gson;
import com.tbruyelle.rxpermissions2.RxPermissions;
import java.io.File;
import java.util.ArrayList;
@@ -242,18 +241,19 @@
     * @param file      录制音频文件
     */
    private void uploadAudioFile(String orderId, String orderType, @NonNull File file) {
        HttpManager.getInstance().post(Api.upImage, file, new MyDefaultObserver() {
        HttpManager.getInstance().post(Api.upImage, file, new MyUploadObserver() {
            @Override
            public void success(String responseString) {
                StringBean bean = gson.fromJson(responseString, StringBean.class);
                if (!TextUtils.isEmpty(bean.data)) {
                    Log.d(TAG, "upload success file==>" + file.getAbsolutePath() + " url==>" + bean.data);
                    saveAudioFileUploadResult(orderId, orderType, bean.data);
                    deleteAudioFiles(orderId, orderType);
                    saveOrderAudioUrl(orderId, orderType, bean.data);
                } else {
                    Log.d(TAG, "upload failed file==>" + file.getAbsolutePath());
                }
                Log.d(TAG, "upload success file==>" + file.getAbsolutePath() + " url==>" + responseString);
                saveAudioFileUploadResult(orderId, orderType, responseString);
                deleteAudioFiles(orderId, orderType);
                saveOrderAudioUrl(orderId, orderType, responseString);
            }
            @Override
            protected void onError(int code, String msg, String resposeString) {
                super.onError(code, msg, resposeString);
                Log.d(TAG, "upload failed file==>" + file.getAbsolutePath());
            }
            @Override