代码合并冲突解决

韩亚云
2 parents 852255b2 9ee528fa
Showing 63 changed files with 4492 additions and 48 deletions
app/strike/build.gradle
app/strike/src/main/AndroidManifest.xml
app/strike/src/main/java/com/cnlive/strike/MyActivity.java
app/strike/src/main/java/com/cnlive/strike/MyActivityTest1.java
app/strike/src/main/java/com/cnlive/strike/MyApp.java
app/strike/src/main/java/com/cnlive/strike/MyFragment.java
app/strike/src/main/java/com/cnlive/strike/MyFragment1.java
app/strike/src/main/java/com/cnlive/strike/MyFragment1View.java
app/strike/src/main/java/com/cnlive/strike/MyFragmentView.java
app/strike/src/main/java/com/cnlive/strike/MyPresenter.java
app/strike/src/main/java/com/cnlive/strike/MyPresenter1.java
app/strike/src/main/java/com/cnlive/strike/network/BaseRequest.java
app/strike/src/main/java/com/cnlive/strike/network/api/ApiService.java
app/strike/src/main/java/com/cnlive/strike/network/bean/LetHimNoSeeBean.java
app/strike/src/main/java/com/cnlive/strike/network/bean/TestBean.java
app/strike/src/main/res/layout/activity_main.xml
app/strike/src/main/res/layout/activity_main1.xml
app/strike/src/main/res/values/styles.xml
app/strike/src/main/res/xml/network_security_config.xml
build.gradle
@@ -11,7 +11,7 @@ android {
  
     defaultConfig {
         applicationId "com.cnlive.strike"
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
@@ -157,6 +157,8 @@ dependencies {
 //    implementation project(path: ':core:database')
     implementation project(path: ':core:network')
     implementation project(path: ':core:base')
+    implementation project(path: ':cloud:user')
+
     implementation project(path: ':core:imageload')
 //    implementation project(path: ':core:util')
 //    implementation project(path: ':core:encipher')
@@ -4,12 +4,15 @@
  
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
  
     <application
         android:name=".MyApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 package com.cnlive.strike;
  
  
-import com.cnlive.libs.base.frame.activity.BaseActivity;
+import com.cnlive.core.libs.base.frame.activity.BaseActivity;
  
  
 public class MyActivity extends BaseActivity {
  
     @Override
-    protected int initLayout() {
+    protected int getViewLayoutId() {
         return R.layout.activity_my;
     }
  
     @Override
     protected void initView() {
+        setOpenSwipBack(true);
         getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyFragment()).commitAllowingStateLoss();
     }
  
 package com.cnlive.strike;
  
-import com.cnlive.libs.base.frame.activity.BaseActivity;
+import com.cnlive.core.libs.base.frame.activity.BaseActivity;
  
  
 public class MyActivityTest1 extends BaseActivity {
  
     @Override
-    protected int initLayout() {
+    protected int getViewLayoutId() {
         return R.layout.activity_my1;
     }
  
@@ -2,9 +2,33 @@ package com.cnlive.strike;
  
 import android.app.Application;
  
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.cnlive.core.libs.base.application.AppConfig;
+
 public class MyApp extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        AppConfig.init(this, BuildConfig.APP_ID, BuildConfig.APP_KEY,
+                BuildConfig.APP_SCERET, BuildConfig.SPECIAL_GROUP_MEMBER_LIMIT,
+                BuildConfig.VERSION_AS_DEBUG, "", "",
+                "10514333", "",
+                "", "", "",
+                "", "", "",
+                BuildConfig.BAIDU_MAP_APP_KEY, "");
+        initARouter();
+    }
+
+
+    /**
+     * 初始化阿里的路由
+     */
+    private void initARouter() {
+        if (BuildConfig.DEBUG) {   // 这两行必须写在init之前，否则这些配置在init过程中将无效
+            ARouter.openLog();     // 打印日志
+            ARouter.openDebug();   // 开启调试模式(如果在InstantRun模式下运行，必须开启调试模式！线上版本需要关闭,否则有安全风险)
+            ARouter.printStackTrace(); // 打印日志的时候打印线程堆栈
+        }
+        ARouter.init(this); // 尽可能早，推荐在Application中初始化
     }
 }
 package com.cnlive.strike;
  
  
-import android.content.Intent;
+import android.Manifest;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
  
-import com.cnlive.libs.base.frame.fragment.BaseFragment;
-import com.cnlive.libs.base.util.StatusBarConfig;
+import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
+import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
+import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.HttpConn;
+import com.cnlive.core.network.NetCallBack;
+import com.cnlive.core.libs.base.util.StatusBarConfig;
+import com.cnlive.strike.network.BaseRequest;
+import com.cnlive.strike.network.api.ApiService;
+import com.cnlive.strike.network.bean.LetHimNoSeeBean;
+import com.cnlive.strike.network.bean.TestBean;
  
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
  
+import java.util.HashMap;
+import java.util.Map;
+
+import io.reactivex.Observable;
+import io.reactivex.functions.Function;
+
  
 public class MyFragment extends BaseFragment<MyFragmentView, MyPresenter> {
     private View view;
+    public TextView textView;
  
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         view = inflater.inflate(R.layout.activity_main1, container, false);
+        textView = view.findViewById(R.id.tv1);
         return view;
     }
  
     @Override
     protected void initView() {
+        super.initView();
         setStatusBarColor(R.color.green, 0);
         setStatusBarTextColor(StatusBarConfig.BLACK);
-        view.findViewById(R.id.btn_test).setOnClickListener(new View.OnClickListener() {
+        view.findViewById(R.id.btn_test2).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                getActivity().startActivity(new Intent(getActivity(), MyActivityTest1.class));
+                requestPermission(010001, "测试", new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION}, new OnPermissionResponseListener() {
+                    @Override
+                    public void onSuccess(String[] permissions) {
+                        Log.e(TAG, "onSuccess: ");
+                    }
+
+                    @Override
+                    public void onFail() {
+                        Log.e(TAG, "onFail: ");
+                    }
+                });
             }
         });
-    }
+        view.findViewById(R.id.btn_test1).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                requestPermission(new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION}, new OnPermissionResponseListener() {
+                    @Override
+                    public void onSuccess(String[] permissions) {
+                        Log.e(TAG, "onSuccess: ");
+                    }
  
-    @Override
-    protected void initData() {
+                    @Override
+                    public void onFail() {
+                        Log.e(TAG, "onFail: ");
+                    }
+                });
+            }
+        });
+        view.findViewById(R.id.btn_test).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //单个请求
+                HttpConn.action(
+                        BaseRequest
+                                .init()
+                                .setUrl("http://gank.io/api/data/")
+                                .service(ApiService.class)
+                                .getTest(), new NetCallBack<TestBean>() {
+                            @Override
+                            public void onRequestState(int state) {
+
+                            }
+
+                            @Override
+                            public void onSuccess(TestBean data) {
+                                Log.e(TAG, "onSuccess: " + data.getResults().size());
+                            }
+
+                            @Override
+                            public void onFailure(String errCode, String errMsg) {
+                                Log.e(TAG, "onFailure: " + errMsg);
+                            }
+                        }
+                );
+                //多个请求
+                Map<String, String> param = new HashMap<>();
+                param.put("sid", "358916");
+                HttpConn
+                        .action(
+                                BaseRequest
+                                        .init()
+                                        .setUrl("http://gank.io/api/data/")
+                                        .service(ApiService.class)
+                                        .getTest()
+                                        .concatMap(new Function<TestBean, Observable<BaseResult<LetHimNoSeeBean>>>() {
+                                            @Override
+                                            public Observable<BaseResult<LetHimNoSeeBean>> apply(TestBean testBean) throws Exception {
+                                                Log.e(TAG, "apply: " + testBean.getResults().size());
+                                                return BaseRequest.init().service(ApiService.class).getLetHimNoSee(param);
+                                            }
+                                        }), new NetCallBack<BaseResult<LetHimNoSeeBean>>() {
+                                    @Override
+                                    public void onRequestState(int state) {
+
+                                    }
+
+                                    @Override
+                                    public void onSuccess(BaseResult<LetHimNoSeeBean> data) {
+                                        Log.e(TAG, "onSuccess: " + data.getData().getDoNotletFsids().size());
+                                    }
+
+                                    @Override
+                                    public void onFailure(String errCode, String errMsg) {
+                                        Log.e(TAG, "onFailure: " + errMsg);
+                                    }
+                                });
+
+
+            }
+        });
         getPresenter().setData("hha");
         getMvpView().setData("test");
     }
-
-
 }
 package com.cnlive.strike;
  
  
-import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -10,8 +9,8 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
  
-import com.cnlive.libs.base.frame.fragment.BaseFragment;
-import com.cnlive.libs.base.util.StatusBarConfig;
+import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
+import com.cnlive.core.libs.base.util.StatusBarConfig;
  
  
 public class MyFragment1 extends BaseFragment {
@@ -26,15 +25,8 @@ public class MyFragment1 extends BaseFragment {
  
     @Override
     protected void initView() {
+        super.initView();
         setStatusBarColor(R.color.qmui_config_color_red, 0);
         setStatusBarTextColor(StatusBarConfig.BLACK);
-
-    }
-
-    @Override
-    protected void initData() {
-//        getPresenter().setData1("dd");
     }
-
-
 }
@@ -2,7 +2,7 @@ package com.cnlive.strike;
  
 import android.util.Log;
  
-import com.cnlive.libs.base.frame.view.BaseView;
+import com.cnlive.core.libs.base.frame.view.BaseView;
  
 public class MyFragment1View extends BaseView {
 //    private MyFragment fragment;
 package com.cnlive.strike;
  
-import com.cnlive.libs.base.frame.view.BaseView;
+import com.cnlive.core.libs.base.frame.view.BaseView;
  
 public class MyFragmentView extends BaseView {
     MyFragment fragment;
@@ -9,7 +9,7 @@ public class MyFragmentView extends BaseView {
         this.fragment = fragment;
     }
  
-    public void setData(String msg){
-//        fragment.tx.setText(msg);
+    public void setData(String msg) {
+        fragment.textView.setText(msg);
     }
 }
 package com.cnlive.strike;
  
-import com.cnlive.libs.base.frame.presenter.BasePresenter;
-import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
  
 public class MyPresenter extends BasePresenter<MyFragmentView> {
     public void setData(String msg) {
 package com.cnlive.strike;
  
-import com.cnlive.libs.base.frame.presenter.BasePresenter;
+import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
  
 public class MyPresenter1 extends BasePresenter<MyFragment1View> {
     public void setData1(String msg) {
+package com.cnlive.strike.network;
+
+
+import android.text.TextUtils;
+
+import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.network.NetBuilder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import okhttp3.Interceptor;
+
+/**
+ * 基本请求
+ *  ys
+ */
+public class BaseRequest {
+    private String userSetUrl;
+    private static BaseRequest request;
+    private long connectTimeout;//连接超时
+    private long readTimeout;//读取超时
+    private long writeTimeout;//写入超时
+    private List<Interceptor> interceptorList;//拦截器
+    private String baseUrl = "http://gank.io/api/data/";
+    private final String SP_CMS_URL_DEBUT = "http://cmstest.cnlive.com:8768/";
+    private final String SP_CMS_URL = "http://cms.cnlive.com:8768/";
+    //网++ 接口域名
+    public final String SP_BASE_URL = "https://apiwjj.cnlive.com/";
+    //网++ 测试环境 接口域名
+    public final String SP_DEBUG_URL = "http://apiwjjtest.cnlive.com/";
+    //OPEN API 接口域名
+    private final String SP_OPEN_URL = "https://api.cnlive.com/";
+
+    /**
+     * 构造函数初始化
+     */
+    public BaseRequest() {
+        interceptorList = new ArrayList<>();
+    }
+
+
+    /**
+     * 设置连接超时
+     *
+     * @param connectTimeout
+     * @return
+     */
+    public BaseRequest setConnectTimeout(long connectTimeout) {
+        init();
+        connectTimeout = connectTimeout;
+        return request;
+    }
+
+    /**
+     * 设置读取超时
+     *
+     * @param readTimeout
+     * @return
+     */
+    public BaseRequest setReadTimeout(long readTimeout) {
+        init();
+        readTimeout = readTimeout;
+        return request;
+    }
+
+    /**
+     * 设置写入超时
+     *
+     * @param writeTimeout
+     * @return
+     */
+    public BaseRequest setWriteTimeout(long writeTimeout) {
+        init();
+        writeTimeout = writeTimeout;
+        return request;
+    }
+
+
+    /**
+     * 初始化接口地址
+     */
+    private String initBaseUrl(Class clzz) {
+        if (AppConfig.isDebug()) {
+            baseUrl = SP_DEBUG_URL;//还原初始地址
+        }
+        return baseUrl;
+    }
+
+    /**
+     * 设置连接地址
+     *
+     * @param url
+     * @return
+     */
+    public BaseRequest setUrl(String url) {
+        init();
+        userSetUrl = url;
+        return request;
+    }
+
+    /**
+     * 添加拦截器
+     *
+     * @param interceptor
+     * @return
+     */
+    public BaseRequest addInterceptor(Interceptor interceptor) {
+        if (null != interceptor) {
+            interceptorList.add(interceptor);
+        }
+        return request;
+    }
+
+    /**
+     * @return
+     */
+    public static synchronized BaseRequest init() {
+        if (null == request) {
+            request = new BaseRequest();
+        }
+        return request;
+    }
+
+    public <NetService> NetService service(Class<NetService> clz) {
+        NetService service = null;
+        NetBuilder builder = new NetBuilder(clz);
+        if (connectTimeout > 0) {
+            builder.setConnectTimeout(connectTimeout);
+        }
+        if (readTimeout > 0) {
+            builder.setReadTimeout(readTimeout);
+        }
+        if (writeTimeout > 0) {
+            builder.setWriteTimeout(writeTimeout);
+        }
+        if (null != interceptorList && interceptorList.size() > 0) {
+            builder.addInterceptors(interceptorList);
+        }
+        //设置接口请求头地址
+        if (!TextUtils.isEmpty(userSetUrl)) {
+            builder.setBaseUrl(userSetUrl);
+            userSetUrl = "";
+        } else {
+            builder.setBaseUrl(initBaseUrl(clz));
+        }
+        service = (NetService) builder.getService();
+        builder = null;
+        //重置属性
+        resetData();
+        return service;
+
+    }
+
+    private void resetData() {
+        interceptorList.clear();
+
+        connectTimeout = 0;
+        readTimeout = 0;
+        writeTimeout = 0;
+    }
+
+
+}
 \ No newline at end of file
+package com.cnlive.strike.network.api;
+
+import com.cnlive.core.network.BaseResult;
+import com.cnlive.strike.network.bean.LetHimNoSeeBean;
+import com.cnlive.strike.network.bean.TestBean;
+
+import java.util.Map;
+
+import io.reactivex.Observable;
+import retrofit2.http.GET;
+import retrofit2.http.POST;
+import retrofit2.http.QueryMap;
+
+public interface ApiService {
+    @GET("福利/10/1")
+    Observable<TestBean> getTest();
+
+    @POST("Daren/moment/getDoNotletFsids.action")
+    Observable<BaseResult<LetHimNoSeeBean>> getLetHimNoSee(@QueryMap() Map<String, String> maps);
+}
+package com.cnlive.strike.network.bean;
+
+import java.util.List;
+
+public class LetHimNoSeeBean {
+
+    private List<DoNotletFsidsBean> doNotletFsids;
+
+    public List<DoNotletFsidsBean> getDoNotletFsids() {
+        return doNotletFsids;
+    }
+
+    public void setDoNotletFsids(List<DoNotletFsidsBean> doNotletFsids) {
+        this.doNotletFsids = doNotletFsids;
+    }
+
+    public static class DoNotletFsidsBean {
+        /**
+         * image : http://yweb0.cnliveimg.com/images/headImg/2018/1114/1542164956106_small.jpg
+         * nickName : 峨眉派掌门候选人
+         * userId : 10513196
+         */
+
+        private String image;
+        private String nickName;
+        private String userId;
+
+        public String getImage() {
+            return image;
+        }
+
+        public void setImage(String image) {
+            this.image = image;
+        }
+
+        public String getNickName() {
+            return nickName;
+        }
+
+        public void setNickName(String nickName) {
+            this.nickName = nickName;
+        }
+
+        public String getUserId() {
+            return userId;
+        }
+
+        public void setUserId(String userId) {
+            this.userId = userId;
+        }
+    }
+}
+package com.cnlive.strike.network.bean;
+
+import java.util.List;
+
+public class TestBean {
+    /**
+     * error : false
+     * results : [{"_id":"5ccdbc219d212239df927a93","createdAt":"2019-05-04T16:21:53.523Z","desc":"2019-05-05","publishedAt":"2019-05-04T16:21:59.733Z","source":"web","type":"福利","url":"http://ww1.sinaimg.cn/large/0065oQSqly1g2pquqlp0nj30n00yiq8u.jpg","used":true,"who":"lijinshanmx"},{"_id":"5cc43919fc3326376038d233","createdAt":"2019-04-27T19:12:25.536Z","desc":"2019-04-27","publishedAt":"2019-04-27T19:12:51.865Z","source":"web","type":"福利","url":"https://ww1.sinaimg.cn/large/0065oQSqly1g2hekfwnd7j30sg0x4djy.jpg","used":true,"who":"lijinshanmx"},{"_id":"5c6a4ae99d212226776d3256","createdAt":"2019-02-18T06:04:25.571Z","desc":"2019-02-18","publishedAt":"2019-04-10T00:00:00.0Z","source":"web","type":"福利","url":"https://ws1.sinaimg.cn/large/0065oQSqly1g0ajj4h6ndj30sg11xdmj.jpg","used":true,"who":"lijinshanmx"},{"_id":"5c2dabdb9d21226e068debf9","createdAt":"2019-01-03T06:29:47.895Z","desc":"2019-01-03","publishedAt":"2019-01-03T00:00:00.0Z","source":"web","type":"福利","url":"https://ws1.sinaimg.cn/large/0065oQSqly1fytdr77urlj30sg10najf.jpg","used":true,"who":"lijinshanmx"},{"_id":"5c25db189d21221e8ada8664","createdAt":"2018-12-28T08:13:12.688Z","desc":"2018-12-28","publishedAt":"2018-12-28T00:00:00.0Z","source":"web","type":"福利","url":"https://ws1.sinaimg.cn/large/0065oQSqly1fymj13tnjmj30r60zf79k.jpg","used":true,"who":"lijinshanmx"},{"_id":"5c12216d9d21223f5a2baea2","createdAt":"2018-12-13T09:07:57.2Z","desc":"2018-12-13","publishedAt":"2018-12-13T00:00:00.0Z","source":"web","type":"福利","url":"https://ws1.sinaimg.cn/large/0065oQSqgy1fy58bi1wlgj30sg10hguu.jpg","used":true,"who":"lijinshanmx"},{"_id":"5bfe1a5b9d2122309624cbb7","createdAt":"2018-11-28T04:32:27.338Z","desc":"2018-11-28","publishedAt":"2018-11-28T00:00:00.0Z","source":"web","type":"福利","url":"https://ws1.sinaimg.cn/large/0065oQSqgy1fxno2dvxusj30sf10nqcm.jpg","used":true,"who":"lijinshanmx"},{"_id":"5bf22fd69d21223ddba8ca25","createdAt":"2018-11-19T03:36:54.950Z","desc":"2018-11-19","publishedAt":"2018-11-19T00:00:00.0Z","source":"web","type":"福利","url":"https://ws1.sinaimg.cn/large/0065oQSqgy1fxd7vcz86nj30qo0ybqc1.jpg","used":true,"who":"lijinshanmx"},{"_id":"5be14edb9d21223dd50660f8","createdAt":"2018-11-06T08:20:43.656Z","desc":"2018-11-06","publishedAt":"2018-11-06T00:00:00.0Z","source":"web","type":"福利","url":"https://ws1.sinaimg.cn/large/0065oQSqgy1fwyf0wr8hhj30ie0nhq6p.jpg","used":true,"who":"lijinshanmx"},{"_id":"5bcd71979d21220315c663fc","createdAt":"2018-10-22T06:43:35.440Z","desc":"2018-10-22","publishedAt":"2018-10-22T00:00:00.0Z","source":"web","type":"福利","url":"https://ws1.sinaimg.cn/large/0065oQSqgy1fwgzx8n1syj30sg15h7ew.jpg","used":true,"who":"lijinshanmx"}]
+     */
+
+    private boolean error;
+    private List<ResultsBean> results;
+
+    public boolean isError() {
+        return error;
+    }
+
+    public void setError(boolean error) {
+        this.error = error;
+    }
+
+    public List<ResultsBean> getResults() {
+        return results;
+    }
+
+    public void setResults(List<ResultsBean> results) {
+        this.results = results;
+    }
+
+    public static class ResultsBean {
+        /**
+         * _id : 5ccdbc219d212239df927a93
+         * createdAt : 2019-05-04T16:21:53.523Z
+         * desc : 2019-05-05
+         * publishedAt : 2019-05-04T16:21:59.733Z
+         * source : web
+         * type : 福利
+         * url : http://ww1.sinaimg.cn/large/0065oQSqly1g2pquqlp0nj30n00yiq8u.jpg
+         * used : true
+         * who : lijinshanmx
+         */
+
+        private String _id;
+        private String createdAt;
+        private String desc;
+        private String publishedAt;
+        private String source;
+        private String type;
+        private String url;
+        private boolean used;
+        private String who;
+
+        public String get_id() {
+            return _id;
+        }
+
+        public void set_id(String _id) {
+            this._id = _id;
+        }
+
+        public String getCreatedAt() {
+            return createdAt;
+        }
+
+        public void setCreatedAt(String createdAt) {
+            this.createdAt = createdAt;
+        }
+
+        public String getDesc() {
+            return desc;
+        }
+
+        public void setDesc(String desc) {
+            this.desc = desc;
+        }
+
+        public String getPublishedAt() {
+            return publishedAt;
+        }
+
+        public void setPublishedAt(String publishedAt) {
+            this.publishedAt = publishedAt;
+        }
+
+        public String getSource() {
+            return source;
+        }
+
+        public void setSource(String source) {
+            this.source = source;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+
+        public void setUrl(String url) {
+            this.url = url;
+        }
+
+        public boolean isUsed() {
+            return used;
+        }
+
+        public void setUsed(boolean used) {
+            this.used = used;
+        }
+
+        public String getWho() {
+            return who;
+        }
+
+        public void setWho(String who) {
+            this.who = who;
+        }
+    }
+
+//    /**
+//     * _id : 5ccdbc219d212239df927a93
+//     * createdAt : 2019-05-04T16:21:53.523Z
+//     * desc : 2019-05-05
+//     * publishedAt : 2019-05-04T16:21:59.733Z
+//     * source : web
+//     * type : 福利
+//     * url : http://ww1.sinaimg.cn/large/0065oQSqly1g2pquqlp0nj30n00yiq8u.jpg
+//     * used : true
+//     * who : lijinshanmx
+//     */
+//
+//    private String _id;
+//    private String createdAt;
+//    private String desc;
+//    private String publishedAt;
+//    private String source;
+//    private String type;
+//    private String url;
+//    private boolean used;
+//    private String who;
+//
+//    public String get_id() {
+//        return _id;
+//    }
+//
+//    public void set_id(String _id) {
+//        this._id = _id;
+//    }
+//
+//    public String getCreatedAt() {
+//        return createdAt;
+//    }
+//
+//    public void setCreatedAt(String createdAt) {
+//        this.createdAt = createdAt;
+//    }
+//
+//    public String getDesc() {
+//        return desc;
+//    }
+//
+//    public void setDesc(String desc) {
+//        this.desc = desc;
+//    }
+//
+//    public String getPublishedAt() {
+//        return publishedAt;
+//    }
+//
+//    public void setPublishedAt(String publishedAt) {
+//        this.publishedAt = publishedAt;
+//    }
+//
+//    public String getSource() {
+//        return source;
+//    }
+//
+//    public void setSource(String source) {
+//        this.source = source;
+//    }
+//
+//    public String getType() {
+//        return type;
+//    }
+//
+//    public void setType(String type) {
+//        this.type = type;
+//    }
+//
+//    public String getUrl() {
+//        return url;
+//    }
+//
+//    public void setUrl(String url) {
+//        this.url = url;
+//    }
+//
+//    public boolean isUsed() {
+//        return used;
+//    }
+//
+//    public void setUsed(boolean used) {
+//        this.used = used;
+//    }
+//
+//    public String getWho() {
+//        return who;
+//    }
+//
+//    public void setWho(String who) {
+//        this.who = who;
+//    }
+
+
+}
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+    <LinearLayout 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"
@@ -8,11 +9,11 @@
         android:orientation="vertical"
         tools:context=".ui.activity.AllDeviceActivity">
  
-      <Button
-          android:id="@+id/go_to"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="跳转"/>
+        <Button
+            android:id="@+id/go_to"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="跳转" />
  
         <Button
             android:id="@+id/to_img"
@@ -20,5 +21,17 @@
             android:layout_height="wrap_content"
             android:text="图片加载测试"/>
  
-    </RelativeLayout>
+        <Button
+            android:id="@+id/go_to1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="请求权限默认提示语" />
+
+        <Button
+            android:id="@+id/go_to2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="请求权限自定义提示语" />
+
+    </LinearLayout>
 </layout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
  
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout 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"
@@ -20,5 +20,17 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="测试view" />
-    </RelativeLayout>
+
+        <Button
+            android:id="@+id/btn_test1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="权限申请" />
+
+        <Button
+            android:id="@+id/btn_test2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="自定义提示语权限申请" />
+    </LinearLayout>
 </layout>
 \ No newline at end of file
 <resources>
  
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="QMUI.Compat.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>
@@ -10,11 +10,11 @@ buildscript {
     repositories {
         google()
         jcenter()
-        
+
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.1'
-        
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath "com.alibaba:arouter-register:1.0.2"
@@ -26,9 +26,25 @@ allprojects {
     repositories {
         google()
         jcenter()
-        
+
     }
 }
+
+////配置全局变量
+//ext {
+//    def versionMajor = 1
+//    def versionMinor = 5
+//    def versionPatch = 6
+//    def versionBuild = 0
+//    // module依赖库公共版本号
+//    versionCode = versionMajor * 1000 + versionMinor * 100 + versionPatch * 10 + versionBuild
+//    versionName = "${versionMajor}.${versionMinor}.${versionPatch}.${versionBuild}"
+//
+//    compileSdkVersion = 29
+//    buildToolsVersion = "29.0.2"
+//    minSdkVersion = 19
+//    targetSdkVersion = 29
+//}
 allprojects {
     afterEvaluate {
         if (project.parent == null || project.parent == rootProject) return
@@ -37,7 +53,7 @@ allprojects {
             compileSdkVersion 29
             buildToolsVersion "29.0.0"
             defaultConfig {
-                if (minSdkVersion == null) minSdkVersion 16
+                if (minSdkVersion == null) minSdkVersion 21
                 if (targetSdkVersion == null) targetSdkVersion 29
                 if (versionCode == null) versionCode 1
                 if (versionName == null) versionName "1.2"
@@ -93,7 +109,7 @@ allprojects {
         imput("implementation", project, moudle.core_base)
  
         //Tripartite Base
-        for (String moudle : base_librarys)  imput('implementation', project, moudle)
+        for (String moudle : base_librarys) imput('implementation', project, moudle)
         for (String moudle : base_compilers) imput('annotationProcessor', project, moudle)
  
     }
+/build
+apply plugin: 'com.android.library'
+
+android {
+//    compileSdkVersion 29
+//    buildToolsVersion "29.0.2"
+//
+//
+//    defaultConfig {
+//        minSdkVersion 21
+//        targetSdkVersion 29
+//        versionCode 1
+//        versionName "1.0"
+//
+//        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+//        consumerProguardFiles 'consumer-rules.pro'
+//    }
+
+    buildTypes {
+        debug {
+            resValue("string", "ACCOUNT_LABEL", "网家家 内测")
+            resValue("string", "ACCOUNT_TYPE", "com.cnlive.strike.debug.AccountType")
+            resValue("string", "ACCOUNT_PROVIDE", "com.cnlive.strike.debug.AccountProvide")
+            zipAlignEnabled true
+        }
+        release {
+            resValue("string", "ACCOUNT_LABEL", "网家家")
+            resValue("string", "ACCOUNT_TYPE", "com.cnlive.strike.AccountType")
+            resValue("string", "ACCOUNT_PROVIDE", "com.cnlive.strike.AccountProvide")
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            zipAlignEnabled true
+        }
+    }
+    dataBinding {
+        enabled true
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+
+    implementation project(path: ':core:network')
+//    implementation project(path: ':core:base')
+
+    implementation 'com.cnlive.libs:emoj:2.0.9'
+}
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+package com.cnlive.strike.user;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+        assertEquals("com.cnlive.strike.user.test", appContext.getPackageName());
+    }
+}
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.cnlive.strike.user">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <!-- for mta statistics, not necessary-->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission
+        android:name="android.permission.AUTHENTICATE_ACCOUNTS"
+        android:maxSdkVersion="22" />
+    <uses-permission
+        android:name="android.permission.GET_ACCOUNTS"
+        android:maxSdkVersion="22" />
+    <uses-permission
+        android:name="android.permission.MANAGE_ACCOUNTS"
+        android:maxSdkVersion="22" />
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> <!-- 账户自动更新 App保活相关 -->
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+    <uses-permission android:name="android.permission.ACTION_LIGHT_DEVICE_IDLE_MODE_CHANGED" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <!-- 账户权限相关 -->
+    <uses-permission
+        android:name="android.permission.INTERACT_ACROSS_USERS_FULL"
+        tools:ignore="ProtectedPermissions" />
+    <uses-permission
+        android:name="android.permission.ACCOUNT_MANAGER"
+        tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application android:largeHeap="true">
+        <meta-data
+            android:name="WEIBO_APPKEY"
+            android:value="3884700821" />
+        <meta-data
+            android:name="WEIBO_CHANNEL"
+            android:value="weibo" />
+
+        <activity android:name="com.cnlive.strike.moudle.user.ui.activity.MainTestActivity" />
+        <activity
+            android:name=".ui.activity.LoginActivity"
+            android:configChanges="keyboardHidden|screenSize|orientation|smallestScreenSize|screenLayout"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden|adjustPan">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="com.cnlive.strike.moudle.user.ui.activity.BindPhoneNumberActivity"
+            android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".ui.activity.FirstLoginActivity"
+            android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".ui.activity.SelectCountryActivity"
+            android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
+        <!-- 个人资料页-->
+        <activity
+            android:name="com.cnlive.strike.moudle.user.ui.activity.PersonalDataActivity"
+            android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+        <!--预览头像-->
+        <activity
+            android:name="com.cnlive.strike.moudle.user.ui.activity.PersonalImageActivity"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+        <!-- 个人资料姓名-->
+        <activity
+            android:name="com.cnlive.strike.moudle.user.ui.activity.UpdateContentActivity"
+            android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateVisible|adjustPan" />
+        <!--        个人签名-->
+        <activity
+            android:name="com.cnlive.strike.moudle.user.ui.activity.SignatureActivity"
+            android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateVisible|adjustPan" />
+
+
+        <service
+            android:name="com.cnlive.strike.user.auth.UserAccountService"
+            tools:ignore="ExportedService">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/authenticator" />
+        </service>
+
+        <service
+            android:name="com.cnlive.strike.user.auth.UserSyncService"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.content.SyncAdapter" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.content.SyncAdapter"
+                android:resource="@xml/account_sync_adapter" />
+        </service>
+
+        <provider
+            android:name="com.cnlive.strike.user.auth.UserAccountProvider"
+            android:authorities="@string/ACCOUNT_PROVIDE"
+            android:exported="false"
+            android:syncable="true" />
+    </application>
+</manifest>
+package com.cnlive.strike.user;
+
+import android.content.Context;
+import android.os.Environment;
+import android.text.TextUtils;
+
+import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.HttpConn;
+import com.cnlive.strike.user.network.api.ApiBaseServiceOpen;
+import com.cnlive.strike.user.network.api.BaseRequest;
+import com.cnlive.strike.user.network.model.TokenData;
+import com.cnlive.strike.user.network.model.UserData;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import io.reactivex.Observable;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
+
+/**
+ * Created by Lynn on 2018/10/15.
+ */
+
+public class UserUtilAction {
+    public static final String TOKEN_ERROR_CODE = "-900001";
+    public static String TOKEN_ERROR_MSG = "用户token为空";
+
+    /**
+     * 快捷登录前发送手机验证码
+     *
+     * @param context
+     * @param mobile  手机号
+     * @return
+     */
+    public static Observable<BaseResult> sendMsgBefQuickLoginAction(final Context context, final String mobile, String countryCode) {
+        Map<String, String> requestMap = new HashMap<>();
+        requestMap.put("appId", AppConfig.getAppId());
+        requestMap.put("mobile", mobile);
+        requestMap.put("countryCode", countryCode);
+        requestMap.put("clientPlat", "a");
+        return BaseRequest.init().service(ApiBaseServiceOpen.class).sendVerifyCodeBefQuickLogin(requestMap);
+    }
+
+
+    /**
+     * 快捷登录
+     *
+     * @param context
+     * @param userPhone 手机号
+     * @param userCode  验证码
+     * @return
+     */
+    public static Observable<BaseResult<UserData>> quickLoginAction(Context context, String userPhone, String userCode, String countryCode) {
+        Map<String, String> requestMap = new HashMap<>();
+        requestMap.put("appId", AppConfig.getAppId());
+        requestMap.put("userName", userPhone);
+        requestMap.put("verificationCode", userCode);
+        requestMap.put("uuid", AppConfig.getAppUUID());
+        requestMap.put("frmId", AppConfig.getAppChannel());
+        requestMap.put("countryCode", countryCode);
+        requestMap.put("clientPlat", "a");
+        return BaseRequest.init().service(ApiBaseServiceOpen.class).quickLogin(requestMap);
+
+    }
+
+    /**
+     * 登录
+     *
+     * @param context
+     * @param userName 用户名
+     * @param pwd      密码
+     * @return
+     */
+    public static Observable<BaseResult<UserData>> loginAction(Context context, String userName, String pwd) {
+        Map<String, String> map = new HashMap<>();
+        map.put("appId", AppConfig.getAppId());
+        map.put("userName", userName);
+        map.put("pwd", pwd);
+        map.put("uuid", AppConfig.getAppUUID());
+        map.put("frmId", "");
+        map.put("clientPlat", "a");
+        return BaseRequest.init().service(ApiBaseServiceOpen.class).login(map);
+
+    }
+
+
+    /**
+     * 查询用户信息
+     *
+     * @param context
+     * @param userId  用户ID
+     * @param srcUid  被查询用户ID
+     * @param token   查询者平台TOKEN
+     * @return
+     */
+    public static Observable<BaseResult<UserData>> queryUserInfo(Context context, String userId, String srcUid, String token) {
+        Map<String, String> map = new HashMap<>();
+        map.put("appId", AppConfig.getAppId());
+        map.put("uid", userId);
+        map.put("srcUid", srcUid);
+        map.put("clientPlat", "a");
+        map.put("token", token);
+        if (TextUtils.isEmpty(token)) {
+            HttpConn.error(UserUtilAction.TOKEN_ERROR_CODE, TOKEN_ERROR_MSG);
+        }
+        return BaseRequest.init().service(ApiBaseServiceOpen.class).queryUserInfo(map);
+
+    }
+
+    /**
+     * 修改用户附加信息
+     *
+     * @param context
+     * @param userId  用户id
+     * @param extInfo 扩展信息
+     * @param token   平台token
+     * @return
+     */
+    public static Observable<BaseResult> updateUserExtInfo(Context context, String userId, String extInfo, String token) {
+        Map<String, String> map = new HashMap<>();
+        map.put("appId", AppConfig.getAppId());
+        map.put("uid", userId);
+        map.put("extInfo", extInfo);
+        map.put("token", token);
+        map.put("clientPlat", "a");
+        if (TextUtils.isEmpty(token)) {
+            HttpConn.error(UserUtilAction.TOKEN_ERROR_CODE, TOKEN_ERROR_MSG);
+        }
+        return BaseRequest.init().service(ApiBaseServiceOpen.class).updateUserExtInfo(map);
+
+    }
+
+    ;
+
+    /**
+     * 修改用户单项信息
+     *
+     * @param context
+     * @param uid     用户Id
+     * @param type    nickName-昵称，gender-性别，email-邮箱, location-联系方式
+     * @param value   对应的信息，性别，m：男、f：女、n：未知
+     * @param token   平台TOKEN
+     * @return
+     */
+    public static Observable<BaseResult> modifyUserInfo(Context context, String uid, String type, String value, String token) {
+        Map<String, String> map = new HashMap<>();
+        map.put("appId", AppConfig.getAppId());
+        map.put("uid", uid);
+        map.put("type", type);
+        map.put("value", value);
+        map.put("clientPlat", "a");
+        map.put("token", token);
+        if (TextUtils.isEmpty(token)) {
+            HttpConn.error(UserUtilAction.TOKEN_ERROR_CODE, TOKEN_ERROR_MSG);
+        }
+        return BaseRequest.init().service(ApiBaseServiceOpen.class).modifyUserInfo(map);
+
+    }
+
+    /**
+     * 注册或修改手机号前发手机验证码
+     *
+     * @param context
+     * @param mobile  手机号
+     * @return
+     */
+    public static Observable<BaseResult> sendVerifyCodeForUnRegistered(Context context, String mobile, String countryCode) {
+        Map<String, String> map = new HashMap<>();
+        map.put("appId", AppConfig.getAppId());
+        map.put("mobile", mobile);
+        map.put("clientPlat", "a");
+        map.put("countryCode", countryCode);
+        return BaseRequest.init().service(ApiBaseServiceOpen.class).sendVerifyCodeForUnRegistered(map);
+    }
+
+    /**
+     * 更新手机号
+     *
+     * @param context
+     * @param uid              用户ID
+     * @param mobile           手机号
+     * @param verificationCode 手机验证码
+     * @param token            平台TOKEN
+     * @return
+     */
+    public static Observable<BaseResult> updateMobile(Context context, String uid, String mobile, String verificationCode, String token, String countryCode) {
+        Map<String, String> map = new HashMap<>();
+        map.put("appId", AppConfig.getAppId());
+        map.put("uid", uid);
+        map.put("mobile", mobile);
+        map.put("verificationCode", verificationCode);
+        map.put("clientPlat", "a");
+        map.put("countryCode", countryCode);
+        map.put("token", token);
+        if (TextUtils.isEmpty(token)) {
+            HttpConn.error(UserUtilAction.TOKEN_ERROR_CODE, TOKEN_ERROR_MSG);
+        }
+        return BaseRequest.init().service(ApiBaseServiceOpen.class).updateMobile(map);
+
+    }
+
+    /**
+     * 注册
+     *
+     * @param context
+     * @param userName         邮箱或手机
+     * @param pwd              密码
+     * @param verificationCode 手机验证码（手机号注册时必填）
+     * @return
+     */
+    public static Observable<BaseResult<UserData>> register(Context context, String userName, String pwd, String verificationCode) {
+        Map<String, String> map = new HashMap<>();
+        map.put("appId", AppConfig.getAppId());
+        map.put("userName", userName);
+        map.put("pwd", pwd);
+        map.put("verificationCode", verificationCode);
+        map.put("invitationCode", "");
+        map.put("uuid", AppConfig.getAppUUID());
+        map.put("frmId", "");
+        map.put("clientPlat", "a");
+        return BaseRequest.init().service(ApiBaseServiceOpen.class).register(map);
+    }
+
+
+    /**
+     * 获取access_token
+     *
+     * @param context
+     * @return
+     */
+    public static Observable<BaseResult<TokenData>> accessToken(Context context) {
+        Map<String, String> map = new HashMap<>();
+        map.put("appId", AppConfig.getAppId());
+        map.put("secret", AppConfig.getAppSceret());
+        return BaseRequest.init().service(ApiBaseServiceOpen.class).accessToken(map);
+    }
+
+//    /**
+//     * 上传头像
+//     *
+//     * @param context
+//     * @param uid          用户ID
+//     * @param face         头像文件
+//     * @param token        平台TOKEN
+//     * @param access_token
+//     * @return
+//     */
+//    public static Disposable updateUserFace(Context context, String uid, File face, String token, String access_token, DataCallback<BaseInfo<FaceData>> callback) {
+//        Map<String, RequestBody> params = new HashMap<>();
+//
+//        if (TextUtils.isEmpty(token)) {
+//            callback.callback(TOKEN_ERROR_CODE, TOKEN_ERROR_MSG, null);
+//        }
+//
+//        params.put("uid", getRequestString(uid));
+//        params.put("clientPlat", getRequestString("a"));
+//        params.put("token", getRequestString(token));
+//        params.put("access_token", getRequestString(access_token));
+//
+//        RequestBody requestFace = RequestBody.create(MediaType.parse("multipart/form-data"), face);
+//        MultipartBody.Part faceBody = MultipartBody.Part.createFormData("face", face.getName(), requestFace);
+//
+//        List<MultipartBody.Part> parts = new ArrayList<>();
+//        parts.add(faceBody);
+//
+//
+//        Subscriber<BaseInfo<FaceData>> subscriber = new Subscriber<BaseInfo<FaceData>>(context, ApiBaseSubscriber.subscriberBuild) {
+//            @Override
+//            public void onCompleted(String s, String s1, BaseInfo<FaceData> faceDataBaseInfo) {
+//                if (callback == null) return;
+//                callback.callback(SUCCESS, "", faceDataBaseInfo);
+//            }
+//
+//            @Override
+//            public void onError(String s, String s1) {
+//                if (callback == null) return;
+//                int errorCode = -1;
+//                try {
+//                    errorCode = Integer.valueOf(s);
+//                } catch (Exception ignored) {
+//                } finally {
+//                    callback.callback(errorCode, s1, null);
+//                }
+//            }
+//        };
+//
+//        return ApiBaseRequest.subscribe(ApiBaseRequest.service(ApiBaseServiceOpen.class).updateUserFace(params, parts), subscriber);
+////        return ApiBaseRequest.service(ApiBaseServiceOpen.class, service -> service.updateUserFace(params, parts)).subscribe(context, callback);
+//    }
+
+    private static RequestBody getRequestString(String value) {
+        RequestBody requestString = RequestBody.create(MediaType.parse("text/plain"), value);
+        return requestString;
+    }
+
+//    public static Disposable zipFiles(Context context, List<String> imageFiles, DataCallback<List<String>> callback) {
+//        if (imageFiles == null || imageFiles.size() == 0) {
+//            callback.callback(0, "", imageFiles);
+//        } else {
+//            return Flowable.just(imageFiles)
+//                    .observeOn(Schedulers.io())
+//                    .map(list -> Luban.with(context)
+//                            .ignoreBy(500)
+//                            .setTargetDir(getPath())
+//                            .load(list)
+//                            .get())
+//                    .observeOn(AndroidSchedulers.mainThread())
+//                    .doOnError(throwable -> callback.callback(0, "", imageFiles))
+//                    .onErrorResumeNext(Flowable.empty())
+//                    .subscribe(
+//                            list -> {
+//                                List<String> files = new ArrayList<>();
+//                                for (File file : list) files.add(file.getPath());
+//                                callback.callback(0, "", files);
+//                            });
+//        }
+//        return null;
+//    }
+
+    private static String getPath() {
+        String path = Environment.getExternalStorageDirectory() + "/strike/image/";
+        File file = new File(path);
+        if (file.mkdirs()) {
+            return path;
+        }
+        return path;
+    }
+
+
+}
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.cnlive.strike.user.auth;
+
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.AccountManager;
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+/**
+ * Base class for implementing an Activity that is used to help implement an
+ * AbstractAccountAuthenticator. If the AbstractAccountAuthenticator needs to use an activity
+ * to handle the request then it can have the activity extend AccountAuthenticatorActivity.
+ * The AbstractAccountAuthenticator passes in the response to the intent using the following:
+ * <pre>
+ *      intent.putExtra({@link AccountManager#KEY_ACCOUNT_AUTHENTICATOR_RESPONSE}, response);
+ * </pre>
+ * The activity then sets the result that is to be handed to the response via
+ * {@link #setAccountAuthenticatorResult(Bundle)}.
+ * This result will be sent as the result of the request when the activity finishes. If this
+ * is never set or if it is set to null then error {@link AccountManager#ERROR_CODE_CANCELED}
+ * will be called on the response.
+ */
+public class AccountAuthenticatorActivity extends AppCompatActivity {
+    private AccountAuthenticatorResponse mAccountAuthenticatorResponse = null;
+    private Bundle mResultBundle = null;
+
+    /**
+     * Set the result that is to be sent as the result of the request that caused this
+     * Activity to be launched. If result is null or this method is never called then
+     * the request will be canceled.
+     *
+     * @param result this is returned as the result of the AbstractAccountAuthenticator request
+     */
+    public final void setAccountAuthenticatorResult(Bundle result) {
+        mResultBundle = result;
+    }
+
+    /**
+     * Retreives the AccountAuthenticatorResponse from either the intent of the icicle, if the
+     * icicle is non-zero.
+     *
+     * @param icicle the save instance data of this Activity, may be null
+     */
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mAccountAuthenticatorResponse =
+                getIntent().getParcelableExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE);
+
+        if (mAccountAuthenticatorResponse != null) {
+            mAccountAuthenticatorResponse.onRequestContinued();
+        }
+    }
+
+    /**
+     * Sends the result or a Constants.ERROR_CODE_CANCELED error if a result isn't present.
+     */
+    public void finish() {
+        if (mAccountAuthenticatorResponse != null) {
+            // send the result bundle back if set, otherwise send an error.
+            if (mResultBundle != null) {
+                mAccountAuthenticatorResponse.onResult(mResultBundle);
+            } else {
+                mAccountAuthenticatorResponse.onError(AccountManager.ERROR_CODE_CANCELED,
+                        "canceled");
+            }
+            mAccountAuthenticatorResponse = null;
+        }
+        super.finish();
+    }
+}
+package com.cnlive.strike.user.auth;
+
+import android.accounts.AbstractAccountAuthenticator;
+import android.accounts.Account;
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.AccountManager;
+import android.accounts.NetworkErrorException;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.cnlive.core.libs.base.util.LogUtil;
+
+
+public class UserAccountAuthenticator extends AbstractAccountAuthenticator {
+    private String _tag = "UserAccountAuthenticator";
+    private Context _context;
+
+    public UserAccountAuthenticator(Context context) {
+        super(context);
+        _context = context;
+    }
+
+    public Bundle addAccount(AccountAuthenticatorResponse response, String accountType, String authTokenType, String[] requiredFeatures, Bundle options) {
+        LogUtil.d(_tag, accountType + " - " + authTokenType);
+        Bundle ret = new Bundle();
+        try {
+            Class<?> clazz = Class.forName("com.cnlive.strike.moudle.user.ui.activity.LoginActivity");
+            Intent intent = new Intent(_context, clazz);
+            intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);
+            ret.putParcelable(AccountManager.KEY_INTENT, intent);
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+        return ret;
+    }
+
+
+    @Override
+    public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account, Bundle options) {
+        LogUtil.d(_tag, ".confirmCredentials");
+        return null;
+    }
+
+
+    @Override
+    public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
+        LogUtil.d(_tag, ".editProperties");
+        return null;
+    }
+
+
+    @Override
+    public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle loginOptions) throws NetworkErrorException {
+        LogUtil.d(_tag, ".getAuthToken");
+        return null;
+    }
+
+
+    @Override
+    public String getAuthTokenLabel(String authTokenType) {
+        LogUtil.d(_tag, ".getAuthTokenLabel");
+        return null;
+    }
+
+
+    @Override
+    public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account, String[] features) throws NetworkErrorException {
+        LogUtil.d(_tag, ".hasFeatures");
+        return null;
+    }
+
+
+    @Override
+    public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle loginOptions) {
+        LogUtil.d(_tag, ".updateCredentials");
+        return null;
+    }
+
+}
+package com.cnlive.strike.user.auth;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+
+import androidx.annotation.Nullable;
+
+public class UserAccountProvider extends ContentProvider {
+
+    @Override
+    public boolean onCreate() {
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getType(Uri uri) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        return null;
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        return 0;
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        return 0;
+    }
+}
+package com.cnlive.strike.user.auth;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+public class UserAccountService extends Service {
+    private UserAccountAuthenticator _saa;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        IBinder ret = null;
+        if (intent.getAction().equals(android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT))
+            ret = getMovieAuthenticator().getIBinder();
+        return ret;
+    }
+
+    private UserAccountAuthenticator getMovieAuthenticator() {
+        if (_saa == null)
+            _saa = new UserAccountAuthenticator(this);
+        return _saa;
+    }
+}
+package com.cnlive.strike.user.auth;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AccountManagerCallback;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.libs.base.util.SharedPreferencesHelper;
+import com.cnlive.strike.user.R;
+import com.cnlive.strike.user.model.CNLiveUserInfo;
+import com.cnlive.strike.user.model.CNLiveUserInfoExt;
+import com.cnlive.strike.user.network.model.UserData;
+import com.google.gson.Gson;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 用户管理类
+ */
+public class UserService {
+    private final String defaultFaceUrl = "http://wjj.ys1.cnliveimg.com/admin/test/head.png";
+
+    private final String baseFaceUrl = "/mobile/images/mobilehead/default/";
+
+    private boolean checkDefaultUrl(String url) {
+        if (!TextUtils.isEmpty(url) && url.contains(baseFaceUrl)) return true;
+        return false;
+    }
+
+    private final String KEY_DEFAULT_ACCOUNT = "defaultaccount";//用户默认账户
+    private final String KEY_USER_DATA_USER_ID = "uid";        //用户uid
+    private final String KEY_USER_DATA_NICKNAME = "nickname";  //用户昵称
+    private final String KEY_USER_DATA_BIGFACEURL = "bigfaceurl";    //用户头像
+    private final String KEY_USER_DATA_FACEURL = "faceurl";    //用户头像
+    private final String KEY_USER_DATA_GENDER = "gender";      //用户性别
+    private final String KEY_USER_DATA_MOBILE = "mobile";      //用户手机号
+    private final String KEY_USER_COUNTRY_CODE = "countryCode";//手机号国家码
+    private final String KEY_USER_DATA_EMAIL = "email";        //用户邮箱
+    private final String KEY_USER_DATA_LOCATION = "location";  //用户地址
+    private final String KEY_USER_TOKEN = "token";             //用户token
+    private final String KEY_USER_FIRST_LOGIN = "firstLogin";             //用户token
+    private final String KEY_USER_SIGN = "sign";               //用户签名
+    private final String KEY_USER_UID_QQ = "qq";               //qquid
+    private final String KEY_USER_UID_WECHAT = "wechat";               //微信uid
+    private final String KEY_USER_UID_WEIBO = "weibo";               //微信签名
+
+    private static UserService mInstance;
+    private Account activeAccount;
+    private CNLiveUserInfo activeUserInfo;
+    private SharedPreferencesHelper sharedPrefs;
+    private AccountManager mAccountManager;
+    private String mAccountType, mAccountProvide;
+
+    private Map<String, Account> mAccountMap = new HashMap<>();
+
+    /**
+     * 获取用户管理服务实例
+     *
+     * @param context 上下文
+     * @return 管理对象实例
+     */
+    public static synchronized UserService getInstance(Context context) {
+        if (mInstance == null && context != null)
+            mInstance = new UserService(context.getApplicationContext());
+        return mInstance;
+    }
+
+    /**
+     * 默认构造函数(单例)
+     *
+     * @param context
+     */
+    private UserService(Context context) {
+        sharedPrefs = SharedPreferencesHelper.getInstance(context);
+        mAccountManager = AccountManager.get(context);
+        mAccountType = context.getString(R.string.ACCOUNT_TYPE);
+        mAccountProvide = context.getString(R.string.ACCOUNT_PROVIDE);
+        //初始化用户列表
+        initSystemAccounts();
+        //初始化登录用户
+        initAppAccount();
+    }
+
+    /**
+     * 初始化系统用户列表
+     */
+    private void initSystemAccounts() {
+        mAccountMap.clear();
+        Account[] accounts = mAccountManager.getAccountsByType(mAccountType);
+        for (Account account : accounts) {
+            mAccountMap.put(account.name, account);
+        }
+    }
+
+    /**
+     * 初始化默认系统账号
+     */
+    private void initAppAccount() {
+        String accountName = sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT);
+
+        if (mAccountMap.containsKey(accountName)) {
+            activeAccount = mAccountMap.get(accountName);
+            activeUserInfo = getAccountInfo(activeAccount);
+        } else {
+            activeAccount = null;
+            activeUserInfo = null;
+        }
+    }
+
+    /**
+     * 判断App用户登录
+     *
+     * @return 如果登录返回 true
+     */
+    public boolean hasAppAccount() {
+        String accountName = sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT);
+        return mAccountMap.containsKey(accountName) && activeUserInfo != null;
+    }
+
+    /**
+     * 登录App用户 ,录入系统账号信息
+     *
+     * @param username    用户名
+     * @param password    密码
+     * @param userProfile 用户数据
+     */
+    public void loginAppAccount(String username, String password, UserData userProfile) {
+        if (mAccountMap.containsKey(username)) {
+            activeAccount = mAccountMap.get(username);
+            mAccountManager.setPassword(activeAccount, password);
+        } else {
+            activeAccount = new Account(username, mAccountType);
+            mAccountManager.addAccountExplicitly(activeAccount, password, null);
+        }
+
+        // 自动同步
+        ContentResolver.setIsSyncable(activeAccount, mAccountProvide, 1);
+        ContentResolver.setSyncAutomatically(activeAccount, mAccountProvide, true);
+        // 间隔时间为30秒
+        ContentResolver.addPeriodicSync(activeAccount, mAccountProvide, new Bundle(), 1);
+
+        setSystemAccountInfo(activeAccount, userProfile);
+
+        mAccountMap.put(username, activeAccount);
+
+        activeUserInfo = getAccountInfo(activeAccount);
+
+        sharedPrefs.setValue(KEY_DEFAULT_ACCOUNT, username);
+    }
+
+    /**
+     * 登出App用户
+     */
+    public void logoutAppAccount() {
+        AppConfig.setSid("");
+        if (sharedPrefs != null) {
+            sharedPrefs.remove(KEY_DEFAULT_ACCOUNT);
+        }
+        if (mAccountMap != null && activeAccount != null) mAccountMap.remove(activeAccount.name);
+        activeAccount = null;
+        activeUserInfo = null;
+        mInstance = null;
+    }
+
+    /**
+     * 获取已经登陆用户信息
+     *
+     * @return 用户信息
+     */
+    public CNLiveUserInfo getAppAccount() {
+        return activeUserInfo;
+    }
+
+    public static String getUid(Context context) {
+        CNLiveUserInfo activeUserInfo = getInstance(context).getAppAccount();
+        return activeUserInfo == null ? "" : activeUserInfo.getUid();
+    }
+
+    public Account getSystemAccount() {
+        return activeAccount;
+    }
+
+    public String getPassword(Account account) {
+        return mAccountManager.getPassword(account);
+    }
+
+    /**
+     * 删除系统账号信息
+     *
+     * @param username 用户名
+     */
+    public void removeUser(String username, AccountManagerCallback<Boolean> callback) {
+        Account account = mAccountMap.remove(username);
+        if (account != null) mAccountManager.removeAccount(account, callback, null);
+    }
+
+    /**
+     * 删除系统账号信息
+     *
+     * @param account 系统账号
+     */
+    public void removeUser(Account account, AccountManagerCallback<Boolean> callback) {
+        if (account != null) {
+            mAccountManager.removeAccount(account, callback, null);
+        }
+    }
+
+
+    /**
+     * 更新系统账号信息
+     *
+     * @param account     系统账号数据
+     * @param userProfile 用户账号数据
+     */
+    private void setSystemAccountInfo(Account account, UserData userProfile) {
+        if (account == null) return;
+        if (checkDefaultUrl(userProfile.getFaceUrl())) {
+            userProfile.setFaceUrl(defaultFaceUrl);
+            userProfile.setBigFaceUrl(defaultFaceUrl);
+        }
+        mAccountManager.setUserData(account, KEY_USER_DATA_USER_ID, userProfile.getUid());
+        mAccountManager.setUserData(account, KEY_USER_DATA_NICKNAME, userProfile.getNickName());
+        mAccountManager.setUserData(account, KEY_USER_DATA_FACEURL, userProfile.getFaceUrl());
+        mAccountManager.setUserData(account, KEY_USER_DATA_BIGFACEURL, userProfile.getBigFaceUrl());
+        mAccountManager.setUserData(account, KEY_USER_DATA_GENDER, userProfile.getGender());
+        mAccountManager.setUserData(account, KEY_USER_DATA_MOBILE, userProfile.getMobile());
+        mAccountManager.setUserData(account, KEY_USER_COUNTRY_CODE, userProfile.getCountryCode());
+        mAccountManager.setUserData(account, KEY_USER_DATA_EMAIL, userProfile.getEmail());
+        mAccountManager.setUserData(account, KEY_USER_FIRST_LOGIN, userProfile.isNewUser() ? "0" : "1");
+        mAccountManager.setUserData(account, KEY_USER_DATA_LOCATION, userProfile.getLocation());
+        mAccountManager.setUserData(account, KEY_USER_TOKEN, userProfile.getToken());
+
+        mAccountManager.setUserData(account, KEY_USER_UID_QQ, userProfile.getQqUid());
+        mAccountManager.setUserData(account, KEY_USER_UID_WEIBO, userProfile.getSinaUid());
+        mAccountManager.setUserData(account, KEY_USER_UID_WECHAT, userProfile.getWxUid());
+        setUserExt(userProfile.getExtInfo());
+    }
+
+    public void setUserExt(String ext) {
+        try {
+            CNLiveUserInfoExt extData = new Gson().fromJson(ext, CNLiveUserInfoExt.class);
+
+            mAccountManager.setUserData(activeAccount, KEY_USER_SIGN, extData.getUserSign());
+        } catch (Exception e) {
+        }
+    }
+
+    public void setUserInfo(UserData userProfile) {
+        if (mAccountMap.containsKey(sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT))) {
+            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_USER_ID, userProfile.getUid());
+            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_NICKNAME, userProfile.getNickName());
+            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_FACEURL, userProfile.getFaceUrl());
+            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_BIGFACEURL, userProfile.getBigFaceUrl());
+            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_GENDER, userProfile.getGender());
+            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_MOBILE, userProfile.getMobile());
+            mAccountManager.setUserData(activeAccount, KEY_USER_COUNTRY_CODE, userProfile.getCountryCode());
+            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_EMAIL, userProfile.getEmail());
+
+            mAccountManager.setUserData(activeAccount, KEY_USER_FIRST_LOGIN, "1");
+
+            mAccountManager.setUserData(activeAccount, KEY_USER_UID_QQ, userProfile.getQqUid());
+            mAccountManager.setUserData(activeAccount, KEY_USER_UID_WEIBO, userProfile.getSinaUid());
+            mAccountManager.setUserData(activeAccount, KEY_USER_UID_WECHAT, userProfile.getWxUid());
+            setUserExt(userProfile.getExtInfo());
+
+            activeUserInfo = getAccountInfo(activeAccount);
+        }
+    }
+
+    public void setUserSign(String userSign) {
+        if (mAccountMap.containsKey(sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT))) {
+            activeUserInfo.setUserSign(userSign);
+            mAccountManager.setUserData(activeAccount, KEY_USER_SIGN, userSign);
+        }
+    }
+
+    public void setUserFaceUrl(String faceUrl, String bigFaceUrl) {
+        if (mAccountMap.containsKey(sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT))) {
+            activeUserInfo.setFaceUrl(faceUrl);
+            activeUserInfo.setBigFaceUrl(bigFaceUrl);
+            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_FACEURL, faceUrl);
+            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_BIGFACEURL, bigFaceUrl);
+        }
+    }
+
+    public void setUserNickName(String nickName) {
+        if (mAccountMap.containsKey(sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT))) {
+            activeUserInfo.setNickName(nickName);
+            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_NICKNAME, nickName);
+        }
+    }
+
+    public void setPhoneNumber(String phoneNumber, String countryCode) {
+        if (mAccountMap.containsKey(sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT))) {
+            activeUserInfo.setMobile(phoneNumber);
+            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_MOBILE, phoneNumber);
+            mAccountManager.setUserData(activeAccount, KEY_USER_COUNTRY_CODE, countryCode);
+        }
+    }
+
+    /**
+     * 更新用户性别
+     *
+     * @param sex
+     */
+    public void setUserSex(String sex) {
+        if (mAccountMap.containsKey(sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT))) {
+            activeUserInfo.setGender(sex);
+            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_GENDER, sex);
+        }
+    }
+
+    /**
+     * 更新 用户信息的地址
+     *
+     * @param location
+     */
+    public void setUserLocation(String location) {
+        if (mAccountMap.containsKey(sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT))) {
+            activeUserInfo.setLocation(location);
+            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_LOCATION, location);
+        }
+    }
+
+    /**
+     * 通过系统账号获取用户账号信息
+     *
+     * @param account 系统账号数据
+     * @return 用户账号信息
+     */
+    public CNLiveUserInfo getAccountInfo(Account account) {
+        if (account == null) return null;
+
+        CNLiveUserInfo user = new CNLiveUserInfo();
+        user.setUid(mAccountManager.getUserData(account, KEY_USER_DATA_USER_ID));
+        user.setNickName(mAccountManager.getUserData(account, KEY_USER_DATA_NICKNAME));
+        user.setFaceUrl(mAccountManager.getUserData(account, KEY_USER_DATA_FACEURL));
+        user.setBigFaceUrl(mAccountManager.getUserData(account, KEY_USER_DATA_BIGFACEURL));
+        user.setGender(mAccountManager.getUserData(account, KEY_USER_DATA_GENDER));
+        user.setMobile(mAccountManager.getUserData(account, KEY_USER_DATA_MOBILE));
+        user.setCountryCode(mAccountManager.getUserData(account, KEY_USER_COUNTRY_CODE));
+        user.setEmail(mAccountManager.getUserData(account, KEY_USER_DATA_EMAIL));
+        user.setNewUser("0".equals(mAccountManager.getUserData(account, KEY_USER_FIRST_LOGIN)));
+        user.setLocation(mAccountManager.getUserData(account, KEY_USER_DATA_LOCATION));
+        user.setToken(mAccountManager.getUserData(account, KEY_USER_TOKEN));
+        user.setUserSign(mAccountManager.getUserData(account, KEY_USER_SIGN));
+
+        user.setQqUid(mAccountManager.getUserData(account, KEY_USER_UID_QQ));
+        user.setWxUid(mAccountManager.getUserData(account, KEY_USER_UID_WECHAT));
+        user.setSinaUid(mAccountManager.getUserData(account, KEY_USER_UID_WEIBO));
+
+        AppConfig.setSid(user.getUid());
+
+        return user;
+    }
+
+    /**
+     * 获取系统账号列表
+     *
+     * @return 用户列表
+     */
+    public Account[] getUserList() {
+        return mAccountManager.getAccountsByType(mAccountType);
+    }
+
+
+    public static boolean hasAppAccount(Context context) {
+        return UserService.getInstance(context).getAppAccount() != null;
+    }
+
+    /**
+     * 更新 qqId
+     *
+     * @param qqID
+     */
+    public void setUserQQUID(String qqID) {
+        if (mAccountMap.containsKey(sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT))) {
+            activeUserInfo.setQqUid(qqID);
+            mAccountManager.setUserData(activeAccount, KEY_USER_UID_QQ, qqID);
+        }
+    }
+
+    /**
+     * 更新 weixinUID
+     *
+     * @param wxuid
+     */
+    public void setUserWXUID(String wxuid) {
+        if (mAccountMap.containsKey(sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT))) {
+            activeUserInfo.setWxUid(wxuid);
+            mAccountManager.setUserData(activeAccount, KEY_USER_UID_WECHAT, wxuid);
+        }
+    }
+
+    /**
+     * 更新 微博Uid
+     *
+     * @param wbuid
+     */
+    public void setUserWBUID(String wbuid) {
+        if (mAccountMap.containsKey(sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT))) {
+            activeUserInfo.setSinaUid(wbuid);
+            mAccountManager.setUserData(activeAccount, KEY_USER_UID_WEIBO, wbuid);
+        }
+    }
+
+}
+package com.cnlive.strike.user.auth;
+
+import android.accounts.Account;
+import android.app.Service;
+import android.content.AbstractThreadedSyncAdapter;
+import android.content.ContentProviderClient;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SyncResult;
+import android.os.Bundle;
+import android.os.IBinder;
+
+public class UserSyncService extends Service {
+
+    private static final Object syncLock = new Object();
+    private static SyncAdapter syncAdapter = null;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return syncAdapter.getSyncAdapterBinder();
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        synchronized (syncLock) {
+            if (syncAdapter == null) {
+                syncAdapter = new SyncAdapter(getApplicationContext(), true);
+            }
+        }
+    }
+
+
+    class SyncAdapter extends AbstractThreadedSyncAdapter {
+
+        public SyncAdapter(Context context, boolean autoInitialize) {
+            super(context, autoInitialize);
+        }
+
+        @Override
+        public void onPerformSync(Account account, Bundle extras, String authority, ContentProviderClient provider, SyncResult syncResult) {
+        }
+
+    }
+}
 \ No newline at end of file
+package com.cnlive.strike.user.frame.data;
+
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
+import com.cnlive.strike.user.BR;
+/**
+ * Created by xiansong on 2018/1/19.
+ */
+
+public class FirstLoginData extends BaseObservable {
+
+    private String name;
+    private String image;
+
+    @Bindable
+    public String getImage() {
+        return image;
+    }
+
+    public void setImage(String image) {
+        this.image = image;
+        super.notifyPropertyChanged(BR.image);
+    }
+
+    @Bindable
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+        super.notifyPropertyChanged(BR.name);
+    }
+}
+package com.cnlive.strike.user.frame.data;
+
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
+
+import com.cnlive.core.network.HttpConn;
+import com.cnlive.core.network.NetCallBack;
+import com.cnlive.strike.user.BR;
+
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
+/**
+ * Created by xiansong on 2018/1/2.
+ */
+@Deprecated
+public class LoginData extends BaseObservable implements NetCallBack {
+    private String name = "";
+    private String password = "";
+    private int loadVisibility = GONE;
+
+    @Bindable
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+        notifyPropertyChanged(BR.name);
+    }
+
+    @Bindable
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+        notifyPropertyChanged(BR.password);
+    }
+
+    @Bindable
+    public int getLoadVisibility() {
+        return loadVisibility;
+    }
+
+    public void setLoadVisibility(int loadVisibility) {
+        this.loadVisibility = loadVisibility;
+        notifyPropertyChanged(BR.loadVisibility);
+    }
+
+//    @Override
+//    public void onState(int state) {
+//        loadVisibility = state == Config.STATE_LOAD ? VISIBLE : GONE;
+//    }
+
+    @Override
+    public void onRequestState(int state) {
+        loadVisibility = state == HttpConn.ON_START ? VISIBLE : GONE;
+    }
+
+    @Override
+    public void onSuccess(Object data) {
+
+    }
+
+    @Override
+    public void onFailure(String errCode, String errMsg) {
+
+    }
+}
+package com.cnlive.strike.user.frame.data;
+
+import java.io.Serializable;
+
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2019/9/10
+ * <p>
+ * 简介: 三方登陆的用户信息
+ */
+public class OtherUserInfo implements Serializable {
+    // 用户昵称
+    String nickName;
+    //性别，m：男、f：女、n：未知
+    String gender;
+    //用户所在地
+    String location;
+    //头像，约100*100
+    String faceUrl;
+
+    //第三方用户ID
+    //[qq: 建议使用openid, wx: 建议使用unionid, sina: 建议使用idstr]；
+    //注意：同一用户在登录Sp下不同app时，thirdPartyId必须相同
+    String thirdPartyId;
+    //三方登陆的类型  微信: weixin   微博 :sina  qq :qq
+    String loginType;
+
+    public String getLoginType() {
+        return loginType;
+    }
+
+    public void setLoginType(String loginType) {
+        this.loginType = loginType;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public String getFaceUrl() {
+        return faceUrl;
+    }
+
+    public void setFaceUrl(String faceUrl) {
+        this.faceUrl = faceUrl;
+    }
+
+    public String getThirdPartyId() {
+        return thirdPartyId;
+    }
+
+    public void setThirdPartyId(String thirdPartyId) {
+        this.thirdPartyId = thirdPartyId;
+    }
+
+}
+package com.cnlive.strike.user.frame.data;
+
+
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
+
+import com.cnlive.core.network.HttpConn;
+import com.cnlive.core.network.NetCallBack;
+import com.cnlive.strike.user.BR;
+
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
+/**
+ * Created by xiansong on 2018/1/11.
+ */
+//implements StateCallback
+public class QuickLoginData extends BaseObservable implements NetCallBack {
+    private static final String send = "获取验证码";
+    private static final String time_format = "%s秒后重发";
+
+    private String phone = "";
+    private String code = "";
+    private String sendBtnText = send;
+    private int time;
+    private boolean sendEnabled = true;
+    private int loadVisibility = GONE;
+
+    @Bindable
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+        notifyPropertyChanged(BR.phone);
+    }
+
+    @Bindable
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+        notifyPropertyChanged(BR.code);
+    }
+
+    @Bindable
+    public int getTime() {
+        return time;
+    }
+
+    public void setTime(int time) {
+        this.time = time;
+        setSendBtnText(time <= 0 ? send : String.format(time_format, time));
+        setSendEnabled(time <= 0);
+        notifyPropertyChanged(BR.time);
+    }
+
+    @Bindable
+    public String getSendBtnText() {
+        return sendBtnText;
+    }
+
+    public void setSendBtnText(String sendBtnText) {
+        this.sendBtnText = sendBtnText;
+        notifyPropertyChanged(BR.sendBtnText);
+    }
+
+    @Bindable
+    public boolean getSendEnabled() {
+        return sendEnabled;
+    }
+
+    public void setSendEnabled(boolean sendEnabled) {
+        this.sendEnabled = sendEnabled;
+        notifyPropertyChanged(BR.sendEnabled);
+    }
+
+    @Bindable
+    public int getLoadVisibility() {
+        return loadVisibility;
+    }
+
+    public void setLoadVisibility(int loadVisibility) {
+        this.loadVisibility = loadVisibility;
+        notifyPropertyChanged(BR.loadVisibility);
+    }
+
+    @Override
+    public void onRequestState(int state) {
+        loadVisibility = state == HttpConn.ON_START ? VISIBLE : GONE;
+    }
+
+    @Override
+    public void onSuccess(Object data) {
+
+    }
+
+    @Override
+    public void onFailure(String errCode, String errMsg) {
+
+    }
+
+//    @Override
+//    public void onState(int state) {
+//    }
+}
 \ No newline at end of file
+package com.cnlive.strike.user.frame.presenter;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
+import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.HttpConn;
+import com.cnlive.core.network.NetCallBack;
+import com.cnlive.strike.user.R;
+import com.cnlive.strike.user.UserUtilAction;
+import com.cnlive.strike.user.auth.UserService;
+import com.cnlive.strike.user.frame.view.FirstLoginView;
+import com.cnlive.strike.user.network.model.UserData;
+
+import java.io.File;
+
+import io.reactivex.ObservableSource;
+import io.reactivex.functions.Function;
+
+
+/**
+ * Created by xiansong on 2018/1/19.
+ */
+
+public class FirstLoginPresenter extends BasePresenter<FirstLoginView> {
+
+    public void loadUserInfo(Context context) {
+        UserService userService = UserService.getInstance(context);
+        if (userService != null && userService.getAppAccount() != null) {
+            String sid = UserService.getUid(context);
+            String token = userService.getAppAccount().getToken();
+            HttpConn.action(
+                    UserUtilAction.queryUserInfo(context, sid, sid, token)
+                    , new NetCallBack<BaseResult<UserData>>() {
+                        @Override
+                        public void onRequestState(int state) {
+
+                        }
+
+                        @Override
+                        public void onSuccess(BaseResult<UserData> data) {
+                            userService.setUserInfo(data.getData());
+                        }
+
+                        @Override
+                        public void onFailure(String errCode, String errMsg) {
+
+                        }
+                    }
+            );
+        }
+    }
+
+    public void uploadName(Context context, String nickName) {
+        if (TextUtils.isEmpty(nickName)) {
+            if (getView() != null)
+                getView().showToast(context.getString(R.string.user_toast_edit_nickname_empty));
+            return;
+        }
+        if (nickName.trim().length() == 0) {
+            if (getView() != null)
+                getView().showToast(context.getString(R.string.user_toast_edit_nickname_only_space));
+            return;
+        }
+//        请输入昵称（不支持表情符号）
+        UserService userService = UserService.getInstance(context);
+        String sid = UserService.getUid(context);
+        String token = userService.getAppAccount().getToken();
+        HttpConn.action(
+                UserUtilAction.modifyUserInfo(context, sid, "nickName", nickName.trim().replaceAll("[\r\n]", ""), token)
+                        .concatMap(new Function<BaseResult, ObservableSource<BaseResult<UserData>>>() {
+                            @Override
+                            public ObservableSource<BaseResult<UserData>> apply(BaseResult baseResult) throws Exception {
+                                if (baseResult.isSuccess()) {
+                                    return UserUtilAction.queryUserInfo(context, sid, sid, token);
+                                }
+                                return HttpConn.error(baseResult);
+                            }
+                        })
+                , new NetCallBack<BaseResult<UserData>>() {
+                    @Override
+                    public void onRequestState(int state) {
+                        if (state == HttpConn.ON_START) {
+                            ifViewAttached(view -> view.showProgress(R.string.upload_nickname_dialog));
+                        } else if (state == HttpConn.ON_END) {
+                            ifViewAttached(view -> view.hideProgress());
+                        }
+                    }
+
+                    @Override
+                    public void onSuccess(BaseResult<UserData> data) {
+                        userService.setUserInfo(data.getData());
+
+//                        HelperUtil.modifyUserName(context, nickName);
+                        userService.setUserNickName(nickName);
+                        ifViewAttached(view -> view.showMainPage());
+                    }
+
+                    @Override
+                    public void onFailure(String errCode, String errMsg) {
+                        if ("8".equals(errCode) || "9".equals(errCode)) {
+//                        UserOfflineUtil.userInvalid(context);
+//                            HelperUtil.userInvalid(context);
+                        } else if (errCode.equals(UserUtilAction.TOKEN_ERROR_CODE)) {
+                            ifViewAttached(view -> view.showTokenErrorDialog());
+                        } else {
+                            ifViewAttached(view -> view.showToast(errMsg));
+                        }
+                    }
+                }
+        );
+    }
+
+//    public void uploadFile(Context context, String filePath) {
+//        if (updateFaceEvent != null) updateFaceEvent.cencel();
+//        if (getView() == null) return;
+//        getView().showProgress(R.string.upload_image_dialog);
+//        File file = new File(filePath);
+//        UserService userService = UserService.getInstance(context);
+//        if (file.exists()) {
+//
+//            updateFaceEvent = Logic.create()
+//                    .action(UserUtilAction.accessToken(context))
+//                    .action((BaseInfo<TokenData> data, DataCallback<BaseInfo<FaceData>> callback) -> {
+//                        UserUtilAction.updateUserFace(context, UserService.getUid(context), file, userService.getAppAccount().getToken(), data.getData().getAccess_token(), callback);
+//                        return null;
+//                    })
+//                    .<BaseInfo<FaceData>>event()
+//                    .setStateCallback(state -> {
+//                        if (getView() == null) return;
+//                        if (state == STATE_LOAD) {
+//
+//                        } else if (state == STATE_IDLE) {
+//                            getView().hideProgress();
+//                        }
+//                    })
+//                    .setFailureCallback((state, message) -> {
+//                        if (getView() == null) return;
+//                        if (state == 8 || state == 9) {
+////                            UserOfflineUtil.userInvalid(context);
+//                            HelperUtil.userInvalid(context);
+//                        } else if (state == UserUtilAction.TOKEN_ERROR_CODE) {
+//                            getView().showTokenErrorDialog();
+//                        } else {
+//                            getView().showToast(message);
+//                        }
+//                    })
+//                    .setSuccessCallback(data -> {
+//                        HelperUtil.modifyUserImage(context, data.getData().getFaceUrl());
+////                        LoginManager.modifyUserImage( UserService.getUid(context), data.getData().getFaceUrl());
+//                        userService.setUserFaceUrl(data.getData().getFaceUrl(), data.getData().getBigFaceUrl());
+//                        if (getView() == null) return;
+//                        getView().photoChange(data.getData().getFaceUrl());
+//                    })
+//                    .start();
+//        } else {
+//            if (getView() != null) getView().showToast("文件不存在");
+//        }
+//    }
+
+}
+
+package com.cnlive.strike.user.frame.presenter;
+
+import android.accounts.Account;
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
+import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.HttpConn;
+import com.cnlive.core.network.NetCallBack;
+import com.cnlive.core.libs.base.util.TimerUtil;
+import com.cnlive.strike.user.R;
+import com.cnlive.strike.user.UserUtilAction;
+import com.cnlive.strike.user.auth.UserService;
+import com.cnlive.strike.user.frame.data.OtherUserInfo;
+import com.cnlive.strike.user.frame.data.QuickLoginData;
+import com.cnlive.strike.user.frame.view.QuickLoginView;
+import com.cnlive.strike.user.model.CNLiveUserInfo;
+import com.cnlive.strike.user.router.user.UserAction;
+import com.cnlive.strike.user.ui.activity.FirstLoginActivity;
+import com.cnlive.strike.user.ui.fragment.QuickLoginFragment;
+import com.cnlive.strike.user.util.RegexUtils;
+import com.cnlive.strike.user.util.TimeEvent;
+import com.hannesdorfmann.mosby3.mvp.MvpActivity;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import io.reactivex.disposables.Disposable;
+
+
+/**
+ * @author Lynn
+ * @date 2017/12/22
+ */
+
+public class QuickLoginPresenter extends BasePresenter<QuickLoginView> {
+    private TimerUtil timerUtil; //计时工具类
+
+    //    private Event<CNLiveUserInfo> event;
+    private Disposable sendMsgBefQuickLogin;
+//    private Event otherEvent;
+
+    public void deleteUserInfo(Context context, String userName) {
+        UserService.getInstance(context).removeUser(userName, future -> {
+            if (getView() == null) return;
+            //获取已登录用户列表
+            Account[] accounts = UserService.getInstance(context).getUserList();
+            //倒序输出最近登录用户
+
+            Collections.reverse(Arrays.asList(accounts));
+            getView().uploadListData(accounts);
+        });
+    }
+
+    public void init(Context context) {
+        if (getView() == null) return;
+        UserService us = UserService.getInstance(context);
+        //获取已登录用户列表
+        Account[] accounts = us.getUserList();
+        //倒序输出最近登录用户
+        Collections.reverse(Arrays.asList(accounts));
+        //获取最近登录用户数据
+        Account account = accounts.length > 0 ? accounts[0] : null;
+        String name = account == null ? "" : account.name;
+        //页面填充数据
+        if (!TextUtils.isEmpty(name)) {
+            getView().uploadInputData(name);
+        }
+        if (null != accounts) {
+            getView().uploadListData(accounts);
+        }
+    }
+
+    private void startTimer() {
+        if (timerUtil != null) timerUtil.cancel();
+
+        timerUtil = new TimerUtil();
+        timerUtil.setTotalTime(60_000);//设置毫秒数
+        timerUtil.setIntervalTime(500);//设置间隔数
+        timerUtil.start();
+        timerUtil.setTimerLiener(new TimerUtil.TimeListener() {
+            @Override
+            public void onFinish() {
+                if (getView() != null) getView().onTimerFinish();
+            }
+
+            @Override
+            public void onInterval(long remainTime) {
+                if (getView() != null) getView().onTimerInterval(remainTime / 1000);
+            }
+        });
+    }
+
+    public void sendCode(Context context, String phone, String countryCode) {
+        if (getView() == null) return;
+        if (TimeEvent.debounce(2_000)) return;
+        if (TextUtils.isEmpty(phone)) {
+            getView().showToast(context.getString(R.string.user_toast_quick_login_empty_phone));
+            return;
+        }
+        if ("86".equals(countryCode) && !RegexUtils.isMobileSimple(phone)) {
+            getView().showToast(context.getString(R.string.user_toast_quick_login_error_phone));
+            return;
+        }
+        if (sendMsgBefQuickLogin != null && !sendMsgBefQuickLogin.isDisposed()) {
+            getView().showToast("处理中请稍后...");
+        } else {
+            sendMsgBefQuickLogin = HttpConn.action(UserUtilAction.sendMsgBefQuickLoginAction(context, phone, countryCode), new NetCallBack<BaseResult>() {
+                @Override
+                public void onRequestState(int state) {
+
+                }
+
+                @Override
+                public void onSuccess(BaseResult data) {
+                    startTimer();
+                    ifViewAttached(view -> view.showToast("验证码已发送"));
+                }
+
+                @Override
+                public void onFailure(String errCode, String errMsg) {
+                    ifViewAttached(view -> view.showToast(errMsg));
+
+                }
+            });
+        }
+    }
+
+    public void login(QuickLoginFragment context, QuickLoginData data, String countryCode) {
+        if (TextUtils.isEmpty(data.getPhone())) {
+            ifViewAttached(view -> view.showToast(context.getString(R.string.user_toast_quick_login_empty_phone)));
+        } else if (TextUtils.isEmpty(data.getCode())) {
+            ifViewAttached(view -> view.showToast(context.getString(R.string.user_toast_quick_login_empty_code)));
+        } else {
+            context.isLogin = true;
+//            UserAction.mobileLogin(context.getActivity(), data.getPhone(), data.getCode(), countryCode, initLoginEvent(context, true));
+            UserAction.mobileLogin(context.getActivity(), data.getPhone(), data.getCode(), countryCode, new UserAction.CallBack() {
+                @Override
+                public void callback(int state, String msg, Object object) {
+                    initLoginEvent(context, state, msg, true, null);
+                }
+            });
+
+        }
+    }
+
+    private void initLoginEvent(QuickLoginFragment context, int state, String msg, Boolean retry, OtherUserInfo otherUserInfo) {
+        switch (state) {
+            //请求成功
+            case 0:
+                CNLiveUserInfo user = UserService.getInstance(context.getActivity()).getAppAccount();
+                if (user == null || (user != null && TextUtils.isEmpty(user.getToken()))) {
+                    ifViewAttached(view -> view.showToast("用户登陆失败,再试一次吧."));
+                } else if (user.isNewUser()) {
+                    //是新用户
+                    //TODO 必须设置用户头像
+                    //OpenInstall用户注册统计
+//                        OpenInstall.reportRegister();
+                    //友盟账号登录统计,暂时只有平台登录，后续对接三方登录
+//                        MobclickAgent.onProfileSignIn("CNLive", user.getUid());
+                    //三方登陆不需要重新设置头像  otherUserInfo不为空表示三方登陆
+                    if (otherUserInfo != null) {
+                        ifViewAttached(view -> view.showMainView(true, true));
+                    } else {
+                        ifViewAttached(view -> view.showEditView(false));
+                    }
+                } else {
+                    //友盟账号登录统计,暂时只有平台登录，后续对接三方登录
+//                        MobclickAgent.onProfileSignIn("CNLive", user.getUid());
+//                    ifViewAttached(view -> view.showMainView(false, false));
+                    //todo 测试首次用户
+                    ifViewAttached(view -> view.showEditView(false));
+                }
+                AppConfig.setCountryCode("");
+                AppConfig.setVerificationCode("");
+                AppConfig.setUserPhone("");
+                context.hasLogin = true;
+                if (context != null) {
+                    context.isLogin = false;
+                }
+                break;
+            case HttpConn.ON_START:
+                ifViewAttached(view -> view.showProgress());
+                break;
+            case HttpConn.ON_END:
+                ifViewAttached(view -> view.hideProgress());
+                break;
+            case 41010: //手机号无效
+                ifViewAttached(view -> view.showToast(msg));
+                break;
+            case 41002: //验证码为6位数字
+                ifViewAttached(view -> view.showToast(msg));
+                break;
+            case 41009: //验证码错误
+                ifViewAttached(view -> view.showToast(msg));
+                break;
+            case 41006: //手机号已存在
+                ifViewAttached(view -> view.showToast(msg));
+                break;
+            case 42013: //此帐号未注册,请先注册
+                ifViewAttached(view -> view.bindPhone(otherUserInfo));
+                break;
+            case 6208:  //当前用户在其他地点登陆
+                if (retry) {
+                    if (otherUserInfo == null) {
+                        UserAction.mobileLogin(context.getActivity(), context.data.getPhone(), context.data.getCode(), "", new UserAction.CallBack() {
+                            @Override
+                            public void callback(int state, String msg, Object object) {
+                                initLoginEvent(context, state, msg, false, null);
+                            }
+                        });
+                    }
+                    return;
+                } else {
+                    ifViewAttached(view -> view.showToast("用户登录失败,再试一次吧."));
+                }
+                break;
+            default: //其他错误
+                ifViewAttached(view -> view.showToast(msg));
+                break;
+        }
+    }
+
+//    private void initLoginEvent(QuickLoginFragment context, Boolean retry) {
+//        return initLoginEvent(context, retry, null);
+//    }
+
+
+//
+//    private Event<CNLiveUserInfo> initLoginEvent(QuickLoginFragment context, Boolean retry, OtherUserInfo otherUserInfo) {
+//        return event = new Event<CNLiveUserInfo>()
+//                .setStateCallback(state -> {
+//                    if (state == Config.STATE_LOAD) getView().showProgress();
+//                    else getView().hideProgress();
+//                }).setFailureCallback((state, message) -> {
+//                    if (context == null) return;
+//                    if (getView() == null) return;
+//                    switch (state) {
+//                        case 41010: //手机号无效
+//                            getView().showToast(message);
+//                            break;
+//                        case 41002: //验证码为6位数字
+//                            getView().showToast(message);
+//                            break;
+//                        case 41009: //验证码错误
+//                            getView().showToast(message);
+//                            break;
+//                        case 41006: //手机号已存在
+//                            getView().showToast(message);
+//                            break;
+//                        case 42013: //此帐号未注册,请先注册
+//                            getView().bindPhone(otherUserInfo);
+//                            break;
+//                        case 6208:  //当前用户在其他地点登陆
+//                            if (retry) {
+//                                if (otherUserInfo == null) {
+//                                    UserAction.mobileLogin(context.getActivity(), context.data.getPhone(), context.data.getCode(), "", initLoginEvent(context, false));
+//                                }
+//                                return;
+//                            } else getView().showToast("用户登录失败,再试一次吧.");
+//                            break;
+//                        default: //其他错误
+//                            getView().showToast(message);
+//                            break;
+//                    }
+//                    context.hasLogin = false;
+//                    if (context != null) context.isLogin = false;
+//                }).setSuccessCallback((info) -> {
+//                    if (context == null) return;
+//                    if (getView() == null) return;
+//                    CNLiveUserInfo user = UserService.getInstance(context.getActivity()).getAppAccount();
+//                    if (user == null || (user != null && TextUtils.isEmpty(user.getToken()))) {
+//                        getView().showToast("用户登陆失败,再试一次吧.");
+//                    } else if (user.isNewUser()) {
+//                        //是新用户
+//                        //TODO 必须设置用户头像
+//                        //OpenInstall用户注册统计
+////                        OpenInstall.reportRegister();
+//                        //友盟账号登录统计,暂时只有平台登录，后续对接三方登录
+////                        MobclickAgent.onProfileSignIn("CNLive", user.getUid());
+//                        //三方登陆不需要重新设置头像  otherUserInfo不为空表示三方登陆
+//                        if (otherUserInfo != null) {
+//                            getView().showMainView(true, true);
+//                        } else {
+//                            getView().showEditView(false);
+//                        }
+//
+//                    } else {
+//                        //友盟账号登录统计,暂时只有平台登录，后续对接三方登录
+////                        MobclickAgent.onProfileSignIn("CNLive", user.getUid());
+//                        getView().showMainView(false, false);
+//                    }
+//                    AppConfig.setCountryCode("");
+//                    AppConfig.setVerificationCode("");
+//                    AppConfig.setUserPhone("");
+//                    context.hasLogin = true;
+//                    if (context != null) context.isLogin = false;
+//                }).setCancelCallback(() -> {
+//                    //取消操作可能被触发多次 ,根据页面逻辑选择使用
+//                    context.hasLogin = false;
+//                    if (context != null) context.isLogin = false;
+//                });
+//    }
+
+}
+package com.cnlive.strike.user.frame.presenter;
+
+import com.cnlive.core.libs.base.frame.activity.BaseActivity;
+import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
+import com.cnlive.strike.user.frame.view.SelectCountryView;
+import com.cnlive.strike.user.model.CountryData;
+import com.cnlive.strike.user.ui.activity.SelectCountryActivity;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+import io.reactivex.Observable;
+import io.reactivex.ObservableEmitter;
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.Observer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
+
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2018/11/17
+ * <p>
+ * 简介:
+ */
+public class SelectCountryPresenter extends BasePresenter<SelectCountryView> {
+    public void processData(SelectCountryActivity countryActivity, String countryCode) {
+
+
+        Observable.create(new ObservableOnSubscribe<List<CountryData>>() {
+            @Override
+            public void subscribe(ObservableEmitter<List<CountryData>> emitter) throws Exception {
+                String country = "[{\"contryName\":\"阿尔巴尼亚\",\"contryCode\":\"355\"},{\"contryName\":\"阿尔及利亚\",\"contryCode\":\"213\"},{\"contryName\":\"阿富汗\",\"contryCode\":\"93\"},{\"contryName\":\"阿根廷\",\"contryCode\":\"54\"},{\"contryName\":\"阿拉伯联合酋长国\",\"contryCode\":\"971\"},{\"contryName\":\"阿鲁巴\",\"contryCode\":\"297\"},{\"contryName\":\"阿曼\",\"contryCode\":\"968\"},{\"contryName\":\"阿塞拜疆\",\"contryCode\":\"994\"},{\"contryName\":\"埃及\",\"contryCode\":\"20\"},{\"contryName\":\"埃塞俄比亚\",\"contryCode\":\"251\"},{\"contryName\":\"爱尔兰\",\"contryCode\":\"353\"},{\"contryName\":\"爱沙尼亚\",\"contryCode\":\"372\"},{\"contryName\":\"安道尔\",\"contryCode\":\"376\"},{\"contryName\":\"安哥拉\",\"contryCode\":\"244\"},{\"contryName\":\"安圭拉\",\"contryCode\":\"1264\"},{\"contryName\":\"安提瓜和巴布达\",\"contryCode\":\"1268\"},{\"contryName\":\"奥地利\",\"contryCode\":\"43\"},{\"contryName\":\"澳大利亚\",\"contryCode\":\"61\"},{\"contryName\":\"巴巴多斯\",\"contryCode\":\"1246\"},{\"contryName\":\"巴布亚新几内亚\",\"contryCode\":\"675\"},{\"contryName\":\"巴哈马\",\"contryCode\":\"1242\"},{\"contryName\":\"巴基斯坦\",\"contryCode\":\"92\"},{\"contryName\":\"巴拉圭\",\"contryCode\":\"595\"},{\"contryName\":\"巴林\",\"contryCode\":\"973\"},{\"contryName\":\"巴拿马\",\"contryCode\":\"507\"},{\"contryName\":\"巴西\",\"contryCode\":\"55\"},{\"contryName\":\"白俄罗斯\",\"contryCode\":\"375\"},{\"contryName\":\"百慕大群岛\",\"contryCode\":\"1441\"},{\"contryName\":\"保加利亚\",\"contryCode\":\"359\"},{\"contryName\":\"贝宁\",\"contryCode\":\"229\"},{\"contryName\":\"比利时\",\"contryCode\":\"32\"},{\"contryName\":\"冰岛\",\"contryCode\":\"354\"},{\"contryName\":\"波多黎各\",\"contryCode\":\"1787\"},{\"contryName\":\"波兰\",\"contryCode\":\"48\"},{\"contryName\":\"波斯尼亚和黑塞哥维那\",\"contryCode\":\"387\"},{\"contryName\":\"玻利维亚\",\"contryCode\":\"591\"},{\"contryName\":\"伯利兹\",\"contryCode\":\"501\"},{\"contryName\":\"博茨瓦纳\",\"contryCode\":\"267\"},{\"contryName\":\"不丹\",\"contryCode\":\"975\"},{\"contryName\":\"布基纳法索\",\"contryCode\":\"226\"},{\"contryName\":\"布隆迪\",\"contryCode\":\"257\"},{\"contryName\":\"朝鲜\",\"contryCode\":\"850\"},{\"contryName\":\"赤道几内亚\",\"contryCode\":\"240\"},{\"contryName\":\"丹麦\",\"contryCode\":\"45\"},{\"contryName\":\"德国\",\"contryCode\":\"49\"},{\"contryName\":\"东帝汶\",\"contryCode\":\"670\"},{\"contryName\":\"多哥\",\"contryCode\":\"228\"},{\"contryName\":\"多米尼加\",\"contryCode\":\"1767\"},{\"contryName\":\"多米尼加共和国\",\"contryCode\":\"1809\"},{\"contryName\":\"俄罗斯\",\"contryCode\":\"7\"},{\"contryName\":\"厄瓜多尔\",\"contryCode\":\"593\"},{\"contryName\":\"厄立特里亚\",\"contryCode\":\"291\"},{\"contryName\":\"法国\",\"contryCode\":\"33\"},{\"contryName\":\"法罗群岛\",\"contryCode\":\"298\"},{\"contryName\":\"法属波利尼西亚\",\"contryCode\":\"689\"},{\"contryName\":\"法属圭亚那\",\"contryCode\":\"594\"},{\"contryName\":\"菲律宾\",\"contryCode\":\"63\"},{\"contryName\":\"斐济\",\"contryCode\":\"679\"},{\"contryName\":\"芬兰\",\"contryCode\":\"358\"},{\"contryName\":\"冈比亚\",\"contryCode\":\"220\"},{\"contryName\":\"刚果共和国\",\"contryCode\":\"242\"},{\"contryName\":\"刚果民主共和国\",\"contryCode\":\"243\"},{\"contryName\":\"哥伦比亚\",\"contryCode\":\"57\"},{\"contryName\":\"哥斯达黎加\",\"contryCode\":\"506\"},{\"contryName\":\"格林纳达\",\"contryCode\":\"1473\"},{\"contryName\":\"格陵兰岛\",\"contryCode\":\"299\"},{\"contryName\":\"格鲁吉亚\",\"contryCode\":\"995\"},{\"contryName\":\"古巴\",\"contryCode\":\"53\"},{\"contryName\":\"瓜德罗普岛\",\"contryCode\":\"590\"},{\"contryName\":\"瓜地马拉\",\"contryCode\":\"502\"},{\"contryName\":\"关岛\",\"contryCode\":\"1671\"},{\"contryName\":\"圭亚那\",\"contryCode\":\"592\"},{\"contryName\":\"哈萨克斯坦\",\"contryCode\":\"7\"},{\"contryName\":\"海地\",\"contryCode\":\"509\"},{\"contryName\":\"韩国\",\"contryCode\":\"82\"},{\"contryName\":\"荷兰\",\"contryCode\":\"31\"},{\"contryName\":\"荷兰加勒比\",\"contryCode\":\"599\"},{\"contryName\":\"黑山\",\"contryCode\":\"382\"},{\"contryName\":\"洪都拉斯\",\"contryCode\":\"504\"},{\"contryName\":\"基里巴斯\",\"contryCode\":\"686\"},{\"contryName\":\"吉布提\",\"contryCode\":\"253\"},{\"contryName\":\"吉尔吉斯斯坦\",\"contryCode\":\"996\"},{\"contryName\":\"几内亚\",\"contryCode\":\"224\"},{\"contryName\":\"几内亚比绍共和国\",\"contryCode\":\"245\"},{\"contryName\":\"加拿大\",\"contryCode\":\"1\"},{\"contryName\":\"加纳\",\"contryCode\":\"233\"},{\"contryName\":\"加蓬\",\"contryCode\":\"241\"},{\"contryName\":\"柬埔寨\",\"contryCode\":\"855\"},{\"contryName\":\"捷克\",\"contryCode\":\"420\"},{\"contryName\":\"津巴布韦\",\"contryCode\":\"263\"},{\"contryName\":\"喀麦隆\",\"contryCode\":\"237\"},{\"contryName\":\"卡塔尔\",\"contryCode\":\"974\"},{\"contryName\":\"开曼群岛\",\"contryCode\":\"1345\"},{\"contryName\":\"开普\",\"contryCode\":\"238\"},{\"contryName\":\"科摩罗\",\"contryCode\":\"269\"},{\"contryName\":\"科威特\",\"contryCode\":\"965\"},{\"contryName\":\"克罗地亚\",\"contryCode\":\"385\"},{\"contryName\":\"肯尼亚\",\"contryCode\":\"254\"},{\"contryName\":\"库克群岛\",\"contryCode\":\"682\"},{\"contryName\":\"库拉索\",\"contryCode\":\"599\"},{\"contryName\":\"拉脱维亚\",\"contryCode\":\"371\"},{\"contryName\":\"莱索托\",\"contryCode\":\"266\"},{\"contryName\":\"老挝\",\"contryCode\":\"856\"},{\"contryName\":\"黎巴嫩\",\"contryCode\":\"961\"},{\"contryName\":\"立陶宛\",\"contryCode\":\"370\"},{\"contryName\":\"利比里亚\",\"contryCode\":\"231\"},{\"contryName\":\"利比亚\",\"contryCode\":\"218\"},{\"contryName\":\"列支敦士登\",\"contryCode\":\"423\"},{\"contryName\":\"留尼汪\",\"contryCode\":\"262\"},{\"contryName\":\"卢森堡\",\"contryCode\":\"352\"},{\"contryName\":\"卢旺达\",\"contryCode\":\"250\"},{\"contryName\":\"罗马尼亚\",\"contryCode\":\"40\"},{\"contryName\":\"马达加斯加\",\"contryCode\":\"261\"},{\"contryName\":\"马尔代夫\",\"contryCode\":\"960\"},{\"contryName\":\"马耳他\",\"contryCode\":\"356\"},{\"contryName\":\"马拉维\",\"contryCode\":\"265\"},{\"contryName\":\"马来西亚\",\"contryCode\":\"60\"},{\"contryName\":\"马里\",\"contryCode\":\"223\"},{\"contryName\":\"马其顿\",\"contryCode\":\"389\"},{\"contryName\":\"马绍尔群岛\",\"contryCode\":\"692\"},{\"contryName\":\"马约特\",\"contryCode\":\"269\"},{\"contryName\":\"毛里求斯\",\"contryCode\":\"230\"},{\"contryName\":\"毛里塔尼亚\",\"contryCode\":\"222\"},{\"contryName\":\"美国\",\"contryCode\":\"1\"},{\"contryName\":\"美属萨摩亚\",\"contryCode\":\"1684\"},{\"contryName\":\"蒙古\",\"contryCode\":\"976\"},{\"contryName\":\"蒙特塞拉特岛\",\"contryCode\":\"1664\"},{\"contryName\":\"孟加拉国\",\"contryCode\":\"880\"},{\"contryName\":\"秘鲁\",\"contryCode\":\"51\"},{\"contryName\":\"密克罗尼西亚\",\"contryCode\":\"691\"},{\"contryName\":\"缅甸\",\"contryCode\":\"95\"},{\"contryName\":\"摩尔多瓦\",\"contryCode\":\"373\"},{\"contryName\":\"摩洛哥\",\"contryCode\":\"212\"},{\"contryName\":\"摩纳哥\",\"contryCode\":\"377\"},{\"contryName\":\"莫桑比克\",\"contryCode\":\"258\"},{\"contryName\":\"墨西哥\",\"contryCode\":\"52\"},{\"contryName\":\"拿鲁岛\",\"contryCode\":\"674\"},{\"contryName\":\"纳米比亚\",\"contryCode\":\"264\"},{\"contryName\":\"南非\",\"contryCode\":\"27\"},{\"contryName\":\"尼泊尔\",\"contryCode\":\"977\"},{\"contryName\":\"尼加拉瓜\",\"contryCode\":\"505\"},{\"contryName\":\"尼日尔\",\"contryCode\":\"227\"},{\"contryName\":\"尼日利亚\",\"contryCode\":\"234\"},{\"contryName\":\"挪威\",\"contryCode\":\"47\"},{\"contryName\":\"帕劳\",\"contryCode\":\"680\"},{\"contryName\":\"葡萄牙\",\"contryCode\":\"351\"},{\"contryName\":\"日本\",\"contryCode\":\"81\"},{\"contryName\":\"瑞典\",\"contryCode\":\"46\"},{\"contryName\":\"瑞士\",\"contryCode\":\"41\"},{\"contryName\":\"萨尔瓦多\",\"contryCode\":\"503\"},{\"contryName\":\"萨摩亚\",\"contryCode\":\"685\"},{\"contryName\":\"塞尔维亚\",\"contryCode\":\"381\"},{\"contryName\":\"塞拉利昂\",\"contryCode\":\"232\"},{\"contryName\":\"塞内加尔\",\"contryCode\":\"221\"},{\"contryName\":\"塞浦路斯\",\"contryCode\":\"357\"},{\"contryName\":\"塞舌尔\",\"contryCode\":\"248\"},{\"contryName\":\"沙特阿拉伯\",\"contryCode\":\"966\"},{\"contryName\":\"圣彼埃尔和密克隆岛\",\"contryCode\":\"508\"},{\"contryName\":\"圣多美和普林西比\",\"contryCode\":\"239\"},{\"contryName\":\"圣基茨和尼维斯\",\"contryCode\":\"1869\"},{\"contryName\":\"圣露西亚\",\"contryCode\":\"1758\"},{\"contryName\":\"圣马力诺\",\"contryCode\":\"378\"},{\"contryName\":\"圣文森特和格林纳丁斯\",\"contryCode\":\"1784\"},{\"contryName\":\"斯里兰卡\",\"contryCode\":\"94\"},{\"contryName\":\"斯洛伐克\",\"contryCode\":\"421\"},{\"contryName\":\"斯洛文尼亚\",\"contryCode\":\"386\"},{\"contryName\":\"斯威士兰\",\"contryCode\":\"268\"},{\"contryName\":\"苏丹\",\"contryCode\":\"249\"},{\"contryName\":\"苏里南\",\"contryCode\":\"597\"},{\"contryName\":\"所罗门群岛\",\"contryCode\":\"677\"},{\"contryName\":\"索马里\",\"contryCode\":\"252\"},{\"contryName\":\"塔吉克斯坦\",\"contryCode\":\"992\"},{\"contryName\":\"泰国\",\"contryCode\":\"66\"},{\"contryName\":\"坦桑尼亚\",\"contryCode\":\"255\"},{\"contryName\":\"汤加\",\"contryCode\":\"676\"},{\"contryName\":\"特克斯和凯科斯群岛\",\"contryCode\":\"1649\"},{\"contryName\":\"特立尼达和多巴哥\",\"contryCode\":\"1868\"},{\"contryName\":\"突尼斯\",\"contryCode\":\"216\"},{\"contryName\":\"土耳其\",\"contryCode\":\"90\"},{\"contryName\":\"土库曼斯坦\",\"contryCode\":\"993\"},{\"contryName\":\"瓦努阿图\",\"contryCode\":\"678\"},{\"contryName\":\"委内瑞拉\",\"contryCode\":\"58\"},{\"contryName\":\"文莱\",\"contryCode\":\"673\"},{\"contryName\":\"乌干达\",\"contryCode\":\"256\"},{\"contryName\":\"乌克兰\",\"contryCode\":\"380\"},{\"contryName\":\"乌拉圭\",\"contryCode\":\"598\"},{\"contryName\":\"乌兹别克斯坦\",\"contryCode\":\"998\"},{\"contryName\":\"西班牙\",\"contryCode\":\"34\"},{\"contryName\":\"希腊\",\"contryCode\":\"30\"},{\"contryName\":\"象牙海岸\",\"contryCode\":\"225\"},{\"contryName\":\"新加坡\",\"contryCode\":\"65\"},{\"contryName\":\"新喀里多尼亚\",\"contryCode\":\"687\"},{\"contryName\":\"新西兰\",\"contryCode\":\"64\"},{\"contryName\":\"匈牙利\",\"contryCode\":\"36\"},{\"contryName\":\"叙利亚\",\"contryCode\":\"963\"},{\"contryName\":\"牙买加\",\"contryCode\":\"1876\"},{\"contryName\":\"亚美尼亚\",\"contryCode\":\"374\"},{\"contryName\":\"也门\",\"contryCode\":\"967\"},{\"contryName\":\"伊拉克\",\"contryCode\":\"964\"},{\"contryName\":\"伊朗\",\"contryCode\":\"98\"},{\"contryName\":\"以色列\",\"contryCode\":\"972\"},{\"contryName\":\"意大利\",\"contryCode\":\"39\"},{\"contryName\":\"印度\",\"contryCode\":\"91\"},{\"contryName\":\"印度尼西亚\",\"contryCode\":\"62\"},{\"contryName\":\"英国\",\"contryCode\":\"44\"},{\"contryName\":\"英属处女群岛\",\"contryCode\":\"1284\"},{\"contryName\":\"约旦\",\"contryCode\":\"962\"},{\"contryName\":\"越南\",\"contryCode\":\"84\"},{\"contryName\":\"赞比亚\",\"contryCode\":\"260\"},{\"contryName\":\"乍得\",\"contryCode\":\"235\"},{\"contryName\":\"直布罗陀\",\"contryCode\":\"350\"},{\"contryName\":\"智利\",\"contryCode\":\"56\"},{\"contryName\":\"中非共和国\",\"contryCode\":\"236\"},{\"contryName\":\"中国(澳门)\",\"contryCode\":\"853\"},{\"contryName\":\"中国(台湾)\",\"contryCode\":\"886\"},{\"contryName\":\"中国(香港)\",\"contryCode\":\"852\"},{\"contryName\":\"中国\",\"contryCode\":\"86\"}]";
+
+                Gson gson = new Gson();
+                Type type = new TypeToken<List<CountryData>>() {
+                }.getType();
+                List<CountryData> countryDataList = gson.fromJson(country, type);
+                countryDataList.size();
+                //处理数据 设置Letter
+                for (CountryData countryData : countryDataList) {
+                    countryData.setLetterContent(countryData.getContryName());
+                }
+                //处理数据
+                String letter = "";
+                List<CountryData> newList = new ArrayList<>();
+                for (CountryData data : countryDataList) {
+                    if (!letter.equals(data.getLetter().substring(0, 1))) {
+                        letter = data.getLetter().substring(0, 1);
+                        CountryData newBean = new CountryData();
+                        newBean.setLetter(letter);
+                        newBean.setType(CountryData.TYPE_CATGORY);
+                        newList.add(newBean);
+                        countryActivity.contactLetterGuideMap.put(letter, newList.size());
+                    }
+
+                    data.setType(CountryData.TYPE_COUNTRY);
+                    newList.add(data);
+                    if (countryCode.equals(data.getContryCode())) {
+                        data.setSelect(true);
+                        countryActivity.fistPosition = newList.indexOf(data);
+                    } else {
+                        data.setSelect(false);
+                    }
+                }
+                if (emitter != null && newList != null) {
+                    emitter.onNext(newList);
+                }
+            }
+        }).subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<List<CountryData>>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+
+            }
+
+            @Override
+            public void onNext(List<CountryData> countryData) {
+                ifViewAttached(view -> view.showView(countryData));
+            }
+
+            @Override
+            public void onError(Throwable e) {
+
+            }
+
+            @Override
+            public void onComplete() {
+
+            }
+        });
+    }
+}
+package com.cnlive.strike.user.frame.view;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.text.TextUtils;
+
+import com.cnlive.core.libs.base.frame.view.BaseView;
+import com.cnlive.core.libs.base.util.AlertUtil;
+import com.cnlive.core.libs.base.util.GlideUtil;
+import com.cnlive.strike.user.R;
+import com.cnlive.strike.user.model.LoginSuccessInfo;
+import com.cnlive.strike.user.model.msg.UserEventMsg;
+import com.cnlive.strike.user.ui.activity.FirstLoginActivity;
+import com.cnlive.strike.user.ui.fragment.FirstLoginFragment;
+import com.cnlive.strike.user.ui.widget.TokenErrorDialog;
+
+import org.greenrobot.eventbus.EventBus;
+
+/**
+ * Created by xiansong on 2018/1/19.
+ */
+
+public class FirstLoginView extends BaseView {
+    private FirstLoginFragment fragment;
+
+    public FirstLoginView(FirstLoginFragment fragment) {
+        this.fragment = fragment;
+    }
+
+    private Activity getContext() {
+        return fragment.getActivity();
+    }
+
+    public void showToast(String msg) {
+        if (getContext() == null) return;
+        Context context = getContext();
+        AlertUtil.showDeftToast(context, msg);
+    }
+
+    public void showProgress(int stringId) {
+        if (!fragment.mProgressDialog.isShowing()) {
+            String tag = getContext().getString(stringId);
+            fragment.mProgressDialog.setMessage(tag);
+            fragment.mProgressDialog.show();
+        }
+    }
+
+    public void hideProgress() {
+        if (fragment.mProgressDialog.isShowing()) fragment.mProgressDialog.dismiss();
+    }
+
+    public void photoChange(String faceUrl) {
+        if (getContext() == null) return;
+        GlideUtil.init(fragment, faceUrl).error(R.drawable.touxiang_circle).circleCrop().into(fragment.binding.ivUserIcon);
+    }
+
+    public void showMainPage() {
+        if (getContext() == null) return;
+        //设置跳转信息
+        LoginSuccessInfo successInfo = new LoginSuccessInfo();
+        successInfo.setClickAd(fragment.clickAd);
+        successInfo.setTagMsg(fragment.tagMsg);
+        EventBus.getDefault().post(new UserEventMsg(UserEventMsg.LOGIN_SUCCESS, successInfo));
+
+
+
+//        Intent intent = new Intent(getContext(), MainTestActivity.class);
+//        if (!TextUtils.isEmpty(fragment.tagMsg))
+//            intent.putExtra("classifyTagMsg", fragment.tagMsg);
+//
+//        intent.putExtra(FirstLoginActivity.TAG_CLICK_AD, fragment.clickAd);
+//        getContext().startActivity(intent);
+//        getContext().finish();
+    }
+
+    public void showTokenErrorDialog() {
+        if (fragment.tokenErrorDialog != null)
+            fragment.tokenErrorDialog.dismiss();
+        fragment.tokenErrorDialog = TokenErrorDialog.showTokenErrorDialog(fragment.getActivity());
+    }
+
+
+}
+package com.cnlive.strike.user.frame.view;
+
+import android.accounts.Account;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.text.Editable;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.text.style.ForegroundColorSpan;
+import android.view.View;
+
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.libs.base.frame.view.BaseView;
+import com.cnlive.core.libs.base.util.AlertUtil;
+import com.cnlive.core.libs.base.util.DoublePressed;
+import com.cnlive.strike.user.R;
+import com.cnlive.strike.user.frame.data.OtherUserInfo;
+import com.cnlive.strike.user.model.LoginSuccessInfo;
+import com.cnlive.strike.user.sms.OnSmsCatchListener;
+import com.cnlive.strike.user.sms.SmsVerifyCatcher;
+import com.cnlive.strike.user.ui.activity.FirstLoginActivity;
+import com.cnlive.strike.user.ui.activity.LoginActivity;
+import com.cnlive.strike.user.ui.fragment.QuickLoginFragment;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author Lynn
+ * @date 2017/12/22
+ */
+
+public class QuickLoginView extends BaseView {
+
+    private QuickLoginFragment fragment;
+
+    public QuickLoginView(QuickLoginFragment fragment) {
+        this.fragment = fragment;
+    }
+
+    public Activity getContext() {
+        return fragment.getActivity();
+    }
+
+    /**
+     * 更新用户信息点击事件
+     */
+    public void onUploadLoginUser(String name) {
+        uploadInputData(name);
+    }
+
+
+    /**
+     * 删除用户记录
+     */
+    public void onDeleteLoginUser(String name) {
+        fragment.getPresenter().deleteUserInfo(getContext(), name);
+    }
+
+    //更新输入信息
+    public void uploadInputData(String phone) {
+        fragment.data.setPhone(phone);
+        if (!TextUtils.isEmpty(phone)) {
+            fragment.binding.ivDelete.setVisibility(View.VISIBLE);
+        }
+        fragment.data.setCode("");
+        //通过DataBinding更新文字后无法立即设置光标位置
+        if (!TextUtils.isEmpty(phone)) {
+            fragment.binding.userName.setText(phone);
+            fragment.binding.userName.setSelection(phone.length());
+        }
+        String contryCode = AppConfig.getCountryCode();
+        //设置区号
+//        CNLiveUserInfo userInfo = UserService.getInstance(fragment.getActivity()).getAppAccount();
+        if (!TextUtils.isEmpty(contryCode)) {
+            fragment.binding.tvCountry.setText("+ " + contryCode);
+        } else {
+            fragment.binding.tvCountry.setText("+ " + "86");
+        }
+        String contryName = AppConfig.getCountryName();
+        if (TextUtils.isEmpty(contryName)) {
+            fragment.binding.tvCountryName.setText("中国");
+        } else {
+            fragment.binding.tvCountryName.setText(contryName);
+        }
+
+
+    }
+
+    public void uploadInputData(String phone, String countryCode, String verficatinCode) {
+        fragment.data.setPhone(phone);
+        if (!TextUtils.isEmpty(phone)) {
+            fragment.binding.ivDelete.setVisibility(View.VISIBLE);
+        }
+//        fragment.data.setCode(TextUtils.isEmpty(verficatinCode) ? "" : verficatinCode);
+        //通过DataBinding更新文字后无法立即设置光标位置
+        if (!TextUtils.isEmpty(phone)) {
+            fragment.binding.userName.setText(phone);
+            fragment.binding.userName.setSelection(phone.length());
+        }
+
+        //设置区号
+//        CNLiveUserInfo userInfo = UserService.getInstance(fragment.getActivity()).getAppAccount();
+//        if (userInfo != null && !TextUtils.isEmpty(userInfo.getCountryCode())) {
+//            fragment.rootBinding.tvCountry.setText("+ " + userInfo.getCountryCode());
+//        } else {
+//            fragment.rootBinding.tvCountry.setText("+ " + "86");
+//        }
+        fragment.binding.tvCountry.setText("+ ".concat(TextUtils.isEmpty(countryCode) ? "86" : countryCode));
+
+    }
+
+    public void initView() {
+        if (fragment == null) return;
+        fragment.smsVerifyCatcher = new SmsVerifyCatcher(fragment.getActivity(), new OnSmsCatchListener<String>() {
+            @Override
+            public void onSmsCatch(String message) {
+                String code = parseCode(message);
+                fragment.binding.etSms.setText(code);
+            }
+        });
+        fragment.binding.userName.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (s.length() > 0) {
+                    fragment.binding.ivDelete.setVisibility(View.VISIBLE);
+                } else {
+                    fragment.binding.ivDelete.setVisibility(View.GONE);
+                }
+            }
+        });
+
+        fragment.binding.etSms.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (s.length() > 0) {
+                    fragment.binding.ivDeleteYzm.setVisibility(View.VISIBLE);
+                } else {
+                    fragment.binding.ivDeleteYzm.setVisibility(View.GONE);
+                }
+            }
+        });
+
+
+    }
+
+    //更新用户列表
+    public void uploadListData(Account[] list) {
+        fragment.adapter.clear();
+        if (list.length > 0) fragment.adapter.addAll(list);
+    }
+
+    public void showToast(String msg) {
+        if (getContext() == null) return;
+        Context context = getContext();
+        AlertUtil.showDeftToast(context, msg);
+    }
+
+
+    public void showEditView(boolean isHasOtherUserInfo) {
+        if (getContext() == null) return;
+        //设置跳转信息
+//        LoginSuccessInfo successInfo = new LoginSuccessInfo();
+//        successInfo.setTagMsg(TextUtils.isEmpty(fragment.tagMsg) ? "" : fragment.tagMsg);
+//        successInfo.setClickAd(fragment.clickAd);
+//        HelperUtil.isNewUser(fragment.getActivity(), successInfo, isHasOtherUserInfo);
+
+        Intent intent = new Intent(getContext(), FirstLoginActivity.class);
+        intent.putExtra(LoginActivity.TAG_MSG, TextUtils.isEmpty(fragment.tagMsg) ? "" : fragment.tagMsg);
+        intent.putExtra(LoginActivity.TAG_CLICK_AD, fragment.clickAd);
+        getContext().startActivity(intent);
+        getContext().finish();
+    }
+
+    public void showMainView(boolean isNewUser, boolean isHasOtherUserInfo) {
+        if (getContext() == null) return;
+        //判断如果是因为token为空跳转到的登录页面则不需要跳转到MainActivity，直接关闭登录页面即可
+        if (fragment.fromTokenError) {
+            fragment.getActivity().finish();
+            return;
+        }
+        //设置跳转信息
+        LoginSuccessInfo successInfo = new LoginSuccessInfo();
+        successInfo.setType("login");
+        successInfo.setUri(fragment.uri);
+        successInfo.setClickAd(fragment.clickAd);
+        successInfo.setTagShare(fragment.tagShare);
+        successInfo.setTagMsg(fragment.tagMsg);
+        if (isNewUser) {
+//            HelperUtil.isNewUser(fragment.getActivity(), successInfo, isHasOtherUserInfo);
+        } else {
+//            HelperUtil.isNotNewUser(fragment.getActivity(), successInfo);
+        }
+//        EventBus.getDefault().post(new UserEventMsg(UserEventMsg.LOGIN_SUCCESS, successInfo));
+//        Intent intent = new Intent(getContext(), MainTestActivity.class);
+//        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+//        intent.putExtra("type", "login");
+//        intent.putExtra("uri", fragment.uri);
+//        intent.putExtra(LoginActivity.TAG_CLICK_AD, fragment.clickAd);
+//        intent.putExtra("sharetype", fragment.tagShare);
+//        if (!TextUtils.isEmpty(fragment.tagMsg))
+//            intent.putExtra("classifyTagMsg", fragment.tagMsg);
+//        getContext().startActivity(intent);
+    }
+
+    public void showProgress() {
+        if (!fragment.mProgressDialog.isShowing()) fragment.mProgressDialog.show();
+    }
+
+    public void hideProgress() {
+        if (fragment.mProgressDialog.isShowing()) {
+            fragment.isLogin = false;
+            fragment.mProgressDialog.dismiss();
+        }
+    }
+
+    public void onTimerFinish() {
+        fragment.data.setTime(0);
+        fragment.binding.codeRequest.setTextColor(fragment.getActivity().getResources().getColor(R.color.white));
+    }
+
+    public void onTimerInterval(long l) {
+        fragment.data.setTime((int) l);
+        fragment.binding.codeRequest.setTextColor(fragment.getActivity().getResources().getColor(R.color.color_f2f2f2));
+    }
+
+    public void setAgreementText() {
+        String textContent = "登录即代表阅读并同意《用户协议》 及 《隐私政策》";
+        SpannableStringBuilder ssb = new SpannableStringBuilder(textContent);
+        ssb.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(View widget) {
+                if (!fragment.isLogin) {
+                    startWebView("yhxy");
+                }
+            }
+
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                ds.setUnderlineText(false);
+            }
+        }, 11, 15, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+        ssb.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(View widget) {
+                if (!fragment.isLogin) {
+                    startWebView("yszc");
+                }
+            }
+
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                ds.setUnderlineText(false);
+            }
+        }, 20, 24, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+        ssb.setSpan(new ForegroundColorSpan(fragment.getResources().getColor(R.color.color_23d41e)), 11, 15, Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+        ssb.setSpan(new ForegroundColorSpan(fragment.getResources().getColor(R.color.color_23d41e)), 20, 24, Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+        fragment.binding.tvAgreement.setMovementMethod(LinkMovementMethod.getInstance());
+        fragment.binding.tvAgreement.setText(ssb);
+    }
+
+    private void startWebView(String type) {
+//        WWebView wWebView = new WWebView.Builder()
+//                .urlType(type)
+//                .isOther(true)
+//                .enableJump(true)
+//                .enableRefresh(false)
+//                .enableImageLongClick(false)
+//                .builder();
+//        wWebView.startWebViewActivity(fragment.getActivity());
+
+
+        ARouter.getInstance().build("/web/WebViewActivity")
+                .withString("rUrlType", type)
+                .withBoolean("rIsOther", true)
+                .withBoolean("rEnableJump", true)
+                .withBoolean("rEnableRefresh", false)
+                .withBoolean("rEnableImageLongClick", false)
+                .navigation(fragment.getActivity());
+    }
+
+    public void startWeb() {
+        if (fragment == null) return;
+        //浏览入口
+        if (DoublePressed.onDoublePressed()) return;
+//        WWebView wWebView = new WWebView.Builder()
+//                // TODO: 2018/12/28 浏览页面h5地址
+//                .url(AppConfig.isDebug() ? "http://wjjh5test.cnlive.com/cnLogoutPreview.html" : "http://wjjh5.cnlive.com/cnLogoutPreview.html")
+//                .enableTitleLayout(false)
+//                .enableTitle(false)
+//                .enableJump(true)
+//                .enableImageLongClick(false)
+//                .enableClose(false)
+//                .enableRefresh(false)
+//                .from(WWebViewOptions.FROM_PRE_BROWSE)
+//                .builder();
+//        wWebView.startWebViewActivity(fragment.getActivity());
+
+
+        ARouter.getInstance().build("/web/WebViewActivity")
+//                .withString("rSid", uid == null ? "" : uid)
+                .withString("rUrl", AppConfig.isDebug() ? "http://wjjh5test.cnlive.com/cnLogoutPreview.html" : "http://wjjh5.cnlive.com/cnLogoutPreview.html")
+                .withBoolean("rEnableTitle", false)
+                .withBoolean("enableMore", false)
+                .withBoolean("rEnableJump", true)
+                .withBoolean("rNeedSign", false)
+                .withBoolean("rEnableRefresh", false)
+                .withBoolean("rEnableClose", false)
+                .withBoolean("rEnableTitleLayout", false)
+                .navigation(fragment.getActivity());
+
+
+    }
+
+
+    private String parseCode(String message) {
+        Pattern p = Pattern.compile("\\b\\d{6}\\b");
+        Matcher m = p.matcher(message);
+        String code = "";
+        while (m.find()) {
+            code = m.group(0);
+        }
+        return code;
+    }
+
+    public void bindPhone(OtherUserInfo otherUserInfo) {
+        if (fragment == null) return;
+//        BindPhoneNumberActivity.startActivity(fragment.getActivity(),
+//                otherUserInfo, fragment.fromTokenError, fragment.tagMsg, fragment.tagShare, fragment.clickAd);
+    }
+
+}
+package com.cnlive.strike.user.frame.view;
+
+import android.content.Intent;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.cnlive.core.libs.base.frame.view.BaseView;
+import com.cnlive.core.libs.base.ui.widget.LetterBarView;
+import com.cnlive.core.libs.base.util.AlertUtil;
+import com.cnlive.core.libs.base.util.DensityUtils;
+import com.cnlive.strike.user.R;
+import com.cnlive.strike.user.model.CountryData;
+import com.cnlive.strike.user.ui.activity.SelectCountryActivity;
+import com.cnlive.strike.user.ui.adapter.SelectCountryAdapter;
+import com.qmuiteam.qmui.widget.QMUITopBar;
+
+import java.util.List;
+
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2018/11/17
+ * <p>
+ * 简介:
+ */
+public class SelectCountryView extends BaseView implements SelectCountryAdapter.OnItemClickLIstener {
+    private SelectCountryActivity mContext;
+    private TextView rightBtn;
+    public SelectCountryAdapter mAdapter;
+    private QMUITopBar toolbar;
+
+    public SelectCountryView(SelectCountryActivity countryActivity) {
+        mContext = countryActivity;
+    }
+
+    public void initView() {
+        initTooBar();
+        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(mContext);
+        mContext.binding.rvCountry.setLayoutManager(linearLayoutManager);
+        if (mAdapter == null) mAdapter = new SelectCountryAdapter(mContext);
+        mContext.binding.rvCountry.setAdapter(mAdapter);
+        mContext.binding.letterBarView.setOnLetterSelectListener(new LetterBarView.OnLetterSelectListener() {
+            @Override
+            public void onLetterSelect(String s) {
+                if (mContext.contactLetterGuideMap != null && mContext.contactLetterGuideMap.containsKey(s)) {
+                    linearLayoutManager.scrollToPositionWithOffset(mContext.contactLetterGuideMap.get(s), 0);
+                }
+            }
+        });
+        mAdapter.setOnItemClickListener(this);
+    }
+
+    private void initTooBar() {
+        if (mContext == null) return;
+        toolbar = (QMUITopBar) mContext.binding.includeToolbar;
+        toolbar.setTitle("选择国家");
+        toolbar.addLeftImageButton(R.drawable.xzq_fh, R.id.qmui_topbar_item_left_back).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mContext.finish();
+            }
+        });
+    }
+
+    public void showMessage(String message) {
+        if (mContext == null) return;
+        AlertUtil.showDeftToast(mContext, message);
+    }
+
+    public TextView addRightTextButtonWrapContent(QMUITopBar toolbar, int bgId) {
+        int dp_10 = DensityUtils.dp2px(mContext, 10);
+        TextView textView = new TextView(mContext);
+        textView.setBackgroundResource(bgId > 0 ? bgId : android.R.color.transparent);
+        textView.setGravity(Gravity.CENTER);
+        textView.setTextSize(15f);
+        textView.setPadding(dp_10, 0, dp_10, 0);
+        textView.setText(mContext.getResources().getString(R.string.select_contact_finish));
+        textView.setTextColor(mContext.getResources().getColor(R.color.color_656565));
+        RelativeLayout.LayoutParams rl = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
+        rl.addRule(RelativeLayout.CENTER_IN_PARENT);
+        toolbar.addRightView(textView, R.id.rightBtn, rl);
+        return textView;
+    }
+
+
+    CountryData currentData;
+
+    @Override
+    public void onItemClick(CountryData data, int position) {
+
+        if (position == mContext.fistPosition) {
+            if (data.isSelect()) {
+                mAdapter.getItem(position).setSelect(false);
+            } else {
+                mAdapter.getItem(position).setSelect(true);
+            }
+            mAdapter.notifyItemChanged(position);
+        } else {
+            if (data.isSelect()) {
+                mAdapter.getItem(position).setSelect(false);
+            } else {
+                mAdapter.getItem(position).setSelect(true);
+            }
+            if (mContext.fistPosition != -1) {
+                if (mAdapter.getItem(mContext.fistPosition).isSelect()) {
+                    mAdapter.getItem(mContext.fistPosition).setSelect(false);
+                }
+            }
+            mAdapter.notifyItemChanged(position);
+            mAdapter.notifyItemChanged(mContext.fistPosition);
+        }
+        if (data.isSelect()){
+            if (rightBtn != null){
+                rightBtn.setVisibility(View.VISIBLE);
+                rightBtn.setTextColor(mContext.getResources().getColor(R.color.color_ffa300));
+            }
+
+        }else {
+            if (rightBtn != null){
+                rightBtn.setVisibility(View.GONE);
+                rightBtn.setTextColor(mContext.getResources().getColor(R.color.color_656565));
+            }
+
+        }
+        currentData = data;
+        mContext.fistPosition = position;
+    }
+
+    public void showView(List<CountryData> countryData) {
+        if (mAdapter != null)
+            mAdapter.addItems(countryData);
+        mContext.binding.emptyView.setVisibility(View.GONE);
+
+        rightBtn = addRightTextButtonWrapContent(toolbar, -1);
+        rightBtn.setVisibility(View.GONE);
+        rightBtn.setOnClickListener(v -> {
+            Intent intent = new Intent();
+            if (currentData != null && currentData.isSelect()) {
+                intent.putExtra("country", currentData.getContryName());
+                intent.putExtra("countryCode", currentData.getContryCode());
+            }
+
+            mContext.setResult(mContext.ACTIVITY_RESULT_CODE, intent);
+            mContext.finish();
+        });
+
+    }
+}
+package com.cnlive.strike.user.model;
+
+/**
+ * 银行卡信息
+ * Created by xiansong on 2017/12/27.
+ * TODO 数据库加密
+ */
+
+public class BankCardInfo {
+    //银行名称
+    private String bankName;
+    //银行卡卡号
+    private String bankCardNumber;
+    //银行卡类型
+    private String bankCardType;
+    //持卡人姓名
+    private String holderName;
+    //持卡人预留手机号
+    private String holderPhoneNumber;
+
+}
+package com.cnlive.strike.user.model;
+
+import android.graphics.drawable.Drawable;
+
+
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
+
+import java.io.Serializable;
+import com.cnlive.strike.user.BR;
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2019/9/9
+ * <p>
+ * 简介: 用户绑定的信息
+ */
+public class BindPhoneNumberInfo extends BaseObservable implements Serializable {
+    public static final int TYPE_TITLE= 199149;
+    public static final int TYPE_LOGIN= 199150;
+    //条目类型
+    public int itemType ;
+    // 类型名
+    private String itemName;
+    // 类型名
+    private String typeName;
+    //类型图标
+    private Drawable typeIcon;
+    //用户名
+    private String userName;
+    //是否绑定
+    private boolean isBind;
+    //类型  0手机号  3 微信  2 qq  1  微博
+    public int type ;
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+
+    public int getItemType() {
+        return itemType;
+    }
+
+    public void setItemType(int itemType) {
+        this.itemType = itemType;
+    }
+
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public Drawable getTypeIcon() {
+        return typeIcon;
+    }
+
+    public void setTypeIcon(Drawable typeIcon) {
+        this.typeIcon = typeIcon;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+    @Bindable
+    public boolean isBind() {
+        return isBind;
+    }
+
+    public void setBind(boolean bind) {
+        isBind = bind;
+        notifyPropertyChanged(BR.bind);
+    }
+
+
+
+
+}
+package com.cnlive.strike.user.model;
+
+import android.text.TextUtils;
+
+import java.io.Serializable;
+
+/**
+ * 开放平台-用户信息
+ *
+ * @author Lynn
+ * @date 2017/12/22
+ */
+
+public class CNLiveUserInfo implements Serializable {
+    //用户id
+    private String uid;
+    //昵称
+    private String nickName;
+    //性别
+    private String gender;
+    //地址
+    private String location;
+    //头像
+    private String faceUrl;
+    //手机号
+    private String mobile;
+    //邮箱
+    private String email;
+    //平台TOKEN
+    private String token;
+    //新用户
+    private boolean isNewUser;
+    //个性签名
+    private String userSign;
+    //用户头像大图
+    private String bigFaceUrl;
+    //手机号国家码
+    private String countryCode;
+    //qqid
+    private String qqUid;
+    //微信id
+    private String wxUid;
+    //微博id
+    private String sinaUid;
+
+
+    public String getUid() {
+        return uid == null ? "" : uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public String getFaceUrl() {
+        return faceUrl;
+    }
+
+    public void setFaceUrl(String faceUrl) {
+        this.faceUrl = faceUrl;
+    }
+
+    public String getBigFaceUrl() {
+        if (TextUtils.isEmpty(bigFaceUrl)) return faceUrl;
+        return bigFaceUrl;
+    }
+
+    public void setBigFaceUrl(String bigFaceUrl) {
+        this.bigFaceUrl = bigFaceUrl;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public boolean isNewUser() {
+        return isNewUser;
+    }
+
+    public void setNewUser(boolean newUser) {
+        isNewUser = newUser;
+    }
+
+    public String getQqUid() {
+        return qqUid;
+    }
+
+    public void setQqUid(String qqUid) {
+        this.qqUid = qqUid;
+    }
+
+    public String getWxUid() {
+        return wxUid;
+    }
+
+    public void setWxUid(String wxUid) {
+        this.wxUid = wxUid;
+    }
+
+    public String getSinaUid() {
+        return sinaUid;
+    }
+
+    public void setSinaUid(String sinaUid) {
+        this.sinaUid = sinaUid;
+    }
+
+    public String getUserSign() {
+        return userSign;
+    }
+
+    public void setUserSign(String userSign) {
+        this.userSign = userSign;
+    }
+
+    public String getCountryCode() {
+        return countryCode;
+    }
+
+    public void setCountryCode(String countryCode) {
+        this.countryCode = countryCode;
+    }
+}
+package com.cnlive.strike.user.model;
+
+/**
+ * Created by xiansong on 2018/4/3.
+ */
+
+public class CNLiveUserInfoExt {
+
+
+    @Override
+    public String toString() {
+        return "CNLiveUserInfoExt{" +
+                "userSign='" + userSign + '\'' +
+                '}';
+    }
+
+    private String userSign ;
+
+    public String getUserSign() {
+        return userSign;
+    }
+
+    public void setUserSign(String userSign) {
+        this.userSign = userSign;
+    }
+
+
+}
+package com.cnlive.strike.user.model;
+
+/**
+ * 实名认证信息
+ * Created by xiansong on 2017/12/27.
+ */
+
+public class CertificationInfo {
+    //姓名
+    private String name;
+    //手机号
+    private String phoneNumber;
+    //身份证编号
+    private String idNumber;
+
+}
+package com.cnlive.strike.user.model;
+
+import android.text.TextUtils;
+
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
+
+import com.cnlive.strike.user.util.PinyinUtil;
+import com.cnlive.strike.user.util.search.SearchUtil;
+
+import java.io.Serializable;
+import java.util.Locale;
+import com.cnlive.strike.user.BR;
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2018/11/17
+ * <p>
+ * 简介:
+ */
+public class CountryData  extends BaseObservable implements Serializable {
+
+    public static final int TYPE_CATGORY= 199149;
+    public static final int TYPE_COUNTRY= 199150;
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public int type ;
+
+    public String getLetter() {
+        return letter;
+    }
+
+    public void setLetter(String letter) {
+        this.letter = letter;
+    }
+
+    /**
+     * contryName : 阿尔巴尼亚
+     * contryCode : 355
+     */
+    private String letter = "";
+
+    private String contryName;
+    private String contryCode;
+
+    private boolean isSelect;
+    @Bindable
+    public boolean isSelect() {
+        return isSelect;
+    }
+
+    public void setSelect(boolean isSelect) {
+        this.isSelect = isSelect;
+        notifyPropertyChanged(BR.select);
+    }
+
+
+    public String getContryName() {
+        return contryName;
+    }
+
+    public void setContryName(String contryName) {
+
+        this.contryName = contryName;
+    }
+
+    public String getContryCode() {
+        return contryCode;
+    }
+
+    public void setContryCode(String contryCode) {
+        this.contryCode = contryCode;
+    }
+
+
+    public void setLetterContent(String nickName) {
+        if (TextUtils.isEmpty(nickName)) {
+            letter = "#";
+        } else {
+            String pinYin = PinyinUtil.getPinyin(nickName).toUpperCase(Locale.getDefault());
+            if (TextUtils.isEmpty(pinYin)) {
+                letter = "#";
+            } else {
+                letter = SearchUtil.isAllEnglish(pinYin.substring(0, 1)) ? pinYin : "#";
+            }
+        }
+    }
+}
+package com.cnlive.strike.user.model;
+
+import android.net.Uri;
+
+import java.io.Serializable;
+
+/**
+ * 登录成功后携带的跳转信息
+ */
+public class LoginSuccessInfo implements Serializable {
+    private String type;
+    private Uri uri;
+    public Boolean clickAd;
+    public String tagShare;
+    public String tagMsg;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Uri getUri() {
+        return uri;
+    }
+
+    public void setUri(Uri uri) {
+        this.uri = uri;
+    }
+
+    public Boolean getClickAd() {
+        return clickAd;
+    }
+
+    public void setClickAd(Boolean clickAd) {
+        this.clickAd = clickAd;
+    }
+
+    public String getTagShare() {
+        return tagShare;
+    }
+
+    public void setTagShare(String tagShare) {
+        this.tagShare = tagShare;
+    }
+
+    public String getTagMsg() {
+        return tagMsg;
+    }
+
+    public void setTagMsg(String tagMsg) {
+        this.tagMsg = tagMsg;
+    }
+}
+package com.cnlive.strike.user.model;
+
+public class UserConst {
+    public static final int IS_NEW_USER = 1000;//是新用户
+    public static final int IS_NOT_NEW_USER = 1001;//不是新用户
+    public static final int MODIFY_USER_IMAGE = 1002;//修改用户头像
+    public static final int USER_INVALID = 1003;//用户失效
+    public static final int MODIFY_USER_NAME = 1004;//修改用户昵称
+    public static final int COIN_RAIN_ACTION = 1005;//下金币
+}
+package com.cnlive.strike.user.model;
+
+/**
+ * Created by Lynn on 2018/10/15.
+ */
+
+public class UserData {
+    private String uid;
+    private String nickName;
+    private String gender;
+    private String location;
+    private String faceUrl;
+    private String mobile;
+    private String email;
+    private String extInfo;
+    private String qqUid;
+    private String wxUid;
+    private String sinaUid;
+    private String renrenUid;
+    private String hUid;
+    private String platformId;
+    private String token;
+    private String callbackAcitvityStatushttpPostUrl;
+    private boolean isNewUser;
+    private String bigFaceUrl;
+    private String countryCode = "86";//手机号国家码
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public String getFaceUrl() {
+        return faceUrl;
+    }
+
+    public void setFaceUrl(String faceUrl) {
+        this.faceUrl = faceUrl;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getExtInfo() {
+        return extInfo;
+    }
+
+    public void setExtInfo(String extInfo) {
+        this.extInfo = extInfo;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getQqUid() {
+        return qqUid;
+    }
+
+    public void setQqUid(String qqUid) {
+        this.qqUid = qqUid;
+    }
+
+    public String getWxUid() {
+        return wxUid;
+    }
+
+    public void setWxUid(String wxUid) {
+        this.wxUid = wxUid;
+    }
+
+    public String getSinaUid() {
+        return sinaUid;
+    }
+
+    public void setSinaUid(String sinaUid) {
+        this.sinaUid = sinaUid;
+    }
+
+    public String getRenrenUid() {
+        return renrenUid;
+    }
+
+    public void setRenrenUid(String renrenUid) {
+        this.renrenUid = renrenUid;
+    }
+
+    public String gethUid() {
+        return hUid;
+    }
+
+    public void sethUid(String hUid) {
+        this.hUid = hUid;
+    }
+
+    public String getPlatformId() {
+        return platformId;
+    }
+
+    public void setPlatformId(String platformId) {
+        this.platformId = platformId;
+    }
+
+    public boolean isNewUser() {
+        return isNewUser;
+    }
+
+    public void setNewUser(boolean newUser) {
+        isNewUser = newUser;
+    }
+
+    public String getBigFaceUrl() {
+        return bigFaceUrl;
+    }
+
+    public void setBigFaceUrl(String bigFaceUrl) {
+        this.bigFaceUrl = bigFaceUrl;
+    }
+
+    public String getCountryCode() {
+        return countryCode;
+    }
+
+    public void setCountryCode(String countryCode) {
+        this.countryCode = countryCode;
+    }
+
+    public String getCallbackAcitvityStatushttpPostUrl() {
+        return callbackAcitvityStatushttpPostUrl;
+    }
+
+    public void setCallbackAcitvityStatushttpPostUrl(String callbackAcitvityStatushttpPostUrl) {
+        this.callbackAcitvityStatushttpPostUrl = callbackAcitvityStatushttpPostUrl;
+    }
+
+    @Override
+    public String toString() {
+        return "UserData{" +
+                "uid='" + uid + '\'' +
+                ", nickName='" + nickName + '\'' +
+                ", gender='" + gender + '\'' +
+                ", location='" + location + '\'' +
+                ", faceUrl='" + faceUrl + '\'' +
+                ", mobile='" + mobile + '\'' +
+                ", email='" + email + '\'' +
+                ", extInfo='" + extInfo + '\'' +
+                ", qqUid='" + qqUid + '\'' +
+                ", wxUid='" + wxUid + '\'' +
+                ", sinaUid='" + sinaUid + '\'' +
+                ", renrenUid='" + renrenUid + '\'' +
+                ", hUid='" + hUid + '\'' +
+                ", platformId='" + platformId + '\'' +
+                ", token='" + token + '\'' +
+                ", callbackAcitvityStatushttpPostUrl='" + callbackAcitvityStatushttpPostUrl + '\'' +
+                ", isNewUser=" + isNewUser +
+                ", bigFaceUrl='" + bigFaceUrl + '\'' +
+                ", countryCode='" + countryCode + '\'' +
+                '}';
+    }
+}
+package com.cnlive.strike.user.model;
+
+/**
+ * 用户信用信息
+ * Created by xiansong on 2017/12/27.
+ */
+
+public class UserFaithInfo {
+}
+package com.cnlive.strike.user.model;
+
+/**
+ * 我的钱包 / 资产管理
+ * Created by xiansong on 2017/12/27.
+ */
+
+public class WalletInfo {
+
+    //钱包余额
+    private String residual;
+
+    //积分
+    private String integral;
+
+}
+package com.cnlive.strike.user.model.msg;
+
+public class UserEventMsg {
+    public static final int LOGIN_SUCCESS = 0;//登陆成功
+    public static final int LOGIN_FAIL = 1;//登录失败
+    public static final int LOGIN_OUT = 2;//退出登录
+    public static final int IS_NEW_USER = 3;//是新用户
+    public static final int MODIFY_USER_IMAGE = 4;//修改用户头像
+    public static final int COIN_RAIN_ACTION = 5;//掉金币
+
+    private int type;
+    private Object Data;
+
+    public UserEventMsg(int type, Object data) {
+        this.type = type;
+        Data = data;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public Object getData() {
+        return Data;
+    }
+
+    public void setData(Object data) {
+        Data = data;
+    }
+}
+package com.cnlive.strike.user.network.api;
+
+
+import com.cnlive.core.network.BaseResult;
+import com.cnlive.strike.user.network.model.FaceData;
+import com.cnlive.strike.user.network.model.TokenData;
+import com.cnlive.strike.user.network.model.UserData;
+
+import java.util.List;
+import java.util.Map;
+
+import io.reactivex.Observable;
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
+import retrofit2.http.Multipart;
+import retrofit2.http.POST;
+import retrofit2.http.Part;
+import retrofit2.http.PartMap;
+import retrofit2.http.QueryMap;
+
+/**
+ * Created by xiansong on 2018/3/22.
+ */
+
+public interface ApiBaseServiceOpen {
+
+
+    /**
+     * 顶踩一条节目 0：踩    1：顶
+     *
+     * @param map
+     * @return
+     */
+    @POST("open/api2/ctServices/supportForHd/support")
+    Observable<BaseResult> support(@QueryMap Map<String, String> map);
+
+
+    /**
+     * 快捷登录前发送验证码
+     *
+     * @param map
+     * @return
+     */
+    @POST("open/api2/user/sendVerifyCode")
+    Observable<BaseResult> sendVerifyCodeBefQuickLogin(@QueryMap Map<String, String> map);
+
+    /**
+     * 快捷登录
+     *
+     * @param map
+     * @return
+     */
+    @POST("open/api2/user/loginInQuickly")
+    Observable<BaseResult<UserData>> quickLogin(@QueryMap Map<String, String> map);
+
+    /**
+     * 登录
+     *
+     * @param map
+     * @return
+     */
+    @POST("open/api2/user/loginIn")
+    Observable<BaseResult<UserData>> login(@QueryMap Map<String, String> map);
+
+    /**
+     * 查询用户信息
+     *
+     * @param map
+     * @return
+     */
+    @POST("open/api2/user/readUserById")
+    Observable<BaseResult<UserData>> queryUserInfo(@QueryMap Map<String, String> map);
+
+    /**
+     * 更新用户附加信息
+     *
+     * @param map
+     * @return
+     */
+    @POST("open/api2/user/updateUserExtInfo")
+    Observable<BaseResult> updateUserExtInfo(@QueryMap Map<String, String> map);
+
+    /**
+     * 修改用户单项信息
+     *
+     * @param map
+     * @return
+     */
+    @POST("open/api2/user/updateUserById")
+    Observable<BaseResult> modifyUserInfo(@QueryMap Map<String, String> map);
+
+
+    /**
+     * 注册或修改手机号前发手机验证码
+     *
+     * @param map
+     * @return
+     */
+    @POST("open/api2/user/sendVerifyCodeForUnRegistered")
+    Observable<BaseResult> sendVerifyCodeForUnRegistered(@QueryMap Map<String, String> map);
+
+    /**
+     * 更新手机号
+     *
+     * @param map
+     * @return
+     */
+    @POST("open/api2/user/updateMobileById")
+    Observable<BaseResult> updateMobile(@QueryMap Map<String, String> map);
+
+    /**
+     * 注册
+     *
+     * @param map
+     * @return
+     */
+    @POST("open/api2/user/register")
+    Observable<BaseResult<UserData>> register(@QueryMap Map<String, String> map);
+
+
+    /**
+     * 获取access_token
+     *
+     * @param map
+     * @return
+     */
+    @POST("open/api2/token")
+    Observable<BaseResult<TokenData>> accessToken(@QueryMap Map<String, String> map);
+
+    /**
+     * 上传头像
+     *
+     * @param map
+     * @param params
+     * @return
+     */
+    @Multipart
+    @POST("open/api2/user/updateUserFaceById")
+    Observable<BaseResult<FaceData>> updateUserFace(@PartMap Map<String, RequestBody> map,
+                                                          @Part List<MultipartBody.Part> params);
+
+
+
+    /**
+     * 音频播放鉴权接口
+     * @param map
+     * @return
+     */
+    @POST("open/api2/user/loginIn3rdForWJJ")
+    Observable<BaseResult<UserData>> loginIn3rdForWJJ(@QueryMap Map<String, String> map);
+    /**
+     * 登陆
+     * @param map
+     * @return
+     */
+    @POST("open/api2/user/loginIn3rdAndMobileForWJJ")
+    Observable<BaseResult<UserData>> loginIn3rdAndMobileForWJJ(@QueryMap Map<String, String> map);
+
+}
+package com.cnlive.strike.user.network.api;
+
+
+import android.text.TextUtils;
+
+import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.NetBuilder;
+import com.cnlive.core.network.ServerException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.reactivex.Observable;
+import okhttp3.Interceptor;
+
+/**
+ * 基本请求
+ *  ys
+ */
+public class BaseRequest {
+    private String userSetUrl;
+    private static BaseRequest request;
+    private long connectTimeout;//连接超时
+    private long readTimeout;//读取超时
+    private long writeTimeout;//写入超时
+    private List<Interceptor> interceptorList;//拦截器
+    private String baseUrl = "http://gank.io/api/data/";
+    private final String SP_CMS_URL_DEBUT = "http://cmstest.cnlive.com:8768/";
+    private final String SP_CMS_URL = "http://cms.cnlive.com:8768/";
+    //网++ 接口域名
+    public final String SP_BASE_URL = "https://apiwjj.cnlive.com/";
+    //网++ 测试环境 接口域名
+    public final String SP_DEBUG_URL = "http://apiwjjtest.cnlive.com/";
+    //OPEN API 接口域名
+    private final String OPEN_URL = "https://api.cnlive.com/";
+
+    /**
+     * 构造函数初始化
+     */
+    public BaseRequest() {
+        interceptorList = new ArrayList<>();
+    }
+
+
+    /**
+     * 设置连接超时
+     *
+     * @param connectTimeout
+     * @return
+     */
+    public BaseRequest setConnectTimeout(long connectTimeout) {
+        init();
+        connectTimeout = connectTimeout;
+        return request;
+    }
+
+    /**
+     * 设置读取超时
+     *
+     * @param readTimeout
+     * @return
+     */
+    public BaseRequest setReadTimeout(long readTimeout) {
+        init();
+        readTimeout = readTimeout;
+        return request;
+    }
+
+    /**
+     * 设置写入超时
+     *
+     * @param writeTimeout
+     * @return
+     */
+    public BaseRequest setWriteTimeout(long writeTimeout) {
+        init();
+        writeTimeout = writeTimeout;
+        return request;
+    }
+
+
+    /**
+     * 初始化接口地址
+     */
+    private String initBaseUrl(Class clazz) {
+        if (AppConfig.isDebug()) {
+            baseUrl = SP_DEBUG_URL;//还原初始地址
+            if (clazz == ApiBaseServiceOpen.class) {
+                return OPEN_URL;
+            }
+        }
+        return baseUrl;
+    }
+
+    /**
+     * 设置连接地址
+     *
+     * @param url
+     * @return
+     */
+    public BaseRequest setUrl(String url) {
+        init();
+        userSetUrl = url;
+        return request;
+    }
+
+    /**
+     * 添加拦截器
+     *
+     * @param interceptor
+     * @return
+     */
+    public BaseRequest addInterceptor(Interceptor interceptor) {
+        if (null != interceptor) {
+            interceptorList.add(interceptor);
+        }
+        return request;
+    }
+
+    /**
+     * @return
+     */
+    public static synchronized BaseRequest init() {
+        if (null == request) {
+            request = new BaseRequest();
+        }
+        return request;
+    }
+
+    public <NetService> NetService service(Class<NetService> clz) {
+        NetService service = null;
+        NetBuilder builder = new NetBuilder(clz);
+        if (connectTimeout > 0) {
+            builder.setConnectTimeout(connectTimeout);
+        }
+        if (readTimeout > 0) {
+            builder.setReadTimeout(readTimeout);
+        }
+        if (writeTimeout > 0) {
+            builder.setWriteTimeout(writeTimeout);
+        }
+        if (null != interceptorList && interceptorList.size() > 0) {
+            builder.addInterceptors(interceptorList);
+        }
+        //设置接口请求头地址
+        if (!TextUtils.isEmpty(userSetUrl)) {
+            builder.setBaseUrl(userSetUrl);
+            userSetUrl = "";
+        } else {
+            builder.setBaseUrl(initBaseUrl(clz));
+        }
+        service = (NetService) builder.getService();
+        builder = null;
+        //重置属性
+        resetData();
+        return service;
+
+    }
+
+    private void resetData() {
+        interceptorList.clear();
+
+        connectTimeout = 0;
+        readTimeout = 0;
+        writeTimeout = 0;
+    }
+
+
+
+
+}
 \ No newline at end of file
+package com.cnlive.strike.user.network.model;
+
+/**
+ * Created by Lynn on 2018/10/15.
+ */
+
+public class FaceData {
+    private String faceUrl;
+    private String bigFaceUrl;
+
+    public String getFaceUrl() {
+        return faceUrl;
+    }
+
+    public void setFaceUrl(String faceUrl) {
+        this.faceUrl = faceUrl;
+    }
+
+    public String getBigFaceUrl() {
+        return bigFaceUrl;
+    }
+
+    public void setBigFaceUrl(String bigFaceUrl) {
+        this.bigFaceUrl = bigFaceUrl;
+    }
+}