bug修复

module_discovery/src/main/java/com/xxfc/discovery/DiscoveryFragment.java

@@ -7,6 +7,7 @@ import android.support.annotation.Nullable;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.PopupWindow;
@@ -30,6 +31,7 @@ import com.xxfc.discovery.fragment.RecommendFragment;
 import com.xxfc.discovery.fragment.ShortVideoFragment;
 import com.xxfc.discovery.popupwindow.AddDiscoveryContentPw;
 import com.xxfc.discovery.presenter.DiscoveryPresenter;
+import com.yuyife.okgo.OkGoUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -220,6 +222,12 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
                 helper.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
+                        //判断是否已经登录
+                        if (TextUtils.isEmpty(OkGoUtil.getToken())) {
+                            ARouter.getInstance().build(Constance.ACTIVITY_URL_LOGINRV).navigation();
+                            return;
+                        }
+
                         int id = v.getId();
                         if (id == R.id.tv_pat) {
                             //拍拍
@@ -230,6 +238,7 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
 
                         } else if (id == R.id.tv_short_video) {
                             //短视频
+
                             ARouter.getInstance()
                                     .build(Constance.ACTIVITY_URL_SENDVIDEO)
                                     .navigation();

module_discovery/src/main/java/com/xxfc/discovery/event/PostPatEvent.java

+package com.xxfc.discovery.event;
+
+import com.frame.base.bus.Event;
+
+public class PostPatEvent extends Event {
+}

module_discovery/src/main/java/com/xxfc/discovery/fragment/PatFragment.java

@@ -8,6 +8,8 @@ import android.view.View;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.base.bus.Observer;
+import com.frame.base.bus.RxBus;
 import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
@@ -19,6 +21,8 @@ import com.xxfc.discovery.R2;
 import com.xxfc.discovery.adapter.DiscoveryRecommendAdapter;
 import com.xxfc.discovery.api.DiscoveryApi;
 import com.xxfc.discovery.bean.DiscoveryRecommendBean;
+import com.xxfc.discovery.event.DiscoveryAddEvent;
+import com.xxfc.discovery.event.PostPatEvent;
 import com.xxfc.discovery.presenter.DiscoveryPresenter;
 import com.yuyife.okgo.OkGoUtil;
 
@@ -27,6 +31,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import butterknife.BindView;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * 拍拍
@@ -61,6 +66,7 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Bas
     protected void initView(Bundle savedInstanceState) {
         mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(_mActivity));
         mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
+        initRxbus();
         mAdapter = new DiscoveryRecommendAdapter();
         rvContent.setLayoutManager(new GridLayoutManager(_mActivity, 2));
         rvContent.addItemDecoration(new AbSpacesItemDecoration(15));// 分割线。
@@ -81,6 +87,17 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Bas
         });
     }
 
+    private void initRxbus() {
+        RxBus.tObservable(PostPatEvent.class)
+                .observeOn(Schedulers.newThread())
+                .subscribe(new Observer<PostPatEvent>(disposable) {
+                    @Override
+                    public void onNext(PostPatEvent event) {
+                        onFresh();
+                    }
+                });
+    }
+
     @Override
     protected void loadData(Bundle savedInstanceState) {
         onFresh();
@@ -114,7 +131,7 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Bas
 
     private void processData(DiscoveryRecommendBean bean) {
         if (mPage == 1) {
-            countPage = bean.getData().getTotalPage();
+            countPage = bean.getData().getPageSize();
             mAdapter.setNewData(bean.getData().getList());
             if (bean.getData().getTotalCount() == 0) {
 //                mAdapter.setEmptyView(getEmptyView(rvContent, -1, "暂无拍拍数据"));

module_discovery/src/main/java/com/xxfc/discovery/other/DetailPatActivity.java

@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.os.Build;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.view.Window;
@@ -20,6 +21,7 @@ import android.widget.ProgressBar;
 
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.frame.base.url.Constance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
@@ -136,6 +138,11 @@ public class DetailPatActivity  extends BaseStatusActivity<DiscoveryPresenter> {
     public void onViewClicked(View view) {
         int id = view.getId();
         if (id ==R.id.ll_item_comment){
+            //评论
+            if (TextUtils.isEmpty(OkGoUtil.getToken())) {
+                ARouter.getInstance().build(Constance.ACTIVITY_URL_LOGINRV).navigation();
+                return;
+            }
             TrillCommentInputDialog trillCommentInputDialog = new TrillCommentInputDialog(mActivity, new TrillCommentInputDialog.OnSendCommentListener() {
                 @Override
                 public void sendComment(String str) {

module_discovery/src/main/java/com/xxfc/discovery/other/DetailQuestionAndAnswerActivity.java

@@ -4,6 +4,7 @@ import android.annotation.TargetApi;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.view.Window;
@@ -19,6 +20,7 @@ import android.widget.ProgressBar;
 
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.frame.base.url.Constance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
@@ -140,6 +142,11 @@ public class DetailQuestionAndAnswerActivity extends BaseStatusActivity<Discover
     public void onViewClicked(View view) {
         int ids = view.getId();
         if (ids == R.id.ll_item_comment) {
+            //评论
+            if (TextUtils.isEmpty(OkGoUtil.getToken())) {
+                ARouter.getInstance().build(Constance.ACTIVITY_URL_LOGINRV).navigation();
+                return;
+            }
             TrillCommentInputDialog trillCommentInputDialog = new TrillCommentInputDialog(mActivity, new TrillCommentInputDialog.OnSendCommentListener() {
                 @Override
                 public void sendComment(String str) {

module_discovery/src/main/java/com/xxfc/discovery/other/PostPatActivity.java

@@ -43,6 +43,7 @@ import com.xxfc.discovery.api.DiscoveryApi;
 import com.xxfc.discovery.bean.DiscoveryIMTokenBean;
 import com.xxfc.discovery.bean.DiscoveryUploadImageBean;
 import com.xxfc.discovery.bean.ImageSources;
+import com.xxfc.discovery.event.PostPatEvent;
 import com.xxfc.discovery.presenter.DiscoveryPresenter;
 import com.xxfc.imcamera.activity.EasyCameraActivity;
 import com.xxfc.imcamera.event.MessageEventGpu;
@@ -135,6 +136,10 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
                 DiscoveryIMTokenBean intokenBean = (DiscoveryIMTokenBean) result;
                 setData(intokenBean);
                 break;
+            case 2:
+                 RxBus.post(new PostPatEvent());
+                 finish();
+                break;
         }
     }
 

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

@@ -514,9 +514,14 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
                 tvCouponAmount.setText("-¥" + couponDataList.get(0).getUsedAmount());
                 getPayMoney();
             } else {
+                dataBean.setTickerNos("");
+                couponAmount =0;
                 tvCouponAmount.setText("暂无可用优惠券");
+                getPayMoney();
             }
         } else {
+            dataBean.setTickerNos("");
+            couponAmount =0;
             tvCouponAmount.setText("暂无优惠券");
         }
     }
@@ -561,6 +566,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
                     dataBean.setRentFreeDay(0);
                     isMemberType = 0;
                 }
+                couponAmount =0;
                 getPayMoney();
             }
         });
@@ -574,7 +580,6 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
             return;
         }
 
-
         ArrayList<OrderPriceDetailBean.ChildrenBean> childrenBeanList = new ArrayList<>(); //费用明细
         double payMoney = 0.00;
         double dayPrice = mCarBean.getVehicleModel().getSum();
@@ -613,6 +618,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
             childrenBean3.setVal("¥" + priceBean.getData().getDriverAmount());
             childrenBeanList.add(childrenBean3);
         }
+
         if (deductiblePriceType == 1) {
             payMoney = payMoney + priceBean.getData().getDamageSafePrice() * dayNum; //+免赔付价格
 

module_tourism/src/main/java/com/rv/tourism/TourismFragment.java

@@ -231,7 +231,7 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
         map.put("tagId", "");
         map.put("query", "");
         map.put("page", page);
-        map.put("limit", "10");
+//        map.put("limit", "10");
         map.put("latitude", latLatitude);
         map.put("longitude", lonLongitude);
         mPresenter.getData(2, TourismApi.QUERY_RIM_LIST, BeanTourAround.class, map, false);