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 @@
-
-
+
+
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 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 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");
}
//处理二维码的数据