From 4230457ee9edca6af738ec3f832ed0f49d0d99c3 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 04 十二月 2024 18:10:30 +0800
Subject: [PATCH] 1.下载地图瓦片判断是否有网。 2.没有上传成功的巡检坐标有网时重新上传。 3.添加网络判断的工具类

---
 app/src/main/java/com/dayu/pipirrapp/fragment/OrderFragment.java |   76 +++++++++++++++----------------------
 1 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/com/dayu/pipirrapp/fragment/OrderFragment.java b/app/src/main/java/com/dayu/pipirrapp/fragment/OrderFragment.java
index c0efb85..2405d79 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/OrderFragment.java
+++ b/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();
+                }
+
+
             }
 
         });

--
Gitblit v1.8.0