bug修复

RvClient/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
 
-        versionCode 114
-        versionName "1.1.4"
+        versionCode 116
+        versionName "1.1.6"
         multiDexEnabled true
 
         //新版Gradle 是 implementation 为了兼容compile,写上这句话

RvFrame/src/main/java/com/frame/rv/config/RvFrameConstant.java

@@ -22,5 +22,9 @@ public interface RvFrameConstant {
     int ERROR_TYPE_URL = 1004;//url错误
     int ERROR_TYPE_EXCEPTION = 1005;//未知错误
 
+    /**
+     * im 请求
+     */
+    int HTTP_STATE_SUCCESS_IM = 1;//请求成功
 
 }

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

@@ -12,5 +12,7 @@ public class BaseBean{
 //    public String message;
     public  int status;
     public String message;
+
+    public  int resultCode;
 //    public boolean isEmpty;
 }

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

@@ -61,6 +61,12 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
                         break;
                 }
 
+                switch (bean.resultCode){
+                    case RvFrameConstant.HTTP_STATE_SUCCESS_IM:
+                        baseView.onShowResult(position, bean);
+                        break;
+                }
+
             } catch (Exception e) {
                 e.printStackTrace();
             }

RvWrapper/src/main/java/com/ruiwenliu/wrapper/weight/refresh/SimpleRefreshLayout.java

@@ -74,6 +74,7 @@ public  class SimpleRefreshLayout extends ViewGroup implements NestedScrollingPa
 
 
     private OnSimpleRefreshListener mRefreshListener;
+    private OnSimpleLoadListener mLoadListener;
 
     public SimpleRefreshLayout(Context context) {
         this(context, null);
@@ -573,9 +574,9 @@ public  class SimpleRefreshLayout extends ViewGroup implements NestedScrollingPa
                 if (mFooterWrapper != null) {
                     mFooterWrapper.pullUpRelease();
                 }
-                if (mRefreshListener != null) {
-//                    mRefreshListener.onLoadMore();
-                    onLoadMore();
+                if (mLoadListener != null) {
+                    mLoadListener.onLoadMore();
+//                    onLoadMore();
                 }
                 setEnable(false);
                 break;
@@ -706,9 +707,11 @@ public  class SimpleRefreshLayout extends ViewGroup implements NestedScrollingPa
     public interface OnSimpleRefreshListener {
         void onRefresh();
 
-//        void onLoadMore();
     }
 
+    public interface OnSimpleLoadListener{
+                void onLoadMore();
+    }
 
     /**
      * 加载更多
@@ -721,6 +724,10 @@ public  class SimpleRefreshLayout extends ViewGroup implements NestedScrollingPa
         this.mRefreshListener = listener;
     }
 
+    public void setOnSimpleLoadListener(OnSimpleLoadListener listener) {
+        this.mLoadListener = listener;
+    }
+
     public void setPullDownEnable(boolean pullDownEnable) {
         this.pullDownEnable = pullDownEnable;
     }

module_discovery/src/main/java/com/xxfc/discovery/adapter/DiscoveryAskAdapter.java

@@ -29,6 +29,14 @@ public class DiscoveryAskAdapter extends BaseQuickAdapter<DiscoveryAskBean.DataB
           helper.setText(R.id.tv_ask_content,item.getContent());
           helper.setText(R.id.tv_ask_name,item.getNickname());
           helper.setText(R.id.tv_like_number,item.getPraiseCount());
-          helper.setText(R.id.tv_comment_number,item.getCommentCount() );
+          helper.setText(R.id.tv_comment_number,item.getCommentCount());
+
+          if (item.isPraise()){
+                helper.setImageResource(R.id.iv_like,R.drawable.icon_discovery_ask_like);
+          }else {
+              helper.setImageResource(R.id.iv_like,R.drawable.icon_discovery_ask_unlike);
+          }
+
+          helper.addOnClickListener(R.id.ll_item_like);
     }
 }

module_discovery/src/main/java/com/xxfc/discovery/api/DiscoveryApi.java

@@ -25,11 +25,17 @@ public interface DiscoveryApi extends RvFrameConfig {
     // 问答评论
     String DISCOVERY_IMCOMMENT_ADD = HOST + "/api/im/imComment/add";
 
+    //点赞
+    String DISCOVERY_IMPRAISE_ADD = HOST + "/api/im/imPraise/add";
+
+   //取消点赞
+    String DISCOVERY_IMPRAISE_DELETE = HOST + "/api/im/imPraise/delete";
+
     //拍拍添加评论
-    String DISCOVERY_COMMENT_ADD = HOST + "/b/circle/msg/comment/add";
+    String DISCOVERY_COMMENT_ADD = IMA_BASEUSRL + "/b/circle/msg/comment/add";
 
     // 添加消息（拍拍、段视频）
-    String DISCOVERY_MSG_ADD = "https://xxfcim.upyuns.com/xxfcim/b/circle/msg/add";
+    String DISCOVERY_MSG_ADD = IMA_BASEUSRL +"/b/circle/msg/add";
 
     //im登录
     String DISCOVERY_IM_LOGIN = HOST + "/api/auth/jwt/imi/login";

module_discovery/src/main/java/com/xxfc/discovery/bean/DiscoveryAskBean.java

@@ -87,6 +87,7 @@ public class DiscoveryAskBean extends BaseBean {
             private int visible;//":1,
             private int state;//":1,
             private boolean isDel;//":false,
+            private boolean praise;  //是否点赞
             private String content;//":"谁知道呀你想吃啥吃啥",
             private String commentCount;//":1,
             private String praiseCount;//":1,
@@ -229,6 +230,14 @@ public class DiscoveryAskBean extends BaseBean {
                 this.imPraise = imPraise;
             }
 
+            public boolean isPraise() {
+                return praise;
+            }
+
+            public void setPraise(boolean praise) {
+                this.praise = praise;
+            }
+
             public static class ImComment implements Serializable {
                 private String id;//  ": 4,
                 private String questionId;//": 3,

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

@@ -36,7 +36,7 @@ import io.reactivex.schedulers.Schedulers;
 /**
  * 拍拍
  */
-public class PatFragment extends BaseFragment<DiscoveryPresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener {
+public class PatFragment extends BaseFragment<DiscoveryPresenter> implements  SimpleRefreshLayout.OnSimpleRefreshListener {
 
     @BindView(R2.id.rv_content)
     RecyclerView rvContent;
@@ -48,7 +48,6 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Bas
     private int mPage;
 
 
-
     public static PatFragment getInstance(int type) {
         Bundle bundl = new Bundle();
         bundl.putInt("type", type);
@@ -70,14 +69,17 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Bas
         mAdapter = new DiscoveryRecommendAdapter();
         rvContent.setLayoutManager(new GridLayoutManager(_mActivity, 2));
         rvContent.addItemDecoration(new AbSpacesItemDecoration(15));// 分割线。
-        rvContent.setNestedScrollingEnabled(false);
         rvContent.setAdapter(mAdapter);
+        mAdapter.bindToRecyclerView(rvContent);
+        mAdapter.setEnableLoadMore(true);
+        mAdapter.disableLoadMoreIfNotFullPage();
+
 
         mAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 DiscoveryRecommendBean.DataBeanX.DataBean item = (DiscoveryRecommendBean.DataBeanX.DataBean) adapter.getItem(position);
-                if (item !=null) {
+                if (item != null) {
                     ARouter.getInstance()
                             .build(Constance.ACTIVITY_URL_DETAILPAT)
                             .withString("id", item.getMsgId())
@@ -85,6 +87,22 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Bas
                 }
             }
         });
+
+        mAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override public void onLoadMoreRequested() {
+                rvContent.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (mPage >= countPage) {
+                            mAdapter.loadMoreEnd();
+                        } else {
+                            mPage++;
+                            geDataList(mPage);
+                        }
+                    }
+                }, 200);
+            }
+        }, rvContent);
     }
 
     private void initRxbus() {
@@ -119,8 +137,8 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Bas
     private void geDataList(int page) {
         Map<String, Object> map = new LinkedHashMap<>();
         map.put("page", page);
-        map.put("type",2);
-        mPresenter.postData( 0, DiscoveryApi.DISCOVERY_UNAUTH_LIST, DiscoveryRecommendBean.class, map, page == 1 ? false : false);
+        map.put("type", 2);
+        mPresenter.postData(0, DiscoveryApi.DISCOVERY_UNAUTH_LIST, DiscoveryRecommendBean.class, map, page == 1 ? false : false);
     }
 
     @Override
@@ -143,21 +161,22 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Bas
         }
     }
 
-    @Override
-    public void onLoadMoreRequested() {
-        if (mPage >= countPage) {
-            mAdapter.loadMoreEnd();
-        } else {
-            mPage++;
-            geDataList(mPage);
-        }
-    }
 
     @Override
     public void onRefresh() {
         onFresh();
     }
 
+//    @Override
+//    public void onLoadMoreRequested() {
+//
+//    }
+
+//    @Override
+//    public void onLoadMore() {
+//
+//    }
+
 
     public class AbSpacesItemDecoration extends RecyclerView.ItemDecoration {
 

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

@@ -15,6 +15,7 @@ import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
+import com.rv.component.utils.DateUtils;
 import com.xxfc.discovery.R;
 import com.xxfc.discovery.R2;
 import com.xxfc.discovery.adapter.DiscoveryAskAdapter;
@@ -81,6 +82,29 @@ public class QuestionAndAnswerFragment extends BaseFragment<DiscoveryPresenter>
             }
         });
 
+        mAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
+            @Override
+            public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
+                DiscoveryAskBean.DataBeanX.DataBean item = (DiscoveryAskBean.DataBeanX.DataBean) adapter.getItem(position);
+                int id = view.getId();
+                if (id == R.id.ll_item_like){
+                       Map<String, Object> headMap = new LinkedHashMap<>();
+                       if (OkGoUtil.getToken() != null) {
+                           headMap.put("Authorization", OkGoUtil.getToken());
+                           Map<String, Object> map = new LinkedHashMap<>();
+                           map.put("questionId", item.getId());
+
+                           if (item.isPraise()) {
+                               mPresenter.postData(RvFrameConfig.HOST, 2, DiscoveryApi.DISCOVERY_IMPRAISE_DELETE, BaseBean.class, map, headMap, true);
+                           }else {
+                               map.put("time", DateUtils.getCurTimeMillis());
+                               mPresenter.postData(RvFrameConfig.HOST, 1, DiscoveryApi.DISCOVERY_IMPRAISE_ADD, BaseBean.class, map, headMap, true);
+                           }
+                       }
+                }
+            }
+        });
+
     }
 
     private void initRxbus() {
@@ -113,7 +137,20 @@ public class QuestionAndAnswerFragment extends BaseFragment<DiscoveryPresenter>
     @Override
     public void onShowResult(int requestType, BaseBean result) {
         mSimpleRefreshLayout.onRefreshComplete();
-        processData((DiscoveryAskBean) result);
+        switch (requestType){
+            case 0:
+                processData((DiscoveryAskBean) result);
+                break;
+
+            case 1:
+                onFresh();
+                break;
+
+            case 2:
+                onFresh();
+                break;
+        }
+
     }
 
     @Override
@@ -132,9 +169,13 @@ public class QuestionAndAnswerFragment extends BaseFragment<DiscoveryPresenter>
      * @param page
      */
     private void geDataList(int page) {
+        Map<String, Object> headMap = new LinkedHashMap<>();
         Map<String, Object> map = new LinkedHashMap<>();
+        if (OkGoUtil.getToken() != null) {
+            headMap.put("Authorization", OkGoUtil.getToken());
+        }
         map.put("page", page);
-        mPresenter.getData( 0, DiscoveryApi.DISCOVERY_IMQUESTION_LIST, DiscoveryAskBean.class, map, page == 1 ? false : false);
+        mPresenter.getData( DiscoveryApi.HOST,0, DiscoveryApi.DISCOVERY_IMQUESTION_LIST, DiscoveryAskBean.class, map,headMap, page == 1 ? false : false);
     }
 
 

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

@@ -61,8 +61,10 @@ public class RecommendFragment extends BaseFragment<DiscoveryPresenter> implemen
         mRecommendAdapter = new DiscoveryRecommendAdapter();
         rvContent.setLayoutManager(new GridLayoutManager(_mActivity, 2));
         rvContent.addItemDecoration(new AbSpacesItemDecoration(15));// 分割线。
-        rvContent.setNestedScrollingEnabled(false);
         rvContent.setAdapter(mRecommendAdapter);
+        mRecommendAdapter.bindToRecyclerView(rvContent);
+        mRecommendAdapter.setEnableLoadMore(true);
+        mRecommendAdapter.disableLoadMoreIfNotFullPage();
 
         mRecommendAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
@@ -90,6 +92,24 @@ public class RecommendFragment extends BaseFragment<DiscoveryPresenter> implemen
                 }
             }
         });
+
+        mRecommendAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override public void onLoadMoreRequested() {
+                rvContent.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (mPage >= countPage) {
+                            mRecommendAdapter.loadMoreEnd();
+                        } else {
+                            mPage++;
+                            geDataList(mPage);
+                        }
+                    }
+                }, 200);
+            }
+        }, rvContent);
+
+
     }
 
 

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

@@ -29,7 +29,7 @@ import butterknife.BindView;
 /**
  * 短视频
  */
-public class ShortVideoFragment extends BaseFragment<DiscoveryPresenter>  implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener {
+public class ShortVideoFragment extends BaseFragment<DiscoveryPresenter>  implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener{
 
     @BindView(R2.id.rv_content)
     RecyclerView rvContent;
@@ -61,7 +61,6 @@ public class ShortVideoFragment extends BaseFragment<DiscoveryPresenter>  implem
         mAdapter = new DiscoveryRecommendAdapter();
         rvContent.setLayoutManager(new GridLayoutManager(_mActivity, 2));
         rvContent.addItemDecoration(new AbSpacesItemDecoration(15));// 分割线。
-        rvContent.setNestedScrollingEnabled(false);
         rvContent.setAdapter(mAdapter);
 
     }
@@ -127,6 +126,7 @@ public class ShortVideoFragment extends BaseFragment<DiscoveryPresenter>  implem
     }
 
 
+
     public class AbSpacesItemDecoration extends RecyclerView.ItemDecoration {
 
         private int space;

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

@@ -23,6 +23,7 @@ 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.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
@@ -30,6 +31,7 @@ import com.rv.component.utils.DateUtils;
 import com.xxfc.discovery.R;
 import com.xxfc.discovery.R2;
 import com.xxfc.discovery.api.DiscoveryApi;
+import com.xxfc.discovery.bean.DiscoveryIMTokenBean;
 import com.xxfc.discovery.dialog.TrillCommentInputDialog;
 import com.xxfc.discovery.presenter.DiscoveryPresenter;
 import com.yuyife.okgo.OkGoUtil;
@@ -56,6 +58,7 @@ public class DetailPatActivity  extends BaseStatusActivity<DiscoveryPresenter> {
     LinearLayout llItemComment;
 
     private String webUrl;
+    private String content;
 
     @Autowired()
     String id;
@@ -146,18 +149,16 @@ public class DetailPatActivity  extends BaseStatusActivity<DiscoveryPresenter> {
             TrillCommentInputDialog trillCommentInputDialog = new TrillCommentInputDialog(mActivity, new TrillCommentInputDialog.OnSendCommentListener() {
                 @Override
                 public void sendComment(String str) {
-                    Map<String, Object> headMap = new LinkedHashMap<>();
-                    if (OkGoUtil.getToken() != null) {
-                        headMap.put("Authorization", OkGoUtil.getToken());
+                    content = str;
+                        if (OkGoUtil.getToken() != null) {
+                            Map<String, Object> headMap = new LinkedHashMap<>();
+                            headMap.put("Authorization",OkGoUtil.getToken());
+                            mPresenter.postData(RvFrameConfig.HOST,0, DiscoveryApi.DISCOVERY_IM_LOGIN, DiscoveryIMTokenBean.class,headMap, headMap,true);
+                        }
+
+//                        headMap.put("Authorization", OkGoUtil.getToken());
 //                        headMap.put("content-type ","application/json");
-                        Map<String, Object> map = new LinkedHashMap<>();
-                        map.put("messageId",id);
-                        map.put("toUserId","");
-                        map.put("toNickname", "");
-                        map.put("toBody", "");
-                        map.put("body", str);
-                        mPresenter.postData(DiscoveryApi.HOST,1, DiscoveryApi.DISCOVERY_COMMENT_ADD, BaseBean.class, map, headMap,true);
-                    }
+
 
                 }
             });
@@ -171,7 +172,24 @@ public class DetailPatActivity  extends BaseStatusActivity<DiscoveryPresenter> {
 
     @Override
     public void onShowResult(int requestType, BaseBean result) {
-        mWebView.reload();
+        switch (requestType){
+            case 0:
+                DiscoveryIMTokenBean intokenBean = (DiscoveryIMTokenBean) result;
+                setData(intokenBean);
+                break;
+            case 1:
+                mWebView.reload();
+                break;
+        }
+    }
+
+
+    private void setData(DiscoveryIMTokenBean intokenBean) {
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("access_token",intokenBean.getData());
+        map.put("messageId",id);
+        map.put("body", content);
+        mPresenter.postData(1, DiscoveryApi.DISCOVERY_COMMENT_ADD, BaseBean.class, map,true);
     }
 
     public class AndroidJs {

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

@@ -17,7 +17,6 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.LinearLayout;
 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;

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

@@ -36,6 +36,7 @@ import com.ruiwenliu.wrapper.util.permission.RxPermission;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.component.control.MyGridView;
 import com.rv.component.control.SquareCenterImageView;
+import com.rv.component.utils.DateUtils;
 import com.rv.component.utils.Inc;
 import com.xxfc.discovery.R;
 import com.xxfc.discovery.R2;
@@ -107,6 +108,7 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setTitle("发布拍拍");
         initRxbus();
+        permissionProcess();
         mPhotoList = new ArrayList<>();
         mAdapter = new GridViewAdapter();
         rvIcon.setAdapter(mAdapter);
@@ -164,6 +166,7 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
             map.put("location", addrStr);
         }
         map.put("cityId", "0");
+        map.put("time", DateUtils.getCurTimeMillis());
         mPresenter.postData(2, DiscoveryApi.DISCOVERY_MSG_ADD, BaseBean.class, map,true);
     }
 

module_discovery/src/main/res/layout/activity_detail_pat.xml

@@ -36,7 +36,7 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/size_40"
             android:layout_weight="1"
-            android:text="回复您的答案..."
+            android:text="说点什么吧..."
             android:textSize="@dimen/text_14"
             android:textColor="@color/colorGray"
             android:gravity="center_vertical"

module_discovery/src/main/res/layout/rv_item_discovery_ask.xml

@@ -63,6 +63,7 @@
                 android:orientation="horizontal">
 
                 <ImageView
+                    android:id="@+id/iv_like"
                     android:layout_width="@dimen/size_15"
                     android:layout_height="@dimen/size_15"
                     android:src="@drawable/icon_discovery_ask_unlike" />

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

@@ -137,7 +137,6 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
         rvPopularMore.setNestedScrollingEnabled(false);
         rvPopularMore.setAdapter(mAllPopularAdapter);
 
-
         //周边游
         mTourAroundAdapter = new TourAroundAdapter();
         rvTourAround.setLayoutManager(new LinearLayoutManager(_mActivity, LinearLayoutManager.VERTICAL, false));
@@ -231,7 +230,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);
@@ -362,7 +361,9 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
     @Override
     public void onDestroy() {
         super.onDestroy();
-        geoCoder.destroy();
+        if (geoCoder !=null){
+            geoCoder.destroy();
+        }
     }