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

RvWrapper/src/main/java/com/ruiwenliu/wrapper/browse/FragmentImageBrowse.java

@@ -81,7 +81,9 @@ public class FragmentImageBrowse extends BaseFragment {
         pinchImageView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Objects.requireNonNull(getActivity()).finish();
+                if (Objects.requireNonNull(getActivity()) != null)
+                    Objects.requireNonNull(getActivity()).finish();
+
             }
         });
     }

module_camp/src/main/java/com/rv/camp/camp/CampDetailActivity.java

@@ -210,10 +210,12 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
     public void onViewClicked(View view) {
         int id = view.getId();
         if (id == R.id.tv_scheduled_camp) {
-            Intent intent = new Intent(Intent.ACTION_DIAL);
-            Uri uri = Uri.parse("tel:" + data.getData().getPhone());
-            intent.setData(uri);
-            startActivity(intent);
+            if (data.getData() != null && data.getData().getPhone() != null) {
+                Intent intent = new Intent(Intent.ACTION_DIAL);
+                Uri uri = Uri.parse("tel:" + data.getData().getPhone());
+                intent.setData(uri);
+                startActivity(intent);
+            }
         }
     }
 

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

@@ -4,27 +4,36 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.Editable;
+import android.text.SpannableStringBuilder;
+import android.text.TextPaint;
 import android.text.method.HideReturnsTransformationMethod;
+import android.text.method.LinkMovementMethod;
 import android.text.method.PasswordTransformationMethod;
+import android.text.style.ClickableSpan;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.rv.home.R;
-import com.rv.home.R2;
+
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.frame.base.url.Constance;
 import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
+import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.ruiwenliu.wrapper.util.listener.TextChangedListener;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.home.R;
+import com.rv.home.R2;
+import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.BaseLoginActivity;
-import com.ruiwenliu.wrapper.bean.BeanUserInfo;
-import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 
 import java.util.Map;
 
 import butterknife.BindView;
+import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 /**
@@ -44,10 +53,10 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
     ImageView ivClearAgainPwd;
     @BindView(R2.id.cb_annotations)
     CheckBox cbAnnotations;
-    @BindView(R2.id.tv_agreement)
-    TextView tvAgreement;
     @BindView(R2.id.tv_registered)
     TextView tvRegistered;
+    @BindView(R2.id.tv_agreement)
+    TextView tvAgreement;
     private String mOpenid;
     private String mHeadImg;
     private String mName;
@@ -58,6 +67,7 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
 
     private boolean pwdShow;//密码
     private boolean confirmShow;//确认密码
+
     public static Intent getIntent(Context context, String openid, String headImg, int isQQ, String name, String phone, String code, String uid) {
         return new Intent(context, ConfirmPwdActivity.class)
                 .putExtra("openid", openid)
@@ -87,10 +97,75 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
         mIsQQ = intent.getIntExtra("isQQ", 1);
         mCode = intent.getStringExtra("code");
         mPhone = intent.getStringExtra("phone");
-        mUnionid=intent.getStringExtra("uid");
+        mUnionid = intent.getStringExtra("uid");
+        initData();
+    }
+
+    private void initData() {
+        String str = "注册即表示同意滴房车《用户协议》和《隐私政策》";
+
+        SpannableStringBuilder ssb = new SpannableStringBuilder();
+        ssb.append(str);
+
+        final int start = str.indexOf("《");//第一个出现的位置
+        ssb.setSpan(new ClickableSpan() {
+
+            @Override
+            public void onClick(View widget) {
+                avoidHintColor(widget);
+                ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
+                        .withString("title", "用户协议")
+                        .withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
+                        .withInt("type", 15)
+                        .navigation();
+            }
+
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                super.updateDrawState(ds);
+                ds.setColor(getResources().getColor(R.color.gray_FFB74B));       //设置文件颜色
+                // 去掉下划线
+                ds.setUnderlineText(false);
+            }
+
+        }, start, start + 6, 0);
+
+        final int end = str.lastIndexOf("《");//最后一个出现的位置
+        ssb.setSpan(new ClickableSpan() {
+
+            @Override
+            public void onClick(View widget) {
+                avoidHintColor(widget);
+                ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
+                        .withString("title", "隐私政策")
+                        .withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
+                        .withInt("type", 19)
+                        .navigation();
+
+            }
+
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                super.updateDrawState(ds);
+                ds.setColor(getResources().getColor(R.color.gray_FFB74B));       //设置文件颜色
+                // 去掉下划线
+                ds.setUnderlineText(false);
+            }
+
+        }, end, end + 6, 0);
+
+        tvAgreement.setMovementMethod(LinkMovementMethod.getInstance());
+        tvAgreement.setText(ssb, TextView.BufferType.SPANNABLE);
+    }
+
+
+    private void avoidHintColor(View view) {
+        if (view instanceof TextView)
+            ((TextView) view).setHighlightColor(getResources().getColor(android.R.color.transparent));
     }
 
 
+
     @Override
     protected void loadData(Bundle savedInstanceState, Intent intent) {
 
@@ -100,8 +175,8 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
     public void onShowResult(int requestType, BaseBean result) {
         if (requestType == 2) {
             processLoginData((RegisteredBean) result);
-        }else if (requestType == 10){
-                setDataUser((BeanUserInfo)result);
+        } else if (requestType == 10) {
+            setDataUser((BeanUserInfo) result);
         }
     }
 
@@ -142,19 +217,17 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
 
     @OnClick({R2.id.iv_clear_pwd, R2.id.iv_clear_again_pwd, R2.id.tv_agreement, R2.id.tv_registered})
     public void onViewClicked(View view) {
-        if(view.getId()==R.id.iv_clear_pwd){
-            pwdShow=!pwdShow;
+        if (view.getId() == R.id.iv_clear_pwd) {
+            pwdShow = !pwdShow;
             ivClearPwd.setSelected(pwdShow);
-            etPwd.setTransformationMethod(pwdShow? HideReturnsTransformationMethod.getInstance(): PasswordTransformationMethod.getInstance());
-        }else if(view.getId()==R.id.iv_clear_again_pwd){
-            confirmShow=!confirmShow;
+            etPwd.setTransformationMethod(pwdShow ? HideReturnsTransformationMethod.getInstance() : PasswordTransformationMethod.getInstance());
+        } else if (view.getId() == R.id.iv_clear_again_pwd) {
+            confirmShow = !confirmShow;
             ivClearAgainPwd.setSelected(confirmShow);
-            etAgainPwd.setTransformationMethod(confirmShow? HideReturnsTransformationMethod.getInstance(): PasswordTransformationMethod.getInstance());
-        }
-        else if(view.getId()==R.id.tv_agreement){
+            etAgainPwd.setTransformationMethod(confirmShow ? HideReturnsTransformationMethod.getInstance() : PasswordTransformationMethod.getInstance());
+        } else if (view.getId() == R.id.tv_agreement) {
 
-        }
-        else if(view.getId()==R.id.tv_registered){
+        } else if (view.getId() == R.id.tv_registered) {
             if (getPwd().length() < 8) {
                 showToast(mActivity.getString(R.string.rv_pwd_length));
                 return;
@@ -167,7 +240,7 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
                 showToast(mActivity.getString(R.string.rv_confirm_agreement));
                 return;
             }
-            otherLoginBind(mPhone, mCode, getPwd(), mName, mHeadImg, mOpenid, 2, mIsQQ,mUnionid);
+            otherLoginBind(mPhone, mCode, getPwd(), mName, mHeadImg, mOpenid, 2, mIsQQ, mUnionid);
         }
     }
 
@@ -200,4 +273,11 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
             }
         });
     }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
 }

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

@@ -5,112 +5,112 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context=".rv.module.ui.login.ConfirmPwdActivity">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/size_50"
         android:layout_marginLeft="@dimen/size_30"
-        android:layout_marginRight="@dimen/size_30"
         android:layout_marginTop="@dimen/size_20"
+        android:layout_marginRight="@dimen/size_30"
         android:background="@drawable/shape_rv_input"
         android:gravity="center_vertical"
         android:orientation="horizontal">
+
         <EditText
+            android:id="@+id/et_pwd"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/size_15"
+            android:layout_weight="1"
             android:background="@null"
             android:gravity="center_vertical"
-            android:layout_marginLeft="@dimen/size_15"
             android:hint="@string/rv_pwd_hint"
-            android:maxLength="16"
-            android:id="@+id/et_pwd"
             android:inputType="textPassword"
-            android:layout_weight="1"
+            android:maxLength="16"
             android:maxLines="1"
             android:textColorHint="@color/colorGray"
             android:textSize="@dimen/text_16" />
+
         <ImageView
+            android:id="@+id/iv_clear_pwd"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:id="@+id/iv_clear_pwd"
             android:padding="@dimen/size_15"
-            android:src="@drawable/selector_rv_pwd"
-            />
+            android:src="@drawable/selector_rv_pwd" />
 
     </LinearLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/size_50"
         android:layout_marginLeft="@dimen/size_30"
-        android:layout_marginRight="@dimen/size_30"
         android:layout_marginTop="@dimen/size_20"
+        android:layout_marginRight="@dimen/size_30"
         android:background="@drawable/shape_rv_input"
         android:gravity="center_vertical"
         android:orientation="horizontal">
+
         <EditText
+            android:id="@+id/et_again_pwd"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/size_15"
+            android:layout_weight="1"
             android:background="@null"
             android:gravity="center_vertical"
-            android:layout_marginLeft="@dimen/size_15"
             android:hint="@string/rv_pwd_again_hint"
-            android:maxLength="16"
             android:inputType="textPassword"
-            android:id="@+id/et_again_pwd"
-            android:layout_weight="1"
+            android:maxLength="16"
             android:maxLines="1"
             android:textColorHint="@color/colorGray"
             android:textSize="@dimen/text_16" />
+
         <ImageView
+            android:id="@+id/iv_clear_again_pwd"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:id="@+id/iv_clear_again_pwd"
             android:padding="@dimen/size_15"
-            android:src="@drawable/selector_rv_pwd"
-            />
-
+            android:src="@drawable/selector_rv_pwd" />
     </LinearLayout>
+
     <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
         android:layout_marginLeft="@dimen/size_30"
-        android:layout_marginRight="@dimen/size_30"
         android:layout_marginTop="@dimen/size_15"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_marginRight="@dimen/size_30"
+        android:orientation="horizontal">
+
         <CheckBox
+            android:id="@+id/cb_annotations"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="@dimen/text_14"
-            android:id="@+id/cb_annotations"
             android:textColor="@color/textGray"
-            android:text="@string/rv_registered_annotations"
-            />
+            android:textSize="@dimen/text_14" />
+
         <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorAuxiliaryYellow"
             android:id="@+id/tv_agreement"
-            android:textSize="@dimen/text_16"
-            android:text="@string/rv_registered_agreement"
-            />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/textGray"
+            android:textSize="@dimen/text_14" />
 
     </LinearLayout>
 
 
-
-
     <TextView
+        android:id="@+id/tv_registered"
         android:layout_width="match_parent"
+        android:layout_height="@dimen/size_50"
         android:layout_marginLeft="@dimen/size_30"
+        android:layout_marginTop="@dimen/size_40"
         android:layout_marginRight="@dimen/size_30"
-        android:layout_height="@dimen/size_50"
-        android:textColor="@color/colorWrite"
-        android:text="@string/rv_registered"
-        android:textSize="@dimen/size_16"
-        android:id="@+id/tv_registered"
-        android:gravity="center"
-        android:enabled="false"
         android:background="@drawable/selector_rv_button"
-        android:layout_marginTop="@dimen/size_40"
-        />
+        android:enabled="false"
+        android:gravity="center"
+        android:text="@string/rv_registered"
+        android:textColor="@color/colorWrite"
+        android:textSize="@dimen/size_16" />
 
 </LinearLayout>

module_mine/src/main/java/com/rv/rvmine/traveler/PersonalInformationActivity.java

@@ -390,6 +390,10 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
             showToast("生日不为空！");
             return;
         }
+
+        if (info == null) {
+            return;
+        }
         mPresenter.postBodyData(RvFrameConfig.ADMIN_POST, 1, ApiConfig.HTTP_URL_UPUSER_EDIT, BaseBean.class, new UserInfo(info.getId() + "", info.getUserid() + "", info.getUsername(), "0", nickName, info.getRealname(), ivAvatarUrl, birthday, sex, mWXOpenid, mUnionid, mQQOpenid), getHeadMap(), true);
 //        mPresenter.postBodyData(RvFrameConfig.ADMIN_POST, 1, ApiConfig.HTTP_URL_UPUSER_EDIT, BaseBean.class, new UserInfo(info.getId() + "", info.getUserid() + "", info.getUsername(), "0", nickName, info.getRealname(), ivAvatarUrl, birthday, sex, "", "", ""), getHeadMap(), true);
     }