1.在地图中心显示中心点。 2.优化地图覆盖物显示，使显示的图标正对坐标。 3.优化地图覆盖物文字居中显示。

zuoxiao

2024-12-17 2fb397e4a31d14880ed2524f898ae67a0d664c06

 app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java

@@ -6,21 +6,39 @@
import android.view.LayoutInflater;
import android.view.View;

import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.Nullable;
import androidx.core.content.res.ResourcesCompat;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.SimpleItemAnimator;

import com.dayu.pipirrapp.MyApplication;
import com.dayu.pipirrapp.R;
import com.dayu.pipirrapp.adapter.ImageAdapter;
import com.dayu.pipirrapp.bean.net.DealDetailResult;
import com.dayu.pipirrapp.bean.net.ImageResult;
import com.dayu.pipirrapp.bean.net.OrderDetailResult;
import com.dayu.pipirrapp.databinding.ActivityOrderDetailBinding;
import com.dayu.pipirrapp.fragment.OrderFragment;
import com.dayu.pipirrapp.net.ApiManager;
import com.dayu.pipirrapp.net.BaseResponse;
import com.dayu.pipirrapp.net.Constants;
import com.dayu.pipirrapp.net.subscribers.SubscriberListener;
import com.dayu.pipirrapp.tool.FullyGridLayoutManager;
import com.dayu.pipirrapp.utils.ToastUtil;
import com.dayu.pipirrapp.view.ConfirmDialog;
import com.dayu.pipirrapp.view.TitleBar;
import com.luck.picture.lib.decoration.GridSpacingItemDecoration;
import com.luck.picture.lib.utils.DensityUtil;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import cc.shinichi.library.ImagePreview;

/**
 * OrderDetailActivity -
@@ -34,6 +52,20 @@
    ActivityOrderDetailBinding binding;
    String workOrderId;
    String proResultId;
    ImageAdapter mAdapter;
    List<ImageResult> images = new ArrayList<>();
    RecyclerView mRecyclerView;
    final List<String> imageInfoList = new ArrayList<>();
    int ProResultStateId;
    private ActivityResultLauncher<Intent> activityResultLauncher =
            registerForActivityResult(
                    new ActivityResultContracts.StartActivityForResult(),
                    result -> {
                        if (result.getResultCode() == OrderFragment.RESULT_REFRESH) {
                            setResult(OrderFragment.RESULT_REFRESH);
                            finish();
                        }
                    });

    @Override
    protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -48,8 +80,11 @@
    void initView() {
        workOrderId = this.getIntent().getStringExtra("workOrderId");
        if (this.getIntent().hasExtra("proResultId")) {
            binding.orderDealLL.setVisibility(View.VISIBLE);
            proResultId = this.getIntent().getStringExtra("proResultId");
            getHandleData(proResultId);
        } else {
            binding.orderDealLL.setVisibility(View.GONE);
        }
        if (!TextUtils.isEmpty(workOrderId)) {
            getMarkerData(workOrderId);
@@ -61,6 +96,20 @@

        binding.setItemclidk(OrderDetailActivity.this);

        mRecyclerView = binding.recyclerView;
        FullyGridLayoutManager manager = new FullyGridLayoutManager(this, 4, GridLayoutManager.VERTICAL, false);
        mRecyclerView.setLayoutManager(manager);
        RecyclerView.ItemAnimator itemAnimator = mRecyclerView.getItemAnimator();
        if (itemAnimator != null) {
            ((SimpleItemAnimator) itemAnimator).setSupportsChangeAnimations(false);
        }
        // 添加间距装饰，确保图片有合适的间隔
        mRecyclerView.addItemDecoration(new GridSpacingItemDecoration(4, DensityUtil.dip2px(this, 8), false));
        mAdapter = new ImageAdapter(this, images, (v, position) -> {
            ImagePreview.getInstance().setContext(OrderDetailActivity.this).setImageList(imageInfoList).start();

        });
        mRecyclerView.setAdapter(mAdapter);
    }

    /**
@@ -80,30 +129,47 @@
                            if (!TextUtils.isEmpty(t.getContent().getProResultId()) && TextUtils.isEmpty(proResultId)) {
                                getHandleData(orderDetailResult.getProResultId());
                            }
                            switch (orderDetailResult.getProResultStateId()) {
                            ProResultStateId = orderDetailResult.getProResultStateId();
                            switch (ProResultStateId) {
                                case 0://未上报
                                    binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.black));
                                    binding.stateText.setBackground(OrderDetailActivity.this.getResources().getDrawable(R.drawable.order_state_no_bg));
                                    binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.black, null));
                                    binding.stateText.setBackground(ResourcesCompat.getDrawable(OrderDetailActivity.this.getResources(), R.drawable.order_state_no_bg, null));
                                    binding.dealButton.setBackgroundColor(getResources().getColor(R.color.title_color, null));
                                    binding.dealButton.setVisibility(View.VISIBLE);
                                    break;
                                case 1://已上报
                                    binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.white));
                                    binding.stateText.setBackground(OrderDetailActivity.this.getResources().getDrawable(R.drawable.order_state_wait_bg));
                                    binding.dealButton.setVisibility(View.GONE);
                                    binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.white, null));
                                    binding.stateText.setBackground(ResourcesCompat.getDrawable(OrderDetailActivity.this.getResources(), R.drawable.order_state_wait_bg, null));
                                    binding.dealButton.setBackgroundColor(getResources().getColor(R.color.delete_color, null));
                                    binding.dealButton.setVisibility(View.VISIBLE);
                                    binding.dealButton.setText("删除处理结果");
                                    break;
                                case 2://已完成
                                    binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.white));
                                    binding.stateText.setBackground(OrderDetailActivity.this.getResources().getDrawable(R.drawable.order_state_finish_bg));
                                    binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.white, null));
                                    binding.stateText.setBackground(ResourcesCompat.getDrawable(OrderDetailActivity.this.getResources(), R.drawable.order_state_finish_bg, null));
                                    binding.dealButton.setVisibility(View.GONE);
                                    break;
                                case 3://被驳回
                                    binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.white));
                                    binding.stateText.setBackground(OrderDetailActivity.this.getResources().getDrawable(R.drawable.order_state_reject_bg));
                                    binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.white, null));
                                    binding.stateText.setBackground(ResourcesCompat.getDrawable(OrderDetailActivity.this.getResources(), R.drawable.order_state_reject_bg, null));
                                    binding.dealButton.setBackgroundColor(getResources().getColor(R.color.title_color));
                                    binding.dealButton.setVisibility(View.VISIBLE);
                                    break;

                            }
                        } else {
                            ToastUtil.showToast(OrderDetailActivity.this, t.getMsg());
                        }
                    } else if (t.DATA_NULL.equals(t.getCode())) {
                        //工单已被删除
                        ToastUtil.showToast(OrderDetailActivity.this, "订单已被删除！");
                        setResult(OrderFragment.RESULT_REFRESH);
                        OrderDetailActivity.this.finish();

                    } else {

                        ToastUtil.showToast(OrderDetailActivity.this, t.getMsg());
                        OrderDetailActivity.this.finish();
                    }
                } else {
                    ToastUtil.showToast(OrderDetailActivity.this, t.getMsg());
@@ -115,6 +181,12 @@
                super.onCloose();
            }

            @Override
            public void onError(Throwable e) {
                super.onError(e);
                ToastUtil.showToastLong(OrderDetailActivity.this, "获取详情失败，请稍后再试");
                OrderDetailActivity.this.finish();
            }
        });
    }

@@ -132,7 +204,13 @@
                if (t.isSuccess()) {
                    if (t.isSuccess()) {
                        if (t.getContent() != null) {
                            binding.orderDealLL.setVisibility(View.VISIBLE);
                            binding.setDealData(t.getContent());
                            images.addAll(t.getContent().getImages());
                            for (ImageResult imageResult : images) {
                                imageInfoList.add(imageResult.getWebPath());
                            }
                            mAdapter.notifyDataSetChanged();
                        } else {
                            ToastUtil.showToast(OrderDetailActivity.this, t.getMsg());
                        }
@@ -150,11 +228,55 @@
        });
    }

    /**
     * 删除处理详情
     */
    private void deleteDealData() {

        Map<String, Object> params = new HashMap<>();
        params.put("proResultId", proResultId);
        params.put("inspectorId", MyApplication.myApplication.userId);
        ApiManager.getInstance().requestPost(this, Constants.BASE_URL + "/app/workOrder/deleteProResult", DealDetailResult.class, params, new SubscriberListener<BaseResponse<DealDetailResult>>() {
            @Override
            public void onNext(BaseResponse<DealDetailResult> t) {
                if (t.isSuccess()) {
                    if (t.isSuccess()) {
                        ToastUtil.showToastLong(OrderDetailActivity.this, "删除成功!");
                        setResult(OrderFragment.RESULT_REFRESH);
                        OrderDetailActivity.this.finish();
                    }
                } else {
                    ToastUtil.showToast(OrderDetailActivity.this, t.getMsg());
                }
            }

            @Override
            public void onCloose() {
                super.onCloose();
            }

        });
    }

    public void startDealActivity() {
        Intent intent = new Intent(this, OrderDealActivity.class);
        intent.putExtra("workOrderId", workOrderId);
        startActivityForResult(intent, 1);

        switch (ProResultStateId) {
            case 0:
            case 3:
                Intent intent = new Intent(this, OrderDealActivity.class);
                intent.putExtra("workOrderId", workOrderId);
                activityResultLauncher.launch(intent);
                break;
            case 1:
                ConfirmDialog confirmDialog = new ConfirmDialog(this, "确认删除该处理结果吗？", (confirmDialog1, v) -> {
                    confirmDialog1.dismiss();
                    deleteDealData();
                });
                confirmDialog.show();
                break;
        }


    }

}