1.添加当前巡检状态的功能。 2.修复工单界面刷新已完成列表导致未完成列表数据被清除的bug

zuoxiao

2024-12-03 21e38bfe17d3077d7ab0e05ee065f59547536692

 app/src/main/java/com/dayu/pipirrapp/fragment/OrderFragment.java

@@ -49,6 +49,7 @@

    FragmentOrderBinding binding;
    OrderAdapter mAdapter;
    OrderAdapter mDoneAdapter;
    int page = 1;
    int pageSize = 10;
    int state = 1;
@@ -82,11 +83,8 @@
        binding = FragmentOrderBinding.inflate(inflater, container, false);
        initView();
        //获取定位服务传过来的坐标点
        LiveEventBus.get(CommonKeyName.MQTTData).observeForever(new Observer<Object>() {
            @Override
            public void onChanged(Object o) {
        LiveEventBus.get(CommonKeyName.MQTTData).observeForever(o -> {

            }
        });


@@ -96,42 +94,30 @@

    void initView() {
        //未完成
        binding.manageStateProgress.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                chooseStateView(true);
                state = STATE_UNDONE;//1 未开始 2 已完成
        binding.manageStateProgress.setOnClickListener(v -> {
            chooseStateView(true);
            state = STATE_UNDONE;//1 未开始 2 已完成

            }
        });
        //已完成
        binding.manageStateFinish.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                chooseStateView(false);
                state = STATE_DONE;//1 未开始 2 已完成
            }
        binding.manageStateFinish.setOnClickListener(v -> {
            chooseStateView(false);
            state = STATE_DONE;//1 未开始 2 已完成
        });
        //未完成
        RefreshLayout myRefreshLayout = (RefreshLayout) binding.refreshLayout;
        myRefreshLayout.setRefreshHeader(new ClassicsHeader(this.getContext()));
        myRefreshLayout.setRefreshFooter(new ClassicsFooter(this.getContext()));

        myRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
            @Override
            public void onRefresh(RefreshLayout refreshlayout) {
        myRefreshLayout.setOnRefreshListener(refreshlayout -> {
//                refreshlayout.finishRefresh(2000/*,false*/);//传入false表示刷新失败
                recordsList.clear();
                page = 0;
                getMarkerData(refreshlayout, true, STATE_UNDONE);
            }
            recordsList.clear();
            page = 0;
            getMarkerData(refreshlayout, true, STATE_UNDONE);
        });
        myRefreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
            @Override
            public void onLoadMore(RefreshLayout refreshlayout) {
                page = page + 1;
                getMarkerData(refreshlayout, false, STATE_UNDONE);
            }
        myRefreshLayout.setOnLoadMoreListener(refreshlayout -> {
            page = page + 1;
            getMarkerData(refreshlayout, false, STATE_UNDONE);
        });

        mAdapter = new OrderAdapter(this.getContext(), recordsList, this);
@@ -143,26 +129,20 @@
        RefreshLayout myRefreshLayoutDone = (RefreshLayout) binding.refreshLayoutDone;
        myRefreshLayoutDone.setRefreshHeader(new ClassicsHeader(this.getContext()));
        myRefreshLayoutDone.setRefreshFooter(new ClassicsFooter(this.getContext()));
        myRefreshLayoutDone.setOnRefreshListener(new OnRefreshListener() {
            @Override
            public void onRefresh(RefreshLayout refreshlayout) {
        myRefreshLayoutDone.setOnRefreshListener(refreshlayout -> {
//                refreshlayout.finishRefresh(2000/*,false*/);//传入false表示刷新失败
                recordsList.clear();
                page = 0;
                getMarkerData(refreshlayout, true, STATE_DONE);
            }
            recordsListDone.clear();
            page = 0;
            getMarkerData(refreshlayout, true, STATE_DONE);
        });
        myRefreshLayoutDone.setOnLoadMoreListener(new OnLoadMoreListener() {
            @Override
            public void onLoadMore(RefreshLayout refreshlayout) {
                page = page + 1;
                getMarkerData(refreshlayout, false, STATE_DONE);
            }
        myRefreshLayoutDone.setOnLoadMoreListener(refreshlayout -> {
            page = page + 1;
            getMarkerData(refreshlayout, false, STATE_DONE);
        });
        mAdapter = new OrderAdapter(this.getContext(), recordsListDone, this);
        mDoneAdapter = new OrderAdapter(this.getContext(), recordsListDone, this);
        LinearLayoutManager layoutManagerDone = new LinearLayoutManager(this.getContext());
        binding.recyclerViewDone.setLayoutManager(layoutManagerDone);
        binding.recyclerViewDone.setAdapter(mAdapter);
        binding.recyclerViewDone.setAdapter(mDoneAdapter);
        getMarkerData(myRefreshLayoutDone, true, 2);
    }

@@ -218,7 +198,13 @@
            public void onCloose() {
                super.onCloose();
                layoutFinish(refreshlayout, isRefresh);
                mAdapter.notifyDataSetChanged();
                if (state == STATE_UNDONE) {
                    mAdapter.notifyDataSetChanged();
                } else {
                    mDoneAdapter.notifyDataSetChanged();
                }


            }

        });