update log

Justson · Aug 27, 2017 · deeda46 · deeda46
1 parent aa12fd1
commit deeda46
Show file tree

Hide file tree

Showing 16 changed files with 84 additions and 76 deletions.
diff --git a/library/src/main/java/com/just/library/AgentWeb.java b/library/src/main/java/com/just/library/AgentWeb.java
@@ -147,7 +147,7 @@ private void doCompat() {
 
         mJavaObjects.put("agentWeb", mAgentWebJsInterfaceCompat = new AgentWebJsInterfaceCompat(this, mActivity));
 
-        LogUtils.i("Info", "AgentWebConfig.isUseAgentWebView:" + AgentWebConfig.WEBVIEW_TYPE + "  mChromeClientCallbackManager:" + mChromeClientCallbackManager);
+        LogUtils.i(TAG, "AgentWebConfig.isUseAgentWebView:" + AgentWebConfig.WEBVIEW_TYPE + "  mChromeClientCallbackManager:" + mChromeClientCallbackManager);
         if (AgentWebConfig.WEBVIEW_TYPE == AgentWebConfig.WEBVIEW_AGENTWEB_SAFE_TYPE) {
             this.mChromeClientCallbackManager.setAgentWebCompatInterface((ChromeClientCallbackManager.AgentWebCompatInterface) mWebCreator.get());
             this.mWebViewClientCallbackManager.setPageLifeCycleCallback((WebViewClientCallbackManager.PageLifeCycleCallback) mWebCreator.get());
@@ -202,7 +202,7 @@ public JsEntraceAccess getJsEntraceAccess() {
     public AgentWeb clearWebCache() {
 
         if (this.getWebCreator().get() != null) {
-            Log.i("Info", "清空 webview 缓存");
+            Log.i(TAG, "清空 webview 缓存");
             AgentWebUtils.clearWebViewAllCache(mActivity, this.getWebCreator().get());
         } else {
             AgentWebUtils.clearWebViewAllCache(mActivity);
@@ -369,7 +369,7 @@ public void destroy() {
     public void destroyAndKill() {
         destroy();
         if (!AgentWebUtils.isMainProcess(mActivity)) {
-            LogUtils.i("Info", "退出进程");
+            LogUtils.i(TAG, "退出进程");
             System.exit(0);
         }
     }
@@ -386,7 +386,7 @@ public void uploadFileResult(int requestCode, int resultCode, Intent data) {
 
         if (mIFileUploadChooser == null)
             mIFileUploadChooser = mAgentWebJsInterfaceCompat.pop();
-        LogUtils.i("Info", "file upload:" + mIFileUploadChooser);
+        LogUtils.i(TAG, "file upload:" + mIFileUploadChooser);
         if (mIFileUploadChooser != null)
             mIFileUploadChooser.fetchFilePathFromIntent(requestCode, resultCode, data);
 

diff --git a/library/src/main/java/com/just/library/AgentWebConfig.java b/library/src/main/java/com/just/library/AgentWebConfig.java
@@ -31,6 +31,7 @@ public class AgentWebConfig {
     public static final int WEBVIEW_CUSTOM_TYPE = 3;
     static int WEBVIEW_TYPE = WEBVIEW_DEFAULT_TYPE;
     private static boolean isInit = false;
+    private static final String TAG=AgentWebConfig.class.getSimpleName();
 
 
     //获取Cookie
@@ -96,7 +97,7 @@ private static ValueCallback<Boolean> getDefaultIgnoreCallback() {
         return new ValueCallback<Boolean>() {
             @Override
             public void onReceiveValue(Boolean ignore) {
-                LogUtils.i("Info", "removeExpiredCookies:" + ignore);
+                LogUtils.i(TAG, "removeExpiredCookies:" + ignore);
             }
         };
     }

diff --git a/library/src/main/java/com/just/library/AgentWebUtils.java b/library/src/main/java/com/just/library/AgentWebUtils.java
@@ -641,7 +641,7 @@ static String getFileAbsolutePath(Activity context, Uri fileUri) {
         if (context == null || fileUri == null)
             return null;
 
-        LogUtils.i("Info", "getAuthority:" + fileUri.getAuthority() + "  getHost:" + fileUri.getHost() + "   getPath:" + fileUri.getPath() + "  getScheme:" + fileUri.getScheme() + "  query:" + fileUri.getQuery());
+        LogUtils.i(TAG, "getAuthority:" + fileUri.getAuthority() + "  getHost:" + fileUri.getHost() + "   getPath:" + fileUri.getPath() + "  getScheme:" + fileUri.getScheme() + "  query:" + fileUri.getQuery());
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && DocumentsContract.isDocumentUri(context, fileUri)) {
             if (isExternalStorageDocument(fileUri)) {
                 String docId = DocumentsContract.getDocumentId(fileUri);

diff --git a/library/src/main/java/com/just/library/AgentWebView.java b/library/src/main/java/com/just/library/AgentWebView.java
@@ -31,7 +31,7 @@
  *
  */
 public class AgentWebView extends WebView  implements ChromeClientCallbackManager.AgentWebCompatInterface,WebViewClientCallbackManager.PageLifeCycleCallback{
-    private static final String TAG = "AgentWebView";
+    private static final String TAG = AgentWebView.class.getSimpleName();
     private Map<String, JsCallJava> mJsCallJavas;
     private Map<String, String> mInjectJavaScripts;
     private FixedOnReceivedTitle mFixedOnReceivedTitle;
@@ -69,11 +69,11 @@ public void addJavascriptInterface(Object interfaceObj, String interfaceName) {
 
         if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.JELLY_BEAN_MR1){
             super.addJavascriptInterface(interfaceObj,interfaceName);
-            Log.i("Info","注入");
+            Log.i(TAG,"注入");
             return;
         }
 
-        LogUtils.i("Info","addJavascriptInterface:"+interfaceObj+"   interfaceName:"+interfaceName);
+        LogUtils.i(TAG,"addJavascriptInterface:"+interfaceObj+"   interfaceName:"+interfaceName);
         if (mJsCallJavas == null) {
             mJsCallJavas = new HashMap<String, JsCallJava>();
         }
@@ -105,7 +105,7 @@ public void destroy() {
         if (mIsInited) {
             resetAccessibilityEnabled();
 //
-            LogUtils.i("Info","destroy web");
+            LogUtils.i(TAG,"destroy web");
             super.destroy();
         }
     }
@@ -217,7 +217,7 @@ public String buildTryCatchInjectJS(String js) {
 
     @Override
     public boolean onJsPrompt(WebView view, String url, String message, String defaultValue, JsPromptResult result) {
-        Log.i("Info","onJsPrompt:"+url+"  message:"+message+"  d:"+defaultValue+"  ");
+        Log.i(TAG,"onJsPrompt:"+url+"  message:"+message+"  d:"+defaultValue+"  ");
         if (mJsCallJavas != null && JsCallJava.isSafeWebViewCallMsg(message)) {
             JSONObject jsonObject = JsCallJava.getMsgJSONObject(message);
             String interfacedName = JsCallJava.getInterfacedName(jsonObject);

diff --git a/library/src/main/java/com/just/library/DefaultChromeClient.java b/library/src/main/java/com/just/library/DefaultChromeClient.java
@@ -239,7 +239,7 @@ public boolean onJsPrompt(WebView view, String url, String message, String defau
             }
             if (AgentWebConfig.WEBVIEW_TYPE == AgentWebConfig.WEBVIEW_AGENTWEB_SAFE_TYPE && mChromeClientCallbackManager != null && mChromeClientCallbackManager.getAgentWebCompatInterface() != null) {
 
-                LogUtils.i("Info", "mChromeClientCallbackManager.getAgentWebCompatInterface():" + mChromeClientCallbackManager.getAgentWebCompatInterface());
+                LogUtils.i(TAG, "mChromeClientCallbackManager.getAgentWebCompatInterface():" + mChromeClientCallbackManager.getAgentWebCompatInterface());
                 if (mChromeClientCallbackManager.getAgentWebCompatInterface().onJsPrompt(view, url, message, defaultValue, result))
                     return true;
             }

diff --git a/library/src/main/java/com/just/library/DefaultMsgConfig.java b/library/src/main/java/com/just/library/DefaultMsgConfig.java
@@ -10,47 +10,47 @@
 public final class DefaultMsgConfig {
 
 
-    private DownLoadMsgConfig mDownLoadMsgConfig=null;
+    private DownLoadMsgConfig mDownLoadMsgConfig = null;
 
-    private ChromeClientMsgCfg mChromeClientMsgCfg=new ChromeClientMsgCfg();
+    private ChromeClientMsgCfg mChromeClientMsgCfg = new ChromeClientMsgCfg();
 
     public ChromeClientMsgCfg getChromeClientMsgCfg() {
         return mChromeClientMsgCfg;
     }
 
-    DefaultMsgConfig(){
+    DefaultMsgConfig() {
 
-        mDownLoadMsgConfig= new DownLoadMsgConfig();
+        mDownLoadMsgConfig = new DownLoadMsgConfig();
     }
 
     public DownLoadMsgConfig getDownLoadMsgConfig() {
         return mDownLoadMsgConfig;
     }
 
-    public static class DownLoadMsgConfig  implements Parcelable {
+    public static class DownLoadMsgConfig implements Parcelable {
 
 
-        private String mTaskHasBeenExist="该任务已经存在 ， 请勿重复点击下载!";
+        private String mTaskHasBeenExist = "该任务已经存在 ， 请勿重复点击下载!";
 
-        private String mTips="提示";
+        private String mTips = "提示";
 
-        private String mHoneycomblow="您正在使用手机流量 ， 继续下载该文件吗?";
+        private String mHoneycomblow = "您正在使用手机流量 ， 继续下载该文件吗?";
 
-        private String mDownLoad="下载";
+        private String mDownLoad = "下载";
 
-        private String mCancel="取消";
+        private String mCancel = "取消";
 
-        private String mDownLoadFail="下载失败 ， 出错了 ！";
+        private String mDownLoadFail = "下载失败!";
 
-        private String mLoading="当前进度:%s";
+        private String mLoading = "当前进度:%s";
 
-        private String mTrickter="您有一条新通知";
+        private String mTrickter = "您有一条新通知";
 
-        private String mFileDownLoad="文件下载";
+        private String mFileDownLoad = "文件下载";
 
-        private String mClickOpen="点击打开";
+        private String mClickOpen = "点击打开";
 
-        private String preLoading="即将开始下载文件";
+        private String preLoading = "即将开始下载文件";
 
         public String getPreLoading() {
             return preLoading;
@@ -60,7 +60,7 @@ public void setPreLoading(String preLoading) {
             this.preLoading = preLoading;
         }
 
-        DownLoadMsgConfig(){
+        DownLoadMsgConfig() {
 
         }
 
@@ -226,21 +226,22 @@ public void writeToParcel(Parcel dest, int flags) {
     }
 
 
-    public static final  class ChromeClientMsgCfg{
+    public static final class ChromeClientMsgCfg {
 
-        private FileUploadMsgConfig mFileUploadMsgConfig=new FileUploadMsgConfig();
+        private FileUploadMsgConfig mFileUploadMsgConfig = new FileUploadMsgConfig();
 
         public FileUploadMsgConfig getFileUploadMsgConfig() {
             return mFileUploadMsgConfig;
         }
 
-        public static final class FileUploadMsgConfig implements Parcelable{
+        public static final class FileUploadMsgConfig implements Parcelable {
 
-            private String[]medias=new String[]{"相机","文件选择器"};
+            private String[] medias = new String[]{"相机", "文件选择器"};
 
-            FileUploadMsgConfig(){
+            FileUploadMsgConfig() {
 
             }
+
             protected FileUploadMsgConfig(Parcel in) {
                 medias = in.createStringArray();
             }

diff --git a/library/src/main/java/com/just/library/EventHandlerImpl.java b/library/src/main/java/com/just/library/EventHandlerImpl.java
@@ -22,7 +22,6 @@ public static final EventHandlerImpl getInstantce(WebView view,EventInterceptor
     }
 
     public EventHandlerImpl(WebView webView,EventInterceptor eventInterceptor) {
-        LogUtils.i("Info","EventInterceptor:"+eventInterceptor);
         this.mWebView = webView;
         this.mEventInterceptor = eventInterceptor;
     }

diff --git a/library/src/main/java/com/just/library/FileUpLoadChooserImpl.java b/library/src/main/java/com/just/library/FileUpLoadChooserImpl.java
@@ -47,6 +47,7 @@ public class FileUpLoadChooserImpl implements IFileUploadChooser {
     private boolean cameraState = false;
     private PermissionInterceptor mPermissionInterceptor;
     private int FROM_INTENTION_CODE = 21;
+
 
     public FileUpLoadChooserImpl(Builder builder) {
 
@@ -341,7 +342,7 @@ public void run() {
             try {
                 Queue<FileParcel> mQueue = AgentWebUtils.convertFile(paths);
                 String result = AgentWebUtils.convertFileParcelObjectsToJson(mQueue);
-                LogUtils.i("Info", "result:" + result);
+                LogUtils.i(TAG, "result:" + result);
                 if (mJsChannelCallback != null)
                     mJsChannelCallback.call(result);
 

diff --git a/library/src/main/java/com/just/library/LogUtils.java b/library/src/main/java/com/just/library/LogUtils.java
@@ -8,38 +8,40 @@
 
 public class LogUtils {
 
+    private static final String PREFIX = " agentweb ---> "; //
 
-    public static boolean isDebug() {
+    static boolean isDebug() {
         return AgentWebConfig.DEBUG;
     }
 
-    public static void i(String tag,String message){
+    static void i(String tag, String message) {
 
-        if(isDebug())
-            Log.i(tag,message);
+        if (isDebug())
+            Log.i(PREFIX.concat(tag), message);
     }
 
-    public static void v(String tag,String message){
+    static void v(String tag, String message) {
 
-        if(isDebug())
-            Log.v(tag,message);
+        if (isDebug())
+            Log.v(PREFIX.concat(tag), message);
 
     }
 
-    public static void safeCheckCrash(String tag, String msg, Throwable tr) {
+    static void safeCheckCrash(String tag, String msg, Throwable tr) {
         if (isDebug()) {
-            throw new RuntimeException(tag + " " + msg, tr);
+            throw new RuntimeException(PREFIX.concat(tag) + " " + msg, tr);
         } else {
-            Log.e(tag, msg, tr);
+            Log.e(PREFIX.concat(tag), msg, tr);
         }
     }
 
-    public static void e(String tag, String msg, Throwable tr) {
+    static void e(String tag, String msg, Throwable tr) {
         Log.e(tag, msg, tr);
     }
-    public static void e(String tag,String message){
 
-        if(BuildConfig.DEBUG)
-            Log.e(tag,message);
+    static void e(String tag, String message) {
+
+        if (BuildConfig.DEBUG)
+            Log.e(PREFIX.concat(tag), message);
     }
 }