Merge branch 'master' of http://113.105.137.151:22280/lify/rvapp into dev-member-john

RvClient/build.gradle

@@ -107,6 +107,11 @@ dependencies {
     api 'com.jakewharton:butterknife:9.0.0-rc1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.6.1'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.1'
+
+
     //    api project(path: ':RvTravel')
     api project(':component_resource')
     api project(path: ':module_home')

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

@@ -22,6 +22,7 @@ import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.util.LogUtils;
 import com.rv.component.utils.LogUtil;
 import com.sh.sdk.shareinstall.ShareInstall;
+import com.squareup.leakcanary.LeakCanary;
 import com.tencent.bugly.crashreport.CrashReport;
 import com.tencent.smtt.sdk.QbSdk;
 import com.tencent.smtt.sdk.TbsListener;
@@ -103,6 +104,15 @@ public class RvClientApplication extends FrameApp {
             ARouter.openDebug();
         }
         ARouter.init(RvClientApplication.this);
+
+      /**********************内存检测****************************/
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            // This process is dedicated to LeakCanary for heap analysis.
+            // You should not init your app in this process.
+            return;
+        }
+        LeakCanary.install(this);
+        /**********************************************/
     }
 
     private void initX5() {

RvClient/src/main/res/drawable/start_back_icon.xml

@@ -8,7 +8,7 @@
     <item>
         <bitmap
             android:gravity="bottom"
-            android:scaleType="centerCrop"
+            android:scaleType="matrix"
             android:src="@drawable/bottom_backgroud2"
             android:tileMode="disabled" />
     </item>

RvClient/src/main/res/values/styles.xml

@@ -17,6 +17,7 @@
         <item name="windowActionBar">true</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowNoTitle">true</item>
+        <!-- 设置全屏 -->
         <item name="android:windowFullscreen">true</item>
     </style>
 

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

@@ -16,12 +16,13 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.alibaba.fastjson.JSON;
-import com.baidu.location.Address;
 import com.baidu.location.BDAbstractLocationListener;
 import com.baidu.location.BDLocation;
 import com.baidu.location.Poi;
@@ -33,7 +34,6 @@ import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.LocationManager;
-import com.ruiwenliu.wrapper.util.MapUtil;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.util.permission.RxPermission;
@@ -57,13 +57,16 @@ import com.xxfc.imcamera.photopicker.PhotoPickerActivity;
 import com.xxfc.imcamera.photopicker.SelectModel;
 import com.xxfc.imcamera.photopicker.intent.PhotoPickerIntent;
 import com.yuyife.okgo.OkGoUtil;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
 import butterknife.BindView;
+import butterknife.ButterKnife;
 import butterknife.OnClick;
 import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
@@ -88,10 +91,13 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
     TextView tvPatOk;
     @BindView(R2.id.rv_icon)
     MyGridView rvIcon;
+    @BindView(R2.id.iv_item_delete)
+    ImageView ivItemDelete;
 
     private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;  // 拍照
     private static final int REQUEST_CODE_PICK_PHOTO = 2;     // 图库
 
+
     private GridViewAdapter mAdapter;
     private ArrayList<String> mPhotoList;
     // 拍照和图库，获得图片的Uri
@@ -105,7 +111,7 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
     private LocationManager locationManager;
     private ArrayList<ImageSources> sourcesList;
 
-    private  String name;
+    private String name;
 
     @Override
     protected int setLayout() {
@@ -136,7 +142,7 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
 
     @Override
     public void onShowResult(int requestType, BaseBean result) {
-        switch (requestType){
+        switch (requestType) {
             case 0:
                 DiscoveryUploadImageBean bean = (DiscoveryUploadImageBean) result;
                 upData(bean.getData());
@@ -146,22 +152,22 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
                 setData(intokenBean);
                 break;
             case 2:
-                 RxBus.post(new PostPatEvent());
-                 finish();
+                RxBus.post(new PostPatEvent());
+                finish();
                 break;
         }
     }
 
     private void setData(DiscoveryIMTokenBean intokenBean) {
-        if (intokenBean ==null){
+        if (intokenBean == null) {
             return;
         }
         Map<String, Object> map = new LinkedHashMap<>();
-        map.put("access_token",intokenBean.getData());
+        map.put("access_token", intokenBean.getData());
         map.put("type", "2");
         map.put("flag", "3");
         map.put("visible", "1");
-        map.put("text",etContent.getText().toString());
+        map.put("text", etContent.getText().toString());
         map.put("images", JSON.toJSONString(sourcesList));
 
         if (!TextUtils.isEmpty(address)) {
@@ -175,12 +181,12 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
         }
         map.put("cityId", "0");
         map.put("time", DateUtils.getCurTimeMillis());
-        mPresenter.postData(2, DiscoveryApi.DISCOVERY_MSG_ADD, BaseBean.class, map,true);
+        mPresenter.postData(2, DiscoveryApi.DISCOVERY_MSG_ADD, BaseBean.class, map, true);
     }
 
     private void upData(List<DiscoveryUploadImageBean.DataBean> data) {
-         sourcesList = new ArrayList<>();
-        if (data !=null){
+        sourcesList = new ArrayList<>();
+        if (data != null) {
             for (int i = 0; i < data.size(); i++) {
                 ImageSources sources = new ImageSources();
                 sources.setoFileName(data.get(i).getFileName());
@@ -192,13 +198,13 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
 
         if (OkGoUtil.getToken() != null) {
             Map<String, Object> headMap = new LinkedHashMap<>();
-            headMap.put("Authorization",OkGoUtil.getToken());
-            mPresenter.postData(RvFrameConfig.HOST,1, DiscoveryApi.DISCOVERY_IM_LOGIN, DiscoveryIMTokenBean.class,headMap, headMap,true);
+            headMap.put("Authorization", OkGoUtil.getToken());
+            mPresenter.postData(RvFrameConfig.HOST, 1, DiscoveryApi.DISCOVERY_IM_LOGIN, DiscoveryIMTokenBean.class, headMap, headMap, true);
         }
     }
 
 
-    @OnClick({R2.id.ll_item_select_icon, R2.id.ll_item_select_address, R2.id.tv_pat_ok})
+    @OnClick({R2.id.ll_item_select_icon, R2.id.ll_item_select_address, R2.id.tv_pat_ok, R2.id.iv_item_delete})
     public void onViewClicked(View view) {
         int id = view.getId();
         if (id == R.id.ll_item_select_icon) {
@@ -206,18 +212,18 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
         } else if (id == R.id.ll_item_select_address) {
             ARouter.getInstance()
                     .build(Constance.ACTIVITY_URL_MAPLOCATION)
-                    .withDouble("latLatitude",latLatitude)
-                    .withDouble("lonLongitude",lonLongitude)
-                    .withString("name",name)
-                    .withString("addrStr",addrStr)
-                    .navigation(this,210);
+                    .withDouble("latLatitude", latLatitude)
+                    .withDouble("lonLongitude", lonLongitude)
+                    .withString("name", name)
+                    .withString("addrStr", addrStr)
+                    .navigation(this, 210);
         } else if (id == R.id.tv_pat_ok) {
-            if (TextUtils.isEmpty(etContent.getText().toString())){
+            if (TextUtils.isEmpty(etContent.getText().toString())) {
                 showToast("亲，请说点什么吧！");
                 return;
             }
 
-            if (mPhotoList.size() <= 0 ) {
+            if (mPhotoList.size() <= 0) {
                 showToast("请选择需要上传的图片！");
                 return;
             }
@@ -229,12 +235,18 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
                 // 发布图片+文字
                 upIcon();
             }
+        } else if (id == R.id.iv_item_delete) {
+            tvPatAddress.setText("");
+            latLatitude = 0;
+            lonLongitude = 0;
+            address = "";
+            ivItemDelete.setVisibility(View.GONE);
         }
     }
 
     private void upIcon() {
         ArrayList<Imag> imags = new ArrayList<>();
-        for (int i = 0; i <mPhotoList.size() ; i++) {
+        for (int i = 0; i < mPhotoList.size(); i++) {
             File file = new File(mPhotoList.get(i));
             Imag imag = new Imag();
             imag.setFileName(file.getName());
@@ -252,7 +264,7 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
                 super.helper(helper);
                 helper.setText(R.id.btn1, "删除");
                 helper.setText(R.id.btn2, "取消");
-                helper.setVisible(R.id.btn3,false);
+                helper.setVisible(R.id.btn3, false);
                 helper.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -335,7 +347,7 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
                     showToast("拍照失败");
                 }
             }
-        }else if (requestCode == REQUEST_CODE_PICK_PHOTO) {
+        } else if (requestCode == REQUEST_CODE_PICK_PHOTO) {
             // 选择图片返回
             if (resultCode == Activity.RESULT_OK) {
                 if (data != null) {
@@ -345,9 +357,10 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
                     showToast("选择失败");
                 }
             }
-        }else if (requestCode == 210 && resultCode == Activity.RESULT_OK){
-            latLatitude = data.getDoubleExtra("latitude",0);
-            lonLongitude = data.getDoubleExtra("longitude",0);
+        } else if (requestCode == 210 && resultCode == Activity.RESULT_OK) {
+            ivItemDelete.setVisibility(View.VISIBLE);
+            latLatitude = data.getDoubleExtra("latitude", 0);
+            lonLongitude = data.getDoubleExtra("longitude", 0);
             address = data.getStringExtra("location");
             tvPatAddress.setText(data.getStringExtra("location"));
         }
@@ -444,7 +457,6 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
     }
 
 
-
     /**
      * 打开相机和相册
      *
@@ -485,6 +497,12 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
         }
     }
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
 
 
     private class GridViewAdapter extends BaseAdapter {
@@ -598,8 +616,8 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
                 latLatitude = location.getLatitude();
                 lonLongitude = location.getLongitude();
                 List<Poi> poiList = location.getPoiList();
-                if (poiList !=null && poiList.size() >0){
-                     name = poiList.get(0).getName();
+                if (poiList != null && poiList.size() > 0) {
+                    name = poiList.get(0).getName();
                 }
                 mLatLng = new LatLng(location.getLatitude(), location.getLongitude());
                 locationManager.stopLocation();

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

@@ -53,12 +53,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/size_15"
             android:layout_marginRight="@dimen/size_15"
-            android:paddingTop="@dimen/size_20"
-            android:paddingBottom="@dimen/size_20">
+            android:gravity="center_vertical"
+            android:paddingTop="@dimen/size_10"
+            android:paddingBottom="@dimen/size_10">
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:paddingTop="@dimen/size_8"
+                android:paddingBottom="@dimen/size_8"
                 android:src="@drawable/campsite_icon_citylocation_hint" />
 
             <TextView
@@ -72,6 +75,14 @@
                 android:text="您所在的位置"
                 android:textColor="@color/colorGray"
                 android:textSize="@dimen/text_12" />
+
+            <ImageView
+                android:id="@+id/iv_item_delete"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/size_8"
+                android:visibility="gone"
+                android:src="@drawable/common_icon_circle_delete" />
         </LinearLayout>
 
         <View

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

@@ -52,7 +52,6 @@ import com.rv.component.utils.DisplayUtil;
 import com.rv.component.utils.LogUtil;
 import com.rv.component.utils.MyUtils;
 import com.rv.component.utils.ObservableScrollView;
-
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
@@ -153,7 +152,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
     TextView tvSeeMorePopular;
     @BindView(R2.id.rl_item_layout)
     RelativeLayout rlItemLayout;
-    @BindView(R2.id.scrollview)
+    @BindView(R2.id.os_scrollview)
     ObservableScrollView scrollview;
     @BindView(R2.id.ll_item_title)
     LinearLayout llItemTitle;
@@ -1081,7 +1080,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
                     buffer.append("(").append(getCityName).append(")");
                 }
 
-                if (buffer.length() > 0) {
+                if (buffer != null && buffer.length() > 0) {
                     headTvGetShop.setText(buffer.toString());
                 } else {
                     headTvGetShop.setText("");
@@ -1102,7 +1101,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
                 if (!TextUtils.isEmpty(outCityName)) {
                     buffer.append("(").append(outCityName).append(")");
                 }
-                if (buffer.length() > 0) {
+                if (buffer != null && buffer.length() > 0) {
                     headTvOutShop.setText(buffer.toString());
                 } else {
                     headTvOutShop.setText("");

module_home/src/main/res/layout/activity_travel_order_details.xml

@@ -53,8 +53,6 @@
         </RelativeLayout>
     </com.ruiwenliu.wrapper.statusbar.StatusBarHeightView>
 
-    <include layout="@layout/common_line" />
-
     <ProgressBar
         android:id="@+id/pb_progress"
         style="?android:attr/progressBarStyleHorizontal"

module_home/src/main/res/layout/fragment_home.xml

@@ -13,7 +13,7 @@
         android:layout_height="match_parent">
 
         <com.rv.component.utils.ObservableScrollView
-            android:id="@+id/scrollview"
+            android:id="@+id/os_scrollview"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scrollbars="none">