增加旅游人信息和退出登录

OkGo/src/main/java/com/yuyife/okgo/OkGoUtil.java

@@ -61,6 +61,16 @@ public class OkGoUtil {
         return null;
     }
 
+    /**
+     * 清空Token
+     */
+    public static void clearToken(){
+        if (application ==null)
+            return;
+        SharedPreferences sp = application.getSharedPreferences(OkGoUtil.class.getSimpleName(), Context.MODE_PRIVATE);
+        sp.edit().clear().commit();
+    }
+
     @SuppressLint("StaticFieldLeak")
     private static Context application = null;
     private static boolean addToken = false;

RvClient/src/main/AndroidManifest.xml

@@ -368,6 +368,15 @@
         <activity android:name="com.rv.rvmine.traveler.AddAVisitorActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
+
+        <!--设置-->
+        <activity android:name="com.rv.rvmine.traveler.SettingActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
+
+        <activity android:name="com.rv.home.rv.module.ui.main.home.order.TravelOrderDetailsActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
         <!--=================================================================-->
 
 

RvMine/src/main/AndroidManifest.xml

@@ -2,8 +2,5 @@
 <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

@@ -3,6 +3,7 @@ package com.rv.rvmine;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -26,6 +27,7 @@ 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.rv.rvmine.traveler.SettingActivity;
 import com.yuyife.banner.Banner;
 import com.yuyife.banner.BannerConfig;
 import com.yuyife.banner.listener.OnBannerListener;
@@ -105,7 +107,7 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
             ivMember.setVisibility(View.VISIBLE);
             tvLogin.setVisibility(View.GONE);
             tvVerified.setVisibility(View.VISIBLE);
-            Log.i("Mineactivityty", "initView: " + UtilsManager.getInstance(mActivity).getSPStringCode("city_json", "headerurl"));
+//            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"));
         }
@@ -165,10 +167,21 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
             showToast("该功能还在开发中");
         } else if (id == R.id.rl_item_setting) {
             //设置
+            startActivityForResult(SettingActivity.getIntent(mActivity),101);
         }
     }
 
-
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 101 && resultCode ==201){
+            ivAvatar.setImageResource(R.drawable.common_icon_avatar_default);
+            tvNickname.setVisibility(View.GONE);
+            ivMember.setVisibility(View.GONE);
+            tvLogin.setVisibility(View.VISIBLE);
+            tvVerified.setVisibility(View.GONE);
+        }
+    }
 
     private ArrayList<String> images = new ArrayList<>();    //图片(默认采用网络地址)
     private List<String> titles = new ArrayList<>();         //图片标题

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

 package com.rv.rvmine.traveler;
 
+import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.EditText;
 
 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;
+import com.rv.rvmine.R2;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
 
+/**
+ * 添加出游人
+ */
 public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
 
+
+    @BindView(R2.id.cb_adult)
+    CheckBox cbAdult;
+    @BindView(R2.id.cb_child)
+    CheckBox cbChild;
+    @BindView(R2.id.et_traveler_name)
+    EditText etTravelerName;
+    @BindView(R2.id.cb_man)
+    CheckBox cbMan;
+    @BindView(R2.id.cb_girl)
+    CheckBox cbGirl;
+    @BindView(R2.id.et_id_card)
+    EditText etIdCard;
+    @BindView(R2.id.et_phone)
+    EditText etPhone;
+
+    private int identityType = 0;
+    private int setType = 0;
+
+
+    public static Intent getIntent(Context context) {
+        return new Intent(context, AddAVisitorActivity.class);
+    }
+
     @Override
     protected int setLayout() {
         return R.layout.activity_add_avisitor;
@@ -19,11 +53,51 @@ public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
 
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
+        titleView.setTitle(getString(R.string.add_a_visitor_title));
+        titleView.setText(R.id.tv_title_right,getString(R.string.rv_save));
+        titleView.setChildClickListener(R.id.tv_title_right, new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
 
+            }
+        });
     }
 
     @Override
     public void onShowResult(int requestType, BaseBean result) {
 
     }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
+
+    @OnClick({R2.id.cb_adult, R2.id.cb_child, R2.id.cb_man, R2.id.cb_girl})
+    public void onViewClicked(View view) {
+        int id = view.getId();
+        if (id == R.id.cb_adult) {
+            //成人
+            cbAdult.setChecked(true);
+            cbChild.setChecked(false);
+            identityType = 0;
+        } else if (id == R.id.cb_child) {
+            //儿童
+            cbAdult.setChecked(false);
+            cbChild.setChecked(true);
+            identityType = 1;
+        } else if (id == R.id.cb_man) {
+            //男
+            cbMan.setChecked(true);
+            cbGirl.setChecked(false);
+            setType = 0;
+        } else if (id == R.id.cb_girl) {
+            //女
+            cbMan.setChecked(false);
+            cbGirl.setChecked(true);
+            setType = 1;
+        }
+    }
 }

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

 package com.rv.rvmine.traveler;
 
-import android.support.v7.app.AppCompatActivity;
+import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
 
-public class SettingActivity extends AppCompatActivity {
+import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
+import com.ruiwenliu.wrapper.util.UtilsManager;
+import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.home.rv.module.basic.presenter.CommonPresenter;
+import com.rv.rvmine.R;
+import com.rv.rvmine.R2;
+import com.yuyife.okgo.OkGoUtil;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * 设置
+ */
+
+public class SettingActivity extends BaseStatusActivity<CommonPresenter> {
+
+    @Override
+    protected int setLayout() {
+        return R.layout.activity_setting;
+    }
+
+
+    public static Intent getIntent(Context context) {
+        return new Intent(context, SettingActivity.class);
+    }
+
+    @Override
+    protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
+        titleView.setTitle(getString(R.string.setting_title));
+    }
+
+    @Override
+    public void onShowResult(int requestType, BaseBean result) {
+
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_setting);
+        ButterKnife.bind(this);
+    }
+
+    @OnClick(R2.id.tv_out_sign)
+    public void onViewClicked(View view) {
+        int id = view.getId();
+        if (id == R.id.tv_out_sign) {
+            //退出登录
+            UtilsManager.getInstance(mActivity).clearShareData("city_json");
+            UtilsManager.getInstance(mActivity).setShNull();
+            OkGoUtil.clearToken();
+            setResult(201);
+            showToast("退出成功！");
+            finish();
+        }
     }
 }

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"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".traveler.SettingActivity">
+    android:background="@color/colorLine"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tv_out_sign"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/size_50"
+        android:gravity="center"
+        android:textColor="@color/text_Main"
+        android:background="@drawable/shape_rv_bg_yellow"
+        android:text="退出登录"/>
+
+</LinearLayout>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file

RvMine/src/main/res/values/strings.xml

@@ -24,4 +24,14 @@
     <string name="tv_negative">反面</string>
     <string name="tv_id_card_photo_hint">*您所上传的身份证信息，仅用于欣新房车验证</string>
     <string name="tv_id_card_certrfication_title">身份证认证</string>
+    <string name="setting_title">设置</string>
+    <string name="et_traveler_name_hint">请输入出游人姓名</string>
+    <string name="cb_man_hint">男</string>
+    <string name="cb_girl_hint">女</string>
+    <string name="et_phone_hint">请输入出游人手机号</string>
+    <string name="tv_travel_phone">手机号码</string>
+    <string name="et_id_card_hint">请输入出游人身份证号码</string>
+    <string name="cb_adult_hint">成人</string>
+    <string name="cb_child_hint">儿童</string>
+    <string name="add_a_visitor_title">添加出游人</string>
 </resources>