hwf453
/
ZJ_DJ_APP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.0.1 version publish

Browse Source
master
hwf453 2 years ago
parent f42b8ba91d
commit 23cd8385bc
9 changed files with 202 additions and 92 deletions
Show Stats Download Patch File Download Diff File

25
ZJYXDXJ/app/build.gradle
Unescape Escape View File

@ -1,14 +1,27 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 33
buildToolsVersion "33.0.0"
// compileSdkVersion 34
// buildToolsVersion "34.0.0"
// defaultConfig {
// applicationId "com.bjzc.zjyxdxj"
// minSdkVersion 24
// targetSdkVersion 34
// versionCode 2
// versionName "1.0.1"
// multiDexEnabled true
// testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装
// resValue "string", "authorities", applicationId
// resourceConfigurations += ['zh', 'en', 'hdpi']
// }
compileSdk 34
defaultConfig {
applicationId "com.bjzc.zjyxdxj"
minSdkVersion 24
targetSdkVersion 33
versionCode 1
versionName "1.0.0"
minSdk 24
targetSdk 34
versionCode 2
versionName "1.0.1"
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
//每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装

2
ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/MyApplication.java
Unescape Escape View File

@ -24,7 +24,7 @@ public class MyApplication extends LitePalApplication implements Application.Act
NoHttp.setDefaultConnectTimeout(6 * 1000);
NoHttp.setDefaultReadTimeout(60 * 1000);
AutoLayoutConifg.getInstance().useDeviceSize();
CrashReport.initCrashReport(getApplicationContext(), "efefa9e04c", true);
CrashReport.initCrashReport(getApplicationContext(), "54865112c3", true);
registerActivityLifecycleCallbacks(this);
}

5
ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/activity/LoginActivity.java
Unescape Escape View File

@ -103,6 +103,7 @@ public class LoginActivity extends BaseActivity {
// Log.i("app", "--------->");
// Log.i("app", UserIDTemp);
// Log.i("app", UserPwdTemp);
showLog("LoginActivity");
boolean save = (boolean) SPUtils.get(LoginActivity.this, "save", true);
networkCheckType = (String) SPUtils.get(LoginActivity.this, Contans.NETWORK_CHECK_TYPE, "");
@ -151,8 +152,8 @@ public class LoginActivity extends BaseActivity {
// etUse.setText("181145");
// etPwd.setText("13902576510");
// etUse.setText("180701");
// etPwd.setText("13902576186");
etUse.setText("180701");
etPwd.setText("13902576186");
}

46
ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/activity/MainActivity.java
Unescape Escape View File

@ -31,6 +31,7 @@ import com.azhon.appupdate.listener.OnButtonClickListener;
import com.azhon.appupdate.listener.OnDownloadListener;
import com.azhon.appupdate.manager.DownloadManager;
import com.bjzc.zjyxdxj.DBModel.XSJJHDataBean;
import com.bjzc.zjyxdxj.DBModel.XSJJHXZBean;
import com.bjzc.zjyxdxj.DBModel.XSJJHXZDataBean;
import com.bjzc.zjyxdxj.DBModel.Xjjh;
import com.bjzc.zjyxdxj.DBModel.XjjhList;
@ -72,8 +73,11 @@ import com.yolanda.nohttp.rest.Response;
import org.litepal.crud.DataSupport;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
@ -131,6 +135,8 @@ public class MainActivity extends BaseActivity3 {
username = RSAUtils.decryptBASE64StrLocal(UserIDTemp);
queue = NoHttp.newRequestQueue(1);
showLog("MainActivity");
btnLogout = findViewById(R.id.btn_logout);
tvLoginUser = findViewById(R.id.tv_login_user);
gv = findViewById(R.id.gv);
@ -468,6 +474,7 @@ public class MainActivity extends BaseActivity3 {
timerUpload.schedule(new TimerTask() {
public void run() {
autoUpload();
deleteOldPlanData();
}
}, 30000, 30000);
// 设定指定的时间time,此处为30秒
@ -623,6 +630,7 @@ public class MainActivity extends BaseActivity3 {
timerUpload.schedule(new TimerTask() {
public void run() {
autoUpload();
deleteOldPlanData();
}
}, 30000, 30000);
// 设定指定的时间time,此处为10000毫秒
@ -640,6 +648,7 @@ public class MainActivity extends BaseActivity3 {
showLog("无网络");
}
}
//检查是否有数据需要上传
public void checkNeedUpload() {
needUploadCount = 0;
@ -664,6 +673,7 @@ public class MainActivity extends BaseActivity3 {
autoUploadDataByBa();
}
}
public void autoUploadDataByBa() {
if (dbxjjh.size() > 0) {
String idTemp = (String) SPUtils.get(context, Contans.REQUEST_ID, "");
@ -729,6 +739,7 @@ public class MainActivity extends BaseActivity3 {
}
}
}
//上传保安单条计划下的已检任务的数据
private void sCDataBA(String json, String zxid, ScxjjhBean scxjjhbean) {
Request<String> request = NoHttp.createStringRequest(Contans.IP + Contans.XSCB_PLAN_BA_UPLOAD, RequestMethod.POST);
@ -736,7 +747,8 @@ public class MainActivity extends BaseActivity3 {
String tokenTemp = (String) SPUtils.get(this, Contans.LOGIN_TOKEN, "");
if (!TextUtils.isEmpty(tokenTemp)) {
String token = RSAUtils.decryptBASE64StrLocal(tokenTemp);;
String token = RSAUtils.decryptBASE64StrLocal(tokenTemp);
;
String credential = "Bearer " + token;
request.addHeader("Authorization", credential);
showLog(request.url());
@ -746,7 +758,8 @@ public class MainActivity extends BaseActivity3 {
queue.add(2, request, new OnResponseListener<String>() {
@Override
public void onStart(int what) {}
public void onStart(int what) {
}
@Override
public void onSucceed(int what, Response<String> response) {
@ -784,6 +797,7 @@ public class MainActivity extends BaseActivity3 {
}
});
}
//检查是否需要删除计划
private void checkNeedDeletePlan(String zxid) {
List<XSJJHXZDataBean> qydDataBeen = DataSupport.where("zxid = ? and username = ?", zxid, username).find(XSJJHXZDataBean.class);
@ -853,4 +867,32 @@ public class MainActivity extends BaseActivity3 {
});
}
private void deleteOldPlanData() {
try {
//格式化日期的对象(转化成习惯的时间格式)
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
SimpleDateFormat sdFormatDay = new SimpleDateFormat("yyyy/MM/dd");
//获取当前时间
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DATE, -3);
//输出当前系统时间;
//showLog(sdFormat.format(calendar.getTime()));
List<Xjjh> dbxjjh = DataSupport.where("download = ? and username = ?", "1", username).find(Xjjh.class);
if (dbxjjh.size() > 0) {
for (Xjjh xjjh : dbxjjh) {
Date date = sdFormat.parse(xjjh.getSt());
Calendar calendarOne = Calendar.getInstance();
calendarOne.setTime(date);
if (calendarOne.before(calendar)) {
DataSupport.deleteAll(XSJJHXZDataBean.class, "zxid = ? and username = ?", xjjh.getZxid(), username);
DataSupport.deleteAll(Xjjh.class, "download = 1 and zxid = ? and username = ?", xjjh.getZxid(), username);
}
}
}
} catch (Exception e) {
e.printStackTrace();
}
}
}

1
ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/activity/NfcinfoActivity.java
Unescape Escape View File

@ -77,6 +77,7 @@ public class NfcinfoActivity extends BaseActivity3 {
public void run() {
if(tvNfc!=null){
tvNfc.setText(result);
showLog(result);
}
}
});

35
ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/activity/sbxj/SxgzActivity.java
Unescape Escape View File

@ -15,9 +15,11 @@ import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import com.bjzc.zjyxdxj.DBModel.UploadLocation;
import com.bjzc.zjyxdxj.DBModel.XSJJHDataBean;
import com.bjzc.zjyxdxj.DBModel.XSJJHXZDataBean;
@ -36,15 +38,22 @@ import com.bjzc.zjyxdxj.utils.RSAUtils;
import com.bjzc.zjyxdxj.utils.SPUtils;
import com.bjzc.zjyxdxj.weight.BaCheckDialog;
import com.bjzc.zjyxdxj.weight.toastviewbymyself;
import com.google.gson.Gson;
import com.yolanda.nohttp.Connection;
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.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import static com.bjzc.zjyxdxj.utils.GsonUtils.GsonToBean;
import static org.litepal.crud.DataSupport.where;
@ -220,11 +229,27 @@ public class SxgzActivity extends BaseActivity3 {
noCheckeListBA.clear();
checkedList.clear();
noCheckeList.clear();
List<XSJJHXZDataBean> planTemp = where("mk = ? and username = ?", type, username).find(XSJJHXZDataBean.class);
List<XSJJHXZDataBean> planTemp = DataSupport.where("mk = ? and username = ?", type, username).find(XSJJHXZDataBean.class);
if (planTemp != null && planTemp.size() > 0) {
Collections.reverse(planTemp);
}
//showLog(new Gson().toJson(planTemp));
//showLog(String.valueOf(planTemp.size()));
//DataSupport.findAll(XSJJHXZDataBean.class);
List<XSJJHXZDataBean> planTemp1 = this.removeDuplicate(planTemp);
if (planTemp1 != null && planTemp1.size() > 0) {
Collections.reverse(planTemp1);
}
// for(XSJJHXZDataBean item :planTemp){
// showLog(new Gson().toJson(item));
// }
//List<XSJJHXZDataBean> planTemp1 = planTemp;
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++) {
XSJJHXZDataBean item = xsjjhxzDataBeanList.get(i);
if (type != null && type.equals("BA")) {
@ -522,7 +547,6 @@ public class SxgzActivity extends BaseActivity3 {
}
//处理二维码的数据
public void handleTwoCodeCheck(String result) {
if (type != null && type.equals("BA")) {
@ -722,3 +746,8 @@ public class SxgzActivity extends BaseActivity3 {
unregisterReceiver(myReceiver);
}
}
//8a9481e48a43fa9a018a4a2d90e82327
//8a9481e48a43fa9a018a4a2d890e1fe0
//8a9481e48a43fa9a018a4a2d890e1fe0
//8a9481e48a43fa9a018a4a2d890e1fe0

1
ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/activity/sbxj/XscbglActivity.java
Unescape Escape View File

@ -388,7 +388,6 @@ public class XscbglActivity extends BaseActivity {
String tokenTemp = (String) SPUtils.get(this, Contans.LOGIN_TOKEN, "");
if (!TextUtils.isEmpty(tokenTemp)) {
String token = RSAUtils.decryptBASE64StrLocal(tokenTemp);
;
String credential = "Bearer " + token;
request.addHeader("Authorization", credential);
showLog(request.url());

48
ZJYXDXJ/build.gradle
Unescape Escape View File

@ -1,26 +1,32 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.0'
}
plugins {
id 'com.android.application' version '8.1.0' apply false
id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
}
allprojects {
repositories {
google()
jcenter()
maven {url "https://jitpack.io"}
maven {url 'https://maven.google.com'}
//
//buildscript {
// repositories {
// google()
// jcenter()
//
// }
// dependencies {
// classpath 'com.android.tools.build:gradle:8.1.0'
// }
//}
//
//allprojects {
// repositories {
// google()
// jcenter()
// maven {url "https://jitpack.io"}
// maven {url 'https://maven.google.com'}
//
// }
//}
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}
//task clean(type: Delete) {
// delete rootProject.buildDir
//}

19
ZJYXDXJ/settings.gradle
Unescape Escape View File

@ -1,2 +1,21 @@
pluginManagement {
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
jcenter()
maven {url "https://jitpack.io"}
maven {url 'https://maven.google.com'}
}
}
include ':app'
rootProject.name = "ZJYXDXJ"
Write Preview
Loading…
Cancel
Save