diff --git a/app/build.gradle b/app/build.gradle
index ee5939e..47e1d20 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
applicationId "com.arpa.hndahesudintocctmsdriver"
minSdkVersion 22
targetSdkVersion 30
- versionCode 49
- versionName "3.1.9"
+ versionCode 50
+ versionName "3.2.0"
flavorDimensions "CHANNEL_VALUE"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
javaCompileOptions {
@@ -111,7 +111,7 @@ android {
}
product {
manifestPlaceholders = [CHANNEL_VALUE: "大河好运司机"]
- buildConfigField("String", "OPEN_API_URL", "\"https://oapi.alct56.com\"")
+ buildConfigField("String", "AL_BASE", "\"https://oapi.alct56.com\"")
buildConfigField("String", "BASE_URL", "\"http://app.dahehuoyun.com/api/\"")
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a11fb4a..2f8b950 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,9 +14,7 @@
-
-
@@ -24,7 +22,6 @@
-
@@ -50,7 +47,7 @@
+ tools:replace="android:icon,android:allowBackup">
@@ -98,6 +95,7 @@
android:screenOrientation="portrait"/>
@@ -157,9 +155,7 @@
android:screenOrientation="portrait">
-
+
@@ -216,7 +212,7 @@
android:process=":remote">
+ android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+ tools:ignore="AppLinkUrlError">
@@ -291,7 +289,7 @@
@@ -305,7 +303,7 @@
@@ -316,7 +314,8 @@
-
+
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java
index 18cdd8a..d143d54 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java
@@ -11,6 +11,7 @@ import android.util.Log;
import com.alct.mdp.MDPLocationCollectionManager;
import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
import com.arpa.hndahesudintocctmsdriver.request.net.Api;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.dahe.mylibrary.CommonBaseLibrary;
import com.esign.esignsdk.EsignSdk;
import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
@@ -32,6 +33,8 @@ public class App extends Application {
public void onCreate() {
super.onCreate();
mApplication = this;
+ //初始化log
+ LogUtil.init(BuildConfig.DEBUG);
con = getBaseContext();
CommonBaseLibrary.getInstance().init(this, Api.BASE_URL);
String state = SPUtil.getSP(con, "state_data", "authorization_state");
@@ -44,8 +47,8 @@ public class App extends Application {
res.updateConfiguration(config, res.getDisplayMetrics());
//安联初始化
if (context.getPackageName().equals(getCurrentProcessName(context))) {
- //Log.e("--使用的测试环境--",BuildConfig.OPEN_API_URL);
- MDPLocationCollectionManager.initialize(this, "https://oapi.alct56.com");
+ //LogUtil.e("--使用的测试环境--",BuildConfig.OPEN_API_URL);
+ MDPLocationCollectionManager.initialize(this, BuildConfig.AL_BASE);
}
//在使用SDK各组件之前初始化context信息，传入ApplicationContext
// 路由初始化
@@ -60,7 +63,7 @@ public class App extends Application {
JTTProcess.init(this);
//QupaiHttpFinal.getInstance().initOkHttpFinal();
} catch (Exception e) {
- Log.e("-error-", "初始化失败sss");
+ LogUtil.e("-error-", "初始化失败sss");
}
}
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/parts/AuthParts.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/parts/AuthParts.java
index 921a15a..d7d4755 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/parts/AuthParts.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/parts/AuthParts.java
@@ -3,6 +3,7 @@ package com.arpa.hndahesudintocctmsdriver.parts;
import android.content.Context;
import android.util.Log;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.google.gson.Gson;
import com.arpa.hndahesudintocctmsdriver.bean.DriverAuthDataBean;
import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
@@ -19,7 +20,7 @@ public class AuthParts {
public static DriverAuthDataBean getAuth(Context con){
String authData=SPUtil.getSP(con,"data","authdata");
- Log.e("--data--",authData);
+ LogUtil.e("--data--",authData);
if("".equals(authData)){
return null;
}else {
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/PushMessageReceiver.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/PushMessageReceiver.java
index e0b646c..7e5f82b 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/PushMessageReceiver.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/PushMessageReceiver.java
@@ -8,6 +8,7 @@ import com.arpa.hndahesudintocctmsdriver.service.MakeUpService;
import com.arpa.hndahesudintocctmsdriver.ui.home.HuoYunDelActivity;
import com.arpa.hndahesudintocctmsdriver.ui.home.StartYunDanActivity;
import com.arpa.hndahesudintocctmsdriver.ui.login.WelcomeActivity;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import org.json.JSONException;
import org.json.JSONObject;
@@ -25,7 +26,7 @@ public class PushMessageReceiver extends JPushMessageReceiver {
@Override
public void onMessage(Context context, CustomMessage customMessage) {
- Log.e(TAG, "[onMessage] " + customMessage);
+ LogUtil.e(TAG, "[onMessage] " + customMessage);
Intent intent = new Intent("com.jiguang.demo.message");
intent.putExtra("msg", customMessage.message);
context.sendBroadcast(intent);
@@ -33,7 +34,7 @@ public class PushMessageReceiver extends JPushMessageReceiver {
@Override
public void onNotifyMessageOpened(Context context, NotificationMessage message) {
- Log.e(TAG, "[onNotifyMessageOpened] " + message);
+ LogUtil.e(TAG, "[onNotifyMessageOpened] " + message);
try{
//打开自定义的Activity
JSONObject json=new JSONObject(message.notificationExtras);
@@ -41,7 +42,7 @@ public class PushMessageReceiver extends JPushMessageReceiver {
String url=json.getString("url");
if(url.indexOf("driver/detail")!=-1){
int id=Integer.parseInt(url.split("=")[1]);
- Log.e("-url-",url+"_"+id);
+ LogUtil.e("-url-",url+"_"+id);
Intent in=new Intent(context, HuoYunDelActivity.class);
in.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
in.putExtra("id",Integer.parseInt(url.split("=")[1]));
@@ -54,7 +55,7 @@ public class PushMessageReceiver extends JPushMessageReceiver {
}
}catch (Throwable throwable){
- Log.e("123", "[onNotifyMessageOpened] " + message);
+ LogUtil.e("123", "[onNotifyMessageOpened] " + message);
Intent in=new Intent(context, WelcomeActivity.class);
in.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
context.startActivity(in);
@@ -63,7 +64,7 @@ public class PushMessageReceiver extends JPushMessageReceiver {
@Override
public void onMultiActionClicked(Context context, Intent intent) {
- Log.e(TAG, "[onMultiActionClicked] 用户点击了通知栏按钮");
+ LogUtil.e(TAG, "[onMultiActionClicked] 用户点击了通知栏按钮");
String nActionExtra = intent.getExtras().getString(JPushInterface.EXTRA_NOTIFICATION_ACTION_EXTRA);
//开发者根据不同 Action 携带的 extra 字段来分配不同的动作。
@@ -72,19 +73,19 @@ public class PushMessageReceiver extends JPushMessageReceiver {
return;
}
if (nActionExtra.equals("my_extra1")) {
- Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮一");
+ LogUtil.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮一");
} else if (nActionExtra.equals("my_extra2")) {
- Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮二");
+ LogUtil.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮二");
} else if (nActionExtra.equals("my_extra3")) {
- Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮三");
+ LogUtil.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮三");
} else {
- Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮未定义");
+ LogUtil.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮未定义");
}
}
@Override
public void onNotifyMessageArrived(Context context,NotificationMessage message) {
- Log.e(TAG, "[onNotifyMessageArrived] " + message);
+ LogUtil.e(TAG, "[onNotifyMessageArrived] " + message);
JSONObject json= null;
String str="";
try {
@@ -103,24 +104,24 @@ public class PushMessageReceiver extends JPushMessageReceiver {
@Override
public void onNotifyMessageDismiss(Context context, NotificationMessage message) {
- Log.e(TAG, "[onNotifyMessageDismiss] " + message);
+ LogUtil.e(TAG, "[onNotifyMessageDismiss] " + message);
}
@Override
public void onRegister(Context context, String registrationId) {
- Log.e(TAG, "[onRegister] " + registrationId);
+ LogUtil.e(TAG, "[onRegister] " + registrationId);
Intent intent = new Intent("com.jiguang.demo.register");
context.sendBroadcast(intent);
}
@Override
public void onConnected(Context context, boolean isConnected) {
- Log.e(TAG, "[onConnected] " + isConnected);
+ LogUtil.e(TAG, "[onConnected] " + isConnected);
}
@Override
public void onCommandResult(Context context, CmdMessage cmdMessage) {
- Log.e(TAG, "[onCommandResult] " + cmdMessage);
+ LogUtil.e(TAG, "[onCommandResult] " + cmdMessage);
}
@Override
@@ -150,7 +151,7 @@ public class PushMessageReceiver extends JPushMessageReceiver {
@Override
public void onNotificationSettingsCheck(Context context, boolean isOn, int source) {
super.onNotificationSettingsCheck(context, isOn, source);
- Log.e(TAG, "[onNotificationSettingsCheck] isOn:" + isOn + ",source:" + source);
+ LogUtil.e(TAG, "[onNotificationSettingsCheck] isOn:" + isOn + ",source:" + source);
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/TagAliasOperatorHelper.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/TagAliasOperatorHelper.java
index 9035ffe..1634c5c 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/TagAliasOperatorHelper.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/TagAliasOperatorHelper.java
@@ -3,6 +3,8 @@ package com.arpa.hndahesudintocctmsdriver.push;
import android.content.Context;
import android.util.Log;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
+
import cn.jpush.android.api.JPushMessage;
/**
@@ -49,7 +51,7 @@ public class TagAliasOperatorHelper {
logs += ", tags is exceed limit need to clean";
}
logs += ", errorCode:" + jPushMessage.getErrorCode();
- Log.e(TAG, logs);
+ LogUtil.e(TAG, logs);
//ToastHelper.showOther(context,logs);
}
}
@@ -63,7 +65,7 @@ public class TagAliasOperatorHelper {
//ToastHelper.showOk(context,"modify success");
}else{
String logs = "Failed to modify tags, errorCode:" + jPushMessage.getErrorCode();
- Log.e(TAG, logs);
+ LogUtil.e(TAG, logs);
//ToastHelper.showOther(context,logs);
}
}
@@ -77,7 +79,7 @@ public class TagAliasOperatorHelper {
//ToastHelper.showOk(context,"modify success");
}else{
String logs = "Failed to modify alias, errorCode:" + jPushMessage.getErrorCode();
- Log.e(TAG, logs);
+ LogUtil.e(TAG, logs);
//ToastHelper.showOther(context,logs);
//MMKV.defaultMMKV().putString(AdvActivity.ALIAS_DATA, "");
}
@@ -92,7 +94,7 @@ public class TagAliasOperatorHelper {
//ToastHelper.showOk(context,"modify success");
}else{
String logs = "Failed to set mobile number, errorCode:" + jPushMessage.getErrorCode();
- Log.e(TAG, logs);
+ LogUtil.e(TAG, logs);
//ToastHelper.showOther(context,logs);
//MMKV.defaultMMKV().putString(AdvActivity.MN_DATA, "");
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/ALProcess.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/ALProcess.java
index a91e501..048182b 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/ALProcess.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/ALProcess.java
@@ -9,6 +9,7 @@ import com.alct.mdp.callback.OnDownloadResultListener;
import com.alct.mdp.callback.OnResultListener;
import com.alct.mdp.model.Identity;
import com.arpa.hndahesudintocctmsdriver.parts.AuthParts;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.google.gson.Gson;
import com.arpa.hndahesudintocctmsdriver.bean.DriverAuthDataBean;
import com.arpa.hndahesudintocctmsdriver.bean.FqBean;
@@ -43,13 +44,11 @@ public class ALProcess {
MDPLocationCollectionManager.register(con, idy, new OnResultListener() {
@Override
public void onSuccess() {
- Log.e("--success--","验证成功");
getFq(con);
}
@Override
public void onFailure(java.lang.String s, java.lang.String s1) {
- Log.e("--error--",s+s1+"");
}
});
}
@@ -58,18 +57,18 @@ public class ALProcess {
MDPLocationCollectionManager.getInvoices(con, 100, 1, new OnDownloadResultListener() {
@Override
public void onSuccess(Object o) {
- Log.e("--获取发票列表成功--",new Gson().toJson(o));
+ LogUtil.e("--获取发票列表成功--",new Gson().toJson(o));
try{
FqBean fb=new Gson().fromJson(new Gson().toJson(o),FqBean.class);
applyFq(con,fb);
}catch (Exception e){
- Log.e("--失败--","数据解析失败");
+ LogUtil.e("--失败--","数据解析失败");
}
}
@Override
public void onFailure(String s, String s1) {
- Log.e("--获取发票列表失败--",s+s1+"");
+ LogUtil.e("--获取发票列表失败--",s+s1+"");
}
});
@@ -82,12 +81,12 @@ public class ALProcess {
@Override
public void onSuccess() {
- Log.e("--成功--","申请发票成功");
+ LogUtil.e("--成功--","申请发票成功");
}
@Override
public void onFailure(String s, String s1) {
- Log.e("--失败--","申请发票失败"+s+s1);
+ LogUtil.e("--失败--","申请发票失败"+s+s1);
}
});
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/JTTProcess.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/JTTProcess.java
index 1046b50..ab2b39d 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/JTTProcess.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/JTTProcess.java
@@ -10,6 +10,7 @@ import com.arpa.hndahesudintocctmsdriver.bean.JTT;
import com.arpa.hndahesudintocctmsdriver.constant.JTTConstant;
import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
import com.arpa.hndahesudintocctmsdriver.service.JTTSendService;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
import com.google.gson.Gson;
@@ -56,12 +57,10 @@ public class JTTProcess {
ENVIRONMENT, new OnResultListener() {
@Override
public void onFailure(String s, String s1) {
- Log.e("交通厅-获取授权",s+s1);
}
@Override
public void onSuccess(List list) {
- Log.e("交通厅-获取授权",gson.toJson(list));
if(list.size()>0){
SPUtil.insSP(con,JTTConstant.JTT_DATA_NAME,JTTConstant.JTT_DATA_JTTORDER_KEY,gson.toJson(list.get(0)));
Intent in=new Intent(con, JTTSendService.class);
@@ -89,19 +88,19 @@ public class JTTProcess {
sni.setEndLocationText(endWay.getAddress());
sni.setEndCountrySubdivisionCode(sob.getData().getEndCountrySubdivisionCode());
snis[0]=sni;
- Log.e("起点代码",sob.getData().getStartCountrySubdivisionCode());
- Log.e("终点代码",sob.getData().getEndCountrySubdivisionCode());
+ LogUtil.e("起点代码",sob.getData().getStartCountrySubdivisionCode());
+ LogUtil.e("终点代码",sob.getData().getEndCountrySubdivisionCode());
// AMapLocationClient.updatePrivacyShow(con,true,true);
// AMapLocationClient.updatePrivacyAgree(con,true);
LocationOpenApi.start(con, sob.getData().getCarNumber(), UserParts.getUser(con).getData().getRname(), remark,snis, new OnResultListener() {
@Override
public void onFailure(String s, String s1) {
- Log.e("交通厅-开启定位失败",s+s1+"");
+ LogUtil.e("交通厅-开启定位失败",s+s1+"");
}
@Override
public void onSuccess(List list) {
- Log.e("交通厅-开启定位成功",gson.toJson(list));
+ LogUtil.e("交通厅-开启定位成功",gson.toJson(list));
if(list.size()>0){
SPUtil.insSP(con, JTTConstant.JTT_DATA_NAME,JTTConstant.JTT_DATA_JTTORDER_KEY,gson.toJson(list.get(0)));
Intent in=new Intent(con, JTTSendService.class);
@@ -125,12 +124,12 @@ public class JTTProcess {
LocationOpenApi.send(con,sob.getData().getCarNumber(), UserParts.getUser(con).getData().getRname(), remark,snis, new OnSendResultListener() {
@Override
public void onFailure(String s, String s1, List list) {
- Log.e("交通厅-发送定位失败",s+s1+"");
+ LogUtil.e("交通厅-发送定位失败",s+s1+"");
}
@Override
public void onSuccess(List list) {
- Log.e("交通厅-发送定位成功",gson.toJson(list));
+ LogUtil.e("交通厅-发送定位成功",gson.toJson(list));
}
});
}
@@ -158,12 +157,12 @@ public class JTTProcess {
@Override
public void onFailure(String s, String s1) {
- Log.e("交通厅-暂停定位失败",s+s1+"");
+ LogUtil.e("交通厅-暂停定位失败",s+s1+"");
}
@Override
public void onSuccess(List list) {
- Log.e("交通厅-暂停定位成功",gson.toJson(list));
+ LogUtil.e("交通厅-暂停定位成功",gson.toJson(list));
}
});
@@ -191,12 +190,12 @@ public class JTTProcess {
@Override
public void onFailure(String s, String s1) {
- Log.e("交通厅-重启定位失败",s+s1+"");
+ LogUtil.e("交通厅-重启定位失败",s+s1+"");
}
@Override
public void onSuccess(List list) {
- Log.e("交通厅-重启定位成功",gson.toJson(list));
+ LogUtil.e("交通厅-重启定位成功",gson.toJson(list));
}
});
@@ -224,12 +223,12 @@ public class JTTProcess {
LocationOpenApi.stop(con, sob.getData().getCarNumber(),UserParts.getUser(con).getData().getRname(), remark,snis, new OnResultListener() {
@Override
public void onFailure(String s, String s1) {
- Log.e("交通厅-结束定位失败",s+s1+"");
+ LogUtil.e("交通厅-结束定位失败",s+s1+"");
}
@Override
public void onSuccess(List list) {
- Log.e("交通厅-结束定位成功",gson.toJson(list));
+ LogUtil.e("交通厅-结束定位成功",gson.toJson(list));
Intent stopIntent = new Intent(con,JTTSendService.class);
con.stopService(stopIntent);
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/AuthRequest.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/AuthRequest.java
index b2d561e..565ec87 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/AuthRequest.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/AuthRequest.java
@@ -63,7 +63,6 @@ public class AuthRequest {
//驾驶证认证
public void driverAuthLicense(Context con, Handler hd, LicenseInputBean iib) {
- Log.e("--认证信息--", gson.toJson(iib));
Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getDRIVERAUTHLICENSE(), gson.toJson(iib)), getToken(con), con);
RequestUtil.start(1, "driverAuthLicense", re, con, hd);
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/BusinessRequest.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/BusinessRequest.java
index d5c55fd..3bf2f36 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/BusinessRequest.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/BusinessRequest.java
@@ -25,10 +25,5 @@ public class BusinessRequest {
Request re = OkHttpUtil.get(new OkDate(url+ Md5Util.resUrl(longitude,latitude,name), "post", ""));
RequestUtil.start(12, "business_list",re,con,hd);
}
- public void GetBusiness(Context con, Handler hd, String id){
- String url="https://openapi.dianping.com/router/poiinfo/detailinfo";
- Request re = OkHttpUtil.get(new OkDate(url+Md5Util.resDelUrl(id), "post", ""));
- RequestUtil.start(1, "business",re,con,hd);
- }
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/NewsRequest.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/NewsRequest.java
index a279db9..9974997 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/NewsRequest.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/NewsRequest.java
@@ -66,7 +66,6 @@ public class NewsRequest {
public void delNewsAll(Context con, Handler hd,Model m){
m.setId(0);
token= SPUtil.getSP(con, LoginActivity.USER,LoginActivity.USER_TOKEN);
- Log.e("-xm-",gson.toJson(m));
Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getXiaoxiDelAll(),gson.toJson(m)),getToken(con),con);
RequestUtil.start(1, NewsActivity.NEWS_DEL,re,con,hd);
///app/message/setReadAll
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/CreateJsonUtils.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/CreateJsonUtils.java
index 8de4129..a2647c0 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/CreateJsonUtils.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/CreateJsonUtils.java
@@ -2,6 +2,7 @@ package com.arpa.hndahesudintocctmsdriver.request.net;
import android.util.Log;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.dahe.mylibrary.net.JsonUtils;
import com.dahe.mylibrary.utils.MD5Utils;
import com.dahe.mylibrary.utils.StringUtils;
@@ -70,7 +71,7 @@ public class CreateJsonUtils {
map.put("api_key", "xccdb-power-bank");
map.put("sign", MD5Utils.md5(JsonUtils.getInstance().getGson().toJson(map)));
map.put("time", TimeUtil.getNowMills());
- Log.i(TAG, new Gson().toJson(map));
+ LogUtil.e(TAG, new Gson().toJson(map));
return new Gson().toJson(map);
}
@@ -123,15 +124,15 @@ public class CreateJsonUtils {
}
try {
signStr = (sign1(requestDataMap) + "&api_key=xccdb-power-bank").replaceFirst("&", "");
- Log.i(TAG, "createRequestBody: " + sign1(requestDataMap));
+ LogUtil.e(TAG, "createRequestBody: " + sign1(requestDataMap));
} catch (JSONException e) {
e.printStackTrace();
}
- Log.i(TAG, "createRequestBody: " + signStr);
+ LogUtil.e(TAG, "createRequestBody: " + signStr);
for (String keySet : requestDataMap.keySet()) {
requestBodyMap.put(keySet, RequestBody.create(MediaType.parse("multipart/form-data"), requestDataMap.get(keySet) + ""));
}
- Log.i(TAG, "createRequestBody: " + MD5Utils.md5((signStr)));
+ LogUtil.e(TAG, "createRequestBody: " + MD5Utils.md5((signStr)));
requestBodyMap.put("sign", RequestBody.create(MediaType.parse("multipart/form-data"),
MD5Utils.md5((signStr))));
requestBodyMap.put("time", RequestBody.create(MediaType.parse("multipart/form-data"), TimeUtil.getNowMills() / 1000 + ""));
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/RequestHeadInterceptor.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/RequestHeadInterceptor.java
index 29d6e3f..2d3beaa 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/RequestHeadInterceptor.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/net/RequestHeadInterceptor.java
@@ -37,7 +37,6 @@ public class RequestHeadInterceptor implements Interceptor {
.addHeader("deviceType", "ANDROID")
.addHeader("language", BaseUtils.getLanguage(App.getApp())+"")
.build();
- Log.i(TAG, "intercept: " + request.headers());
return chain.proceed(request);
}
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/JTTSendService.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/JTTSendService.java
index 6452c8a..63cc221 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/JTTSendService.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/JTTSendService.java
@@ -65,7 +65,6 @@ public class JTTSendService extends Service {
@Override
public void onCreate() {
super.onCreate();
- Log.e("交通厅","开启位置上传");
con=this;
String str= SPUtil.getSP(con, JTTConstant.JTT_DATA_NAME,JTTConstant.JTT_DATA_JTTORDER_KEY);
String str2=SPUtil.getSP(con,JTTConstant.JTT_DATA_NAME,JTTConstant.JTT_DATA_ORDER_KEY);
@@ -103,7 +102,6 @@ public class JTTSendService extends Service {
//开始
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
- Log.e("服务开启","-----");
return START_STICKY;
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/LocationService.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/LocationService.java
index 2987f52..0eb4b78 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/LocationService.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/LocationService.java
@@ -9,6 +9,7 @@ import android.util.Log;
import androidx.annotation.Nullable;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.google.gson.Gson;
import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset;
import com.arpa.hndahesudintocctmsdriver.request.bean.TrackInputBean;
@@ -54,7 +55,7 @@ public class LocationService extends Service {
super.onCreate();
con=this;
hyr=new HuoYuanRequset(con,hd);
- Log.e("开始循环上传，等待100ms","-----");
+ LogUtil.e("开始循环上传，等待100ms","-----");
new Timer().schedule(new TimerTask() {
@Override
public void run() {
@@ -67,7 +68,6 @@ public class LocationService extends Service {
//开始
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
- Log.e("服务开启","-----");
return START_STICKY;
}
@@ -84,10 +84,8 @@ public class LocationService extends Service {
tib.setLatitude(l.getLatitude()+"");
//纬度
tib.setLongitude(l.getLongitude()+"");
- Log.e("经度",l.getLatitude()+"");
- Log.e("维度",l.getLongitude()+"");
sum+=3;
- Log.e("当前app后台服务存活时间(手机息屏状态)",sum+"秒");
+ LogUtil.e("当前app后台服务存活时间(手机息屏状态)",sum+"秒");
}
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpAlService.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpAlService.java
index c3badf1..d427b2a 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpAlService.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpAlService.java
@@ -11,6 +11,7 @@ import androidx.annotation.Nullable;
import com.alct.mdp.MDPLocationCollectionManager;
import com.alct.mdp.model.Image;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.google.gson.Gson;
import com.arpa.hndahesudintocctmsdriver.util.msg.MsgUtil;
import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
@@ -55,7 +56,6 @@ public class MakeUpAlService extends Service {
//开始
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
- Log.e("服务开启","-----");
return START_STICKY;
}
@@ -90,12 +90,12 @@ public class MakeUpAlService extends Service {
@Override
public void onSuccess() {
- Log.e("上报安联","装货照片上传成功");
+ LogUtil.e("上报安联","装货照片上传成功");
}
@Override
public void onFailure(String s, String s1) {
- Log.e("上报安联失败(装货照片):",s+s1);
+ LogUtil.e("上报安联失败(装货照片):",s+s1);
}
});
@@ -106,12 +106,12 @@ public class MakeUpAlService extends Service {
@Override
public void onSuccess() {
- Log.e("上报安联","卸货照片上传成功");
+ LogUtil.e("上报安联","卸货照片上传成功");
}
@Override
public void onFailure(String s, String s1) {
- Log.e("上报安联失败(卸货照片):",s+s1);
+ LogUtil.e("上报安联失败(卸货照片):",s+s1);
}
});
@@ -122,12 +122,12 @@ public class MakeUpAlService extends Service {
@Override
public void onSuccess() {
- Log.e("上报安联","回单照片上传成功");
+ LogUtil.e("上报安联","回单照片上传成功");
}
@Override
public void onFailure(String s, String s1) {
- Log.e("上报安联失败(回单照片):",s+s1);
+ LogUtil.e("上报安联失败(回单照片):",s+s1);
}
});
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpService.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpService.java
index 3d34522..bf67996 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpService.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpService.java
@@ -25,17 +25,14 @@ public class MakeUpService extends Service {
private MediaPlayer mediaPlayer = new MediaPlayer();
public void palyMp3(){
- Log.e("开始播放","-----");
try {
AssetFileDescriptor fd =getAssets().openFd("kujp9scu.mp3");
mediaPlayer.setDataSource(fd);
mediaPlayer.setLooping(false);//设置为循环播放
mediaPlayer.prepare();//初始化播放器MediaPlayer
mediaPlayer.start();
- Log.e("播放成功","-----");
} catch (Exception e) {
e.printStackTrace();
- Log.e("播放失败","-----");
}
}
private Handler hd=new Handler(msg -> {
@@ -64,7 +61,6 @@ public class MakeUpService extends Service {
//开始
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
- Log.e("服务开启","-----");
return START_STICKY;
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/RestartService.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/RestartService.java
index 8418177..bb21a94 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/RestartService.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/RestartService.java
@@ -28,7 +28,6 @@ public class RestartService extends Service {
//Service被启动的时候回调onStartCommand方法
public int onStartCommand(Intent intent, int flags, int startId){
- Log.e("---static---","启动");
return START_STICKY;
}
@Override
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/TestService.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/TestService.java
index 52e3207..9ace9be 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/TestService.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/TestService.java
@@ -59,7 +59,6 @@ public class TestService extends Service {
@Override
public void run() {
notification("消息","您有一条新的订单");
- Log.e("1234","1234");
}
},100,5000);
}
@@ -67,14 +66,12 @@ public class TestService extends Service {
//Service被启动的时候回调onStartCommand方法
public int onStartCommand(Intent intent, int flags, int startId){
- Log.e("---static---","启动");
return START_STICKY;
}
//Service被销毁的时候回调onDestroy方法
public void onDestroy(){
super.onDestroy();
- Log.e("---static---","关闭");
Intent intentOne = new Intent(con,TestService.class);
startService(intentOne);
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/TrackService.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/TrackService.java
index bfec823..87d5c7d 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/TrackService.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/TrackService.java
@@ -9,6 +9,7 @@ import android.util.Log;
import androidx.annotation.Nullable;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.google.gson.Gson;
import com.arpa.hndahesudintocctmsdriver.bean.BaseBean;
import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset;
@@ -43,9 +44,9 @@ public class TrackService extends Service {
if(CacheGroup.cacheList.get("genzong")!=null){
BaseBean bb=gson.fromJson(CacheGroup.cacheList.get("genzong"),BaseBean.class);
if(bb.getCode()==200){
- Log.e("--轨迹上传--","成功");
+ LogUtil.e("--轨迹上传--","成功");
}else{
- Log.e("--轨迹上传失败:--",bb.getMsg());
+ LogUtil.e("--轨迹上传失败:--",bb.getMsg());
}
CacheGroup.cacheList.remove("genzong");
}
@@ -66,7 +67,7 @@ public class TrackService extends Service {
super.onCreate();
con=this;
hyr=new HuoYuanRequset(con,hd);
- Log.e("开始循环上传，等待100ms","-----");
+ LogUtil.e("开始循环上传，等待100ms","-----");
new Timer().schedule(new TimerTask() {
@Override
public void run() {
@@ -84,7 +85,7 @@ public class TrackService extends Service {
//开始
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
- Log.e("服务开启","-----");
+ LogUtil.e("服务开启","-----");
return START_STICKY;
}
@@ -99,8 +100,8 @@ public class TrackService extends Service {
tib.setLatitude(l.getLatitude()+"");
//纬度
tib.setLongitude(l.getLongitude()+"");
- Log.e("经度",l.getLatitude()+"");
- Log.e("维度",l.getLongitude()+"");
+ LogUtil.e("经度",l.getLatitude()+"");
+ LogUtil.e("维度",l.getLongitude()+"");
//单号
tib.setShippingNoteNumber(snn);
hyr.trackTracking(tib);
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt
index b3881d5..17fdab9 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt
@@ -19,7 +19,9 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil
import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity
import com.arpa.hndahesudintocctmsdriver.util.view.BottomTabUtil
import com.arpa.hndahesudintocctmsdriver.util.view.PanDuanUtil
+import com.dahe.mylibrary.utils.RootCheck
import com.google.gson.Gson
+import com.lxj.xpopup.XPopup
import com.permissionx.guolindev.PermissionX
class MainActivity : BaseAppCompatActivity() {
@@ -45,6 +47,7 @@ class MainActivity : BaseAppCompatActivity() {
super.onCreate(savedInstanceState)
StateStyleUtil.stateTextColor(this)
setContentView(R.layout.activity_main)
+ isRoot()
con = this
act = this
//隐藏标题栏
@@ -174,4 +177,17 @@ class MainActivity : BaseAppCompatActivity() {
}
}
+ fun isRoot() {
+ if (RootCheck.isRoot()) {
+ XPopup.Builder(this)
+ .isDestroyOnDismiss(true)
+ .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
+ .asConfirm("警告", "该设备已ROOT,存在安全隐! 请更换安全设备后继续使用!",
+ "取消", "确定", {
+ System.exit(0)
+// moveTaskToBack(true)
+ }, null, true).show()
+ }
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/NFCActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/NFCActivity.java
index 4330349..ad827c8 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/NFCActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/NFCActivity.java
@@ -84,7 +84,6 @@ public class NFCActivity extends BaseAppCompatActivity {
}
});
- Log.e("nfc",str);
}
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/AuthQualificationActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/AuthQualificationActivity.java
index 20cc40d..0eb3394 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/AuthQualificationActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/AuthQualificationActivity.java
@@ -19,6 +19,7 @@ import android.widget.Toast;
import androidx.annotation.Nullable;
import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
import com.bumptech.glide.Glide;
import com.esign.esignsdk.EsignSdk;
@@ -85,7 +86,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
CacheGroup.cacheList.remove("upload");
}
if (CacheGroup.cacheList.get("isAuthDriverAuthQualification") != null) {
- Log.e("is", CacheGroup.cacheList.get("isAuthDriverAuthQualification"));
+ LogUtil.e("is", CacheGroup.cacheList.get("isAuthDriverAuthQualification"));
ib = gson.fromJson(CacheGroup.cacheList.get("isAuthDriverAuthQualification"), IsAuthDriverAuthQualificationBean.class);
if (ib.getCode() == 200) {
if (ib.getData() != null) {
@@ -132,14 +133,14 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
}
if (CacheGroup.cacheList.get("authUrl") != null) {
- Log.e("url", CacheGroup.cacheList.get("authUrl"));
+ LogUtil.e("url", CacheGroup.cacheList.get("authUrl"));
BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("authUrl"), BaseBean.class);
if (bb.getCode() == 200) {
finish();
EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
} else {
Toast.makeText(con, bb.getMsg(), Toast.LENGTH_LONG).show();
- }//Log.e("url",CacheGroup.cacheList.get("authUrl"));
+ }//LogUtil.e("url",CacheGroup.cacheList.get("authUrl"));
CacheGroup.cacheList.remove("authUrl");
}
break;
@@ -324,7 +325,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 12 && resultCode == RESULT_OK) {
path = gia.getFile().getPath();
- Log.e("图片地址:", path);
+ LogUtil.e("图片地址:", path);
gia.dis();
ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
} else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
@@ -337,7 +338,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
paths = image.getPath();
}
path = paths;
- Log.e("图片地址:", path);
+ LogUtil.e("图片地址:", path);
gia.dis();
ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java
index 09d88f3..81e3bc1 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java
@@ -6,13 +6,11 @@ import android.net.Uri;
import android.os.Bundle;
import android.os.Message;
import android.text.TextUtils;
-import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
-import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
@@ -21,12 +19,11 @@ import androidx.annotation.Nullable;
import androidx.cardview.widget.CardView;
import com.arpa.hndahesudintocctmsdriver.bean.DicBean;
-import com.arpa.hndahesudintocctmsdriver.bean.SinglePickBean;
-import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
import com.arpa.hndahesudintocctmsdriver.event.PersonEvent;
import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
import com.arpa.hndahesudintocctmsdriver.util.PickerUtils;
import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.arpa.hndahesudintocctmsdriver.util.map.MapUtil;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
@@ -37,7 +34,6 @@ import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.entity.LocalMedia;
import com.lxj.xpopup.XPopup;
-import com.lxj.xpopup.core.ImageViewerPopupView;
import com.lxj.xpopup.interfaces.XPopupImageLoader;
import com.arpa.hndahesudintocctmsdriver.R;
import com.arpa.hndahesudintocctmsdriver.bean.BaseBean;
@@ -197,7 +193,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
CacheGroup.cacheList.remove("saveVehicleLicense");
}
if (CacheGroup.cacheList.get("saveDrawCar") != null) {
- Log.e("-saveDrawCar-", CacheGroup.cacheList.get("saveDrawCar"));
+ LogUtil.e("-saveDrawCar-", CacheGroup.cacheList.get("saveDrawCar"));
BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("saveDrawCar"), BaseBean.class);
if (bb.getCode() == 200) {
Toast.makeText(con, "挂车信息保存成功", Toast.LENGTH_SHORT).show();
@@ -543,7 +539,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
}
break;
case 3:
- Log.e("挂车信息", gson.toJson(cdb));
+ LogUtil.e("挂车信息", gson.toJson(cdb));
if (cdb != null && cdb.getData().getTrailerResVo() != null) {
url1 = StringUtil.isNull(cdb.getData().getTrailerResVo().getFrontImage(), "");
url2 = StringUtil.isNull(cdb.getData().getTrailerResVo().getBackImage(), "");
@@ -575,7 +571,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 12 && resultCode == RESULT_OK) {
path = gia.getFile().getPath();
- Log.e("图片地址:", path);
+ LogUtil.e("图片地址:", path);
gia.dis();
ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
} else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
@@ -588,7 +584,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
paths = image.getPath();
}
path = paths;
- Log.e("图片地址:", path);
+ LogUtil.e("图片地址:", path);
gia.dis();
ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
}
@@ -676,7 +672,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
case 2:
//{"车牌号","车辆类型","所有人","车辆识别代码"}
if (CacheGroup.cacheList.get(TYPE_NAME[2]) != null) {
- Log.e("olb", CacheGroup.cacheList.get(TYPE_NAME[2]));
+ LogUtil.e("olb", CacheGroup.cacheList.get(TYPE_NAME[2]));
olb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[2]), OCRVehicleLicenseBean.class);
if (olb.getCode() == 200) {
url1 = olb.getData().getUrl();
@@ -687,7 +683,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
fontId = olb.getData().getId();
Glide.with(con).load(url1).into(img1);
oCrcarId = olb.getData().getCarId() + "";
- Log.e("-cardId-", oCrcarId);
+ LogUtil.e("-cardId-", oCrcarId);
} else {
Toast.makeText(con, olb.getMsg(), Toast.LENGTH_SHORT).show();
}
@@ -733,7 +729,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
if (keys[0]) {
new OCRRequest().OCRCard(con, hd, new File(path));
} else {
- Log.e("res" + new File(path).getName(), new File(path).getPath());
+ LogUtil.e("res" + new File(path).getName(), new File(path).getPath());
new OCRRequest().OCRCardBack(con, hd, new File(path));
}
break;
@@ -760,7 +756,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
}
break;
case 3:
- Log.e("添加挂车", "挂车" + oCrcarId);
+ LogUtil.e("添加挂车", "挂车" + oCrcarId);
if (keys[0]) {
new OCRRequest().OCRVehicleLicense(con, hd, new File(path));
} else if (keys[1]) {
@@ -814,7 +810,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
//olb
//{"档案编号","初次领证日期","准驾车型","有效期限(止)"},
if (odl != null && odlb != null) {
- Log.e("ocr", new Gson().toJson(odl));
+ LogUtil.e("ocr", new Gson().toJson(odl));
LicenseInputBean iib = new LicenseInputBean();
iib.setArchivesName(str1);
iib.setDriverLicenseName(value7.getText().toString());
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PersonalAuthActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PersonalAuthActivity.java
index f734d6a..b9b6252 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PersonalAuthActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PersonalAuthActivity.java
@@ -5,7 +5,6 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.text.TextUtils;
-import android.util.Log;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
@@ -17,6 +16,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.arpa.hndahesudintocctmsdriver.event.HomeEvent;
import com.arpa.hndahesudintocctmsdriver.event.PersonEvent;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.bumptech.glide.Glide;
import com.esign.esignsdk.EsignSdk;
import com.esign.esignsdk.data.AuthEvent;
@@ -92,13 +92,13 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
CacheGroup.cacheList.remove("upHeadImg");
}
if (CacheGroup.cacheList.get("authUrl") != null) {
- Log.e("url", CacheGroup.cacheList.get("authUrl"));
+ LogUtil.e("url", CacheGroup.cacheList.get("authUrl"));
BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("authUrl"), BaseBean.class);
if (bb.getCode() == 200) {
EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
} else {
Toast.makeText(con, bb.getMsg(), Toast.LENGTH_LONG).show();
- }//Log.e("url",CacheGroup.cacheList.get("authUrl"));
+ }//LogUtil.e("url",CacheGroup.cacheList.get("authUrl"));
CacheGroup.cacheList.remove("authUrl");
}
break;
@@ -206,7 +206,7 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
@Subscribe
public void personResult(PersonEvent home) {
- Log.e("-res-", home.getMessage());
+ LogUtil.e("-res-", home.getMessage());
if (ur != null) {
ur.User();
}
@@ -223,7 +223,7 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 12 && resultCode == RESULT_OK) {
path = gia.getFile().getPath();
- Log.e("图片地址:", path);
+ LogUtil.e("图片地址:", path);
gia.dis();
ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
} else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
@@ -235,7 +235,7 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
paths = image.getPath();
}
path = paths;
- Log.e("图片地址:", path);
+ LogUtil.e("图片地址:", path);
gia.dis();
ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
}
@@ -257,7 +257,7 @@ public class PersonalAuthActivity extends BaseAppCompatActivity {
@Subscribe
public void processResult(AuthEvent auth) {
//添加实名/意愿/签署完成之后的逻辑
- Log.e("-回调信息-", auth.result);
+ LogUtil.e("-回调信息-", auth.result);
JSONObject jsonObject = JSON.parseObject(auth.result);
if ("success".equalsIgnoreCase(jsonObject.getString("res"))) {
if ("sign".equalsIgnoreCase(jsonObject.getString("key"))) {
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java
index 89054c5..b8244cc 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java
@@ -27,6 +27,7 @@ import com.arpa.hndahesudintocctmsdriver.ui.my.WoDeFragment;
import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
import com.arpa.hndahesudintocctmsdriver.util.file.ImageFileCompressUtil;
import com.arpa.hndahesudintocctmsdriver.util.img.GetImageAlert;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
@@ -82,7 +83,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
switch (m.what) {
case 200:
if (CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL) != null) {
- Log.e("--res--", CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL));
+ LogUtil.e("--res--", CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL));
cdb = gson.fromJson(CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL), CarDelBean.class);
if (cdb.getCode() == 200) {
showImgToView();
@@ -138,7 +139,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
CacheGroup.cacheList.remove("saveCarImg");
}
if (CacheGroup.cacheList.get("saveCarRegisterNo") != null) {
- Log.e("is", CacheGroup.cacheList.get("saveCarRegisterNo"));
+ LogUtil.e("is", CacheGroup.cacheList.get("saveCarRegisterNo"));
IsAuthDriverAuthQualificationBean ib = gson.fromJson(CacheGroup.cacheList.get("saveCarRegisterNo"), IsAuthDriverAuthQualificationBean.class);
if (ib.getCode() == 200) {
finish();
@@ -153,7 +154,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
}
if (CacheGroup.cacheList.get("saveCarRoadLicenseNo") != null) {
- Log.e("is", CacheGroup.cacheList.get("saveCarRoadLicenseNo"));
+ LogUtil.e("is", CacheGroup.cacheList.get("saveCarRoadLicenseNo"));
IsAuthDriverAuthQualificationBean ib = gson.fromJson(CacheGroup.cacheList.get("saveCarRoadLicenseNo"), IsAuthDriverAuthQualificationBean.class);
if (ib.getCode() == 200) {
//判断是否需要跳转挂车行驶证页面
@@ -240,7 +241,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 12 && resultCode == RESULT_OK) {
path = gia.getFile().getPath();
- Log.e("图片地址:", path);
+ LogUtil.e("图片地址:", path);
gia.dis();
ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
} else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
@@ -253,7 +254,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
paths = image.getPath();
}
path = paths;
- Log.e("图片地址:", path);
+ LogUtil.e("图片地址:", path);
gia.dis();
ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/VehicleAuthActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/VehicleAuthActivity.java
index 37bdc70..1575b6d 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/VehicleAuthActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/VehicleAuthActivity.java
@@ -15,6 +15,7 @@ import android.widget.Toast;
import androidx.annotation.Nullable;
import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.google.gson.Gson;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
@@ -64,7 +65,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
CacheGroup.cacheList.remove(CAR_AUDIO);
}
if(CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL)!=null){
- Log.e("--res--",CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL));
+ LogUtil.e("--res--",CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL));
cdb=gson.fromJson(CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL), CarDelBean.class);
if(cdb.getCode()==200){
initView(null);
@@ -158,7 +159,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
refreshLayout=findViewById(R.id.srl);
carId=getIntent().getExtras().getString("carId");
ur=new UserRequset(con,hd);
- Log.e("--carId--",carId+"--");
+ LogUtil.e("--carId--",carId+"--");
initRefreshLoad();
}
@@ -336,7 +337,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 12 && resultCode == RESULT_OK) {
path=gia.getFile().getPath();
- Log.e("图片地址:",path);
+ LogUtil.e("图片地址:",path);
gia.dis();
ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
} else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
@@ -349,7 +350,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
paths = image.getPath();
}
path=paths;
- Log.e("图片地址:",path);
+ LogUtil.e("图片地址:",path);
gia.dis();
ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
}
@@ -364,7 +365,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
public void initRefreshLoad(){
refreshLayout=findViewById(R.id.srl);
refreshLayout.setOnRefreshListener(refreshLayout -> {
- Log.e("下拉刷新","pps");
+ LogUtil.e("下拉刷新","pps");
if("".equals(carId)){
initView(null);
refreshLayout.finishRefresh();
@@ -382,7 +383,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
@Subscribe
public void processResult(VehicleEvent event) {
- Log.e("-msg-",event.getMessage());
+ LogUtil.e("-msg-",event.getMessage());
if(!"挂".equals(event.getMessage())) {
carId = event.getMessage();
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/business/BusinessActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/business/BusinessActivity.java
index 8e47c6b..dfc735a 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/business/BusinessActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/business/BusinessActivity.java
@@ -9,6 +9,7 @@ import android.widget.Toast;
import androidx.annotation.Nullable;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.google.gson.Gson;
import com.arpa.hndahesudintocctmsdriver.R;
import com.arpa.hndahesudintocctmsdriver.bean.BusinessBean;
@@ -57,7 +58,7 @@ public class BusinessActivity extends BaseActivity {
switch (m.what){
case RequsetCodeConstants.SUCCESS:
if(CacheGroup.cacheList.get("business_list")!=null){
- Log.e("--res--",CacheGroup.cacheList.get("business_list")+"");
+ LogUtil.e("--res--",CacheGroup.cacheList.get("business_list")+"");
blb=gson.fromJson(CacheGroup.cacheList.get("business_list"),BusinessListBean.class);
if(blb.getCode()==200){
forGetBusDel();
@@ -77,7 +78,7 @@ public class BusinessActivity extends BaseActivity {
initBusListDel();
break;
case 3:
- Log.e("aaa",(String) m.obj);
+ LogUtil.e("aaa",(String) m.obj);
BusinessBean.DataDTO bd=gson.fromJson((String) m.obj,BusinessBean.DataDTO.class);
if(bd!=null){
@@ -85,7 +86,7 @@ public class BusinessActivity extends BaseActivity {
try {
business_list.addItemV(bd);
}catch (Exception e){
- Log.e("遇到了",bd.toString());
+ LogUtil.e("遇到了",bd.toString());
}
//}
}
@@ -140,7 +141,7 @@ public class BusinessActivity extends BaseActivity {
public void forGetBusDel(){
customDialog.dismiss();
//business_list.remo
- Log.e("-数组-",gson.toJson(blb));
+ LogUtil.e("-数组-",gson.toJson(blb));
for (int i=0;i {
toast.startActivity(in);
- Log.e("-is-", view.isInTouchMode() + "");
+ LogUtil.e("-is-", view.isInTouchMode() + "");
})
// 设置动画样式
//.setAnimStyle(android.R.style.Animation_Translucent)
@@ -344,7 +345,7 @@ public class HomeFragment extends BaseFragment {
.setDuration(1000 * 60 * 60 * 12)
.setOnClickListener(R.id.img_kf, (toast, view) -> {
toast.startActivity(in);
- Log.e("-is-", view.isInTouchMode() + "");
+ LogUtil.e("-is-", view.isInTouchMode() + "");
})
// 设置动画样式
//.setAnimStyle(android.R.style.Animation_Translucent)
@@ -362,7 +363,7 @@ public class HomeFragment extends BaseFragment {
// } catch (UnknownHostException e) {
// e.printStackTrace();
// }
-// Log.e("-ip-",":"+str);
+// LogUtil.e("-ip-",":"+str);
// }
// }.start();
return root;
@@ -372,7 +373,7 @@ public class HomeFragment extends BaseFragment {
public void initRefreshLoad() {
refreshLayout = root.findViewById(R.id.srl);
refreshLayout.setOnRefreshListener(refreshLayout -> {
- Log.e("下拉刷新", "pps");
+ LogUtil.e("下拉刷新", "pps");
keys = true;
getRequest();
});
@@ -588,7 +589,7 @@ public class HomeFragment extends BaseFragment {
if (sob != null && sob.getData() != null && 0 < sob.getData().getWayChildren().size()) {
//order_start.setVisibility(View.VISIBLE);
SPUtil.insSP(con, "order", "ShippingNoteNumber", sob.getData().getShippingNoteNumber());
- Log.e("开始轨迹上传服务", "-----");
+ LogUtil.e("开始轨迹上传服务", "-----");
orderNum.setText("运单号:" + sob.getData().getShippingNoteNumber());
order_state.setText("" + sob.getData().getWaybillStatus());
Intent serviceIn = new Intent(con, TrackService.class);
@@ -789,8 +790,8 @@ public class HomeFragment extends BaseFragment {
public void addMap(double latitude, double longitude, String title, String price, int id) {
if (aMap != null) {
- Log.e("longitude", longitude + "");
- Log.e("latitude", latitude + "");
+ LogUtil.e("longitude", longitude + "");
+ LogUtil.e("latitude", latitude + "");
MarkerOptions markerOption = new MarkerOptions();
markerOption.position(new LatLng(latitude, longitude));
View infoWindow = LayoutInflater.from(con).inflate(
@@ -851,7 +852,7 @@ public class HomeFragment extends BaseFragment {
}
return false;
});
- //Log.e("--长度--",aMap.getMapScreenMarkers().size()+"个");
+ //LogUtil.e("--长度--",aMap.getMapScreenMarkers().size()+"个");
}
}
@@ -894,12 +895,12 @@ public class HomeFragment extends BaseFragment {
MDPLocationCollectionManager.getInvoices(con, 10, 1, new OnDownloadResultListener() {
@Override
public void onSuccess(Object o) {
- Log.e("--成功信息--", new Gson().toJson(o));
+ LogUtil.e("--成功信息--", new Gson().toJson(o));
}
@Override
public void onFailure(String s, String s1) {
- Log.e("--失败信息--", s + s1);
+ LogUtil.e("--失败信息--", s + s1);
}
});
}
@@ -956,8 +957,8 @@ public class HomeFragment extends BaseFragment {
double lat = location.getLatitude();
//纬度
double lng = location.getLongitude();
- Log.e("定位信息1", location.getLatitude() + "");
- Log.e("定位信息2", location.getLongitude() + "");
+ LogUtil.e("定位信息1", location.getLatitude() + "");
+ LogUtil.e("定位信息2", location.getLongitude() + "");
//实现第一次定位成功,将地图中心移动到定位点
CameraUpdate cameraUpdate = CameraUpdateFactory.newLatLngZoom(new
LatLng(lat, lng), 11);
@@ -965,7 +966,7 @@ public class HomeFragment extends BaseFragment {
} else {
//错误信息
String error = bundle.get("errorInfo").toString();
- Log.e("Map", error);
+ LogUtil.e("Map", error);
Toast.makeText(con, "地图定位失败" + error, Toast.LENGTH_LONG).show();
}
}
@@ -973,7 +974,7 @@ public class HomeFragment extends BaseFragment {
@Subscribe
public void processResult(HomeEvent home) {
- Log.e("-res-", home.getMessage());
+ LogUtil.e("-res-", home.getMessage());
initView(null);
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYuanFragmengt.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYuanFragmengt.java
index 9d05a79..97193d4 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYuanFragmengt.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYuanFragmengt.java
@@ -18,6 +18,7 @@ import androidx.annotation.Nullable;
import com.alct.mdp.MDPLocationCollectionManager;
import com.alct.mdp.callback.OnDownloadResultListener;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.google.gson.Gson;
import com.haozhang.lib.SlantedTextView;
import com.lxj.xpopup.XPopup;
@@ -86,7 +87,7 @@ public class HuoYuanFragmengt extends BaseFragment {
case RequsetCodeConstants.SUCCESS:
if (!UiAuxiliary.isLogin(con)){
if (CacheGroup.cacheList.get("hl")!=null && CacheGroup.cacheList.get("up_app")!=null){
- Log.e("未登录货源1",CacheGroup.cacheList.get("hl"));
+ LogUtil.e("未登录货源1",CacheGroup.cacheList.get("hl"));
hb=gson.fromJson(CacheGroup.cacheList.get("hl"),HuoYuanListBean.class);
if(hb.getCode()==200){
initView(null);
@@ -110,9 +111,9 @@ public class HuoYuanFragmengt extends BaseFragment {
}else{
if (CacheGroup.cacheList.get("hl")!=null && CacheGroup.cacheList.get(START_ORDER)!=null
&& CacheGroup.cacheList.get("userdata")!=null && CacheGroup.cacheList.get("up_app")!=null){
- Log.e("货源",CacheGroup.cacheList.get("hl"));
- Log.e("user",CacheGroup.cacheList.get("userdata"));
- Log.e("up_app",CacheGroup.cacheList.get("up_app"));
+ LogUtil.e("货源",CacheGroup.cacheList.get("hl"));
+ LogUtil.e("user",CacheGroup.cacheList.get("userdata"));
+ LogUtil.e("up_app",CacheGroup.cacheList.get("up_app"));
hb=gson.fromJson(CacheGroup.cacheList.get("hl"),HuoYuanListBean.class);
sob=gson.fromJson(CacheGroup.cacheList.get(START_ORDER),StartOrderBean.class);
user=gson.fromJson(CacheGroup.cacheList.get("userdata"),UserBean.class);
@@ -137,7 +138,7 @@ public class HuoYuanFragmengt extends BaseFragment {
delCac();
}
if(CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA)!=null){
- Log.e("--认证信息--",CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA));
+ LogUtil.e("--认证信息--",CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA));
DriverAuthDataBean dad=gson.fromJson(CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA),DriverAuthDataBean.class);
if (dad.getCode()==200) {
SPUtil.insSP(con,"data","authdata",CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA));
@@ -207,7 +208,7 @@ public class HuoYuanFragmengt extends BaseFragment {
public void initRefreshLoad(){
refreshLayout=root.findViewById(R.id.srl);
refreshLayout.setOnRefreshListener(refreshLayout -> {
- Log.e("下拉刷新","pps");
+ LogUtil.e("下拉刷新","pps");
delCac();
hd.sendEmptyMessageDelayed(10, 10000);
hyr.getHuoYuan(1,100);
@@ -230,7 +231,7 @@ public class HuoYuanFragmengt extends BaseFragment {
list.add(new ManyBean(new model(),R.layout.renzheng));
if(sob!=null && sob.getData()!=null && sob.getData().getWayChildren().size()>0){
SPUtil.insSP(con,"order","ShippingNoteNumber",sob.getData().getShippingNoteNumber());
- Log.e("开始轨迹上传服务","-----");
+ LogUtil.e("开始轨迹上传服务","-----");
Intent serviceIn=new Intent(con,TrackService.class);
getActivity().startService(serviceIn);
list.add(new ManyBean(sob.getData(),R.layout.huoyuan_yundan));
@@ -263,11 +264,11 @@ public class HuoYuanFragmengt extends BaseFragment {
MDPLocationCollectionManager.getInvoices(con, 10, 1, new OnDownloadResultListener() {
@Override
public void onSuccess(Object o) {
- Log.e("--成功信息--",new Gson().toJson(o));
+ LogUtil.e("--成功信息--",new Gson().toJson(o));
}
@Override
public void onFailure(String s, String s1) {
- Log.e("--失败信息--",s+s1);
+ LogUtil.e("--失败信息--",s+s1);
}
});
}
@@ -281,7 +282,7 @@ public class HuoYuanFragmengt extends BaseFragment {
user_state=1;
}
}
- Log.e("--登录状态--",UiAuxiliary.isLogin(con)+"");
+ LogUtil.e("--登录状态--",UiAuxiliary.isLogin(con)+"");
TextView rz=v.findViewById(R.id.rz);
TextView state_body=v.findViewById(R.id.state_body);
state_body.setText(states_body[user_state]);
@@ -297,7 +298,7 @@ public class HuoYuanFragmengt extends BaseFragment {
startActivity(in2);
break;
case 2:
- Log.e("路径",PushConstant.ORDER_ALL);
+ LogUtil.e("路径",PushConstant.ORDER_ALL);
//ARouter.getInstance().build(PushConstant.ORDER_ALL).navigation();
Intent in3=new Intent(con, OrderAllActivity.class);
startActivity(in3);
@@ -345,12 +346,12 @@ public class HuoYuanFragmengt extends BaseFragment {
Button qiang=v1.findViewById(R.id.qiang);
TextView type_timer=v1.findViewById(R.id.type_timer);
qiang.setOnClickListener(v22 -> {
- Log.e("user",new Gson().toJson(user));
+ LogUtil.e("user",new Gson().toJson(user));
if(UiAuxiliary.isLogin(con) && user!=null){
if(user.getData().getAuditStatus()==100003){
Intent in=new Intent(con,HuoYunDelActivity.class);
in.putExtra("id",hdr.getOrderId());
- Log.e("---id---",hdr.getOrderId()+"");
+ LogUtil.e("---id---",hdr.getOrderId()+"");
startActivity(in);
}else{
new XPopup.Builder(act)
@@ -393,12 +394,12 @@ public class HuoYuanFragmengt extends BaseFragment {
qiang.setText("抢单");
}
v1.setOnClickListener(v2 -> {
- Log.e("user",new Gson().toJson(user));
+ LogUtil.e("user",new Gson().toJson(user));
if(UiAuxiliary.isLogin(con) && user!=null){
if(user.getData().getAuditStatus()==100003){
Intent in=new Intent(con,HuoYunDelActivity.class);
in.putExtra("id",hdr.getOrderId());
- Log.e("---id---",hdr.getOrderId()+"");
+ LogUtil.e("---id---",hdr.getOrderId()+"");
startActivity(in);
}else{
Toast.makeText(con,"请认证之后再接单",Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java
index ed9fa67..61415b3 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java
@@ -24,6 +24,7 @@ import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
import com.arpa.hndahesudintocctmsdriver.ui.auth.PersonalAuthActivity;
import com.arpa.hndahesudintocctmsdriver.util.img.ImageGetUtil;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
@@ -88,7 +89,7 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
CacheGroup.cacheList.remove(WoDeFragment.VEHICLE_LIST);
}
if (CacheGroup.cacheList.get(END) != null) {
- Log.e("--end--", CacheGroup.cacheList.get(END));
+ LogUtil.e("--end--", CacheGroup.cacheList.get(END));
BaseBean bb = gson.fromJson(CacheGroup.cacheList.get(END), BaseBean.class);
if (bb.getCode() == 200) {
//Toast.makeText(con,"接单成功",Toast.LENGTH_SHORT).show();
@@ -116,7 +117,7 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
break;
case 13:
int index = Integer.valueOf((String) m.obj);
- Log.e("--选择车辆--", clb.getData().get(index).getCarNumber());
+ LogUtil.e("--选择车辆--", clb.getData().get(index).getCarNumber());
car.setText("选择车辆:" + clb.getData().get(index).getCarNumber());
cid = clb.getData().get(index).getCarId();
break;
@@ -243,7 +244,7 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
new OnConfirmListener() {
@Override
public void onConfirm() {
- Log.e("--id--", "cid:" + cid + "---wid:" + id);
+ LogUtil.e("--id--", "cid:" + cid + "---wid:" + id);
customDialog = new CustomDialog(con, "正在接单...");
customDialog.show();
hyr.confirm(cid, id);
@@ -283,7 +284,7 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
HuoYuanDelBean.DataDTO.SendInfoDTO hdsg = (HuoYuanDelBean.DataDTO.SendInfoDTO) o1;
type.setImageResource(R.mipmap.zhuang);
String goodsData = "";
- Log.e("--goodsData--", goodsData);
+ LogUtil.e("--goodsData--", goodsData);
for (int i = 0; i < hdsg.getGoods().size(); i++) {
if (i != 0) {
goodsData += "\n" + hdsg.getGoods().get(i).getGoodName() + "|" + hdsg.getGoods().get(i).getGoodNum() + hdsg.getGoods().get(i).getGoodUnit() + "|货物价值(元):" + hdsg.getGoods().get(i).getGoodPrice();
@@ -301,7 +302,7 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
HuoYuanDelBean.DataDTO.PutInfoDTO hdsg = (HuoYuanDelBean.DataDTO.PutInfoDTO) o1;
type.setImageResource(R.mipmap.xie);
String goodsData = "";
- Log.e("--goodsData--", goodsData);
+ LogUtil.e("--goodsData--", goodsData);
for (int i = 0; i < hdsg.getGoods().size(); i++) {
if (i != 0) {
goodsData += "\n" + hdsg.getGoods().get(i).getGoodName() + "|" + hdsg.getGoods().get(i).getGoodNum() + hdsg.getGoods().get(i).getGoodUnit() + "|货物价值(元):" + hdsg.getGoods().get(i).getGoodPrice();
@@ -319,7 +320,7 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
@Subscribe
public void processResult(AuthEvent auth) {
//添加实名/意愿/签署完成之后的逻辑
- Log.e("-回调信息-", auth.result);
+ LogUtil.e("-回调信息-", auth.result);
JSONObject jsonObject = JSON.parseObject(auth.result);
if ("success".equalsIgnoreCase(jsonObject.getString("res"))) {
if ("sign".equalsIgnoreCase(jsonObject.getString("key"))) {
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/OrderAllActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/OrderAllActivity.java
index f36382c..647afa9 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/OrderAllActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/OrderAllActivity.java
@@ -10,6 +10,7 @@ import android.widget.Toast;
import androidx.annotation.Nullable;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.google.gson.Gson;
import com.haozhang.lib.SlantedTextView;
import com.lxj.xpopup.core.BasePopupView;
@@ -47,7 +48,7 @@ public class OrderAllActivity extends BaseActivity {
switch (m.what){
case RequsetCodeConstants.SUCCESS:
if (CacheGroup.cacheList.get(USER_ORDER_LIST)!=null && index==1) {
- Log.e("结果2",CacheGroup.cacheList.get(USER_ORDER_LIST));
+ LogUtil.e("结果2",CacheGroup.cacheList.get(USER_ORDER_LIST));
olb=gson.fromJson(CacheGroup.cacheList.get(USER_ORDER_LIST),OrderListBean.class);
if(olb.getCode()==200){
initView(null);
@@ -91,14 +92,14 @@ public class OrderAllActivity extends BaseActivity {
public void initRefreshLoad() {
refreshLayout =findViewById(R.id.srl);
refreshLayout.setOnRefreshListener(refreshLayout -> {
- Log.e("下拉刷新", "pps");
+ LogUtil.e("下拉刷新", "pps");
index=1;
dataKey=true;
timer="";
ur.getListV2(index,10);
});
refreshLayout.setOnLoadMoreListener(refreshLayout -> {
- Log.e("上拉加载", "次数"+index);
+ LogUtil.e("上拉加载", "次数"+index);
if(dataKey){
index++;
ur.getListV2(index,10);
@@ -167,7 +168,7 @@ public class OrderAllActivity extends BaseActivity {
v.setTop(getResources().getDimensionPixelOffset(R.dimen.dp_10));
OrderListBean.DataDTO.ListDTO idl= (OrderListBean.DataDTO.ListDTO) o;
v.setOnClickListener(v1 -> {
- Log.e("id",idl.getOrderId()+"");
+ LogUtil.e("id",idl.getOrderId()+"");
Intent in=new Intent(con,StartYunDanActivity.class);
in.putExtra("id",idl.getOrderId());
startActivity(in);
@@ -205,7 +206,7 @@ public class OrderAllActivity extends BaseActivity {
state4.setText(" 已评价");
}
SlantedTextView states=v.findViewById(R.id.states);
- Log.e("类型",":"+ld.getDispatchType());
+ LogUtil.e("类型",":"+ld.getDispatchType());
if(ld.getDispatchType()==1){
states.setText("派单");
} else if(ld.getDispatchType()==2) {
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/OrderListActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/OrderListActivity.java
index 0e6231d..670863e 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/OrderListActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/OrderListActivity.java
@@ -11,6 +11,7 @@ import android.widget.Toast;
import androidx.annotation.Nullable;
import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.google.gson.Gson;
import com.lxj.xpopup.XPopup;
import com.lxj.xpopup.interfaces.OnConfirmListener;
@@ -54,13 +55,13 @@ public class OrderListActivity extends BaseActivity {
public void initRefreshLoad() {
refreshLayout =findViewById(R.id.srl);
refreshLayout.setOnRefreshListener(refreshLayout -> {
- Log.e("下拉刷新", "pps");
+ LogUtil.e("下拉刷新", "pps");
index=1;
dataKey=true;
hyr.getHuoYuan(index,10);
});
refreshLayout.setOnLoadMoreListener(refreshLayout -> {
- Log.e("上拉加载", "次数"+index);
+ LogUtil.e("上拉加载", "次数"+index);
if(dataKey){
index++;
hyr.getHuoYuan(index,10);
@@ -81,7 +82,7 @@ public class OrderListActivity extends BaseActivity {
refreshLayout.finishRefresh();
refreshLayout.finishLoadMore();
if(CacheGroup.cacheList.get("hl")!=null){
- Log.e("货源",CacheGroup.cacheList.get("hl"));
+ LogUtil.e("货源",CacheGroup.cacheList.get("hl"));
hb=gson.fromJson(CacheGroup.cacheList.get("hl"),HuoYuanListBean.class);
if(hb.getCode()==200){
if(index==1){
@@ -95,7 +96,7 @@ public class OrderListActivity extends BaseActivity {
CacheGroup.cacheList.remove("hl");
}
if(CacheGroup.cacheList.get("dealList")!=null){
- Log.e("历史货源",CacheGroup.cacheList.get("dealList"));
+ LogUtil.e("历史货源",CacheGroup.cacheList.get("dealList"));
hdb=gson.fromJson(CacheGroup.cacheList.get("dealList"),HuoYuanListDealBean.class);
if(hdb.getCode()==200){
insDeal();
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java
index 77e908b..fcd72ec 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java
@@ -40,6 +40,7 @@ import com.amap.api.services.route.DriveStep;
import com.amap.api.services.route.RideRouteResult;
import com.amap.api.services.route.RouteSearch;
import com.amap.api.services.route.WalkRouteResult;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.bumptech.glide.Glide;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.gson.Gson;
@@ -102,8 +103,8 @@ public class StartYunDanActivity extends BaseActivity {
case RequsetCodeConstants.SUCCESS:
//获取页面数据
if (CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER)!=null && CacheGroup.cacheList.get(GET_EVALUTE)!=null) {
- Log.e("-评论-",CacheGroup.cacheList.get(GET_EVALUTE));
- Log.e("-运单-",CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER));
+ LogUtil.e("-评论-",CacheGroup.cacheList.get(GET_EVALUTE));
+ LogUtil.e("-运单-",CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER));
sob=gson.fromJson(CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER), StartOrderBean.class);
wnb=gson.fromJson(CacheGroup.cacheList.get(GET_EVALUTE), WNewsBean.class);
if(sob.getCode()==200 && sob.getData()!=null){
@@ -163,7 +164,7 @@ public class StartYunDanActivity extends BaseActivity {
aMap = map.getMap();
initLoaction();
}
- Log.e("--id--",""+id);
+ LogUtil.e("--id--",""+id);
String userdata= SPUtil.getSP(con,"data","userdata");
if(!userdata.equals("")){
ub=gson.fromJson(userdata,UserBean.class);
@@ -236,7 +237,7 @@ public class StartYunDanActivity extends BaseActivity {
m_pl_value.setEnabled(false);
}
if(datum.getType()==1){
- Log.e("分数",datum.getAttitudeScore()+"_");
+ LogUtil.e("分数",datum.getAttitudeScore()+"_");
sv2.setScore(datum.getAttitudeScore());
pl_value.setText(datum.getContent());
}
@@ -247,7 +248,7 @@ public class StartYunDanActivity extends BaseActivity {
String evaluate=m_pl_value.getText()+"";
if(id!=0){
if(evaluate.length()>=5){
- Log.e("星星",""+sv1.getScore());
+ LogUtil.e("星星",""+sv1.getScore());
hyr.keepEvaluate(sv1.getScore(),m_pl_value.getText()+"",id);
}else{
Toast.makeText(con,"写够5个字才是好司机~",Toast.LENGTH_SHORT).show();
@@ -281,7 +282,7 @@ public class StartYunDanActivity extends BaseActivity {
get_contract.setOnClickListener(v13 -> {
Intent in=new Intent(con, WebPDFActivity.class);
in.putExtra("title","电子合同");
- Log.e("--地址--",sob.getData().getContractUrl());
+ LogUtil.e("--地址--",sob.getData().getContractUrl());
in.putExtra("url",sob.getData().getContractUrl());
startActivity(in);
});
@@ -482,7 +483,7 @@ public class StartYunDanActivity extends BaseActivity {
mListener.onLocationChanged(aMapLocation);// 显示系统小蓝点
} else {
String errText = "定位失败," + aMapLocation.getErrorCode()+ ": " + aMapLocation.getErrorInfo();
- Log.e("AmapErr",errText);
+ LogUtil.e("AmapErr",errText);
}
}
}
@@ -664,11 +665,11 @@ public class StartYunDanActivity extends BaseActivity {
// LocationOpenApi.stop(con, snis, new OnResultListener() {
// @Override
// public void onSuccess() {
-// Log.e("关闭定位成功","卸货货上传成功");
+// LogUtil.e("关闭定位成功","卸货货上传成功");
// }
// @Override
// public void onFailure(String s, String s1) {
-// Log.e("关闭定位失败:",s+s1);
+// LogUtil.e("关闭定位失败:",s+s1);
// }
// });
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/drivercircle/VideoReleaseActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/drivercircle/VideoReleaseActivity.java
deleted file mode 100644
index f7929d8..0000000
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/drivercircle/VideoReleaseActivity.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.ui.home.drivercircle;
-
-import android.graphics.Bitmap;
-import android.media.MediaMetadataRetriever;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.Toast;
-
-import androidx.annotation.Nullable;
-
-//import com.alibaba.sdk.android.vod.upload.VODSVideoUploadCallback;
-//import com.alibaba.sdk.android.vod.upload.VODSVideoUploadClient;
-//import com.alibaba.sdk.android.vod.upload.VODSVideoUploadClientImpl;
-//import com.alibaba.sdk.android.vod.upload.model.SvideoInfo;
-//import com.alibaba.sdk.android.vod.upload.session.VodHttpClientConfig;
-//import com.alibaba.sdk.android.vod.upload.session.VodSessionCreateInfo;
-import com.bumptech.glide.Glide;
-import com.arpa.hndahesudintocctmsdriver.R;
-import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
-import com.arpa.hndahesudintocctmsdriver.util.view.BaseActivity;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-
-/**
- * @author hlh
- * @version 1.0.0
- * @date 2021/11/4 17:15
- * @description:
- */
-
-public class VideoReleaseActivity extends BaseActivity {
-
- private String videoPath="";
- private String coverPath="";
- private String video_title="用户未设置";
- private ImageView video_cover;
- @Override
- protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- StateStyleUtil.stateTextColor(this);
- setContentView(R.layout.activity_video_release);
- con=this;
- video_cover=findViewById(R.id.video_cover);
- videoPath=getIntent().getExtras().getString("path");
- setTitle("发布");
- initView(null);
- }
-
- @Override
- public void initView(Object obj) {
- super.initView(obj);
- getFirstframe(videoPath);
- Glide.with(con).load(new File(coverPath)).into(video_cover);
- }
-
- public void submit(View v){
-
- //uplod();
- }
-
- private void getFirstframe(String path){
- MediaMetadataRetriever mmr=new MediaMetadataRetriever();//实例化MediaMetadataRetriever对象
- File file=new File(path);//实例化File对象，文件路径为/storage/emulated/0/shipin.mp4 （手机根目录）
- if(!file.exists()){
- Log.e("s","文件不存在");
- }
- mmr.setDataSource(path);
- Bitmap bitmap = mmr.getFrameAtTime(0); //0表示首帧图片
- mmr.release(); //释放MediaMetadataRetriever对象
- if(bitmap!=null){
- Log.e("s","获取视频缩略图成功");
- //存储媒体已经挂载，并且挂载点可读/写。
- if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
- bitmap.recycle(); //回收bitmap
- return;
- }
- try {
- Calendar now = new GregorianCalendar();
- SimpleDateFormat simpleDate = new SimpleDateFormat("yyyyMMddHHmmss", Locale.getDefault());
- String picture_Name = simpleDate.format(now.getTime()); //获取当前时间戳作为文件名称，避免同名
- String framePath = "/storage/emulated/0/DCIM/Camera/"; //图片保存文件夹
- File frame_file = new File(framePath);
- if (!frame_file.exists()) { //// 如果路径不存在，就创建路径
- frame_file.mkdirs();
- }
- File picture_file = new File(framePath,picture_Name + ".jpg"); // 创建路径和文件名的File对象
- FileOutputStream out = new FileOutputStream(picture_file);
- bitmap.compress(Bitmap.CompressFormat.JPEG, 100, out);
- out.flush();
- out.close(); //注意关闭文件流
- Log.e("s","保存图片成功");
- coverPath=picture_file.getPath();
- } catch (Exception e) {
- Log.e("保存图片失败",e.getMessage().toString());
- Toast.makeText(con, "保存图片失败！" + e.getMessage().toString(), Toast.LENGTH_LONG).show();
- e.printStackTrace();
- }
- }else{
- Log.e("e","获取视频缩略图失败");
- }
- }
-
- private String accessKeyId="";
- private String accessKeySecret="";
- private String securityToken="";
- private String expriedTime="";
- private String requestID="";
-
-// public void uplod(){
-// VODSVideoUploadClient vodsVideoUploadClient = new VODSVideoUploadClientImpl(getApplicationContext());
-// vodsVideoUploadClient.init();
-// //构建上传参数
-// //参数请确保存在，如不存在SDK内部将会直接将错误throw Exception
-// //文件路径保证存在之外因为Android 6.0之后需要动态获取权限，请开发者自行实现获取"文件读写权限"
-// VodHttpClientConfig vodHttpClientConfig = new VodHttpClientConfig.Builder()
-// .setMaxRetryCount(2)//重试次数
-// .setConnectionTimeout(15 * 1000)//连接超时
-// .setSocketTimeout(15 * 1000)//socket超时
-// .build();
-// //构建短视频VideoInfo，常见的描述、标题、详情都可以设置
-// SvideoInfo svideoInfo = new SvideoInfo();
-// svideoInfo.setTitle(video_title);//标题
-// svideoInfo.setDesc("-无-");//文件详情
-// svideoInfo.setCateId(1);//分类ID
-// //构建点播上传参数（重要）
-// VodSessionCreateInfo vodSessionCreateInfo =new VodSessionCreateInfo.Builder()
-// .setImagePath(coverPath)//图片地址
-// .setVideoPath(videoPath)//视频地址
-// .setAccessKeyId(accessKeyId)//临时accessKeyId
-// .setAccessKeySecret(accessKeySecret)//临时accessKeySecret
-// .setSecurityToken(securityToken)//securityToken
-// .setExpriedTime(expriedTime)//STStoken过期时间
-// .setRequestID(requestID)//requestID，开发者可以传将获取STS返回的requestID设置也可以不设
-// .setIsTranscode(true)//是否转码，如开启转码请AppSever务必监听服务端转码成功的通知
-// .setSvideoInfo(svideoInfo)//短视频信息
-// .setVodHttpClientConfig(vodHttpClientConfig)//网络参数
-// .build();
-// vodsVideoUploadClient.uploadWithVideoAndImg(vodSessionCreateInfo, new VODSVideoUploadCallback() {
-// @Override
-// public void onUploadSucceed(String videoId, String imageUrl) {
-// //上传成功返回视频ID和图片URL
-// Log.d("-success-","onUploadSucceed"+ "videoId:"+ videoId + "imageUrl" + imageUrl);
-// }
-// @Override
-// public void onUploadFailed(String code, String message) {
-// //上传失败返回错误码和message，错误码有详细的错误信息请开发者仔细阅读
-// Log.d("-error-","onUploadFailed" + "code" + code + "message" + message);
-// }
-// @Override
-// public void onUploadProgress(long uploadedSize, long totalSize) {
-// //上传的进度回调，非UI线程
-// Log.d("-进度-","onUploadProgress" + uploadedSize * 100 / totalSize);
-// //progress = uploadedSize * 100 / totalSize;
-// //handler.sendEmptyMessage(0);
-// }
-// @Override
-// public void onSTSTokenExpried() {
-// Log.d("过期","onSTSTokenExpried");
-// //STS token过期之后刷新STStoken，如正在上传将会断点续传
-// // vodsVideoUploadClient.refreshSTSToken(accessKeyId,accessKeySecret,securityToken,expriedTime);
-// }
-// @Override
-// public void onUploadRetry(String code, String message) {
-// //上传重试的提醒
-// //Log.d(TAG,"onUploadRetry" + "code" + code + "message" + message);
-// }
-// @Override
-// public void onUploadRetryResume() {
-// //上传重试成功的回调，告知用户重试成功
-// //Log.d(TAG,"onUploadRetryResume");
-// }
-// });
-// }
-}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/GetShangChuanActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/GetShangChuanActivity.java
index 885935f..af13ae6 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/GetShangChuanActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/GetShangChuanActivity.java
@@ -1,12 +1,12 @@
package com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan;
import android.os.Bundle;
-import android.util.Log;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.Nullable;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.bumptech.glide.Glide;
import com.google.gson.Gson;
import com.lxj.xpopup.XPopup;
@@ -38,7 +38,7 @@ public class GetShangChuanActivity extends BaseActivity {
con=this;
initFind();
sdwStr=getIntent().getExtras().getString("sdwStr");
- Log.e("---sdwStr--",sdwStr);
+ LogUtil.e("---sdwStr--",sdwStr);
sdw=new Gson().fromJson(sdwStr,StartOrderBean.DataDTO.WayChildrenDTO.class);
initView(null);
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java
index 62e7615..9134c1e 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java
@@ -24,6 +24,7 @@ import com.arpa.hndahesudintocctmsdriver.util.BitmapUtil;
import com.arpa.hndahesudintocctmsdriver.util.NfcUtils;
import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
import com.arpa.hndahesudintocctmsdriver.util.img.GetCarImageAlert;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.bumptech.glide.Glide;
import com.google.gson.Gson;
import com.luck.picture.lib.PictureSelector;
@@ -87,7 +88,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
switch (m.what){
case RequsetCodeConstants.SUCCESS:
if (CacheGroup.cacheList.get("upload")!=null) {
- Log.e("upload",CacheGroup.cacheList.get("upload"));
+ LogUtil.e("upload",CacheGroup.cacheList.get("upload"));
ub=gson.fromJson(CacheGroup.cacheList.remove("upload"),UploadBean.class);
if(ub.getCode()==200){
imgIds.add(ub.getData().getId());
@@ -147,8 +148,8 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
case ImageFileCompressUtil.COMPRESS_SUCCESS:
path= (String) m.obj;
- Log.e("res:","选定图片结果");
- Log.e("res:",path);
+ LogUtil.e("res:","选定图片结果");
+ LogUtil.e("res:",path);
//选定图片结果
// if(index==1 || index==2){
// new OCRRequest().OCRPlateLicense(con,hd,new File(path));
@@ -186,7 +187,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
h_type=ins.getInt("h_type");
keys=ins.getBoolean("keys");
sobStr=getIntent().getExtras().getString("sob");
- //Log.e("---sdwStr--",sdwStr);
+ //LogUtil.e("---sdwStr--",sdwStr);
sob=new Gson().fromJson(sobStr, StartOrderBean.class);
initView(null);
customDialog=new CustomDialog(con, "正在定位当前位置...");
@@ -237,7 +238,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
});
getImg.setOnClickListener(v -> {
if(key){
- Log.e("--imgIds.size()--",imgIds.size()+"");
+ LogUtil.e("--imgIds.size()--",imgIds.size()+"");
gia.showPopueWindow(this,index==2);
}else{
new XPopup.Builder(con)
@@ -270,7 +271,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
return;
}
path=gia.getFile().getPath();
- Log.e("图片地址:",path);
+ LogUtil.e("图片地址:",path);
gia.dis();
ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
} else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
@@ -283,7 +284,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
paths = image.getPath();
}
path=paths;
- Log.e("图片地址:",path);
+ LogUtil.e("图片地址:",path);
gia.dis();
ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
}
@@ -296,7 +297,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
public void typeRequest(){
// for(int i=0;i {
String phone = String.valueOf(input_phone.getText());
if ("".equals(phone) || phone == null) {
- Log.e("点击事件", "请先输入手机号");
+ LogUtil.e("点击事件", "请先输入手机号");
Toast.makeText(con, "请先输入手机号", Toast.LENGTH_SHORT).show();
} else {
if (11 == phone.length() && phone.indexOf("1") == 0) {
@@ -217,7 +218,7 @@ public class LoginActivity extends BaseActivity {
btn_login.setOnClickListener(v -> {
String phone = String.valueOf(input_phone.getText());
String code = String.valueOf(input_code.getText());
- Log.e("--code--", code);
+ LogUtil.e("--code--", code);
if (judgeFormat(phone, code)) {
if (key) {
LoginRegInputBean lb = new LoginRegInputBean();
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java
index 49b6bf5..3b02e56 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java
@@ -36,6 +36,7 @@ import com.arpa.hndahesudintocctmsdriver.request.UserRequset;
import com.arpa.hndahesudintocctmsdriver.ui.business.BusinessActivity;
import com.arpa.hndahesudintocctmsdriver.util.SPUtils;
import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.bumptech.glide.Glide;
import com.esign.esignsdk.EsignSdk;
import com.google.gson.Gson;
@@ -221,10 +222,10 @@ public class WelcomeActivity extends BaseAppCompatActivity {
br.close();
} catch (java.io.FileNotFoundException ex) {
- Log.d("TAG", "WhiteListPermissionFilter.cfg - FileNotFoundException");
+ LogUtil.e("TAG", "WhiteListPermissionFilter.cfg - FileNotFoundException");
return true;
} catch (java.io.IOException ex) {
- Log.d("TAG", "WhiteListPermissionFilter.cfg - IOException");
+ LogUtil.e("TAG", "WhiteListPermissionFilter.cfg - IOException");
return true;
}
@@ -232,7 +233,7 @@ public class WelcomeActivity extends BaseAppCompatActivity {
while (it.hasNext()) {
String whitelistItem = it.next();
- Log.d("TAG", "whitelistItem:" + whitelistItem);
+ LogUtil.e("TAG", "whitelistItem:" + whitelistItem);
if (packagename.contains(whitelistItem)) {
return false;
}
@@ -257,14 +258,14 @@ public class WelcomeActivity extends BaseAppCompatActivity {
@Override
public void onFailure(Call call, IOException e) {
- Log.e("error", "配置项信息加载失败" + e.toString());
+ LogUtil.e("error", "配置项信息加载失败" + e.toString());
}
@Override
public void onResponse(Call call, Response response) throws IOException {
if (response.code() == 200) {
String body = response.body().string();
- Log.e("-body-", body);
+ LogUtil.e("-body-", body);
ConfigBean cb = new Gson().fromJson(body, ConfigBean.class);
if (cb.getCode() == 200) {
ConfigParts.setParts(con, cb);
@@ -324,13 +325,13 @@ public class WelcomeActivity extends BaseAppCompatActivity {
res.updateConfiguration(config, res.getDisplayMetrics());
//安联初始化
if (context.getPackageName().equals(getCurrentProcessName(context))) {
- //Log.e("--使用的测试环境--",BuildConfig.OPEN_API_URL);
+ //LogUtil.e("--使用的测试环境--",BuildConfig.OPEN_API_URL);
MDPLocationCollectionManager.initialize(getApplicationContext(), "https://oapi.alct56.com");
}
//在使用SDK各组件之前初始化context信息，传入ApplicationContext
// 路由初始化
JVerificationInterface.setDebugMode(true);
- JVerificationInterface.init(con, 5000, (code, msg) -> Log.d("tag", "code = " + code + " msg = " + msg));
+ JVerificationInterface.init(con, 5000, (code, msg) -> LogUtil.e("tag", "code = " + code + " msg = " + msg));
//友盟
//设置非debug版本开启
if (!isDebugVersion(con)) {
@@ -339,7 +340,7 @@ public class WelcomeActivity extends BaseAppCompatActivity {
EsignSdk.getInstance().init(keys, license);
JTTProcess.init(getApplication());
} catch (Exception e) {
- Log.e("-error-", "初始化失败sss");
+ LogUtil.e("-error-", "初始化失败sss");
}
}
SPUtil.insSP(con, "state_data", "authorization_state", "1");
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/MyFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/MyFragment.java
index 05874c4..0309a3c 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/MyFragment.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/MyFragment.java
@@ -24,6 +24,7 @@ import com.arpa.hndahesudintocctmsdriver.parts.StartOrderParts;
import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
import com.arpa.hndahesudintocctmsdriver.ui.business.BusinessActivity;
import com.arpa.hndahesudintocctmsdriver.util.PicturlUtil;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.bumptech.glide.Glide;
import com.google.gson.Gson;
import com.lxj.xpopup.XPopup;
@@ -291,14 +292,14 @@ public class MyFragment extends BaseFragment {
@Subscribe
public void processResult(VehicleEvent event) {
- Log.e("-msg-",event.getMessage());
+ LogUtil.e("-msg-",event.getMessage());
if(!"挂".equals(event.getMessage())) {
ur.vehicleList("1");
}
}
@Subscribe
public void personResult(PersonEvent home) {
- Log.e("-res-", home.getMessage());
+ LogUtil.e("-res-", home.getMessage());
if (ur != null) {
ur.User();
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/WoDeFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/WoDeFragment.java
index 9bb0926..5fc701e 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/WoDeFragment.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/WoDeFragment.java
@@ -16,6 +16,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.bumptech.glide.Glide;
import com.google.gson.Gson;
import com.lxj.xpopup.XPopup;
@@ -109,7 +110,7 @@ public class WoDeFragment extends BaseFragment {
public void initRefreshLoad(){
refreshLayout=root.findViewById(R.id.srl);
refreshLayout.setOnRefreshListener(refreshLayout -> {
- Log.e("下拉刷新","pps");
+ LogUtil.e("下拉刷新","pps");
ur.User();
ur.driverAuthData();
ur.vehicleList("1");
@@ -253,7 +254,7 @@ public class WoDeFragment extends BaseFragment {
}
data_view.setVisibility(View.VISIBLE);
ins_view.setVisibility(View.GONE);
- Log.e("--body--",gson.toJson(clb.getData().get(position)));
+ LogUtil.e("--body--",gson.toJson(clb.getData().get(position)));
v.setOnClickListener(v1 -> {
Intent in=new Intent(con, VehicleAuthActivity.class);
in.putExtra("carId",clb.getData().get(position).getCarId());
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/news/NewsActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/news/NewsActivity.java
index c177b24..ca7e656 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/news/NewsActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/news/NewsActivity.java
@@ -11,6 +11,7 @@ import android.widget.Toast;
import androidx.annotation.Nullable;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.google.gson.Gson;
import com.arpa.hndahesudintocctmsdriver.R;
import com.arpa.hndahesudintocctmsdriver.bean.BaseBean;
@@ -108,13 +109,13 @@ public class NewsActivity extends BaseAppCompatActivity {
public void initRefreshLoad(){
refreshLayout=findViewById(R.id.srl);
refreshLayout.setOnRefreshListener(refreshLayout -> {
- Log.e("下拉刷新","pps");
+ LogUtil.e("下拉刷新","pps");
index=1;
new NewsRequest().getXiaoXiList(con,hd,type,index);
});
refreshLayout.autoRefresh();
refreshLayout.setOnLoadMoreListener(refreshLayout -> {
- Log.e("上拉加载","bbs");
+ LogUtil.e("上拉加载","bbs");
index++;
new NewsRequest().getXiaoXiList(con,hd,type,index);
refreshLayout.finishLoadMore();
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/news/NewsFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/news/NewsFragment.java
index 26c5272..77ce7b4 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/news/NewsFragment.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/news/NewsFragment.java
@@ -14,6 +14,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.google.gson.Gson;
import com.arpa.hndahesudintocctmsdriver.R;
import com.arpa.hndahesudintocctmsdriver.bean.XiaoXiListBean;
@@ -68,7 +69,7 @@ public class NewsFragment extends BaseFragment {
refreshLayout=root.findViewById(R.id.srl);
refreshLayout.setEnableLoadMore(true);
refreshLayout.setOnRefreshListener(refreshLayout -> {
- Log.e("下拉刷新","pps");
+ LogUtil.e("下拉刷新","pps");
new NewsRequest().getXiaoXiLists(con,hd);
});
refreshLayout.autoRefresh();
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/UpBankActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/UpBankActivity.java
index d175828..1760a96 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/UpBankActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/UpBankActivity.java
@@ -12,6 +12,7 @@ import android.widget.Toast;
import androidx.annotation.Nullable;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.bumptech.glide.Glide;
import com.google.gson.Gson;
import com.arpa.hndahesudintocctmsdriver.R;
@@ -131,7 +132,7 @@ public class UpBankActivity extends BaseAppCompatActivity {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 12 && resultCode == RESULT_OK) {
path=gia.getFile().getPath();
- Log.e("图片地址:",path);
+ LogUtil.e("图片地址:",path);
gia.dis();
ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
} else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
@@ -144,7 +145,7 @@ public class UpBankActivity extends BaseAppCompatActivity {
paths = image.getPath();
}
path=paths;
- Log.e("图片地址:",path);
+ LogUtil.e("图片地址:",path);
gia.dis();
ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
}
@@ -164,7 +165,7 @@ public class UpBankActivity extends BaseAppCompatActivity {
ibib.setBankName(bankName);
ibib.setCardUserType(1);
ibib.setImageId(ib.getData().getId());
- Log.e("-res-",new Gson().toJson(ibib));
+ LogUtil.e("-res-",new Gson().toJson(ibib));
qr.insBankCard(ibib);
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/WalletFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/WalletFragment.java
index f6480b7..180beb2 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/WalletFragment.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/WalletFragment.java
@@ -16,6 +16,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.google.gson.Gson;
import com.lxj.xpopup.XPopup;
import com.arpa.hndahesudintocctmsdriver.R;
@@ -137,7 +138,7 @@ public class WalletFragment extends BaseFragment{
public void initRefreshLoad(){
refreshLayout=root.findViewById(R.id.srl);
refreshLayout.setOnRefreshListener(refreshLayout -> {
- Log.e("下拉刷新","pps");
+ LogUtil.e("下拉刷新","pps");
qr.getBankCardList();
qr.getContracts();
ur.User();
@@ -181,7 +182,7 @@ public class WalletFragment extends BaseFragment{
.isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
.asConfirm("好运值说明", "好运值是您在大河好运网络货运平台所赚取的运费总额，包括已提现到银行卡的金额和未提现的电子账户余额。",
"取消", "确认",
- () -> Log.e("1","1"), null, false, R.layout.alert_close) //最后一个参数绑定已有布局
+ () -> LogUtil.e("1","1"), null, false, R.layout.alert_close) //最后一个参数绑定已有布局
.show();
});
//运单量
@@ -278,7 +279,7 @@ public class WalletFragment extends BaseFragment{
// .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
// .asConfirm("好运值说明", "好运值是您在大河好运网络货运平台所赚取的运费总额，包括已提现到银行卡的金额和未提现的电子账户余额。",
// "取消", "确认",
-// () -> Log.e("1","1"), null, false, R.layout.alert_close) //最后一个参数绑定已有布局
+// () -> LogUtil.e("1","1"), null, false, R.layout.alert_close) //最后一个参数绑定已有布局
// .show();
// }
//
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/WithdrawalActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/WithdrawalActivity.java
index 38cf0e0..7fa1fb8 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/WithdrawalActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/WithdrawalActivity.java
@@ -17,6 +17,7 @@ import androidx.annotation.Nullable;
import com.arpa.hndahesudintocctmsdriver.bean.ConfigRecordBean;
import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
+import com.arpa.hndahesudintocctmsdriver.util.log.LogUtil;
import com.arpa.hndahesudintocctmsdriver.weight.pop.CenterPop;
import com.google.gson.Gson;
import com.lxj.xpopup.XPopup;
@@ -225,7 +226,7 @@ public class WithdrawalActivity extends BaseActivity {
public void initRefreshLoad(){
srl=findViewById(R.id.srl);
srl.setOnRefreshListener(refreshLayout -> {
- Log.e("下拉刷新","pps");
+ LogUtil.e("下拉刷新","pps");
qr.changeRecord();
// if("".equals(carId)){
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/web/WebActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/web/WebActivity.java
index d09b065..6ddb42c 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/web/WebActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/web/WebActivity.java
@@ -94,13 +94,10 @@ public class WebActivity extends BaseActivity {
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
//返回值是true的时候控制去WebView打开，为false调用系统浏览器或第三方浏览器
- Log.d("test","webactivity..url:"+url);
if(!url.startsWith("http"))
{
- Log.d("test","非http开头..url:"+url);
Intent intent = new Intent(Intent.ACTION_VIEW,Uri.parse(url));
boolean isInstall = getPackageManager().queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY).size()>0;
- Log.d("test","是否安装要跳转的app:"+isInstall);
if(isInstall)
{
startActivity(intent);
@@ -177,13 +174,11 @@ public class WebActivity extends BaseActivity {
@JavascriptInterface
public void getName(){
- Log.e("eeee-","name");
Toast.makeText(con, "hello", Toast.LENGTH_SHORT).show();
}
@JavascriptInterface
public String getUserToken(){
- Log.e("-token-",UserParts.getUser(con).getData().getToken());
return UserParts.getUser(con).getData().getToken();
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/log/LogUtil.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/log/LogUtil.java
index 213ca86..37ad82d 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/log/LogUtil.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/log/LogUtil.java
@@ -1,40 +1,176 @@
package com.arpa.hndahesudintocctmsdriver.util.log;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.os.Build;
import android.util.Log;
-import java.security.SecureRandom;
+import com.arpa.hndahesudintocctmsdriver.BuildConfig;
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.DESKeySpec;
/**
- * @author hlh
- * @version 1.0.0
- * @date 2022/1/10 16:55
- * @description:日志工具类
+ * author :
+ * e-mail :
+ * time :
+ * desc : Log日志输出工具类
+ * version: 1.0
*/
-public class LogUtil{
-
- public static void show(String title,String value){
- Log.e(title,value);
- Log.d(title,value);
+public class LogUtil {
+ public static boolean isDebug = BuildConfig.DEBUG;
+ // 是否在log中显示行号
+ public static final String TAG = "com.hddhsd.drive";
+ public static boolean SHOW_LINE_NUMBER_IN_LOG = isDebug;
+ //是否已初始化
+ public static boolean initFlag = false;
+ public static void init(boolean debugFlag) {
+ isDebug = debugFlag;
+ SHOW_LINE_NUMBER_IN_LOG = debugFlag;
+ initFlag = true;
}
+ /**
+ * 打印Log.w信息
+ *
+ * @param aPrintLogStr 打印信息字符串
+ */
+ public static void w(String aPrintLogStr) {
+ log(TAG, aPrintLogStr, Log.WARN, false);
+ }
+
+ public static void w(String tag, String aPrintLogStr) {
+ log(tag, aPrintLogStr, Log.WARN, false);
+ }
+
+ public static void i(String tag, String aPrintLogStr) {
+ log(tag, aPrintLogStr, Log.INFO, false);
+ }
+
+ public static void i(String aPrintLogStr) {
+ log(TAG, aPrintLogStr, Log.INFO, false);
+ }
+
+ public static void callerI(String aPrintLogStr) {
+ log(TAG, aPrintLogStr, Log.INFO, true);
+ }
+
+ public static void d(String tag, String aPrintLogStr) {
+ log(tag, aPrintLogStr, Log.DEBUG, false);
+ }
+
+ public static void d(String aPrintLogStr) {
+ log(TAG, aPrintLogStr, Log.DEBUG, false);
+ }
+
+ public static void e(String tag, String aPrintLogStr) {
+ log(tag, aPrintLogStr, Log.ERROR, false);
+ }
+
+ public static void e(String aPrintLogStr) {
+ log(TAG, aPrintLogStr, Log.ERROR, false);
+ }
+
+ public static void v(String tag, String aPrintLogStr) {
+ log(tag, aPrintLogStr, Log.VERBOSE, false);
+ }
+ /**
+ * 判断当前应用是否是debug状态
+ */
+ public static boolean isApkInDebug(Context context) {
+ try {
+ ApplicationInfo info = context.getApplicationInfo();
+ return (info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+ /**
+ * @param tag log的tag
+ * @param content log的内容
+ * @param logType log的类型,如Log.INFO,Log.DEBUG等
+ * @param showCaller 是否显示调用者的方法名和行号等
+ */
+ @SuppressLint("DefaultLocale")
+ public static void log(String tag, String content, int logType, boolean showCaller) {
+ if (!initFlag) {
+ init(true);
+ Log.e("LogUtil", "LogUtil没有初始化，请先初始化后使用，如果未初始化Log将不会输出显示");
+ }
+ if (isDebug) {
+ if (SHOW_LINE_NUMBER_IN_LOG) {
+ Throwable throwable = new Throwable();
+
+ //LogUtils.LOGI的depth是0, 该函数的depth是1, 调用者的depth是2,调用者的调用者是3
+ int methodDepth = 2;
+ StackTraceElement[] stackTraceElements = throwable.getStackTrace();
+
+ if (methodDepth < stackTraceElements.length) {
+ StackTraceElement element = stackTraceElements[methodDepth];
+
+ if (showCaller) {
+ if ((methodDepth + 1) < stackTraceElements.length) {
+ StackTraceElement elementCaller = stackTraceElements[methodDepth + 1];
+
+ if (elementCaller != null && elementCaller.getFileName() != null) {
+
+ String callerClassName = elementCaller.getFileName().substring(0, elementCaller.getFileName().lastIndexOf("."));
+ String className = element.getFileName().substring(0, element.getFileName().lastIndexOf("."));
+ @SuppressLint("DefaultLocale") String loginfo = String.format("[%s.%s() (%s:%d)]", callerClassName, elementCaller.getMethodName(), elementCaller.getFileName(), elementCaller.getLineNumber());
+ loginfo = loginfo + "\n";
+ loginfo = loginfo + " " + String.format("[%s.%s() (%s:%d)]%s", className, element.getMethodName(), element.getFileName(), element.getLineNumber(), content);
+
+ content = loginfo;
+ }
+
+ }
+
+ } else {
+ if (element != null && element.getFileName() != null) {
+ String className = element.getFileName().substring(0, element.getFileName().lastIndexOf("."));
+ content = String.format("[%s.%s() (%s:%d)]%s", className, element.getMethodName(), element.getFileName(), element.getLineNumber(), content);
+ }
+ }
+ }
+ }
+
+ if (content.length() <= 3400) {
+ log(logType, "返回值：" + content, tag);
+ } else {
+ int flag = 0;
+ for (int i = 0; i < (content.length() / 3400); i++) {
+ flag = i + 1;
+ log(logType, "返回值(" + flag + "):"
+ + content.substring(i * 3400, flag * 3400), tag);
+ }
+ log(logType, "返回值(" + (flag + 1) + "):"
+ + content.substring(flag * 3400), tag);
+ }
+ }
+ }
+
+ public static void log(int logType, String content, String tag) {
+ switch (logType) {
+ case Log.INFO:
+ Log.i(tag, "===================>" + content);
+ break;
+ case Log.DEBUG:
+ Log.d(tag, "===================>" + content);
+ break;
+ case Log.ERROR:
+ Log.e(tag, "===================>" + content);
+ break;
+ case Log.WARN:
+ Log.w(tag, "===================>" + content);
+ break;
+ case Log.VERBOSE:
+ Log.v(tag, "===================>" + content);
+ break;
+ default:
+ break;
+ }
+
- public static byte[] desDecrypt(byte[] encryptText, String desKeyParameter) throws Exception {
- SecureRandom sr = new SecureRandom();
- byte rawKeyData[] = desKeyParameter.getBytes();
- DESKeySpec dks = new DESKeySpec(rawKeyData);
- SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES");
- SecretKey key = keyFactory.generateSecret(dks);
- Cipher cipher = Cipher.getInstance("DES");
- cipher.init(Cipher.DECRYPT_MODE, key, sr);
- byte encryptedData[] = encryptText;
- byte decryptedData[] = cipher.doFinal(encryptedData);
- return decryptedData;
}
}
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseActivity.java
index 796f06f..4c438cd 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseActivity.java
@@ -10,6 +10,7 @@ import android.os.Handler;
import android.os.Message;
import android.util.Log;
import android.view.View;
+import android.view.WindowManager;
import android.widget.TextView;
import android.widget.Toast;
@@ -17,6 +18,7 @@ import androidx.annotation.Nullable;
import com.arpa.hndahesudintocctmsdriver.R;
import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
+import com.luck.picture.lib.broadcast.BroadcastManager;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
public abstract class BaseActivity extends Activity {
@@ -81,6 +83,7 @@ public abstract class BaseActivity extends Activity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
}
MyReceiver receiver;
@@ -91,7 +94,7 @@ public abstract class BaseActivity extends Activity {
filter.addAction("exit_app");
if(receiver!=null){
Log.e("广播概况",receiver.toString()+"_"+this.toString());
- registerReceiver(receiver,filter);
+ registerReceiver(receiver,filter,"com.dhhy.receiver",new Handler());
}
}
class MyReceiver extends BroadcastReceiver {
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseAppCompatActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseAppCompatActivity.java
index 054e3f3..4ba598f 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseAppCompatActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseAppCompatActivity.java
@@ -9,6 +9,7 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.view.View;
+import android.view.WindowManager;
import android.widget.Toast;
import androidx.annotation.Nullable;
@@ -71,6 +72,7 @@ public class BaseAppCompatActivity extends AppCompatActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
}
MyReceiver receiver;
@@ -79,7 +81,7 @@ public class BaseAppCompatActivity extends AppCompatActivity {
receiver = new MyReceiver();
IntentFilter filter = new IntentFilter();
filter.addAction("exit_app");
- registerReceiver(receiver,filter);
+ registerReceiver(receiver,filter,"com.dhhy.receiver",new Handler());
}
class MyReceiver extends BroadcastReceiver {
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseFragment.java
index ae0b4be..872376b 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseFragment.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseFragment.java
@@ -91,7 +91,7 @@ public class BaseFragment extends Fragment {
receiver = new MyReceiver();
IntentFilter filter = new IntentFilter();
filter.addAction("exit_app");
- getActivity().registerReceiver(receiver,filter);
+ getActivity().registerReceiver(receiver,filter,"com.dhhy.receiver",new Handler());
}
class MyReceiver extends BroadcastReceiver {
diff --git a/jiguang/.gitignore b/jiguang/.gitignore
deleted file mode 100644
index 92910a0..0000000
--- a/jiguang/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build
-/.idea/
diff --git a/jiguang/build.gradle b/jiguang/build.gradle
deleted file mode 100644
index e056cd5..0000000
--- a/jiguang/build.gradle
+++ /dev/null
@@ -1,52 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion 29
- buildToolsVersion "29.0.0"
-
- defaultConfig {
- minSdkVersion 21
- targetSdkVersion 29
- versionCode 1
- versionName "1.0"
-
- consumerProguardFiles 'consumer-rules.pro'
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
- repositories {
- flatDir {
- dirs 'libs'
- }
- }
-
- sourceSets {
- main {
- jniLibs.srcDirs = ['libs']
- }
- }
-
-}
-
-dependencies {
- api fileTree(dir: 'libs', include: ['*.jar'])
- compileOnly fileTree(dir: 'libs', include: ["*.aar"])
-
- //fcm_dependencies_start
- //谷歌请按照厂商文档配置主 gradle 谷歌镜像依赖和添加 google-services.json 后再打开此依赖
-// implementation 'com.google.firebase:firebase-messaging:21.1.0'
- //fcm_dependencies_end
-
- //huawei_dependencies_start
- //华为请按照厂商文档配置主 gradle 华为镜像依赖和添加 agconnect-services.json 后再打开此依赖
-// implementation 'com.huawei.hms:push:5.3.0.301'
- //huawei_dependencies_end
-
-
-}
-
diff --git a/jiguang/consumer-rules.pro b/jiguang/consumer-rules.pro
deleted file mode 100644
index e69de29..0000000
diff --git a/jiguang/libs/MiPush_SDK_Client_4_0_2.jar b/jiguang/libs/MiPush_SDK_Client_4_0_2.jar
deleted file mode 100644
index 63dec00..0000000
Binary files a/jiguang/libs/MiPush_SDK_Client_4_0_2.jar and /dev/null differ
diff --git a/jiguang/libs/arm64-v8a/libCtaApiLib.so b/jiguang/libs/arm64-v8a/libCtaApiLib.so
deleted file mode 100644
index c490132..0000000
Binary files a/jiguang/libs/arm64-v8a/libCtaApiLib.so and /dev/null differ
diff --git a/jiguang/libs/arm64-v8a/libjcore290.so b/jiguang/libs/arm64-v8a/libjcore290.so
deleted file mode 100644
index fbe3a75..0000000
Binary files a/jiguang/libs/arm64-v8a/libjcore290.so and /dev/null differ
diff --git a/jiguang/libs/armeabi-v7a/libCtaApiLib.so b/jiguang/libs/armeabi-v7a/libCtaApiLib.so
deleted file mode 100644
index 5e1e0be..0000000
Binary files a/jiguang/libs/armeabi-v7a/libCtaApiLib.so and /dev/null differ
diff --git a/jiguang/libs/armeabi-v7a/libjcore290.so b/jiguang/libs/armeabi-v7a/libjcore290.so
deleted file mode 100644
index 02acb93..0000000
Binary files a/jiguang/libs/armeabi-v7a/libjcore290.so and /dev/null differ
diff --git a/jiguang/libs/armeabi/libCtaApiLib.so b/jiguang/libs/armeabi/libCtaApiLib.so
deleted file mode 100644
index 0018d68..0000000
Binary files a/jiguang/libs/armeabi/libCtaApiLib.so and /dev/null differ
diff --git a/jiguang/libs/armeabi/libjcore290.so b/jiguang/libs/armeabi/libjcore290.so
deleted file mode 100644
index 01add54..0000000
Binary files a/jiguang/libs/armeabi/libjcore290.so and /dev/null differ
diff --git a/jiguang/libs/com.heytap.msp-push-2.1.0.aar b/jiguang/libs/com.heytap.msp-push-2.1.0.aar
deleted file mode 100644
index 608aced..0000000
Binary files a/jiguang/libs/com.heytap.msp-push-2.1.0.aar and /dev/null differ
diff --git a/jiguang/libs/jcore-android-2.9.0.jar b/jiguang/libs/jcore-android-2.9.0.jar
deleted file mode 100644
index 1a2e3ab..0000000
Binary files a/jiguang/libs/jcore-android-2.9.0.jar and /dev/null differ
diff --git a/jiguang/libs/jpush-android-4.2.4.jar b/jiguang/libs/jpush-android-4.2.4.jar
deleted file mode 100644
index 03822ea..0000000
Binary files a/jiguang/libs/jpush-android-4.2.4.jar and /dev/null differ
diff --git a/jiguang/libs/jpush-android-plugin-fcm-v4.2.4.jar b/jiguang/libs/jpush-android-plugin-fcm-v4.2.4.jar
deleted file mode 100644
index 7a2f7e5..0000000
Binary files a/jiguang/libs/jpush-android-plugin-fcm-v4.2.4.jar and /dev/null differ
diff --git a/jiguang/libs/jpush-android-plugin-huawei-v4.2.4.jar b/jiguang/libs/jpush-android-plugin-huawei-v4.2.4.jar
deleted file mode 100644
index 8a85692..0000000
Binary files a/jiguang/libs/jpush-android-plugin-huawei-v4.2.4.jar and /dev/null differ
diff --git a/jiguang/libs/jpush-android-plugin-meizu-v4.2.4.jar b/jiguang/libs/jpush-android-plugin-meizu-v4.2.4.jar
deleted file mode 100644
index 4d84d77..0000000
Binary files a/jiguang/libs/jpush-android-plugin-meizu-v4.2.4.jar and /dev/null differ
diff --git a/jiguang/libs/jpush-android-plugin-oppo-v4.2.4.jar b/jiguang/libs/jpush-android-plugin-oppo-v4.2.4.jar
deleted file mode 100644
index 291d237..0000000
Binary files a/jiguang/libs/jpush-android-plugin-oppo-v4.2.4.jar and /dev/null differ
diff --git a/jiguang/libs/jpush-android-plugin-vivo-v4.2.4.jar b/jiguang/libs/jpush-android-plugin-vivo-v4.2.4.jar
deleted file mode 100644
index d544255..0000000
Binary files a/jiguang/libs/jpush-android-plugin-vivo-v4.2.4.jar and /dev/null differ
diff --git a/jiguang/libs/jpush-android-plugin-xiaomi-v4.2.4.jar b/jiguang/libs/jpush-android-plugin-xiaomi-v4.2.4.jar
deleted file mode 100644
index 1c8369d..0000000
Binary files a/jiguang/libs/jpush-android-plugin-xiaomi-v4.2.4.jar and /dev/null differ
diff --git a/jiguang/libs/jverification-android-not_support_dynamic-release-2.7.3.jar b/jiguang/libs/jverification-android-not_support_dynamic-release-2.7.3.jar
deleted file mode 100644
index 11142a8..0000000
Binary files a/jiguang/libs/jverification-android-not_support_dynamic-release-2.7.3.jar and /dev/null differ
diff --git a/jiguang/libs/meizu-push-4.0.7.jar b/jiguang/libs/meizu-push-4.0.7.jar
deleted file mode 100644
index f0f060d..0000000
Binary files a/jiguang/libs/meizu-push-4.0.7.jar and /dev/null differ
diff --git a/jiguang/libs/mips/libjcore290.so b/jiguang/libs/mips/libjcore290.so
deleted file mode 100644
index 51d3fd8..0000000
Binary files a/jiguang/libs/mips/libjcore290.so and /dev/null differ
diff --git a/jiguang/libs/mips64/libjcore290.so b/jiguang/libs/mips64/libjcore290.so
deleted file mode 100644
index 739bfe3..0000000
Binary files a/jiguang/libs/mips64/libjcore290.so and /dev/null differ
diff --git a/jiguang/libs/push_sdk_v3.0.0.jar b/jiguang/libs/push_sdk_v3.0.0.jar
deleted file mode 100644
index 9c87567..0000000
Binary files a/jiguang/libs/push_sdk_v3.0.0.jar and /dev/null differ
diff --git a/jiguang/libs/x86/libCtaApiLib.so b/jiguang/libs/x86/libCtaApiLib.so
deleted file mode 100644
index a311387..0000000
Binary files a/jiguang/libs/x86/libCtaApiLib.so and /dev/null differ
diff --git a/jiguang/libs/x86/libjcore290.so b/jiguang/libs/x86/libjcore290.so
deleted file mode 100644
index 8e68db2..0000000
Binary files a/jiguang/libs/x86/libjcore290.so and /dev/null differ
diff --git a/jiguang/libs/x86_64/libCtaApiLib.so b/jiguang/libs/x86_64/libCtaApiLib.so
deleted file mode 100644
index 426c7fd..0000000
Binary files a/jiguang/libs/x86_64/libCtaApiLib.so and /dev/null differ
diff --git a/jiguang/libs/x86_64/libjcore290.so b/jiguang/libs/x86_64/libjcore290.so
deleted file mode 100644
index 8220e4a..0000000
Binary files a/jiguang/libs/x86_64/libjcore290.so and /dev/null differ
diff --git a/jiguang/proguard-rules.pro b/jiguang/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/jiguang/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/jiguang/src/main/AndroidManifest.xml b/jiguang/src/main/AndroidManifest.xml
deleted file mode 100644
index c2dac34..0000000
--- a/jiguang/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,428 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/jiguang/src/main/assets/uniaccount_core.dat b/jiguang/src/main/assets/uniaccount_core.dat
deleted file mode 100644
index 53d1f7f..0000000
Binary files a/jiguang/src/main/assets/uniaccount_core.dat and /dev/null differ
diff --git a/jiguang/src/main/res/anim/umcsdk_anim_loading.xml b/jiguang/src/main/res/anim/umcsdk_anim_loading.xml
deleted file mode 100644
index e91a600..0000000
--- a/jiguang/src/main/res/anim/umcsdk_anim_loading.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/jiguang/src/main/res/drawable-hdpi/jpush_ic_action_cancle.png b/jiguang/src/main/res/drawable-hdpi/jpush_ic_action_cancle.png
deleted file mode 100644
index 473abfe..0000000
Binary files a/jiguang/src/main/res/drawable-hdpi/jpush_ic_action_cancle.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-hdpi/jpush_ic_action_close.png b/jiguang/src/main/res/drawable-hdpi/jpush_ic_action_close.png
deleted file mode 100644
index 4c6e670..0000000
Binary files a/jiguang/src/main/res/drawable-hdpi/jpush_ic_action_close.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-hdpi/jpush_ic_action_close2.png b/jiguang/src/main/res/drawable-hdpi/jpush_ic_action_close2.png
deleted file mode 100644
index bcedf3c..0000000
Binary files a/jiguang/src/main/res/drawable-hdpi/jpush_ic_action_close2.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-hdpi/jpush_ic_richpush_actionbar_back.png b/jiguang/src/main/res/drawable-hdpi/jpush_ic_richpush_actionbar_back.png
deleted file mode 100644
index c9f4e4d..0000000
Binary files a/jiguang/src/main/res/drawable-hdpi/jpush_ic_richpush_actionbar_back.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-hdpi/jpush_ic_richpush_actionbar_divider.png b/jiguang/src/main/res/drawable-hdpi/jpush_ic_richpush_actionbar_divider.png
deleted file mode 100644
index f289651..0000000
Binary files a/jiguang/src/main/res/drawable-hdpi/jpush_ic_richpush_actionbar_divider.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-hdpi/jpush_richpush_btn_selector.xml b/jiguang/src/main/res/drawable-hdpi/jpush_richpush_btn_selector.xml
deleted file mode 100644
index c6dd002..0000000
--- a/jiguang/src/main/res/drawable-hdpi/jpush_richpush_btn_selector.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- -
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/jiguang/src/main/res/drawable-nodpi-v4/stat_sys_third_app_notify.png b/jiguang/src/main/res/drawable-nodpi-v4/stat_sys_third_app_notify.png
deleted file mode 100644
index 1f5f1b3..0000000
Binary files a/jiguang/src/main/res/drawable-nodpi-v4/stat_sys_third_app_notify.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xhdpi-v4/push_pure_close.png b/jiguang/src/main/res/drawable-xhdpi-v4/push_pure_close.png
deleted file mode 100644
index 8161978..0000000
Binary files a/jiguang/src/main/res/drawable-xhdpi-v4/push_pure_close.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xhdpi-v4/stat_sys_third_app_notify.png b/jiguang/src/main/res/drawable-xhdpi-v4/stat_sys_third_app_notify.png
deleted file mode 100644
index 143a08d..0000000
Binary files a/jiguang/src/main/res/drawable-xhdpi-v4/stat_sys_third_app_notify.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi-v4/push_pure_close.png b/jiguang/src/main/res/drawable-xxhdpi-v4/push_pure_close.png
deleted file mode 100644
index 2cf462f..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi-v4/push_pure_close.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi-v4/stat_sys_third_app_notify.png b/jiguang/src/main/res/drawable-xxhdpi-v4/stat_sys_third_app_notify.png
deleted file mode 100644
index dfb1d45..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi-v4/stat_sys_third_app_notify.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_check_image.png b/jiguang/src/main/res/drawable-xxhdpi/umcsdk_check_image.png
deleted file mode 100644
index 81f3b47..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_check_image.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_exception_bg.9.png b/jiguang/src/main/res/drawable-xxhdpi/umcsdk_exception_bg.9.png
deleted file mode 100644
index faf1b6e..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_exception_bg.9.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_exception_icon.png b/jiguang/src/main/res/drawable-xxhdpi/umcsdk_exception_icon.png
deleted file mode 100644
index b428484..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_exception_icon.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_load_complete_w.png b/jiguang/src/main/res/drawable-xxhdpi/umcsdk_load_complete_w.png
deleted file mode 100644
index 095c3a3..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_load_complete_w.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_load_dot_white.png b/jiguang/src/main/res/drawable-xxhdpi/umcsdk_load_dot_white.png
deleted file mode 100644
index b8c0161..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_load_dot_white.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_login_btn_normal.png b/jiguang/src/main/res/drawable-xxhdpi/umcsdk_login_btn_normal.png
deleted file mode 100644
index 4467ae9..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_login_btn_normal.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_login_btn_press.png b/jiguang/src/main/res/drawable-xxhdpi/umcsdk_login_btn_press.png
deleted file mode 100644
index 65f8929..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_login_btn_press.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_login_btn_unable.png b/jiguang/src/main/res/drawable-xxhdpi/umcsdk_login_btn_unable.png
deleted file mode 100644
index 02943da..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_login_btn_unable.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_mobile_logo.png b/jiguang/src/main/res/drawable-xxhdpi/umcsdk_mobile_logo.png
deleted file mode 100644
index 6a34b20..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_mobile_logo.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_return_bg.png b/jiguang/src/main/res/drawable-xxhdpi/umcsdk_return_bg.png
deleted file mode 100644
index 85818f2..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_return_bg.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_shape_input.png b/jiguang/src/main/res/drawable-xxhdpi/umcsdk_shape_input.png
deleted file mode 100644
index 0843382..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_shape_input.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_sms_normal.png b/jiguang/src/main/res/drawable-xxhdpi/umcsdk_sms_normal.png
deleted file mode 100644
index a247699..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_sms_normal.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_sms_press.png b/jiguang/src/main/res/drawable-xxhdpi/umcsdk_sms_press.png
deleted file mode 100644
index cfbe43d..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_sms_press.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_sms_unable.png b/jiguang/src/main/res/drawable-xxhdpi/umcsdk_sms_unable.png
deleted file mode 100644
index 6ce97ba..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_sms_unable.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_toast_bg.png b/jiguang/src/main/res/drawable-xxhdpi/umcsdk_toast_bg.png
deleted file mode 100644
index 230593a..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_toast_bg.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_uncheck_image.png b/jiguang/src/main/res/drawable-xxhdpi/umcsdk_uncheck_image.png
deleted file mode 100644
index d9c7fac..0000000
Binary files a/jiguang/src/main/res/drawable-xxhdpi/umcsdk_uncheck_image.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxxhdpi-v4/push_pure_close.png b/jiguang/src/main/res/drawable-xxxhdpi-v4/push_pure_close.png
deleted file mode 100644
index 03c37b6..0000000
Binary files a/jiguang/src/main/res/drawable-xxxhdpi-v4/push_pure_close.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable-xxxhdpi-v4/stat_sys_third_app_notify.png b/jiguang/src/main/res/drawable-xxxhdpi-v4/stat_sys_third_app_notify.png
deleted file mode 100644
index ecd4f14..0000000
Binary files a/jiguang/src/main/res/drawable-xxxhdpi-v4/stat_sys_third_app_notify.png and /dev/null differ
diff --git a/jiguang/src/main/res/drawable/jverification_dialog_bg.xml b/jiguang/src/main/res/drawable/jverification_dialog_bg.xml
deleted file mode 100644
index 884ac35..0000000
--- a/jiguang/src/main/res/drawable/jverification_dialog_bg.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/jiguang/src/main/res/drawable/umcsdk_get_smscode_btn_bg.xml b/jiguang/src/main/res/drawable/umcsdk_get_smscode_btn_bg.xml
deleted file mode 100644
index bb38d30..0000000
--- a/jiguang/src/main/res/drawable/umcsdk_get_smscode_btn_bg.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-