Merge branch 'master' of D:\work3\rvapp with conflicts.

RvClient/src/main/AndroidManifest.xml

@@ -360,7 +360,12 @@
             android:screenOrientation="portrait" />
 
         <!--身份证认证-->
-        <activity android:name="com.rv.rvmine.IDCardCertificationActivity"
+        <activity android:name="com.rv.rvmine.personal.IDCardCertificationActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
+
+        <!--添加出游人-->
+        <activity android:name="com.rv.rvmine.traveler.AddAVisitorActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <!--=================================================================-->

RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/TravelOrderDetailsActivity.java

+package com.rv.home.rv.module.ui.main.home.order;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+public class TravelOrderDetailsActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_travel_order_details);
+    }
+}

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

+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".rv.module.ui.main.home.order.TravelOrderDetailsActivity">
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file

RvMine/build.gradle

@@ -24,6 +24,7 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     api 'com.jakewharton:butterknife:8.8.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     api project(':RvHome')
 }

RvMine/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.rv.rvmine">
+
+    <application>
+
+    </application>
+
 </manifest>
\ No newline at end of file

RvMine/src/main/java/com/rv/rvmine/MineActivity.java

 package com.rv.rvmine;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -10,8 +11,9 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.base.utils.base.BaseActivity;
+import com.base.utils.tools.android.IntentUtil;
 import com.base.utils.ui.image.round.RoundImageView;
+import com.frame.base.browse.ActivityImageBrowseInt;
 import com.frame.base.glide.GlideManager;
 import com.frame.rv.BaseTabLayout;
 import com.frame.rv.ModuleChangeUtil;
@@ -23,10 +25,17 @@ import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.login.LoginRvActivity;
 import com.rv.home.rv.module.ui.main.home.order.OrderListActivity;
+import com.rv.rvmine.personal.IDCardCertificationActivity;
+import com.yuyife.banner.Banner;
+import com.yuyife.banner.BannerConfig;
+import com.yuyife.banner.listener.OnBannerListener;
+import com.yuyife.banner.loader.ImageLoader;
 import com.yuyife.okgo.OkGoUtil;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 public class MineActivity extends BaseStatusActivity<CommonPresenter> {
@@ -71,6 +80,8 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
     RelativeLayout rlItemSetting;
     @BindView(R2.id.travel_fragment_layout)
     LinearLayout travelFragmentLayout;
+    @BindView(R2.id.mine_banner)
+    Banner mineBanner;
 
     @Override
     protected int setLayout() {
@@ -83,20 +94,20 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
 
         showTitle(false);
         travelTabLayout.setCurrent(OnModuleChangedListener.MODULE_MINE);
-
-        if (TextUtils.isEmpty( OkGoUtil.getToken())) {
+        setBanner();
+        if (TextUtils.isEmpty(OkGoUtil.getToken())) {
             tvNickname.setVisibility(View.GONE);
             ivMember.setVisibility(View.GONE);
             tvLogin.setVisibility(View.VISIBLE);
             tvVerified.setVisibility(View.GONE);
-        }else {
+        } else {
             tvNickname.setVisibility(View.VISIBLE);
             ivMember.setVisibility(View.VISIBLE);
             tvLogin.setVisibility(View.GONE);
             tvVerified.setVisibility(View.VISIBLE);
-            Log.i("Mineactivityty", "initView: " +UtilsManager.getInstance(mActivity).getSPStringCode("city_json","headerurl"));
-            GlideManager.getInstance(mActivity).loadImage(UtilsManager.getInstance(mActivity).getSPStringCode("city_json","headerurl"), ivAvatar);
-            tvNickname.setText(UtilsManager.getInstance(mActivity).getSPStringCode("city_json","username"));
+            Log.i("Mineactivityty", "initView: " + UtilsManager.getInstance(mActivity).getSPStringCode("city_json", "headerurl"));
+            GlideManager.getInstance(mActivity).loadImage(UtilsManager.getInstance(mActivity).getSPStringCode("city_json", "headerurl"), ivAvatar);
+            tvNickname.setText(UtilsManager.getInstance(mActivity).getSPStringCode("city_json", "username"));
         }
     }
 
@@ -110,59 +121,107 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
     @OnClick({R2.id.iv_avatar, R2.id.tv_login, R2.id.tv_verified, R2.id.rl_item_to_be_paid, R2.id.rl_item_staying, R2.id.rl_item_traveling, R2.id.rl_item_completed, R2.id.rl_item_all, R2.id.rl_item_collection, R2.id.rl_item_personal_information, R2.id.rl_item_information, R2.id.rl_item_setting})
     public void onViewClicked(View view) {
         int id = view.getId();
-        if (id ==R.id.iv_avatar){
+        if (id == R.id.iv_avatar) {
             //头像
             if (isLogin()) return;
-        }else if (id== R.id.tv_login){
-           //登录
+        } else if (id == R.id.tv_login) {
+            //登录
             startActivity(LoginRvActivity.getIntent(mActivity));
-        }else if (id == R.id.tv_verified){
-           //实名认证
+        } else if (id == R.id.tv_verified) {
+            //实名认证
             if (isLogin()) return;
             startActivity(IDCardCertificationActivity.getIntent(mActivity));
-        }else if (id == R.id.rl_item_to_be_paid){
+        } else if (id == R.id.rl_item_to_be_paid) {
             //待支付
             if (isLogin()) return;
             startActivity(OrderListActivity.getIntent(mActivity, 0));
-        }else if (id == R.id.rl_item_staying){
+        } else if (id == R.id.rl_item_staying) {
             //待出行
             if (isLogin()) return;
             startActivity(OrderListActivity.getIntent(mActivity, 1));
-        }else if (id ==R.id.rl_item_traveling){
+        } else if (id == R.id.rl_item_traveling) {
             //出行中
             if (isLogin()) return;
             startActivity(OrderListActivity.getIntent(mActivity, 2));
-        }else if (id == R.id.rl_item_completed){
+        } else if (id == R.id.rl_item_completed) {
             //已完成
             if (isLogin()) return;
             startActivity(OrderListActivity.getIntent(mActivity, 3));
-        }else if (id ==R.id.rl_item_all){
+        } else if (id == R.id.rl_item_all) {
             //全部
             if (isLogin()) return;
             startActivity(OrderListActivity.getIntent(mActivity, 4));
-        }else if (id == R.id.rl_item_collection){
-           //收藏
+        } else if (id == R.id.rl_item_collection) {
+            //收藏
             if (isLogin()) return;
             showToast("该功能还在开发中");
-        }else if (id == R.id.rl_item_personal_information){
+        } else if (id == R.id.rl_item_personal_information) {
             //个人资料
             if (isLogin()) return;
             showToast("该功能还在开发中");
-        }else if (id == R.id.rl_item_information){
+        } else if (id == R.id.rl_item_information) {
             //信息
             if (isLogin()) return;
             showToast("该功能还在开发中");
-        }else if (id ==R.id.rl_item_setting){
-           //设置
+        } else if (id == R.id.rl_item_setting) {
+            //设置
         }
     }
 
+
+
+    private ArrayList<String> images = new ArrayList<>();    //图片(默认采用网络地址)
+    private List<String> titles = new ArrayList<>();         //图片标题
+    private List<Integer> localImages = new ArrayList<>();   //图片(本地资源)
+
+    private void setBanner() {
+        titles.clear();
+        images.clear();
+        localImages.clear();
+
+        localImages.add(R.drawable.abanner);
+        localImages.add(R.drawable.abanner);
+
+        mineBanner.setImages(localImages);
+        for (int i = 0; i < localImages.size(); i++) {
+            titles.add("");
+        }
+        mineBanner.isAutoPlay(true)
+                .setBannerTitles(titles)
+                .setDelayTime(3000)
+                .setImageLoader(new ImageLoader() {
+                    @Override
+                    public void displayImage(Context context, Object path, ImageView imageView) {
+
+                        GlideManager.getInstance(context).loadImage(path, imageView);
+                    }
+                })
+                .setOnBannerListener(new OnBannerListener() {
+                    @Override
+                    public void OnBannerClick(int position) {
+                        if (localImages != null && localImages.size() > 0) {
+                            Bundle bundle = new Bundle();
+                            bundle.putInt(ActivityImageBrowseInt.KEY_BACKGROUND, R.color.colorPrimary);
+                            bundle.putIntegerArrayList(ActivityImageBrowseInt.KEY_IMAGE, (ArrayList<Integer>) localImages);
+                            IntentUtil.startActivity(mActivity, ActivityImageBrowseInt.class, bundle);
+                        }
+                    }
+                })
+                .start();
+
+        mineBanner.updateBannerStyle(BannerConfig.CIRCLE_INDICATOR);
+    }
+
+
+
+
     /**
      * 判断是否登录
+     *
      * @return
      */
     private boolean isLogin() {
-        if (TextUtils.isEmpty( OkGoUtil.getToken())) {
+        if (TextUtils.isEmpty(OkGoUtil.getToken())) {
             startActivity(LoginRvActivity.getIntent(mActivity));
             return true;
         }

RvMine/src/main/java/com/rv/rvmine/IDCardCertificationActivity.java → RvMine/src/main/java/com/rv/rvmine/personal/IDCardCertificationActivity.java

-package com.rv.rvmine;
+package com.rv.rvmine.personal;
 
 import android.content.Context;
 import android.content.Intent;
@@ -8,6 +8,7 @@ import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.rv.module.basic.presenter.PickerPresenter;
+import com.rv.rvmine.R;
 
 public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresenter> {
 

RvMine/src/main/java/com/rv/rvmine/traveler/AddAVisitorActivity.java

+package com.rv.rvmine.traveler;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
+import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.home.rv.module.basic.presenter.CommonPresenter;
+import com.rv.rvmine.R;
+
+public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
+
+    @Override
+    protected int setLayout() {
+        return R.layout.activity_add_avisitor;
+    }
+
+    @Override
+    protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
+
+    }
+
+    @Override
+    public void onShowResult(int requestType, BaseBean result) {
+
+    }
+}

RvMine/src/main/java/com/rv/rvmine/traveler/SettingActivity.java

+package com.rv.rvmine.traveler;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+public class SettingActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_setting);
+    }
+}

RvMine/src/main/res/layout/activity_add_avisitor.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@color/colorLine"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorWrite"
+        android:orientation="vertical">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="@dimen/size_15">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="身份类型"/>
+
+        <CheckBox
+            android:id="@+id/rb_user_driving"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/size_15"
+            android:layout_marginRight="@dimen/size_8"
+            android:paddingLeft="@dimen/size_10"
+            android:button="@drawable/selector_rv_check"
+            android:text="成人"
+            android:textSize="@dimen/text_14" />
+
+        <CheckBox
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/size_15"
+            android:layout_marginRight="@dimen/size_8"
+            android:paddingLeft="@dimen/size_10"
+            android:button="@drawable/selector_rv_check"
+            android:text="儿童"
+            android:textSize="@dimen/text_14" />
+
+    </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

RvMine/src/main/res/layout/activity_setting.xml

+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".traveler.SettingActivity">
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file

RvTravel/build.gradle

@@ -13,7 +13,6 @@ android {
         versionCode 1
         versionName "1.0"
 
-
         javaCompileOptions {
             annotationProcessorOptions {
                 includeCompileClasspath = true