修复问题

18034727885

2026-07-21 c340ff5269a0b53db518fb173fb23ceb2ce4d264

修复问题

 app/src/main/java/com/fangxinxing/xxfxx/base/MyApplication.kt

@@ -356,8 +356,8 @@

                            Const.SOCKET_METHOD.REASSIGN_CONFIRM_REQUEST -> {
                                val info = Gson().fromJson(data, ReassignConfirmInfo::class.java)
                                if (reassignIds != info.reassignIds) {
                                    reassignIds = info.reassignIds
                                if (reassignIds != info.reassignIds&&!info.reassignIds.isNullOrEmpty()) {
                                    reassignIds = info.reassignIds!!
                                    val act = activities[activities.size - 1]
                                    act?.startActivity(
                                        CityOrderReassignConfirmActivity.getIntent(

 app/src/main/java/com/fangxinxing/xxfxx/base/MyBaseFragment.java

@@ -12,7 +12,6 @@
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentTransaction;


import com.fangxinxing.xxfxx.R;
import com.fangxinxing.xxfxx.ui.DialogUtil;
import com.fangxinxing.xxfxx.utils.EasePopup.EasyPopup;
@@ -85,7 +84,7 @@
    @Override
    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
//        View view = inflater.inflate(layoutId(),container,false);
        View view = LayoutInflater.from(getActivity()).inflate(layoutId(),container,false);
        View view = LayoutInflater.from(getActivity()).inflate(layoutId(), container, false);
        mContext = getActivity();
        EventBus.getDefault().register(this);
        return view;
@@ -107,25 +106,30 @@
    public abstract void initView();


    public void startActivity(Class tClass){
        startActivity(new Intent(mContext,tClass));
    public void startActivity(Class tClass) {
        startActivity(new Intent(mContext, tClass));
    }

    @Override
    public void showDialog() {
//        super.showDialog();
        if (easyPopup == null){
        if (easyPopup == null) {
            easyPopup = DialogUtil.INSTANCE.getPopupwindow(getActivity(), R.layout.progress_dialog_main);
        }
        if (easyPopup.isShowing()){
        if (easyPopup.isShowing()) {
            return;
        }
        FragmentActivity activity = getActivity();
        if (activity != null && activity.getWindow() != null) {
        if (activity != null && !activity.isFinishing() && !activity.isDestroyed() && activity.getWindow() != null) {
            try {
                getActivity().getWindow().getDecorView().post(() -> easyPopup.showCenter(getActivity().getWindow().getDecorView()));
            }catch (Exception e){

                getActivity().getWindow().getDecorView().post(() -> {
                    FragmentActivity activity1 = getActivity();
                    if (activity1 != null && !activity1.isFinishing() && !activity1.isDestroyed() && activity1.getWindow() != null) {
                        easyPopup.showCenter(getActivity().getWindow().getDecorView());
                    }
                });
            } catch (Exception e) {
                e.printStackTrace();
            }
        }
    }
@@ -133,7 +137,7 @@
    @Override
    public void onPause() {
        super.onPause();
        if (easyPopup != null && easyPopup.isShowing()){
        if (easyPopup != null && easyPopup.isShowing()) {
            easyPopup.dismiss();
        }
    }
@@ -141,14 +145,14 @@
    @Override
    public void dismissDialog() {
//        super.dismissDialog();?
        if (easyPopup == null){
            easyPopup = DialogUtil.INSTANCE.getPopupwindow(getActivity(),R.layout.progress_dialog_main);
        if (easyPopup != null && easyPopup.isShowing()) {
            easyPopup.dismiss();
        }
        easyPopup.dismiss();
    }

    @Override
    public void onDestroyView() {
        dismissDialog();
        super.onDestroyView();
        EventBus.getDefault().unregister(this);
    }

 app/src/main/java/com/fangxinxing/xxfxx/bean/ReassignConfirmInfo.kt

@@ -6,12 +6,12 @@
//改派确认信息
@Parcelize
data class ReassignConfirmInfo(
    var reassignIds: String,//逗号分隔的改派记录ID
    var orderIds: String,//订单ID值,逗号分隔
    var startSite: String,//起始站点
    var endSite: String,//结束站点
    var routeInfo: String,//起始站点 → 结束站点
    var totalPeopleNumber: String,//总人数
    var travelTime: String,//开始时间
    var expireTime: String,//过期时间
    var reassignIds: String?=null,//逗号分隔的改派记录ID
    var orderIds: String?=null,//订单ID值,逗号分隔
    var startSite: String?=null,//起始站点
    var endSite: String?=null,//结束站点
    var routeInfo: String?=null,//起始站点 → 结束站点
    var totalPeopleNumber: String?=null,//总人数
    var travelTime: String?=null,//开始时间
    var expireTime: String?=null,//过期时间
) : Parcelable

 app/src/main/java/com/fangxinxing/xxfxx/netUtls/NetKit.kt

@@ -100,12 +100,18 @@
    HttpManager.getInstance()
        .post(api, map, object : MyObserver(this) {
            override fun success(responseString: String?) {
                if (view == null) {
                    return
                }
                dismissDialog()
                clickAction(responseString)
            }

            override fun onError(code: Int, msg: String?, resposeString: String?) {
                super.onError(code, msg, resposeString)
                if (view == null) {
                    return
                }
                dismissDialog()
            }

@@ -265,13 +271,18 @@
    HttpManager.getInstance()
        .post(api, map, object : MyObserver(this) {
            override fun success(responseString: String?) {
                if(view==null){
                    return
                }
                dismissDialog()
                clickAction(responseString)
            }

            override fun onError(code: Int, msg: String?, resposeString: String?) {
                super.onError(code, msg, resposeString)

                if(view==null){
                    return
                }
                clickActionError(msg)
            }
        })

 app/src/main/java/com/fangxinxing/xxfxx/ui/adapter/ServerOnlyAdapter.kt

@@ -37,7 +37,7 @@
        }
    }

    fun getSelectId(): com.fangxinxing.xxfxx.bean.AllCarBean.DataBean {
    fun getSelectId(): AllCarBean.DataBean {
      return data[selectPosition]
    }
}

 app/src/main/java/com/fangxinxing/xxfxx/ui/main/MainPubFragment.kt

@@ -674,15 +674,16 @@

    fun showFloater() {
        if (floater == null) {
            floater = EasyFloat.with(requireActivity())
            val activity = requireActivity()
            floater = EasyFloat.with(activity)
                .setLayout(R.layout.layout_floter, OnInvokeView {
                    it.setOnClickListener {
                        requireActivity().startActivity<MainTabActivity>()
                        activity.startActivity<MainTabActivity>()
                    }
                })
                .setShowPattern(ShowPattern.ALL_TIME)
                .setSidePattern(SidePattern.RESULT_LEFT)
                .setGravity(Gravity.START or Gravity.BOTTOM, 0, requireActivity().dip(-180))
                .setGravity(Gravity.START or Gravity.BOTTOM, 0, activity.dip(-180))
                .setDragEnable(true)
                .setTag(EasyFloatTag)
                .setMatchParent(widthMatch = false, heightMatch = false)

 xldUtils/src/main/java/cn/sinata/xldutils/utils/Md5.java

@@ -44,7 +44,7 @@

            return buf.toString();

        } catch (NoSuchAlgorithmException e) {
        } catch (Exception e) {
            e.printStackTrace();
        }