修改分享界面

RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/BaseWrapperFragment.java

@@ -11,6 +11,7 @@ import android.widget.Toast;
 
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.base.utils.tools.android.NetworkUtil;
 import com.ruiwenliu.wrapper.R;
 import com.ruiwenliu.wrapper.dialog.LoadingDialog;
 import com.ruiwenliu.wrapper.presenter.MvpPresenter;
@@ -62,11 +63,11 @@ public abstract class BaseWrapperFragment<P extends MvpPresenter> extends Suppor
 
 
     /*
-  * @param inflater
-  * @param container
-  * @param savedInstanceState
-  * @return
-          */
+     * @param inflater
+     * @param container
+     * @param savedInstanceState
+     * @return
+     */
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         contentView = inflater.inflate(getViewLayout(), container, false);
@@ -102,8 +103,6 @@ public abstract class BaseWrapperFragment<P extends MvpPresenter> extends Suppor
     }
 
 
-
-
     @Override
     public void onShowLoading() {
         if (isAdded() && mLoadingDialog != null && !mLoadingDialog.isShowing()) {
@@ -126,14 +125,12 @@ public abstract class BaseWrapperFragment<P extends MvpPresenter> extends Suppor
 
     @Override
     public void onShowError(String errorMsg, int errorType) {
-
+        if (getContext() != null && !NetworkUtil.isNetworkAvailable(getContext())) {
+            showToast("网络异常，请检察您的网络");
+        }
     }
 
 
-
-
-
-
     /**
      * @return 布局resourceId
      */

RvWrapper/src/main/java/com/ruiwenliu/wrapper/http/RxRequestResult.java

@@ -39,7 +39,7 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
     @Override
     public void onNext(Response<ResponseBody> response) {
         baseView.onHideLoading();
-        if (response.isSuccessful()) {
+        if (response != null && response.isSuccessful()) {
             try {
                 String result = response.body().string();
                 T bean = new Gson().fromJson(result, baseBean);
@@ -61,7 +61,7 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
                         break;
                 }
 
-                switch (bean.resultCode){
+                switch (bean.resultCode) {
                     case RvFrameConstant.HTTP_STATE_SUCCESS_IM:
                         baseView.onShowResult(position, bean);
                         break;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java

@@ -444,8 +444,10 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
 
     @Override
     public void onRefresh() {
+        loadBannerData();
         hotData();
         recommendGood(hotType);
+        getSelectedActivities();
         onFreshLoadDisCovery();
     }
 
@@ -609,7 +611,12 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
                 setRecommend((HomeRecommendBean) result);
                 break;
         }
+    }
 
+    @Override
+    public void onShowError(String errorMsg, int errorType) {
+        super.onShowError(errorMsg, errorType);
+        mSimpleRefreshLayout.onRefreshComplete();
     }
 
     private void setRecommend(HomeRecommendBean bean) {

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

@@ -129,7 +129,9 @@ public class RvWebView extends WebView {
         @JavascriptInterface
         public String getTokenOrLogin() {
             if (TextUtils.isEmpty(OkGoUtil.getToken())) {
-                getContext().startActivity(LoginRvActivity.getIntent(getContext()));
+                Intent intent = LoginRvActivity.getIntent(getContext()) ;
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) ;
+                getContext().startActivity(intent);
                 return "";
             }
             return OkGoUtil.getToken();
@@ -141,6 +143,7 @@ public class RvWebView extends WebView {
             Intent intent = new Intent();
             intent.setComponent(name);
             intent.putExtra("to", "mine_coupons");
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) ;
             getContext().startActivity(intent);
         }
 

plugin_share/src/main/res/layout/activity_bill.xml

@@ -63,13 +63,12 @@
     <android.support.v7.widget.CardView
         android:id="@+id/ll_webview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@id/ll_bottom"
+        android:layout_height="wrap_content"
         android:layout_below="@id/ll_item_title"
+        android:layout_marginBottom="@dimen/size_100"
         android:layout_marginLeft="@dimen/dp_10"
         android:layout_marginTop="@dimen/size_30"
         android:layout_marginRight="@dimen/dp_10"
-        android:layout_marginBottom="@dimen/size_20"
         android:background="@drawable/shape_rv_bg_bill"
         android:orientation="vertical"
         app:cardCornerRadius="5dp" />