diff --git a/YFDXJ/app/build.gradle b/YFDXJ/app/build.gradle index 3775711..b986aea 100755 --- a/YFDXJ/app/build.gradle +++ b/YFDXJ/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdk 33 - buildToolsVersion '33.0.0' + namespace 'com.bjzc.yfdxj' + compileSdk 34 defaultConfig { applicationId "com.bjzc.yfdxj" - minSdkVersion 24 - targetSdkVersion 33 + minSdk 24 + targetSdk 34 versionCode 19 versionName "1.1.8" multiDexEnabled true @@ -56,7 +56,6 @@ android { sourceCompatibility JavaVersion.VERSION_17 targetCompatibility JavaVersion.VERSION_17 } - namespace 'com.bjzc.yfdxj' } dependencies { @@ -69,7 +68,6 @@ dependencies { implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.retrofit2:converter-gson:2.9.0' implementation 'org.litepal.android:core:1.5.1' - implementation 'com.yanzhenjie:permission:2.0.3' implementation 'com.github.huangyanbin:SmartTable:2.2.0' implementation 'com.google.android.material:material:1.2.1' implementation 'androidx.multidex:multidex:2.0.1' diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java index 3b3d690..1f2df06 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java @@ -1,7 +1,6 @@ package com.bjzc.yfdxj.activity; import android.annotation.SuppressLint; -import android.app.ActivityManager; import android.content.Intent; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; @@ -10,7 +9,6 @@ import android.os.Build; import android.provider.Settings; import android.telephony.TelephonyManager; import android.text.TextUtils; -import android.util.Log; import android.view.KeyEvent; import android.view.MotionEvent; import android.widget.Button; @@ -18,7 +16,6 @@ import android.widget.CheckBox; import android.widget.EditText; import android.widget.RadioGroup; import android.widget.TextView; - import com.azhon.appupdate.listener.OnButtonClickListener; import com.azhon.appupdate.listener.OnDownloadListener; import com.azhon.appupdate.manager.DownloadManager; @@ -43,13 +40,10 @@ import com.bjzc.yfdxj.utils.UiUtlis; import com.google.gson.Gson; import com.rinsun.mtdriver.MTnativeInterface; import com.tencent.bugly.crashreport.CrashReport; -import com.yanzhenjie.permission.AndPermission; -import com.yanzhenjie.permission.runtime.Permission; import com.yolanda.nohttp.NoHttp; import com.yolanda.nohttp.RequestMethod; import com.yolanda.nohttp.rest.Request; import com.yolanda.nohttp.rest.Response; - import java.io.File; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -59,7 +53,6 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; - import androidx.annotation.NonNull; import androidx.appcompat.widget.AppCompatTextView; @@ -193,7 +186,7 @@ public class LoginActivity extends BaseActivity { etPwd.setText("lgy12345"); // etUse.setText("161619"); -// etPwd.setText("161619"); +// etPwd.setText("161619"); } //使用完一定记得关闭 电源 mt.RFIDclose(); @@ -291,16 +284,15 @@ public class LoginActivity extends BaseActivity { } private void SetPermission() { - AndPermission.with(this).runtime().permission( - Permission.WRITE_EXTERNAL_STORAGE, - Permission.ACCESS_COARSE_LOCATION, - Permission.READ_PHONE_STATE, - Permission.READ_EXTERNAL_STORAGE, - Permission.WRITE_EXTERNAL_STORAGE, - Permission.CAMERA - ).onGranted(data -> { - }).onDenied(data -> { - }).start(); +// AndPermission.with(this).runtime().permission( +// Permission.ACCESS_COARSE_LOCATION, +// Permission.READ_PHONE_STATE, +// Permission.READ_EXTERNAL_STORAGE, +// Permission.WRITE_EXTERNAL_STORAGE, +// Permission.CAMERA +// ).onGranted(data -> { +// }).onDenied(data -> { +// }).start(); } private void onclick() { @@ -355,15 +347,15 @@ public class LoginActivity extends BaseActivity { @Override public void onSucceed(int what, Response response) throws ParseException { String json = response.get(); -// showLog("-----login-----"); -// showLog(json); + showLog("-----login-----"); + showLog(json); String jsonDecode = RSAUtils.decryptBASE64StrClient(json); if (TextUtils.isEmpty(jsonDecode)) { showToast(UiUtlis.getString(context, R.string.data_error)); } else { UserInfo userInfo = GsonUtils.GsonToBean(jsonDecode, UserInfo.class); - //showLog(jsonDecode); + showLog(jsonDecode); if (userInfo != null) { UserInfo.User user = userInfo.getRows().get(0); @@ -472,9 +464,9 @@ public class LoginActivity extends BaseActivity { info.setRows(list); String json = GsonUtils.GsonString(info); String jsonEncrypt = RSAUtils.encryptBASE64Str(json); -// showLog(json); -// showLog(jsonEncrypt); -// showLog(RSAUtils.decryptBASE64Str(jsonEncrypt)); + showLog(json); + showLog(jsonEncrypt); + showLog(RSAUtils.decryptBASE64Str(jsonEncrypt)); return jsonEncrypt; } @@ -517,6 +509,7 @@ public class LoginActivity extends BaseActivity { @Override public void onSuccess(Call call, retrofit2.Response response) { ApkUpdateBean appUploadInfo = response.body(); + //showLog(new Gson().toJson(appUploadInfo)); if (appUploadInfo != null) { if (appUploadInfo.getTotal().equals("1")) { String appURL = appUploadInfo.getRows().get(0).getApkurl(); @@ -684,6 +677,7 @@ public class LoginActivity extends BaseActivity { //System.out.println("登录已失效: "+String.valueOf(Calendar.getInstance().after(calendarOne))); Intent intent = new Intent(context, MainActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); startActivity(intent); finish(); break; @@ -764,4 +758,10 @@ public class LoginActivity extends BaseActivity { nfcValue = result; nfcOnlineLogin(result); } -} \ No newline at end of file +} +//登录 +//AppLogin/GetData.aspx +//软件自动更新 +//ApkUpdate/Update.ashx +//Apps/APP_GX.ashx +//ApkUpdate/GetData.aspx diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java index 8a7a100..3235733 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java @@ -178,8 +178,9 @@ public class MainActivity extends BaseActivity3 { SPUtils.remove(MainActivity.this,Contans.ZY); SPUtils.remove(MainActivity.this,Contans.NFCBM); SPUtils.remove(MainActivity.this,Contans.LASTLOGINDATE); - //SPUtils.clear(MainActivity.this); + SPUtils.clear(MainActivity.this); Intent intent = new Intent(MainActivity.this, LoginActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); startActivity(intent); finish(); } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XJStatisticsActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XJStatisticsActivity.java index 5af4a47..e612256 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XJStatisticsActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/sbxj/XJStatisticsActivity.java @@ -151,6 +151,7 @@ public class XJStatisticsActivity extends BaseActivity3 { }); } + @Override public void initData() { getMyUploadData(); getStatisticsData(null); diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/contans/Contans.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/contans/Contans.java index 29b493b..d89c00e 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/contans/Contans.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/contans/Contans.java @@ -8,13 +8,13 @@ public class Contans { public static String CHECK_UPDATA_APK = "ApkUpdate/GetData.aspx"; -// public static String IP = "http://113.107.214.27:8090/"; -// public static String network_type_Intranet = "http://192.168.254.1:8090/"; -// public static String network_type_extranet = "http://113.107.214.27:8090/"; + public static String IP = "http://113.107.214.27:8090/"; + public static String network_type_Intranet = "http://192.168.254.1:8090/"; + public static String network_type_extranet = "http://113.107.214.27:8090/"; - public static String IP = "http://113.107.214.27:8092/"; - public static String network_type_Intranet = "http://192.168.254.1:8092/"; - public static String network_type_extranet = "http://113.107.214.27:8092/"; +// public static String IP = "http://113.107.214.27:8092/"; +// public static String network_type_Intranet = "http://192.168.254.1:8092/"; +// public static String network_type_extranet = "http://113.107.214.27:8092/"; // public static String IP = "http://192.168.2.6:8089/"; // public static String network_type_Intranet = "http://192.168.2.6:8089/"; diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/HttpUtils.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/HttpUtils.java index 55233c7..673261c 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/HttpUtils.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/HttpUtils.java @@ -6,6 +6,7 @@ import android.util.Log; import androidx.annotation.NonNull; +import com.bjzc.yfdxj.BuildConfig; import com.bjzc.yfdxj.contans.Contans; import java.io.IOException; @@ -110,8 +111,8 @@ public class HttpUtils { Request request = chain.request(); long t1 = System.nanoTime();//请求发起的时间 - //Log.v("okhttpmsg", String.format("发送请求 %s on %s%n%s",request.url(), chain.connection(), request.headers())); - + String requestData = String.format("发送请求 %s on %s%n%s",request.url(), chain.connection(), request.headers()); + showLog(requestData); Response response = chain.proceed(request); long t2 = System.nanoTime();//收到响应的时间 @@ -121,13 +122,24 @@ public class HttpUtils { //个新的response给应用层处理 ResponseBody responseBody = response.peekBody(1024 * 1024); -// Log.v("okhttpmsg", String.format("接收响应: [%s] %n返回json:【%s】 %.1fms%n%s", -// response.request().url(), -// responseBody.string(), -// (t2 - t1) / 1e6d, -// response.headers())); + String result = String.format("接收响应: [%s] %n返回json:【%s】 %.1fms%n%s", + response.request().url(), + responseBody.string(), + (t2 - t1) / 1e6d, + response.headers()); + showLog(result); return response; } } + + public static void showLog(String logText) { + if (BuildConfig.LOG_ERROR) { + if(TextUtils.isEmpty(logText)){ + Log.i("app", "logText is null"); + }else{ + Log.i("app", logText); + } + } + } } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/NohttpUtils.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/NohttpUtils.java index 41236f0..f901e8d 100755 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/NohttpUtils.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/NohttpUtils.java @@ -89,6 +89,8 @@ public class NohttpUtils { // showLog(credential); // showLog(new Gson().toJson(request.headers())); // } + }else{ + showLog(request.url()); } mQueue.add(what, request, new HttpResponseListener(mActivity, request, callback, canCanel, isLoading, msg)); } diff --git a/YFDXJ/build.gradle b/YFDXJ/build.gradle index 451c06b..24babc8 100755 --- a/YFDXJ/build.gradle +++ b/YFDXJ/build.gradle @@ -1,26 +1,6 @@ // 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' - } -} - -allprojects { - repositories { - google() - jcenter() - maven {url "https://jitpack.io"} - maven {url 'https://maven.google.com'} - - } -} - -task clean(type: Delete) { - delete rootProject.buildDir +plugins { + id 'com.android.application' version '8.1.1' apply false + id 'org.jetbrains.kotlin.android' version '1.8.0' apply false } diff --git a/YFDXJ/settings.gradle b/YFDXJ/settings.gradle index c48ef72..09d7568 100755 --- a/YFDXJ/settings.gradle +++ b/YFDXJ/settings.gradle @@ -1,2 +1,23 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + jcenter() + } +} +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 = "YFDXJ" \ No newline at end of file