1 修改日志输出

YangShuai
1 parent 0a369345
Showing 7 changed files with 49 additions and 39 deletions
app/strike/src/main/java/com/cnlive/strike/MainActivity.java
app/strike/src/main/java/com/cnlive/strike/MyFragment.java
app/strike/src/main/java/com/cnlive/strike/MyFragment1.java
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/LoginActivity.java
core/base/src/main/java/com/cnlive/core/libs/base/application/BaseApplication.java
core/base/src/main/java/com/cnlive/core/libs/base/frame/activity/BaseActivity.java
core/base/src/main/java/com/cnlive/core/libs/base/frame/fragment/BaseFragment.java
@@ -28,7 +28,7 @@ public class MainActivity extends AppCompatActivity {
         findViewById(R.id.go_to).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(MainActivity.this, LoginActivity.class));
+                startActivity(new Intent(MainActivity.this, DemoActivity.class));
 //                finish();
             }
         });
@@ -19,6 +19,7 @@ import com.cnlive.strike.network.bean.LetHimNoSeeBean;
 import com.cnlive.strike.network.bean.TestBean;
 import com.me.yokeyword.fragmentation.anim.DefaultVerticalAnimator;
 import com.me.yokeyword.fragmentation.anim.FragmentAnimator;
+import com.orhanobut.logger.Logger;
  
 import java.util.HashMap;
 import java.util.Map;
@@ -72,7 +73,7 @@ public class MyFragment extends BaseFragment&lt;MyFragmentView, MyPresenter&gt; {
 //                        Log.e(TAG, "onFail: ");
 //                    }
 //                });
-                startForResult(new MyFragment1(),1001);
+                startForResult(new MyFragment1(), 1001);
             }
         });
         baseView.findViewById(R.id.btn_test).setOnClickListener(new View.OnClickListener() {
@@ -149,8 +150,12 @@ public class MyFragment extends BaseFragment&lt;MyFragmentView, MyPresenter&gt; {
     @Override
     public void onFragmentResult(int requestCode, int resultCode, Bundle data) {
         super.onFragmentResult(requestCode, resultCode, data);
-        if (requestCode==1001){
-            setStatusBarColor(R.color.green,0);
+        if (requestCode == 1001) {
+            setStatusBarColor(R.color.green, 0);
+
+            if (null != data) {
+                logError(data.getString("test"));
+            }
         }
     }
 }
 package com.cnlive.strike;
  
  
+import android.os.Build;
+import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
  
@@ -24,6 +26,10 @@ public class MyFragment1 extends BaseFragment {
     @Override
     protected void initView() {
         super.initView();
+        Bundle bundle = new Bundle();
+        bundle.putString("test", "你好");
+        setFragmentResult(1001, bundle);
+
         setStatusBarColor(R.color.qmui_config_color_red, 0);
         setStatusBarTextColor(StatusBarConfig.BLACK);
         baseView.findViewById(R.id.btn_test).setOnClickListener(new View.OnClickListener() {
@@ -54,5 +60,6 @@ public class MyFragment1 extends BaseFragment {
                         });
             }
         });
+
     }
 }
@@ -11,6 +11,7 @@ import androidx.fragment.app.FragmentManager;
  
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
+import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
 import com.cnlive.core.libs.base.util.FragmentUtil;
 import com.cnlive.strike.user.R;
 import com.cnlive.strike.user.ui.fragment.QuickLoginFragment;
@@ -28,7 +29,7 @@ public class LoginActivity extends BaseActivity {
     public static String TAG_MSG = "tagMsg";
     public static String TAG_SHARE = "tagValue";
     public static String TAG_CLICK_AD = "clickAd";
-    private Fragment quickLoginFragment;
+    private BaseFragment quickLoginFragment;
     private boolean fromTokenError;
     private String tagMsg;
     private String shareType;
@@ -72,11 +73,6 @@ public class LoginActivity extends BaseActivity {
  
  
     @Override
-    protected int getViewLayoutId() {
-        return R.layout.activity_login;
-    }
-
-    @Override
     protected void initView() {
         fromTokenError = getIntent().getBooleanExtra(FROM_TOKEN_ERROR, false);
         tagMsg = getIntent().getStringExtra(TAG_MSG) == null ? "" : getIntent().getStringExtra(TAG_MSG);
@@ -85,10 +81,6 @@ public class LoginActivity extends BaseActivity {
         addFragment();
     }
  
-    @Override
-    protected void initData() {
-
-    }
  
     @Override
     protected void onNewIntent(Intent intent) {
@@ -104,10 +96,7 @@ public class LoginActivity extends BaseActivity {
         } else {
             quickLoginFragment = QuickLoginFragment.newInstance(fromTokenError, tagMsg, clickAd);
         }
-
-        FragmentManager fragmentManager = getSupportFragmentManager();
-        FragmentUtil fragmentUtil = new FragmentUtil(R.id.loginContent);
-        fragmentUtil.changeFragment(quickLoginFragment, fragmentManager);
+        loadRootFragment(quickLoginFragment);
     }
  
     @Override
@@ -4,7 +4,9 @@ import android.app.Application;
  
 import com.cnlive.strike.base.BuildConfig;
 import com.orhanobut.logger.AndroidLogAdapter;
+import com.orhanobut.logger.FormatStrategy;
 import com.orhanobut.logger.Logger;
+import com.orhanobut.logger.PrettyFormatStrategy;
  
 public class BaseApplication extends Application {
     private static BaseApplication instance;
@@ -13,7 +15,14 @@ public class BaseApplication extends Application {
     public void onCreate() {
         super.onCreate();
         instance = this;
-        Logger.addLogAdapter(new AndroidLogAdapter() {
+        FormatStrategy formatStrategy = PrettyFormatStrategy.newBuilder()
+//                .showThreadInfo(true)  // (Optional) Whether to show thread info or not. Default true
+//                .methodCount(5)         // (Optional) How many method line to show. Default 2
+//                .methodOffset(0)        // (Optional) Hides internal method calls up to offset. Default 5
+//                .logStrategy(customLog) // (Optional) Changes the log strategy to print out. Default LogCat
+                .tag("TAG")   // (Optional) Global tag for every log. Default PRETTY_LOGGER
+                .build();
+        Logger.addLogAdapter(new AndroidLogAdapter(formatStrategy) {
             @Override
             public boolean isLoggable(int priority, String tag) {
                 return AppConfig.isDebug();
@@ -705,24 +705,24 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
 //    }
  
  
-    public void logError(Object info) {
+    public void logError(String info) {
         Logger.e(TAG, info);
     }
  
-    public void logDebug(Object info) {
-        Logger.d(TAG, info);
+    public void logDebug(String info) {
+        Logger.d(info);
     }
  
-    public void logWarn(Object info) {
-        Logger.w(TAG, info);
+    public void logWarn(String info) {
+        Logger.w(info);
     }
  
-    public void logInfo(Object info) {
-        Logger.i(TAG, info);
+    public void logInfo(String info) {
+        Logger.i(info);
     }
  
-    public void logVerbose(Object info) {
-        Logger.v(TAG, info);
+    public void logVerbose(String info) {
+        Logger.v(info);
     }
  
     public void logJson(String json) {
@@ -1020,7 +1020,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (null!=getSupportFragmentManager()&&null != getSupportFragmentManager().getFragments()) {
+        if (null != getSupportFragmentManager() && null != getSupportFragmentManager().getFragments()) {
             for (Fragment fragment : getSupportFragmentManager().getFragments()) {
                 if (null != fragment) {
                     fragment.onActivityResult(requestCode, resultCode, data);
@@ -357,24 +357,24 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
     }
  
     /*************************************log******************************************/
-    public void logError(Object info) {
-        Logger.e(TAG, info);
+    public void logError(String info) {
+        Logger.e(info);
     }
  
-    public void logDebug(Object info) {
-        Logger.d(TAG, info);
+    public void logDebug(String info) {
+        Logger.d(info);
     }
  
-    public void logWarn(Object info) {
-        Logger.w(TAG, info);
+    public void logWarn(String info) {
+        Logger.w(info);
     }
  
-    public void logInfo(Object info) {
-        Logger.i(TAG, info);
+    public void logInfo(String info) {
+        Logger.i(info);
     }
  
-    public void logVerbose(Object info) {
-        Logger.v(TAG, info);
+    public void logVerbose(String info) {
+        Logger.v( info);
     }
  
     public void logJson(String json) {