Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im

# Conflicts:
#	plugin_im/src/main/res/values/styles.xml

RvClient/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         flavorDimensions "default"
-        versionCode 150
-        versionName "1.5.0"
+        versionCode 151
+        versionName "1.5.1"
         multiDexEnabled true
 
         ndk {

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

@@ -48,6 +48,7 @@ import com.ruiwenliu.wrapper.util.listener.SwitchFragment;
 import com.ruiwenliu.wrapper.weight.CustomScrollViewPager;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.camp.CampFragment;
+import com.rv.component.utils.AppCookie;
 import com.rv.component.utils.Cookie;
 import com.rv.component.utils.DateUtils;
 import com.rv.component.utils.LogUtil;
@@ -92,10 +93,13 @@ import butterknife.OnClick;
 import cn.jpush.android.api.BasicPushNotificationBuilder;
 import cn.jpush.android.api.CustomPushNotificationBuilder;
 import cn.jpush.android.api.JPushInterface;
+import pub.devrel.easypermissions.AppSettingsDialog;
 import pub.devrel.easypermissions.EasyPermissions;
 
 
-public class MainActivity extends BaseActivity<CommonPresenter> {
+public class MainActivity extends BaseActivity<CommonPresenter> implements  EasyPermissions.PermissionCallbacks{
+
+    private static final String TAG = MainActivity.class.getSimpleName();
 
     //    @BindView(R2.id.pager_view_fragment)
     CustomScrollViewPager viewPager;
@@ -262,10 +266,10 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
             case 1:
                 EffectiveTimeBean bean = (EffectiveTimeBean) result;
                 if (bean != null && bean.isRel() && bean.getData() != null) {
-                    Cookie.save(getApplicationContext(), "actRent", bean.getData().getActRent());
-                    Cookie.save(getApplicationContext(), "actTour", bean.getData().getActTour());
-                    Cookie.save(getApplicationContext(), "insurePrice", bean.getData().getInsurePrice());
-                    Cookie.save(getApplicationContext(), "actMember", bean.getData().getActMember());
+                    AppCookie.save(getApplicationContext(), "actRent", bean.getData().getActRent());
+                    AppCookie.save(getApplicationContext(), "actTour", bean.getData().getActTour());
+                    AppCookie.save(getApplicationContext(), "insurePrice", bean.getData().getInsurePrice());
+                    AppCookie.save(getApplicationContext(), "actMember", bean.getData().getActMember());
                 }
                 break;
             case 2:
@@ -417,17 +421,28 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        switch (requestCode) {
-            case 1001:
-                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    updateAppUtils.download();
-                } else {
-                    Toast.makeText(getApplicationContext(), "授权失败,无法下载最新App", Toast.LENGTH_SHORT).show();
+        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
     }
-                break;
+
+    @Override
+    public void onPermissionsGranted(int requestCode, @NonNull List<String> perms) {
+
+    }
+
+    @Override
+    public void onPermissionsDenied(int requestCode, @NonNull List<String> perms) {
+        Toast.makeText(this, "用户授权失败", Toast.LENGTH_SHORT).show();
+        if (EasyPermissions.somePermissionPermanentlyDenied(this, perms)) {
+            new AppSettingsDialog.Builder(this).
+                    setTitle("需要权限")
+                    .setRationale("如果没有这些权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
+                    .build().show();
         }
     }
 
+
+
+
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
         if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {

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

@@ -21,6 +21,7 @@ import com.frame.base.bean.BeanHeartbeat;
 import com.frame.base.manager.MyFrameManager;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.util.LogUtils;
+import com.rv.component.utils.AppCookie;
 import com.rv.component.utils.Cookie;
 import com.rv.component.utils.LogUtil;
 import com.rv.component.utils.RvCache;
@@ -56,6 +57,7 @@ public class RvClientApplication extends FrameApp {
         super.onCreate();
         RvCache.init(this);
         Cookie.init(this);
+        AppCookie.init(this);
         ViewTarget.setTagId(R.id.glideIndexTag);
         Log.e("xxxxxxxxxxxxxxxxxxxxx", "RvClientApplication_onCreate");
         ImSetting.init(this);

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

@@ -5,12 +5,11 @@ import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.TextUtils;
 
-import com.rv.component.utils.Cookie;
+import com.rv.component.utils.AppCookie;
 import com.rv.component.utils.LogUtil;
 import com.sh.sdk.shareinstall.ShareInstall;
 import com.sh.sdk.shareinstall.listener.AppGetInfoListener;
 
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.net.URLDecoder;
@@ -42,7 +41,7 @@ public class WakeUpActivity extends AppCompatActivity {
                 JSONObject object = new JSONObject(info);
                 String inviteCode = object.optString("code");
                 if (!TextUtils.isEmpty(inviteCode)) {
-                    Cookie.save(getApplicationContext(), "code", inviteCode);
+                    AppCookie.save(getApplicationContext(), "code", inviteCode);
                 }
                 String url = object.optString("url");
                 LogUtil.d("唤醒传过来的url=" + url);

component_utils/src/main/java/com/rv/component/utils/AppCookie.java

@@ -5,9 +5,9 @@ import android.content.SharedPreferences;
 
 import java.lang.ref.WeakReference;
 
-public class Cookie {
+public class AppCookie {
 
-    private final static String COOKIE_FILE = "cookie";
+    private final static String COOKIE_FILE = "app_cookie";
 
     private static SharedPreferences preferences;
 
@@ -83,8 +83,4 @@ public class Cookie {
     public static boolean getBooleanValue(Context context, String key, boolean def) {
         return getPreference().getBoolean(key, def);
     }
-
-    public static void clear(Context context) {
-        getPreference().edit().clear().commit();
-    }
 }

module_home/src/main/java/com/rv/home/rv/module/ui/login/LoginRvActivity.java

@@ -20,6 +20,7 @@ import com.ruiwenliu.wrapper.util.RxJavaManager;
 import com.ruiwenliu.wrapper.util.listener.TextChangedListener;
 import com.ruiwenliu.wrapper.weight.TitleView;
 
+import com.rv.component.utils.AppCookie;
 import com.rv.component.utils.Cookie;
 import com.rv.component.utils.IsAppInstall;
 import com.rv.component.utils.LogUtil;
@@ -107,7 +108,7 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
                         JSONObject object = new JSONObject(info);
                         String inviteCode = object.optString("code");
                         if (!TextUtils.isEmpty(inviteCode)) {
-                            Cookie.save(getApplicationContext(), "code", inviteCode);
+                            AppCookie.save(getApplicationContext(), "code", inviteCode);
                         }
                     } catch (JSONException e) {
                         e.printStackTrace();
@@ -225,7 +226,7 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
         Map<String, Object> map = new LinkedHashMap<>();
         map.put("username", getPhone());
         map.put("type", 4);
-        map.put("code", Cookie.getStringValue(getApplicationContext(), "code"));
+        map.put("code", AppCookie.getStringValue(getApplicationContext(), "code"));
         mPresenter.postData(0, ApiConfig.HTTP_URL_SEND_CODE, SendCodeBean.class, map, true);
     }
 
@@ -236,7 +237,7 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
         Map<String, Object> map = new LinkedHashMap<>();
         map.put("openid", openid);
         map.put("isQQ", isQQ);
-        map.put("code", Cookie.getStringValue(getApplicationContext(), "code"));
+        map.put("code", AppCookie.getStringValue(getApplicationContext(), "code"));
         mPresenter.postData(1, ApiConfig.HTTP_URL_OTHER_LOGIN, RegisteredBean.class, map, true);
     }
 
@@ -248,7 +249,7 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
         map.put("username", getPhone());
         map.put("mobilecode", getCode());
         map.put("type", 2);
-        map.put("code", Cookie.getStringValue(getApplicationContext(), "code"));
+        map.put("code", AppCookie.getStringValue(getApplicationContext(), "code"));
         mPresenter.postData(2, ApiConfig.HTTP_URL_PWD_LOGIN, RegisteredBean.class, map, true);
     }
 

module_home/src/main/java/com/rv/home/rv/module/ui/login/PwdLoginActivity.java

@@ -14,6 +14,7 @@ import android.widget.TextView;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.listener.TextChangedListener;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.component.utils.AppCookie;
 import com.rv.component.utils.Cookie;
 import com.rv.home.R;
 import com.rv.home.R2;
@@ -242,7 +243,7 @@ public class PwdLoginActivity extends BaseLoginActivity<CommonPresenter> {
         map.put("username", getPhone());
         map.put("password", getPwd());
         map.put("type", 1);
-        map.put("code", Cookie.getStringValue(getApplicationContext(), "code"));
+        map.put("code", AppCookie.getStringValue(getApplicationContext(), "code"));
         mPresenter.postData(0, ApiConfig.HTTP_URL_PWD_LOGIN, RegisteredBean.class, map, true);
     }
 

module_home/src/main/java/com/rv/home/rv/module/ui/login/RegisteredActivity.java

@@ -20,6 +20,7 @@ import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.RxJavaManager;
 import com.ruiwenliu.wrapper.util.listener.TextChangedListener;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.component.utils.AppCookie;
 import com.rv.component.utils.Cookie;
 import com.rv.home.R;
 import com.rv.home.R2;
@@ -213,7 +214,7 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
         map.put("username", getPhone());
         map.put("mobilecode", getCode());
         map.put("password", getPwd());
-        map.put("code", Cookie.getStringValue(this, "code"));
+        map.put("code", AppCookie.getStringValue(this, "code"));
         mPresenter.postData(RvFrameConfig.AUTH_POST, 1, ApiConfig.HTTP_URL_USER_REGISTER, RegisteredBean.class, map, headMap, true);
     }
 

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ForPaymentAdapter.java

@@ -8,6 +8,7 @@ import android.widget.ImageView;
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
 import com.ruiwenliu.wrapper.util.BaseGlideHolder;
+import com.rv.component.utils.AppCookie;
 import com.rv.component.utils.Cookie;
 import com.rv.component.utils.DateUtils;
 import com.rv.home.R;
@@ -48,7 +49,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                 if (dataBean == null) {
                     return;
                 }
-                setTimes(Cookie.getLongValue(mContext, "actRent"), helper, (OrderListBean.DataBeanX.DataBean) item);
+                setTimes(AppCookie.getLongValue(mContext, "actRent"), helper, (OrderListBean.DataBeanX.DataBean) item);
                 helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
                 if (dataBean.getOrderRentVehicleDetail() != null && dataBean.getOrderRentVehicleDetail().getStart_city_name() != null) {
                     helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
@@ -82,7 +83,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                 if (dataBean.getOrderTourDetail() == null) {
                     return;
                 }
-                setTimes(Cookie.getLongValue(mContext, "actTour"), helper, (OrderListBean.DataBeanX.DataBean) item);
+                setTimes(AppCookie.getLongValue(mContext, "actTour"), helper, (OrderListBean.DataBeanX.DataBean) item);
                 helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
                 helper.setText(R.id.tv_city, dataBean.getOrderTourDetail().getStartCityName());
                 helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 8);
@@ -101,7 +102,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                 if (dataBean.getOrderMemberDetail() == null) {
                     return;
                 }
-                setTimes(Cookie.getLongValue(mContext, "actMember"), helper, (OrderListBean.DataBeanX.DataBean) item);
+                setTimes(AppCookie.getLongValue(mContext, "actMember"), helper, (OrderListBean.DataBeanX.DataBean) item);
                 helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
                 helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_name, dataBean.getName());

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/OrderListAdapter.java

@@ -8,6 +8,7 @@ import android.widget.ImageView;
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
 import com.ruiwenliu.wrapper.util.BaseGlideHolder;
+import com.rv.component.utils.AppCookie;
 import com.rv.component.utils.Cookie;
 import com.rv.component.utils.DateUtils;
 import com.rv.home.R;
@@ -91,7 +92,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                         helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
                         helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_pay_for));
                         helper.setVisible(R.id.tv_process, true);
-                        setTimes(Cookie.getLongValue(mContext, "actRent"), helper, (OrderListBean.DataBeanX.DataBean) item);
+                        setTimes(AppCookie.getLongValue(mContext, "actRent"), helper, (OrderListBean.DataBeanX.DataBean) item);
                         break;
                     case 4:
                         helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_to_travel));
@@ -160,7 +161,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                         helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
                         helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
                         helper.setVisible(R.id.tv_camp_process, true);
-                        setTimes(Cookie.getLongValue(mContext, "actTour"), helper, (OrderListBean.DataBeanX.DataBean) item);
+                        setTimes(AppCookie.getLongValue(mContext, "actTour"), helper, (OrderListBean.DataBeanX.DataBean) item);
                         break;
                     case 4:
                         helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_to_travel));

plugin_im/src/main/java/com/rv/im/ImSetting.java

@@ -44,10 +44,10 @@ public class ImSetting {
      *
      */
     public static void logout() {
-        SQLiteHelper.closeDb();  // 关掉数据库连接
-        ChatConversationServiceImp.getInstance(getContext()).release();
+//        ChatConversationServiceImp.getInstance(getContext()).release();
         CustomerServiceImp.getInstance(getContext()).release();
         ChatMessageServiceImp.getInstance(getContext()).release();
+        SQLiteHelper.closeDb();  // 关掉数据库连接
     }
 
     private static SharedPreferences getSharePreference(Context context) {

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

@@ -67,7 +67,7 @@ public class GridMemerAdapter extends BaseAdapter {
             holder = (ViewHolder) view.getTag();
         }
 
-        SpannableString s = new SpannableString("￥" + memberCard.getPrice());
+        SpannableString s = new SpannableString("¥" + memberCard.getPrice());
 
         s.setSpan(new AbsoluteSizeSpan(12, true), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         s.setSpan(new AbsoluteSizeSpan(18, true), 1, s.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

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

@@ -111,7 +111,7 @@ public class MemberListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     /*******
      * 是否已经同意协议
      */
-    private boolean hasAgree = true;
+    private boolean hasAgree = false;
 
     private void setHeadViewData(final HeadViewHolder viewHolder) {
         setMemeberTop(viewHolder);

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

@@ -257,9 +257,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/size_2"
-                        android:text="滴个房车去旅行"
+                        android:text="房车.让生活更美好"
                         android:textColor="#ffffb74b"
-                        android:textSize="10sp" />
+                        android:textSize="12sp" />
 
                 </LinearLayout>