数据两次反转,防止旧数据覆盖新数据

master
hwf453 2 years ago
parent f361e67a3b
commit 770161f9e5

@ -22,8 +22,10 @@
<uses-permission android:name="android.permission.READ_PHONE_STATE" /> <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_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_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.READ_EXTERNAL_STORAGE"
<uses-permission android:name="android.permission.WRITE_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_PROFILE" />
<uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.NFC" /> <uses-permission android:name="android.permission.NFC" />

@ -13,10 +13,12 @@ import android.widget.LinearLayout;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import com.bjzc.yfdxj.DBModel.UploadLocation; import com.bjzc.yfdxj.DBModel.UploadLocation;
import com.bjzc.yfdxj.DBModel.XSJJHDataBean; import com.bjzc.yfdxj.DBModel.XSJJHDataBean;
import com.bjzc.yfdxj.DBModel.XSJJHXZDataBean; 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.utils.SPUtils;
import com.bjzc.yfdxj.weight.BaCheckDialog; import com.bjzc.yfdxj.weight.BaCheckDialog;
import com.bjzc.yfdxj.weight.toastviewbymyself; import com.bjzc.yfdxj.weight.toastviewbymyself;
import com.google.gson.Gson;
import com.rinsun.mtdriver.MTnativeInterface; import com.rinsun.mtdriver.MTnativeInterface;
import com.yolanda.nohttp.NoHttp; import com.yolanda.nohttp.NoHttp;
import com.yolanda.nohttp.RequestMethod; import com.yolanda.nohttp.RequestMethod;
import com.yolanda.nohttp.rest.Request; import com.yolanda.nohttp.rest.Request;
import com.yolanda.nohttp.rest.Response; import com.yolanda.nohttp.rest.Response;
import org.litepal.crud.DataSupport; import org.litepal.crud.DataSupport;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import static com.bjzc.yfdxj.utils.GsonUtils.GsonToBean; import static com.bjzc.yfdxj.utils.GsonUtils.GsonToBean;
import static org.litepal.crud.DataSupport.where; import static org.litepal.crud.DataSupport.where;
@ -114,7 +121,6 @@ public class SxgzActivity extends BaseActivity3 {
ll_check = findViewById(R.id.ll_check); ll_check = findViewById(R.id.ll_check);
Intent intent = getIntent(); Intent intent = getIntent();
type = intent.getStringExtra("type"); type = intent.getStringExtra("type");
@ -244,7 +250,18 @@ public class SxgzActivity extends BaseActivity3 {
noCheckeList.clear(); noCheckeList.clear();
List<XSJJHXZDataBean> planTemp = where("mk = ? and username = ?", type, username).find(XSJJHXZDataBean.class); List<XSJJHXZDataBean> planTemp = where("mk = ? and username = ?", type, username).find(XSJJHXZDataBean.class);
//DataSupport.findAll(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); List<XSJJHXZDataBean> planTemp1 = this.removeDuplicate(planTemp);
if (planTemp1 != null && planTemp1.size() > 0) {
Collections.reverse(planTemp1);
}
//showLog(new Gson().toJson(planTemp1));
xsjjhxzDataBeanList.addAll(planTemp1); xsjjhxzDataBeanList.addAll(planTemp1);
Log.i("app", String.valueOf(xsjjhxzDataBeanList.size())); Log.i("app", String.valueOf(xsjjhxzDataBeanList.size()));
for (int i = 0; i < xsjjhxzDataBeanList.size(); i++) { for (int i = 0; i < xsjjhxzDataBeanList.size(); i++) {
@ -544,7 +561,7 @@ public class SxgzActivity extends BaseActivity3 {
public void handleNfc(String result) { public void handleNfc(String result) {
super.handleNfc(result); super.handleNfc(result);
handleNfcCheck(result); handleNfcCheck(result);
//handleNfcCheck("044D98529E0F90"); //handleNfcCheck("040697529E0F91");
} }
//处理二维码的数据 //处理二维码的数据

Loading…
Cancel
Save