From 770161f9e5f25a1a80661bb383ae57799e8b97a0 Mon Sep 17 00:00:00 2001
From: hwf453 <hwf453@163.com>
Date: Thu, 21 Sep 2023 10:12:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=A4=E6=AC=A1=E5=8F=8D?=
 =?UTF-8?q?=E8=BD=AC=EF=BC=8C=E9=98=B2=E6=AD=A2=E6=97=A7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=A6=86=E7=9B=96=E6=96=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YFDXJ/app/src/main/AndroidManifest.xml        |  6 ++++--
 .../yfdxj/activity/sbxj/SxgzActivity.java     | 21 +++++++++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/YFDXJ/app/src/main/AndroidManifest.xml b/YFDXJ/app/src/main/AndroidManifest.xml
index 91ed2a1..35a0cbb 100755
--- a/YFDXJ/app/src/main/AndroidManifest.xml
+++ b/YFDXJ/app/src/main/AndroidManifest.xml
@@ -22,8 +22,10 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.READ_PROFILE" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.NFC" />
diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/SxgzActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/SxgzActivity.java
index 900906f..5cc24c3 100755
--- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/SxgzActivity.java
+++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/SxgzActivity.java
@@ -13,10 +13,12 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
+
 import com.bjzc.yfdxj.DBModel.UploadLocation;
 import com.bjzc.yfdxj.DBModel.XSJJHDataBean;
 import com.bjzc.yfdxj.DBModel.XSJJHXZDataBean;
@@ -35,16 +37,21 @@ import com.bjzc.yfdxj.utils.RSAUtils;
 import com.bjzc.yfdxj.utils.SPUtils;
 import com.bjzc.yfdxj.weight.BaCheckDialog;
 import com.bjzc.yfdxj.weight.toastviewbymyself;
+import com.google.gson.Gson;
 import com.rinsun.mtdriver.MTnativeInterface;
 import com.yolanda.nohttp.NoHttp;
 import com.yolanda.nohttp.RequestMethod;
 import com.yolanda.nohttp.rest.Request;
 import com.yolanda.nohttp.rest.Response;
+
 import org.litepal.crud.DataSupport;
+
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+
 import static com.bjzc.yfdxj.utils.GsonUtils.GsonToBean;
 import static org.litepal.crud.DataSupport.where;
 
@@ -114,7 +121,6 @@ public class SxgzActivity extends BaseActivity3 {
         ll_check = findViewById(R.id.ll_check);
 
 
-
         Intent intent = getIntent();
         type = intent.getStringExtra("type");
 
@@ -244,7 +250,18 @@ public class SxgzActivity extends BaseActivity3 {
         noCheckeList.clear();
         List<XSJJHXZDataBean> planTemp = where("mk = ? and username = ?", type, username).find(XSJJHXZDataBean.class);
         //DataSupport.findAll(XSJJHXZDataBean.class);
+
+        showLog(new Gson().toJson(planTemp));
+        if (planTemp != null && planTemp.size() > 0) {
+            Collections.reverse(planTemp);
+        }
+        //showLog(new Gson().toJson(planTemp));
+
         List<XSJJHXZDataBean> planTemp1 = this.removeDuplicate(planTemp);
+        if (planTemp1 != null && planTemp1.size() > 0) {
+            Collections.reverse(planTemp1);
+        }
+        //showLog(new Gson().toJson(planTemp1));
         xsjjhxzDataBeanList.addAll(planTemp1);
         Log.i("app", String.valueOf(xsjjhxzDataBeanList.size()));
         for (int i = 0; i < xsjjhxzDataBeanList.size(); i++) {
@@ -544,7 +561,7 @@ public class SxgzActivity extends BaseActivity3 {
     public void handleNfc(String result) {
         super.handleNfc(result);
         handleNfcCheck(result);
-        //handleNfcCheck("044D98529E0F90");
+        //handleNfcCheck("040697529E0F91");
     }
 
     //处理二维码的数据