修复BUG

Author: raedev

.idea/modules.xml

@@ -2,6 +2,7 @@
 <android.support.v7.widget.FitWindowsFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 

module-blog/src/main/res/layout/activity_history.xml

@@ -54,6 +54,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
     @OnClick(R2.id.img_question)
     public void onQuestionClick() {
         AppRoute.routeToAntColumnWeb(this, getString(R.string.url_antcode_about));
+//        AppRoute.routeToAntColumnWeb(this, "http://192.168.1.112:8088/about");
     }
 
     class AntColumnAdapter extends FragmentPagerAdapter {

module-discover/src/main/java/com/rae/cnblogs/discover/ui/AntColumnActivity.java

@@ -9,11 +9,19 @@
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.qmuiteam.qmui.util.QMUIDisplayHelper;
 import com.rae.cnblogs.AppRoute;
+import com.rae.cnblogs.UICompat;
 import com.rae.cnblogs.activity.WebActivity;
 import com.rae.cnblogs.discover.R;
+import com.rae.cnblogs.web.client.JavaScriptConfig;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 @Route(path = AppRoute.PATH_DISCOVER_COLUMN_WEB)
 public class AntColumnWebViewActivity extends WebActivity {
+    private boolean mBackIsHistory;
+
     @Override
     protected int getLayoutId() {
         return R.layout.activity_ant_web;
@@ -40,5 +48,28 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             mShareView.setImageTintList(ColorStateList.valueOf(ContextCompat.getColor(this, R.color.black)));
         }
+
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEvent(JavaScriptConfig config) {
+        mBackIsHistory = config.backIsHistory;
+        UICompat.setVisibility(mShareView, config.enableShare);
+    }
+
+
+    @Override
+    protected void doOnBackPressed() {
+        if (mWebViewFragment != null && mBackIsHistory && mWebViewFragment.doOnBackPressed()) {
+            return;
+        }
+        super.doOnBackPressed();
     }
 }

module-discover/src/main/java/com/rae/cnblogs/discover/web/AntColumnWebViewActivity.java

@@ -12,5 +12,5 @@
     <string name="study_now">立即学习</string>
     <string name="format_article_updated">已更新%d篇文章</string>
     <string name="unsubscribe_success">取消订阅成功</string>
-    <string name="url_antcode_about">https://app.mayizhuanlan.com/about</string>
+    <string name="url_antcode_about">http://app.mayizhuanlan.com/about</string>
 </resources>

module-discover/src/main/res/values/strings.xml

@@ -127,13 +127,6 @@ public void afterTextChanged(Editable s) {
     @OnClick(R2.id.btn_search)
     public void onSearchClick() {
         UICompat.hideSoftInputFromWindow(this);
-        // 检查登录状态
-        if (!SessionManager.getDefault().isLogin()) {
-            UICompat.toastInCenter(getContext(), "请登录后再搜索");
-            AppRoute.routeToLogin(getContext());
-            return;
-        }
-
         if (mSearchView.length() > 0)
             // 执行搜索
             performSearch(mSearchView.getText().toString());
@@ -145,6 +138,13 @@ public void onSearchClick() {
      * 执行搜索
      */
     private void performSearch(String text) {
+        // 检查登录状态
+        if (!SessionManager.getDefault().isLogin()) {
+            UICompat.toastInCenter(getContext(), "请登录后再搜索");
+            AppRoute.routeToLogin(getContext());
+            return;
+        }
+
         if (TextUtils.isEmpty(text)) return;
         // 显示搜索结果页，由子Fragment处理
         if (mSearchResultFragment == null) {

module-home/src/main/java/com/rae/cnblogs/home/search/SearchActivity.java

@@ -40,7 +40,7 @@ public class WebActivity extends BasicActivity implements ShareDialogFragment.On
     @BindView(R2.id.view_holder)
     View mNightView;
 
-    WebViewFragment mWebViewFragment;
+    protected WebViewFragment mWebViewFragment;
 
     private ShareDialogFragment mShareDialogFragment;
 

module-middleware/src/main/java/com/rae/cnblogs/activity/WebActivity.java

@@ -24,12 +24,17 @@
 import com.rae.cnblogs.middleware.R;
 import com.rae.cnblogs.theme.ThemeCompat;
 import com.rae.cnblogs.web.client.AppJavaScript;
+import com.rae.cnblogs.web.client.JavaScriptConfig;
 import com.rae.cnblogs.web.client.RaeJavaScriptBridge;
 import com.rae.cnblogs.web.client.RaeWebChromeClient;
 import com.rae.cnblogs.web.client.RaeWebViewClient;
 import com.rae.cnblogs.widget.AppLayout;
 import com.rae.cnblogs.widget.RaeWebView;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import java.io.File;
 
 import in.srain.cube.views.ptr.PtrDefaultHandler;
@@ -59,6 +64,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
             mRawUrl = getArguments().getString("url");
             mUrl = mRawUrl;
         }
+        EventBus.getDefault().register(this);
     }
 
 
@@ -130,6 +136,7 @@ public void onClick(View v) {
 
     @Override
     public void onDestroy() {
+        EventBus.getDefault().unregister(this);
         if (mContentLayout != null) {
             mContentLayout.removeAllViews();
         }
@@ -163,6 +170,11 @@ public void enablePullToRefresh(boolean enable) {
         }
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEvent(JavaScriptConfig config) {
+        enablePullToRefresh(config.enablePullToRefresh);
+    }
+
     public AppLayout getAppLayout() {
         return mAppLayout;
     }
@@ -264,4 +276,12 @@ public void loadUrl(String url) {
     public void reload() {
         mWebView.reload();
     }
+
+    public boolean doOnBackPressed() {
+        if (mWebView.canGoBack()) {
+            mWebView.goBack();
+            return true;
+        }
+        return false;
+    }
 }

module-middleware/src/main/java/com/rae/cnblogs/web/WebViewFragment.java

@@ -6,16 +6,23 @@
 import android.support.v4.app.FragmentManager;
 import android.webkit.JavascriptInterface;
 
+import com.antcode.sdk.AntSessionManager;
+import com.antcode.sdk.model.AntTokenInfo;
+import com.antcode.sdk.model.AntUserInfo;
 import com.rae.cnblogs.AppRoute;
 import com.rae.cnblogs.ContentEntityConverter;
 import com.rae.cnblogs.UICompat;
 import com.rae.cnblogs.basic.ContentEntity;
 import com.rae.cnblogs.dialog.DefaultDialogFragment;
 import com.rae.cnblogs.middleware.R;
+import com.rae.cnblogs.sdk.AppGson;
+import com.rae.cnblogs.sdk.UserProvider;
 import com.rae.cnblogs.sdk.bean.BlogBean;
+import com.rae.cnblogs.sdk.bean.UserInfoBean;
 import com.rae.cnblogs.sdk.config.CnblogAppConfig;
 import com.rae.cnblogs.sdk.parser.BlogInfoParser;
 
+import org.greenrobot.eventbus.EventBus;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.select.Elements;
@@ -79,4 +86,39 @@ public void onClick(DialogInterface dialog, int which) {
                 .show(mFragmentManager);
     }
 
+
+    @JavascriptInterface
+    public void config(String text) {
+        JavaScriptConfig config = AppGson.get().fromJson(text, JavaScriptConfig.class);
+        if (config != null) {
+            EventBus.getDefault().post(config);
+        }
+    }
+
+    @JavascriptInterface
+    public String getUser() {
+        try {
+            UserJsonObj obj = new UserJsonObj();
+            obj.cbUser = UserProvider.getInstance().getLoginUserInfo();
+            obj.antUser = AntSessionManager.getDefault().getUser();
+            return AppGson.toJson(obj);
+        } catch (Exception ex) {
+            return "{}";
+        }
+    }
+
+    @JavascriptInterface
+    public String getToken() {
+        try {
+            AntTokenInfo antUserInfo = AntSessionManager.getDefault().getUserToken();
+            return AppGson.toJson(antUserInfo);
+        } catch (Exception ex) {
+            return "{}";
+        }
+    }
+
+    private class UserJsonObj {
+        UserInfoBean cbUser;
+        AntUserInfo antUser;
+    }
 }

module-middleware/src/main/java/com/rae/cnblogs/web/client/AppJavaScript.java

@@ -0,0 +1,13 @@
+package com.rae.cnblogs.web.client;
+
+/**
+ * 交互配置
+ */
+public class JavaScriptConfig {
+    // 是否启用下拉刷新
+    public boolean enablePullToRefresh;
+    // 是否显示分享
+    public boolean enableShare;
+    // 返回按钮返回历史记录
+    public boolean backIsHistory;
+}