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

REMOE

Browse Source
master
hwf452 2 years ago
parent 5936035346
commit 73ba7f711a
11 changed files with 135 additions and 25 deletions
Show Stats Download Patch File Download Diff File

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

@ -15,8 +15,25 @@ android {
resValue "string", "authorities", applicationId
resourceConfigurations += ['zh', 'en', 'hdpi']
}
buildFeatures {
buildConfig = true
}
signingConfigs {
release {
keyAlias 'key0'
storeFile file('../key/keystore')
storePassword 'abc123123'
keyPassword 'abc123123'
v1SigningEnabled true //是否开启V1签名
v2SigningEnabled true //是否开启V2签名
}
}
/* keypassword:abc123123 alias key0*/
buildTypes {
debug {
minifyEnabled false
buildConfigField "boolean", "LOG_ERROR", "true"
}
release {
lintOptions {
checkReleaseBuilds false
@ -26,6 +43,8 @@ android {
zipAlignEnabled true // 对齐zip
debuggable false // 是否debug
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
buildConfigField "boolean", "LOG_ERROR", "false"
signingConfig signingConfigs.release // 打包签名信息
}
}
sourceSets {

20
ZJYXDXJ/app/release/output-metadata.json
Unescape Escape View File

@ -0,0 +1,20 @@
{
"version": 3,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.bjzc.zjyxdxj",
"variantName": "release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 1,
"versionName": "1.0.0",
"outputFile": "app-release.apk"
}
],
"elementType": "File"
}

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

@ -37,6 +37,7 @@ import com.bjzc.zjyxdxj.utils.RSAUtils;
import com.bjzc.zjyxdxj.utils.SPUtils;
import com.bjzc.zjyxdxj.utils.StatusBarUtil;
import com.bjzc.zjyxdxj.utils.UiUtlis;
import com.google.gson.Gson;
import com.tencent.bugly.crashreport.CrashReport;
import com.yanzhenjie.permission.AndPermission;
import com.yanzhenjie.permission.runtime.Permission;
@ -147,8 +148,11 @@ public class LoginActivity extends BaseActivity {
});
//initNFC();
etUse.setText("181145");
etPwd.setText("13902576510");
// etUse.setText("181145");
// etPwd.setText("13902576510");
etUse.setText("180701");
etPwd.setText("13902576186");
}
@ -254,17 +258,18 @@ public class LoginActivity extends BaseActivity {
@Override
public void onSucceed(int what, Response<String> response) throws ParseException {
String json = response.get();
// Log.i("app", "login-----");
// Log.i("app", json);
showLog("login-----");
showLog(json);
String jsonDecode = RSAUtils.decryptBASE64StrByPublic(json);
if(TextUtils.isEmpty(jsonDecode)){
//showToast(UiUtlis.getString(context, R.string.login_no_connect_to_server));
showToast("登录异常...");
//showToast("登录异常...");
}else{
UserInfo userInfo = GsonUtils.GsonToBean(jsonDecode, UserInfo.class);
//Log.i("app",new Gson().toJson(userInfo));
//Log.i("app", jsonDecode);
showLog(new Gson().toJson(userInfo));
showLog(jsonDecode);
if (userInfo != null) {
UserInfo.User user = userInfo.getRows().get(0);
String status = user.getStatus();
@ -359,9 +364,9 @@ public class LoginActivity extends BaseActivity {
list.add(userInfo);
info.setRows(list);
String json = GsonUtils.GsonString(info);
//Log.i("app", json);
//Log.i("app",RSAUtils.encryptBASE64Str(json));
return RSAUtils.encryptBASE64Str(json)+"1";
showLog(json);
showLog(RSAUtils.encryptBASE64Str(json));
return RSAUtils.encryptBASE64Str(json);
}
public String getNfcInfo(String nfcId) {
@ -413,11 +418,11 @@ public class LoginActivity extends BaseActivity {
if (appURL != null && appURL.contains("http://")) {
int startIndex = appURL.indexOf("Apps");
Log.i("app", String.valueOf(startIndex));
//Log.i("app", String.valueOf(startIndex));
if (startIndex != -1) {
String baseApkUrl = appURL.substring(startIndex);
appURL = Contans.IP + baseApkUrl;
Log.i("app",appURL);
//Log.i("app",appURL);
}
} else {
appURL = Contans.IP + appURL;

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

@ -157,8 +157,8 @@ public class MainActivity extends BaseActivity3 {
checkUpdateApk();
List<String> permissionsResult = this.getPermissionsResult();
Log.i("app", "---------");
Log.i("app", new Gson().toJson(permissionsResult));
// Log.i("app", "---------");
// Log.i("app", new Gson().toJson(permissionsResult));
boolean isApp_YXXJ = false;
boolean isApp_RLXJ = false;
for (String permissions : permissionsResult) {

14
ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/base/BaseActivity.java
Unescape Escape View File

@ -16,10 +16,14 @@ import android.nfc.tech.NfcF;
import android.nfc.tech.NfcV;
import android.os.Bundle;
import android.os.Parcelable;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.view.WindowManager;
import android.widget.TextView;
import android.widget.Toast;
import com.bjzc.zjyxdxj.BuildConfig;
import com.bjzc.zjyxdxj.R;
import com.bjzc.zjyxdxj.utils.ControllerActivity;
import com.zhy.autolayout.AutoLayoutActivity;
@ -197,4 +201,14 @@ public abstract class BaseActivity extends AutoLayoutActivity {
}
public void handleNfc(String result) {
}
public void showLog(String logText) {
if (BuildConfig.LOG_ERROR) {
if(TextUtils.isEmpty(logText)){
Log.i("app", "logText is null");
}else{
Log.i("app", logText);
}
}
}
}

13
ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/base/BaseActivity3.java
Unescape Escape View File

@ -17,10 +17,13 @@ import android.nfc.tech.NfcF;
import android.nfc.tech.NfcV;
import android.os.Bundle;
import android.os.Parcelable;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.EditText;
import android.widget.Toast;
import com.bjzc.zjyxdxj.BuildConfig;
import com.bjzc.zjyxdxj.R;
import com.bjzc.zjyxdxj.utils.AppManager;
import com.bjzc.zjyxdxj.utils.OAToolbar;
@ -235,4 +238,14 @@ public abstract class BaseActivity3 extends AutoLayoutActivity {
return editText.getText().toString();
}
public void showLog(String logText) {
if (BuildConfig.LOG_ERROR) {
if(TextUtils.isEmpty(logText)){
Log.i("app", "logText is null");
}else{
Log.i("app", logText);
}
}
}
}

13
ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/base/BaseFragment.java
Unescape Escape View File

@ -3,6 +3,8 @@ package com.bjzc.zjyxdxj.base;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -12,6 +14,8 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import com.bjzc.zjyxdxj.BuildConfig;
/**
* Created by Administrator on 2016/9/icon5.
@ -57,5 +61,14 @@ public abstract class BaseFragment extends Fragment {
}
}
public void showLog(String logText) {
if (BuildConfig.LOG_ERROR) {
if(TextUtils.isEmpty(logText)){
Log.i("app", "logText is null");
}else{
Log.i("app", logText);
}
}
}
}

11
ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/contans/Contans.java
Unescape Escape View File

@ -5,13 +5,14 @@ public class Contans {
public static String LOGIN = "AppLogin.ashx";
public static String LOGINNFC = "AppLogin/userLogin.ashx";
//内网正式环境
//public static String IP = "http://10.20.1.100:8500/app/";
public static String IP = "http://192.168.2.90:28500/app/";
public static String network_type_Intranet = "http://192.168.2.90:28500/app/";
//public static String network_type_Intranet = "http://10.20.1.100:8500/app/";
// public static String IP = "http://192.168.2.90:28500/app/";
// public static String network_type_Intranet = "http://192.168.2.90:28500/app/";
//内网正式环境
public static String IP = "http://10.20.1.100:8500/app/";
public static String network_type_Intranet = "http://10.20.1.100:8500/app/";
public static String network_type_extranet = "https://www.zjtsp.com/app/";
public static String MAXIMOIP = "http://10.46.0.152:7001/";

12
ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/utils/NoProgresshttpUtils.java
Unescape Escape View File

@ -7,6 +7,7 @@ import android.content.Context;
import android.text.TextUtils;
import android.util.Log;
import com.bjzc.zjyxdxj.BuildConfig;
import com.bjzc.zjyxdxj.R;
import com.bjzc.zjyxdxj.contans.Contans;
import com.google.gson.Gson;
@ -72,6 +73,7 @@ public class NoProgresshttpUtils {
String token = RSAUtils.decryptBASE64StrLocal(tokenTemp);;
String credential = "Bearer " + token;
request.addHeader("Authorization", credential);
showLog(request.url());
// Log.i("app", request.url());
// Log.i("app", credential);
// Log.i("app",new Gson().toJson(request.headers()));
@ -79,6 +81,16 @@ public class NoProgresshttpUtils {
mQueue.add(what, request, new HttpResponseListenerNoProgress<T>(mActivity, request, callback));
}
public void showLog(String logText) {
if (BuildConfig.LOG_ERROR) {
if(TextUtils.isEmpty(logText)){
Log.i("app", "logText is null");
}else{
Log.i("app", logText);
}
}
}
/**
* 取消这个sign这个标记的所有请求
*

21
ZJYXDXJ/app/src/main/java/com/bjzc/zjyxdxj/utils/NohttpUtils.java
Unescape Escape View File

@ -5,6 +5,7 @@ import android.content.Context;
import android.text.TextUtils;
import android.util.Log;
import com.bjzc.zjyxdxj.BuildConfig;
import com.bjzc.zjyxdxj.R;
import com.bjzc.zjyxdxj.activity.LoginActivity;
import com.bjzc.zjyxdxj.contans.Contans;
@ -78,28 +79,40 @@ public class NohttpUtils {
*/
public <T> void add(Activity mActivity, int what, Request<T> request, HttpListener<T> callback, boolean canCanel, boolean isLoading, String msg) {
String tokenTemp = (String) SPUtils.get(mActivity, Contans.LOGIN_TOKEN, "");
Log.i("app", request.url());
//Log.i("app", request.url());
if(!TextUtils.isEmpty(tokenTemp)){
String token = RSAUtils.decryptBASE64StrLocal(tokenTemp);;
String credential = "Bearer " + token;
request.addHeader("Authorization", credential);
showLog(request.url());
//Log.i("app", request.url());
Log.i("app", credential);
// Log.i("app", credential);
// Log.i("app",new Gson().toJson(request.headers()));
}
mQueue.add(what, request, new HttpResponseListener<T>(mActivity, request, callback, canCanel, isLoading, msg));
}
public void showLog(String logText) {
if (BuildConfig.LOG_ERROR) {
if(TextUtils.isEmpty(logText)){
Log.i("app", "logText is null");
}else{
Log.i("app", logText);
}
}
}
public <T> void add(Activity mActivity, int what, Request<T> request, HttpListener<T> callback) {
String tokenTemp = (String) SPUtils.get(mActivity, Contans.LOGIN_TOKEN, "");
Log.i("app", request.url());
//Log.i("app", request.url());
if(!TextUtils.isEmpty(tokenTemp)){
String token = RSAUtils.decryptBASE64StrLocal(tokenTemp);;
String credential = "Bearer " + token;
request.addHeader("Authorization", credential);
showLog(request.url());
//Log.i("app", request.url());
Log.i("app", credential);
//Log.i("app", credential);
// Log.i("app",new Gson().toJson(request.headers()));
}
mQueue.add(what, request, new HttpResponseListener<T>(mActivity, request, callback, true, true, "加载中..."));

0
ZJYXDXJ/key/keystore1 → ZJYXDXJ/key/keystore
Unescape Escape View File

Write Preview
Loading…
Cancel
Save