Merge remote-tracking branch 'origin/master-invoice' into master-invoice

RvClient/src/main/java/com/xxfc/rv/MainActivity.java

@@ -436,6 +436,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
     }
 
 
+
     private void getActivityPopup() {
         Map<String, Object> map = new HashMap<>();
         if (!TextUtils.isEmpty(OkGoUtil.getToken())) {

plugin_member/src/main/java/com/rv.member/adapter/ConsumeRecordListAdapter.java

@@ -28,7 +28,6 @@ public class ConsumeRecordListAdapter extends BaseQuickAdapter<OrderListBean.Dat
     }
 
 
-
     @Override
     protected void convert(BaseViewHolder helper, final OrderListBean.DataBeanX.DataBean bean) {
 

plugin_share/src/main/java/com/rv/share/view/RvWebView.java

@@ -18,9 +18,12 @@ import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.frame.base.url.Constance;
 import com.ruiwenliu.wrapper.SPConstance;
 import com.rv.component.utils.Cookie;
 import com.rv.component.utils.LogUtil;
+import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.ui.login.LoginRvActivity;
 import com.yuyife.okgo.OkGoUtil;
 
@@ -194,7 +197,6 @@ public class RvWebView extends WebView {
         }
 
 
-
         @JavascriptInterface
         public void toMyWallet() {
             ComponentName name = new ComponentName(getContext(), "com.xxfc.rv.MainActivity");
@@ -250,6 +252,17 @@ public class RvWebView extends WebView {
             return password;
         }
 
+        /**
+         * 跳到规则
+         */
+        @JavascriptInterface
+        public void goRule() {
+            ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
+                    .withString("title", "活动规则")
+                    .withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
+                    .withInt("type", 30)
+                    .navigation();
+        }
     }
 
     public interface WebViewListener {