Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/newModuleStrike

韩亚云
2 parents e9d55089 d6c3ecde
Showing 37 changed files with 3571 additions and 457 deletions
app/strike/build.gradle
cloud/user/src/main/java/com/cnlive/strike/user/network/api/BaseRequest.java → app/strike/src/BaseRequest.java
app/strike/src/main/java/com/cnlive/strike/MainActivity.java
app/strike/src/main/java/com/cnlive/strike/MyActivity.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/demo/activity/DemoActivity.java
app/strike/src/main/res/values/styles.xml
build.gradle
cloud/user/build.gradle
cloud/user/src/main/java/com/cnlive/strike/user/UserUtilAction.java
cloud/user/src/main/java/com/cnlive/strike/user/auth/UserService.java
cloud/user/src/main/java/com/cnlive/strike/user/frame/data/LoginData.java
cloud/user/src/main/java/com/cnlive/strike/user/frame/presenter/FirstLoginPresenter.java
cloud/user/src/main/java/com/cnlive/strike/user/frame/presenter/QuickLoginPresenter.java
cloud/user/src/main/java/com/cnlive/strike/user/frame/view/FirstLoginView.java
cloud/user/src/main/java/com/cnlive/strike/user/router/user/UserAction.java
cloud/user/src/main/java/com/cnlive/strike/user/router/user/UserOfflineUtil.java
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/LoginActivity.java
cloud/user/src/main/java/com/cnlive/strike/user/ui/fragment/FirstLoginFragment.java
@@ -159,6 +159,7 @@ dependencies {
     implementation project(path: ':cloud:user')
     implementation project(path: ':core:imageload')
+    compile project(path: ':module:xiaojiasoundbox')
 //    implementation project(path: ':core:util')
 //    implementation project(path: ':core:encipher')
 //    implementation project(path: ':cloud:user')
@@ -9,7 +9,9 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
+import com.cnlive.strike.demo.activity.DemoActivity;
 import com.cnlive.strike.imgutil.ImgActivity;
+import com.cnlive.strike.user.ui.activity.LoginActivity;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -22,6 +24,7 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        findViewById(R.id.go_to).setOnClickListener(view ->   startActivity(new Intent(this, DemoActivity.class)) );
         findViewById(R.id.to_img).setOnClickListener(view ->   startActivity(new Intent(this, ImgActivity.class)) );
     }
 package com.cnlive.strike;
+import android.content.Intent;
+import android.text.TextUtils;
+
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
+import com.cnlive.strike.user.auth.UserService;
+import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
+import com.cnlive.strike.xiaojiaspeaker.ui.activity.AllDeviceActivity;
 public class MyActivity extends BaseActivity {
@@ -13,11 +19,35 @@ public class MyActivity extends BaseActivity {
     @Override
     protected void initView() {
-        setOpenSwipBack(true);
-        getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyFragment()).commitAllowingStateLoss();
+//        getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyFragment()).commitAllowingStateLoss();
+        initXiaoJiaSoundBoxData();
+        startActivity(new Intent(MyActivity.this,AllDeviceActivity.class));
     }
     @Override
     protected void initData() {
     }
+
+    /**
+     * 初始化小家音箱数据
+     */
+    private void initXiaoJiaSoundBoxData() {
+//        XiaoJIaCommInfo.setUserId(this, "10514333");
+//        XiaoJIaCommInfo.setUserPhone(this, "18301489586");
+        if (!TextUtils.isEmpty(UserService.getUid(this))) {
+            XiaoJIaCommInfo.setUserId(this, UserService.getUid(this));
+        }
+        if (null == UserService.getInstance(this).getAppAccount()) {
+            return;
+        }
+        if (null != UserService.getInstance(this).getAppAccount().getMobile() && !TextUtils.isEmpty(UserService.getInstance(this).getAppAccount().getMobile())) {
+            XiaoJIaCommInfo.setUserPhone(this, UserService.getInstance(this).getAppAccount().getMobile());
+        }
+        if (!TextUtils.isEmpty(UserService.getInstance(this).getAppAccount().getFaceUrl())) {
+            XiaoJIaCommInfo.setUserIcon(this, UserService.getInstance(this).getAppAccount().getFaceUrl());
+        }
+        if (!TextUtils.isEmpty(UserService.getInstance(this).getAppAccount().getNickName())) {
+            XiaoJIaCommInfo.setUserNickName(this, UserService.getInstance(this).getAppAccount().getNickName());
+        }
+    }
 }
@@ -4,9 +4,7 @@ package com.cnlive.strike;
 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.core.libs.base.frame.fragment.BaseFragment;
@@ -15,13 +13,12 @@ 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.core.network.request.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 com.me.yokeyword.fragmentation.anim.DefaultVerticalAnimator;
+import com.me.yokeyword.fragmentation.anim.FragmentAnimator;
 import java.util.HashMap;
 import java.util.Map;
@@ -31,23 +28,21 @@ 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;
+    protected int getViewLayoutId() {
+        return R.layout.activity_main1;
     }
     @Override
     protected void initView() {
         super.initView();
+        setSwipeBackEnable(true);
         setStatusBarColor(R.color.green, 0);
         setStatusBarTextColor(StatusBarConfig.BLACK);
-        view.findViewById(R.id.btn_test2).setOnClickListener(new View.OnClickListener() {
+        textView = baseView.findViewById(R.id.tv1);
+        baseView.findViewById(R.id.btn_test2).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 requestPermission(010001, "测试", new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION}, new OnPermissionResponseListener() {
@@ -63,23 +58,24 @@ public class MyFragment extends BaseFragment&lt;MyFragmentView, MyPresenter&gt; {
                 });
             }
         });
-        view.findViewById(R.id.btn_test1).setOnClickListener(new View.OnClickListener() {
+        baseView.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
-                    public void onFail() {
-                        Log.e(TAG, "onFail: ");
-                    }
-                });
+//                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
+//                    public void onFail() {
+//                        Log.e(TAG, "onFail: ");
+//                    }
+//                });
+                startForResult(new MyFragment1(),1001);
             }
         });
-        view.findViewById(R.id.btn_test).setOnClickListener(new View.OnClickListener() {
+        baseView.findViewById(R.id.btn_test).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 //单个请求
@@ -144,4 +140,17 @@ public class MyFragment extends BaseFragment&lt;MyFragmentView, MyPresenter&gt; {
         getPresenter().setData("hha");
         getMvpView().setData("test");
     }
+
+    @Override
+    public FragmentAnimator onCreateFragmentAnimator() {
+        return new DefaultVerticalAnimator();
+    }
+
+    @Override
+    public void onFragmentResult(int requestCode, int resultCode, Bundle data) {
+        super.onFragmentResult(requestCode, resultCode, data);
+        if (requestCode==1001){
+            setStatusBarColor(R.color.green,0);
+        }
+    }
 }
 package com.cnlive.strike;
-import android.os.Bundle;
-import android.view.LayoutInflater;
+import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
 import com.cnlive.core.libs.base.util.StatusBarConfig;
+import com.cnlive.core.network.HttpConn;
+import com.cnlive.core.network.NetCallBack;
+import com.cnlive.core.network.request.BaseRequest;
+import com.cnlive.strike.network.api.ApiService;
+import com.cnlive.strike.network.bean.TestBean;
 public class MyFragment1 extends BaseFragment {
-    private View view;
-    @Nullable
+
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        view = inflater.inflate(R.layout.fragment_main1, container, false);
-        return view;
+    protected int getViewLayoutId() {
+        return R.layout.fragment_main1;
     }
     @Override
@@ -28,5 +26,33 @@ public class MyFragment1 extends BaseFragment {
         super.initView();
         setStatusBarColor(R.color.qmui_config_color_red, 0);
         setStatusBarTextColor(StatusBarConfig.BLACK);
+        baseView.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);
+                            }
+
+                        });
+            }
+        });
     }
 }
@@ -7,7 +7,9 @@ import android.view.View;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
 import com.cnlive.core.libs.base.util.StatusBarConfig;
+import com.cnlive.strike.MyFragment;
 import com.cnlive.strike.R;
+import com.cnlive.strike.base.BuildConfig;
 /**
  * 继承BaseActivity
@@ -19,10 +21,10 @@ public class DemoActivity extends BaseActivity {
      *
      * @return
      */
-    @Override
-    protected int getViewLayoutId() {
-        return R.layout.activity_demo_main;
-    }
+//    @Override
+//    protected int getViewLayoutId() {
+//        return R.layout.activity_demo_main;
+//    }
     /**
      * 设置binding布局
@@ -30,16 +32,16 @@ public class DemoActivity extends BaseActivity {
      *
      * @return
      */
-    @Override
-    protected int getBindLayoutId() {
-        return super.getBindLayoutId();
-    }
+//    @Override
+//    protected int getBindLayoutId() {
+//        return super.getBindLayoutId();
+//    }
-    @Override
-    protected void initBindingData() {
-        super.initBindingData();
-//        binding=(你的bingding)baseBinding;
-    }
+//    @Override
+//    protected void initBindingData() {
+//        super.initBindingData();
+////        binding=(你的bingding)baseBinding;
+//    }
     /**
      * 初始化intent传递参数
@@ -55,8 +57,8 @@ public class DemoActivity extends BaseActivity {
     @Override
     protected void initView() {
         super.initView();
-        //是指是否可以侧滑返回,默认禁用
-        setOpenSwipBack(true);
+        //是指是否可以侧滑返回,默认禁用d
+//        setSwipeBackEnable(true);
         //设置状态栏字体颜色
         setStatusBarTextColor(StatusBarConfig.WHITE);
         //设置状态栏颜色
@@ -75,6 +77,8 @@ public class DemoActivity extends BaseActivity {
         //px2dp
         px2dp(10);
+        loadRootFragment(new MyFragment());
+
 //        String[] permissions = new String[]{Manifest.permission.ACCESS_FINE_LOCATION,
 //                Manifest.permission.ACCESS_COARSE_LOCATION};
 //        //请求权限(默认提示语的)
@@ -114,39 +118,30 @@ public class DemoActivity extends BaseActivity {
 //            }
 //        });
-        findViewById(R.id.go_to1).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                logError("Ada");
-                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
-                    public void onFail() {
-                        Log.e(TAG, "onFail: ");
-                    }
-                });
-            }
-        });
-        findViewById(R.id.go_to2).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                requestPermission(10010, "拒绝我了", 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: ");
-                    }
-                });
-            }
-        });
+//        findViewById(R.id.go_to1).setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                logError("Ada");
+//                loadRootFragment(R.id.fl_container,new MyFragment());
+////                start(new MyFragment());
+//            }
+//        });
+//        findViewById(R.id.go_to2).setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                requestPermission(10010, "拒绝我了", 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: ");
+//                    }
+//                });
+//            }
+//        });
     }
     /**
@@ -157,5 +152,4 @@ public class DemoActivity extends BaseActivity {
         super.initData();
     }
-
 }
@@ -2,6 +2,7 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="QMUI.Compat.NoActionBar">
+        <item name="android:windowIsTranslucent">true</item>
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
@@ -14,7 +14,6 @@ buildscript {
     }
     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"
@@ -110,6 +109,7 @@ allprojects {
         //Tripartite Base
         for (String moudle : base_librarys) imput('implementation', project, moudle)
+//        for (String moudle : base_librarys) imput('api', project, moudle)
         for (String moudle : base_compilers) imput('annotationProcessor', project, moudle)
     }
@@ -118,13 +118,37 @@ allprojects {
         google()
         jcenter()
         maven {
-            url mixedUrl
-            credentials { username = mavenUsername; password = mavenPassword }
+            url maven.mixedUrl
+            credentials { username = nexusId; password = nexusPw }
+        }
+        //------------------ 资源库配置 END------------------
+        maven {
+            url 'https://dl.bintray.com/granzon/cnlive'
+        }
+        maven {
+            url 'https://dl.bintray.com/granzon/cnliveLibs'
+        }
+        maven {
+            url "https://jitpack.io"
+        }
+        maven {
+            url 'http://developer.huawei.com/repo'
         }
-        maven { url 'https://jitpack.io' }
-        maven { url 'http://developer.huawei.com/repo' }
     }
 }
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+//配置全局变量
+ext {
+    libEmoj = '2.0.9'
+    libMediaPicker = '1.5.8'
+    //    loading动画
+    avi = "2.1.3"
+    //蓝牙
+    BleLib="2.3.4"
+    //动画大全
+    viewAnimationsEasing='2.0@aar'
+    viewAnimationsAndroid='2.3@aar'
+}
@@ -46,7 +46,8 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation project(path: ':core:network')
-//    implementation project(path: ':core:base')
+    implementation "com.cnlive.libs:emoj:$rootProject.libEmoj"
+    //图片选择器
+    implementation "com.cnlive.libs:mediapicker:$rootProject.libMediaPicker"
-    implementation 'com.cnlive.libs:emoj:2.0.9'
 }
@@ -7,17 +7,21 @@ 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 com.cnlive.core.network.UserData;
+import com.cnlive.core.network.api.ApiBaseServiceOpen;
+import com.cnlive.core.network.request.BaseRequest;
+import com.cnlive.core.network.FaceData;
+import com.cnlive.core.network.TokenData;
 import java.io.File;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import io.reactivex.Observable;
 import okhttp3.MediaType;
+import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
@@ -239,35 +243,34 @@ public class UserUtilAction {
         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);
-//
-//
+    /**
+     * 上传头像
+     *
+     * @param context
+     * @param uid          用户ID
+     * @param face         头像文件
+     * @param token        平台TOKEN
+     * @param access_token
+     * @return
+     */
+    public static Observable<BaseResult<FaceData>> updateUserFace(Context context, String uid, File face, String token, String access_token) {
+        Map<String, RequestBody> params = new HashMap<>();
+
+        if (TextUtils.isEmpty(token)) {
+            HttpConn.error(TOKEN_ERROR_CODE, TOKEN_ERROR_MSG);
+        }
+        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) {
@@ -287,10 +290,11 @@ public class UserUtilAction {
 //                }
 //            }
 //        };
-//
-//        return ApiBaseRequest.subscribe(ApiBaseRequest.service(ApiBaseServiceOpen.class).updateUserFace(params, parts), subscriber);
-////        return ApiBaseRequest.service(ApiBaseServiceOpen.class, service -> service.updateUserFace(params, parts)).subscribe(context, callback);
-//    }
+
+        return BaseRequest.init().service(ApiBaseServiceOpen.class).updateUserFace(params, parts);
+//                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);
@@ -13,7 +13,7 @@ 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.cnlive.core.network.UserData;
 import com.google.gson.Gson;
 import java.util.HashMap;
-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) {
-
-    }
-}
@@ -11,11 +11,15 @@ 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 com.cnlive.core.network.FaceData;
+import com.cnlive.core.network.TokenData;
+import com.cnlive.core.network.UserData;
+import com.cnlive.strike.user.router.user.UserOfflineUtil;
 import java.io.File;
 import io.reactivex.ObservableSource;
+import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Function;
@@ -24,6 +28,7 @@ import io.reactivex.functions.Function;
  */
 public class FirstLoginPresenter extends BasePresenter<FirstLoginView> {
+    private Disposable updateFaceEvent;
     public void loadUserInfo(Context context) {
         UserService userService = UserService.getInstance(context);
@@ -112,52 +117,60 @@ public class FirstLoginPresenter extends BasePresenter&lt;FirstLoginView&gt; {
         );
     }
-//    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("文件不存在");
-//        }
-//    }
+    public void uploadFile(Context context, String filePath) {
+        if (updateFaceEvent != null) {
+            updateFaceEvent.dispose();
+            updateFaceEvent = null;
+        }
+        ifViewAttached(view -> view.showProgress(R.string.upload_image_dialog));
+        File file = new File(filePath);
+        UserService userService = UserService.getInstance(context);
+        if (file.exists()) {
+            updateFaceEvent =
+                    HttpConn.action(
+                            UserUtilAction.accessToken(context)
+                                    .concatMap(new Function<BaseResult<TokenData>, ObservableSource<BaseResult<FaceData>>>() {
+                                        @Override
+                                        public ObservableSource<BaseResult<FaceData>> apply(BaseResult<TokenData> tokenDataBaseResult) throws Exception {
+                                            if (tokenDataBaseResult.isSuccess()) {
+                                                return UserUtilAction.updateUserFace(context, UserService.getUid(context), file, userService.getAppAccount().getToken(), tokenDataBaseResult.getData().getAccess_token());
+                                            }
+                                            return HttpConn.error(tokenDataBaseResult);
+                                        }
+                                    }), new NetCallBack<BaseResult<FaceData>>() {
+                                @Override
+                                public void onRequestState(int state) {
+                                    if (HttpConn.ON_END == state) {
+                                        ifViewAttached(view -> view.hideProgress());
+                                    }
+                                }
+
+                                @Override
+                                public void onSuccess(BaseResult<FaceData> data) {
+//                                    HelperUtil.modifyUserImage(context, data.getData().getFaceUrl());
+//                        LoginManager.modifyUserImage( UserService.getUid(context), data.getData().getFaceUrl());
+                                    userService.setUserFaceUrl(data.getData().getFaceUrl(), data.getData().getBigFaceUrl());
+                                    ifViewAttached(view -> view.photoChange(data.getData().getFaceUrl()));
+                                }
+
+                                @Override
+                                public void onFailure(String errCode, String errMsg) {
+                                    if ("8".equals(errCode) || "9".equals(errCode)) {
+                                        UserOfflineUtil.userInvalid(context);
+//                                        HelperUtil.userInvalid(context);
+                                    } else if (UserUtilAction.TOKEN_ERROR_CODE.equals(errCode)) {
+                                        ifViewAttached(view -> view.showTokenErrorDialog());
+                                    } else {
+                                        ifViewAttached(view -> view.showToast(errMsg));
+                                    }
+                                }
+                            }
+                    );
+
+        } else {
+            ifViewAttached(view -> view.showToast("文件不存在"));
+        }
+    }
 }
@@ -39,19 +39,18 @@ import io.reactivex.disposables.Disposable;
 public class QuickLoginPresenter extends BasePresenter<QuickLoginView> {
     private TimerUtil timerUtil; //计时工具类
-    //    private Event<CNLiveUserInfo> event;
+    private Disposable 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);
+            ifViewAttached(view -> view.uploadListData(accounts));
         });
     }
@@ -67,10 +66,10 @@ public class QuickLoginPresenter extends BasePresenter&lt;QuickLoginView&gt; {
         String name = account == null ? "" : account.name;
         //页面填充数据
         if (!TextUtils.isEmpty(name)) {
-            getView().uploadInputData(name);
+            ifViewAttached(view -> view.uploadInputData(name));
         }
         if (null != accounts) {
-            getView().uploadListData(accounts);
+            ifViewAttached(view -> view.uploadListData(accounts));
         }
     }
@@ -84,29 +83,28 @@ public class QuickLoginPresenter extends BasePresenter&lt;QuickLoginView&gt; {
         timerUtil.setTimerLiener(new TimerUtil.TimeListener() {
             @Override
             public void onFinish() {
-                if (getView() != null) getView().onTimerFinish();
+                ifViewAttached(view -> view.onTimerFinish());
             }
             @Override
             public void onInterval(long remainTime) {
-                if (getView() != null) getView().onTimerInterval(remainTime / 1000);
+                ifViewAttached(view -> view.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));
+            ifViewAttached(view -> view.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));
+            ifViewAttached(view -> view.showToast(context.getString(R.string.user_toast_quick_login_error_phone)));
             return;
         }
         if (sendMsgBefQuickLogin != null && !sendMsgBefQuickLogin.isDisposed()) {
-            getView().showToast("处理中请稍后...");
+            ifViewAttached(view -> view.showToast("处理中请稍后..."));
         } else {
             sendMsgBefQuickLogin = HttpConn.action(UserUtilAction.sendMsgBefQuickLoginAction(context, phone, countryCode), new NetCallBack<BaseResult>() {
                 @Override
@@ -137,7 +135,7 @@ public class QuickLoginPresenter extends BasePresenter&lt;QuickLoginView&gt; {
         } 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() {
+            event = 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);
@@ -229,7 +227,7 @@ public class QuickLoginPresenter extends BasePresenter&lt;QuickLoginView&gt; {
 //    }
-//
+    //
 //    private Event<CNLiveUserInfo> initLoginEvent(QuickLoginFragment context, Boolean retry, OtherUserInfo otherUserInfo) {
 //        return event = new Event<CNLiveUserInfo>()
 //                .setStateCallback(state -> {
@@ -304,5 +302,12 @@ public class QuickLoginPresenter extends BasePresenter&lt;QuickLoginView&gt; {
 //                    if (context != null) context.isLogin = false;
 //                });
 //    }
-
+    public void cancelLoad() {
+        if (event != null) {
+            if (!event.isDisposed()) {
+                event.dispose();
+            }
+            event = null;
+        }
+    }
 }
@@ -63,8 +63,6 @@ public class FirstLoginView extends BaseView {
         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);
@@ -5,21 +5,17 @@ import android.app.Activity;
 import android.content.Context;
 import android.net.Uri;
 import android.text.TextUtils;
-import android.util.Log;
 import com.cnlive.core.network.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
-import com.cnlive.core.network.ServerException;
+import com.cnlive.core.network.UserData;
 import com.cnlive.strike.user.UserUtilAction;
 import com.cnlive.strike.user.auth.UserService;
 import com.cnlive.strike.user.model.CNLiveUserInfo;
-import com.cnlive.strike.user.network.api.BaseRequest;
-import com.cnlive.strike.user.network.model.UserData;
 import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.functions.Function;
+import io.reactivex.disposables.Disposable;
 public class UserAction {
@@ -49,13 +45,13 @@ public class UserAction {
 //                .start(event);
 //    }
-    public static void mobileLogin(Context context, String phone, String code, String countryCode, CallBack callBack) {
+    public static Disposable mobileLogin(Context context, String phone, String code, String countryCode, CallBack callBack) {
 //        Logic.create()
 //                .action(UserUtilAction.quickLoginAction(context, phone, code, countryCode))
 //                .action(loginAppAction(context, phone, code))
 ////                .action(loginIMAction())
 //                .start(event);
-        HttpConn.action(
+        return HttpConn.action(
                 UserUtilAction.quickLoginAction(context, phone, code, countryCode)
                 , new NetCallBack<BaseResult<UserData>>() {
                     @Override
@@ -86,7 +82,7 @@ public class UserAction {
             if (null != callBack) {
                 callBack.callback(-5, "获取账户信息失败 请重试.", null);
             }
-        }  else if (TextUtils.isEmpty(data.getData().getMobile())) {
+        } else if (TextUtils.isEmpty(data.getData().getMobile())) {
             callBack.callback(-5, "绑定手机号已失效..", null);
         } else {
             //更新登录用户信息
@@ -5,9 +5,14 @@ import android.content.Context;
 import androidx.appcompat.app.AppCompatActivity;
+import com.cnlive.core.libs.base.ui.widget.BottomSheet;
 import com.cnlive.core.libs.base.util.AlertUtil;
+import com.cnlive.core.libs.base.util.AppManager;
 import com.cnlive.strike.user.auth.UserService;
+import com.cnlive.strike.user.ui.activity.LoginActivity;
 import com.kongzue.dialog.interfaces.OnMenuItemClickListener;
+import com.kongzue.dialog.util.DialogSettings;
+import com.kongzue.dialog.util.TextInfo;
 import com.kongzue.dialog.v3.BottomMenu;
 import org.greenrobot.eventbus.EventBus;
@@ -37,40 +42,44 @@ public class UserOfflineUtil {
     }
     public static void userInvalid(Context context) {
-        AlertUtil.showDeftToast(context, "用户 已失效.");
+        AlertUtil.showDeftToast(context, "用户已失效.");
         appLogout(context);
     }
     //todo BottomSheet
     public static void logout(Context context) {
-
-        BottomMenu.show((AppCompatActivity) context, new String[]{"菜单1", "菜单2", "菜单3"}, new OnMenuItemClickListener() {
-            @Override
-            public void onClick(String text, int index) {
-                //返回参数 text 即菜单名称，index 即菜单索引
-            }
-        });
-//        new BottomSheet.BottomListSheetBuilder(context)
-//                .addItem("退出登录", "", true)
-//                .addItem("取消")
-//                .setOnSheetItemClickListener((dialog, itemView, position, tag) -> {
-//                    switch (position) {
-//                        case 0:
-//                            appLogout(context);
-//                            break;
-//                    }
-//                    dialog.dismiss(false);
-//                }).build().show();
+        DialogSettings.style = (DialogSettings.STYLE.STYLE_IOS);
+        TextInfo textInfo = new TextInfo();
+        textInfo.setFontSize(15);
+        DialogSettings.menuTextInfo = textInfo;
+//        BottomMenu.show((AppCompatActivity) context, new String[]{"退出登录"}, new OnMenuItemClickListener() {
+//            @Override
+//            public void onClick(String text, int index) {
+//                //返回参数 text 即菜单名称，index 即菜单索引
+//            }
+//        }).setCancelable(false);
+        new BottomSheet.BottomListSheetBuilder(context)
+                .addItem("退出登录", "", true)
+                .addItem("取消")
+                .setOnSheetItemClickListener((dialog, itemView, position, tag) -> {
+                    switch (position) {
+                        case 0:
+                            appLogout(context);
+                            break;
+                    }
+                    dialog.dismiss(false);
+                }).build().show();
     }
     public static void appLogout(Context context) {
         String uid = UserService.getUid(context);
         UserService.getInstance(context).logoutAppAccount();
         //退出登录
-
+        AppManager.getInstance().killAllActivity();
+        LoginActivity.start(context);
 //        LoginManager.logout(uid, null, context);
 //        if (ActivityLifecycle.isActive()) {
-//            LoginActivity.start(context);
+
 //        } else {
 //            Log.e("FinishAllActivity", "FinishAllActivity-----logout");
 //            FinishAllActivity.finish(context);
@@ -19,8 +19,11 @@ import com.cnlive.strike.user.ui.fragment.QuickLoginFragment;
  * @author Lynn
  * @date 2017/12/22
  */
-@Route(path = "/cnmain/LoginActivity")
+//@Route(path = "/cnmain/LoginActivity")
+@Route(path = LoginActivity.PATH)
 public class LoginActivity extends BaseActivity {
+    public static final String PATH = "/cloud/user/ui/activity/login";
+
     public static String FROM_TOKEN_ERROR = "from_token_error";
     public static String TAG_MSG = "tagMsg";
     public static String TAG_SHARE = "tagValue";
@@ -5,6 +5,7 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Intent;
+import android.os.Environment;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -14,9 +15,13 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
+import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
 import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.core.libs.base.util.GlideUtil;
 import com.cnlive.core.libs.base.util.StatusBarConfig;
+import com.cnlive.media.picker.ImagePicker;
+import com.cnlive.media.picker.PickerConfig;
+import com.cnlive.media.picker.entity.Media;
 import com.cnlive.strike.user.R;
 import com.cnlive.strike.user.auth.UserService;
 import com.cnlive.strike.user.databinding.FragmentFirstLoginBinding;
@@ -28,6 +33,10 @@ import com.cnlive.strike.user.router.user.UserOfflineUtil;
 import com.cnlive.strike.user.ui.activity.FirstLoginActivity;
 import com.cnlive.strike.user.ui.activity.LoginActivity;
+import java.util.List;
+
+import static com.cnlive.media.picker.ui.PickerActivity.REQUEST_CODE_PERMISSION_CAMERA;
+
 /**
  * Created by xiansong on 2018/1/19.
@@ -128,31 +137,37 @@ public class FirstLoginFragment extends BaseFragment&lt;FirstLoginView, FirstLoginP
     public void selectPhoto(boolean fromResult) {
-//        boolean hasPermission = fromResult ? AppUtil.checkPermissions(getActivity(), PERMISSION) : PermissionChecker.checkPermissions(getActivity()
-//                , PERMISSION, REQUEST_CODE_PERMISSION_CAMERA, com.cnlive.media.picker.R.string.dialog_imagepicker_permission_sdcard_message);
-//
-//        if (hasPermission) {
-//            ImagePicker imagePicker = new ImagePicker.Builder()
-//                    //最大选择图片数目，默认40张
-//                    .maxNum(1)
-//                    .setSelectGif(false)
-//                    //是否需要相机（默认false）
-//                    .needCamera(true)
-//                    //选择模式（默认PICKER_IMAGE_VIDEO）     PICKER_IMAGE-->图片 PICKER_VIDEO-->视频  PICKER_IMAGE_VIDEO-->图片&视频
-//                    .selectMode(PickerConfig.PICKER_IMAGE)
-//                    //拍照或录像存储位置 默认Environment.getExternalStorageDirectory().getPath() + File.separator + "JCamera"
-//                    .cachePath(Environment.getExternalStorageDirectory() + "/strike/file/")
-//                    //是否为发朋友圈模式（默认false）  true-->图片与视频不能同时选择
-//                    .isFriendCircle(false)
-//                    //裁剪 只有在单选模式下才可以使用
-//                    .doCrop(1, 1, 300, 300)
-//                    //是否开启单选模式（默认false）
-//                    .isSinglePick(true)
-//                    .builder();
-//
-//            //跳转到图片选择页面 activity    请求码            结果码
-//            imagePicker.start(getActivity(), PickerConfig.PICKER_IMAGE, PickerConfig.DEFAULT_RESULT_CODE);
-//        }
+        requestPermission(REQUEST_CODE_PERMISSION_CAMERA,
+                R.string.dialog_imagepicker_permission_sdcard_message,
+                PERMISSION, new OnPermissionResponseListener() {
+                    @Override
+                    public void onSuccess(String[] permissions) {
+                        ImagePicker imagePicker = new ImagePicker.Builder()
+                                //最大选择图片数目，默认40张
+                                .maxNum(1)
+                                .setSelectGif(false)
+                                //是否需要相机（默认false）
+                                .needCamera(true)
+                                //选择模式（默认PICKER_IMAGE_VIDEO）     PICKER_IMAGE-->图片 PICKER_VIDEO-->视频  PICKER_IMAGE_VIDEO-->图片&视频
+                                .selectMode(PickerConfig.PICKER_IMAGE)
+                                //拍照或录像存储位置 默认Environment.getExternalStorageDirectory().getPath() + File.separator + "JCamera"
+                                .cachePath(Environment.getExternalStorageDirectory() + "/strike/file/")
+                                //是否为发朋友圈模式（默认false）  true-->图片与视频不能同时选择
+                                .isFriendCircle(false)
+                                //裁剪 只有在单选模式下才可以使用
+                                .doCrop(1, 1, 300, 300)
+                                //是否开启单选模式（默认false）
+                                .isSinglePick(true)
+                                .builder();
+                        //跳转到图片选择页面 activity    请求码            结果码
+                        imagePicker.start(getActivity(), PickerConfig.PICKER_IMAGE, PickerConfig.DEFAULT_RESULT_CODE);
+                    }
+
+                    @Override
+                    public void onFail() {
+
+                    }
+                });
     }
@@ -163,31 +178,17 @@ public class FirstLoginFragment extends BaseFragment&lt;FirstLoginView, FirstLoginP
         if (tokenErrorDialog != null) tokenErrorDialog.dismiss();
     }
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        Activity activity = getActivity();
-        if (activity == null) return;
-//        if (requestCode == REQUEST_CODE_PERMISSION_CAMERA) {
-//            boolean hasPermission = PermissionChecker.onRequestPermissionsResult(
-//                    activity, requestCode, permissions, grantResults, false,
-//                    com.cnlive.media.picker.R.string.dialog_imagepicker_permission_sdcard_message)[0];
-//            if (hasPermission) {
-//                selectPhoto(true);
-//            }
-//        }
-    }
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-//        if (resultCode == PickerConfig.DEFAULT_RESULT_CODE) {
-//            List<Media> list = data.getParcelableArrayListExtra(PickerConfig.EXTRA_RESULT);
-//            if (list == null) return;
-//            if (getPresenter() == null) return;
-//            if (list.size() > 0 && list.get(0) != null && !TextUtils.isEmpty(list.get(0).path))
-//                getPresenter().uploadFile(FirstLoginFragment.this.getActivity(), list.get(0).path);
-//
-//        }
+        if (resultCode == PickerConfig.DEFAULT_RESULT_CODE) {
+            List<Media> list = data.getParcelableArrayListExtra(PickerConfig.EXTRA_RESULT);
+            if (list == null) return;
+            if (getPresenter() == null) return;
+            if (list.size() > 0 && list.get(0) != null && !TextUtils.isEmpty(list.get(0).path))
+                getPresenter().uploadFile(FirstLoginFragment.this.getActivity(), list.get(0).path);
+
+        }
     }
 }
@@ -114,7 +114,7 @@ public class QuickLoginFragment extends BaseFragment&lt;QuickLoginView, QuickLoginP
         mProgressDialog.setMessage(getResources().getString(R.string.login_dialog));
         mProgressDialog.setCanceledOnTouchOutside(false);
         mProgressDialog.setOnCancelListener(dialog -> {
-//            getPresenter().cancelLoad();
+            getPresenter().cancelLoad();
         });
         getMvpView().setAgreementText();
         binding.setClickListener(v -> onClick(v.getId()));
 ext {
-    mixedUrl = "http://android.nexus.cnlive.com/repository/cnlive-mixed/"
-    mavenUsername = "developer"
-    mavenPassword = "android_2019"
+    //Nexus 访问账号
+    nexusId = "developer"
+    nexusPw = "android_2019"
     //Nexus 发布配置
     maven = [
@@ -25,7 +25,7 @@ ext {
     ]
     androidx = [
-            appcompat       : "androidx.appcompat:appcompat:1.1.0+",
+            appcompat       : "androidx.appcompat:appcompat:1.1.0",
             constraintlayout: "androidx.constraintlayout:constraintlayout:1.1.3",
             multidex        : "androidx.multidex:multidex:2.0.1"
     ]
@@ -46,17 +46,34 @@ ext {
             espresso: 'androidx.test.espresso:espresso-core:3.2.0'
     ]
+    //Maven Base库配置
+    moudle_cnlive_base = [
+            //编译方式
+            debug  : false,
+            //版本号
+            version: "0.0.2",
+            //Lib库前缀
+            packeg : "com.cnlive.core",
+            //Lib库名称
+            name   : "base"
+    ]
     library = [
+
+            //fragment滑动返回( https://github.com/YoKeyword/Fragmentation ,源码导入修改)
+            fragmentation_swipeback : 'me.yokeyword:fragmentationx-swipeback:1.0.2',
+            //对fragment进行管理( https://github.com/YoKeyword/Fragmentation ,源码导入修改)
+            fragmentationx          : 'me.yokeyword:fragmentationx:1.0.2',
+            //log日志
             logger                  : 'com.orhanobut:logger:2.2.0',
-//            //空祖对话框 https://github.com/kongzue/DialogV3
-//            kongzueDailog           : 'com.kongzue.dialog_v3x:dialog:3.1.6',
+            //空祖对话框 https://github.com/kongzue/DialogV3 (源码导入,修改)
+            kongzueDailog           : 'com.kongzue.dialog_v3x:dialog:3.1.6',
             //视讯云加密
             libCnencipher           : 'com.cnlive:lib-cnencipher:1.1.1',
             //视频库
             libVideoQiniu           : 'com.cnlive.libs:video_qiniu:1.0.6',
             //视讯云播放器
             libCnVideo              : 'com.cnlive:lib_cnvideo2.0:3.3.11',
-            //权限
+//            //权限
             easypermissions         : 'pub.devrel:easypermissions:1.0.0',
             //MVP
             mvp                     : 'com.hannesdorfmann.mosby3:mvp:3.0.4',
@@ -96,14 +113,9 @@ ext {
             cardviewV7              : 'com.android.support:cardview-v7:28.0.0',
             dataBinding             : 'com.android.databinding.library:3.5.1'
     ]
-//    library_jar = [
-//            pinyin4j: ('libs/pinyin4j-2.5.0.jar')
-//    ]
     //基础三方库
     base_librarys = [
             library.logger,
-            //对话框
-//            library.kongzueDailog,
             //视讯云加密库
             library.libCnencipher,
             //视频库
@@ -125,14 +137,6 @@ ext {
             //图片加载Glide
             glide.api,
             glide.transformations,
-            //兼容旧版
-//            library.supportV4,
-//            library.appcompatV7,
-//            library.design,
-//            library.supportV13,
-//            library.recyclerviewV7,
-//            library.cardviewV7,
-//            library.dataBinding,
             //使用androidx
             androidx.appcompat,
             androidx.constraintlayout,
@@ -145,11 +149,9 @@ ext {
             library.retrofitAdapterRxjava2,
             library.okhttp,
             library.okhttpLoggingInterceptor,
+            //数据库
             library.greendao,
-            //管理rxjava生命周期
-//            library.rx
             router.api,
-
             test.junit,
             test.runner,
             test.espresso
@@ -162,10 +164,6 @@ ext {
             router.compiler
     ]
-//    base_jar = [
-//            library_jar.pinyin4j
-//    ]
-
     //正式签名配置
     Properties properties = new Properties()
     properties.load(project.rootProject.file('local.properties').newDataInputStream())
+apply plugin: 'maven'
+
+uploadArchives() {
+    repositories {
+        mavenDeployer {
+            def lib = moudle_cnlive_base
+            //发布环境(正式/测试)
+            android.defaultPublishConfig lib.debug ? "debug" : "release"
+            //发布渠道(地址/账号)
+            repository(url: maven.mixedUrl) {
+                authentication(userName: maven.username, password: maven.password)
+            }
+            //发布信息(包名/别名/版本)
+            pom.project {
+                groupId lib.packeg
+                artifactId lib.name
+                version = lib.debug ? lib.version.concat("-SNAPSHOT") : lib.version
+            }
+            pom.whenConfigured { pom ->
+                pom.dependencies.clear()
+            }
+
+        }
+    }
+}
 \ No newline at end of file
 apply plugin: 'com.android.library'
-
+apply from: './base_maven_push.gradle'
 android {
 //    compileSdkVersion 29
 //    buildToolsVersion "29.0.2"
@@ -27,6 +27,5 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     api files('libs/pinyin4j-2.5.0.jar')
-
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 }
+package androidx.fragment.app;
+
+
+import java.util.List;
+
+/**
+ * Created by YoKey on 16/1/22.
+ */
+public class FragmentationMagician {
+
+    public static boolean isStateSaved(FragmentManager fragmentManager) {
+        if (!(fragmentManager instanceof FragmentManagerImpl))
+            return false;
+        try {
+            FragmentManagerImpl fragmentManagerImpl = (FragmentManagerImpl) fragmentManager;
+            return fragmentManagerImpl.isStateSaved();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    /**
+     * Like {@link FragmentManager#popBackStack()}} but allows the commit to be executed after an
+     * activity's state is saved.  This is dangerous because the action can
+     * be lost if the activity needs to later be restored from its state, so
+     * this should only be used for cases where it is okay for the UI state
+     * to change unexpectedly on the user.
+     */
+    public static void popBackStackAllowingStateLoss(final FragmentManager fragmentManager) {
+        FragmentationMagician.hookStateSaved(fragmentManager, new Runnable() {
+            @Override
+            public void run() {
+                fragmentManager.popBackStack();
+            }
+        });
+    }
+
+    /**
+     * Like {@link FragmentManager#popBackStackImmediate()}} but allows the commit to be executed after an
+     * activity's state is saved.
+     */
+    public static void popBackStackImmediateAllowingStateLoss(final FragmentManager fragmentManager) {
+        FragmentationMagician.hookStateSaved(fragmentManager, new Runnable() {
+            @Override
+            public void run() {
+                fragmentManager.popBackStackImmediate();
+            }
+        });
+    }
+
+    /**
+     * Like {@link FragmentManager#popBackStackImmediate(String, int)}} but allows the commit to be executed after an
+     * activity's state is saved.
+     */
+    public static void popBackStackAllowingStateLoss(final FragmentManager fragmentManager, final String name, final int flags) {
+        FragmentationMagician.hookStateSaved(fragmentManager, new Runnable() {
+            @Override
+            public void run() {
+                fragmentManager.popBackStack(name, flags);
+            }
+        });
+    }
+
+    /**
+     * Like {@link FragmentManager#executePendingTransactions()} but allows the commit to be executed after an
+     * activity's state is saved.
+     */
+    public static void executePendingTransactionsAllowingStateLoss(final FragmentManager fragmentManager) {
+        FragmentationMagician.hookStateSaved(fragmentManager, new Runnable() {
+            @Override
+            public void run() {
+                fragmentManager.executePendingTransactions();
+            }
+        });
+    }
+
+    public static List<Fragment> getActiveFragments(FragmentManager fragmentManager) {
+        return fragmentManager.getFragments();
+    }
+
+    private static void hookStateSaved(FragmentManager fragmentManager, Runnable runnable) {
+        if (!(fragmentManager instanceof FragmentManagerImpl)) return;
+
+        FragmentManagerImpl fragmentManagerImpl = (FragmentManagerImpl) fragmentManager;
+        if (isStateSaved(fragmentManager)) {
+            boolean tempStateSaved = fragmentManagerImpl.mStateSaved;
+            boolean tempStopped = fragmentManagerImpl.mStopped;
+            fragmentManagerImpl.mStateSaved = false;
+            fragmentManagerImpl.mStopped = false;
+
+            runnable.run();
+
+            fragmentManagerImpl.mStopped = tempStopped;
+            fragmentManagerImpl.mStateSaved = tempStateSaved;
+        } else {
+            runnable.run();
+        }
+    }
+}
 \ No newline at end of file
+package com.cnlive.core.libs.base.arouter;
+
+import android.graphics.Bitmap;
+
+import androidx.annotation.Nullable;
+
+import com.alibaba.android.arouter.facade.template.IProvider;
+
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2019/6/18
+ * <p>
+ * 简介: 生成二维码调用的服务
+ */
+public interface QrService extends IProvider {
+    String PATH = "/app/qrservice";
+    String NAME = "app_qrservice";
+    String GROUP = "appqr";
+
+    /**
+     * 生成二维码的逻辑(带图标)
+     *
+     * @param content
+     * @param size        宽高
+     * @param logoBitmap  图标的bitmap
+     * @param logoPercent 百分比
+     * @return
+     */
+    Bitmap createQrIconBitMap(String content, int size, @Nullable Bitmap logoBitmap, float logoPercent);
+
+    /**
+     * 生成不带图标的二维码
+     *
+     * @param content 内容
+     * @param size    二维码大小  单位px
+     * @return
+     */
+    Bitmap createQRNoIconBitmap(@Nullable String content, int size);
+
+}
+package com.cnlive.core.libs.base.arouter.im;
+
+public class FriendListData {
+
+    private String friendId;
+    private String friendFaceUrl;
+    private String friendNickName;
+    private String friendRemark;
+    private String friendCustomInfoJson;
+
+    public String getFriendId() {
+        return friendId;
+    }
+
+    public void setFriendId(String friendId) {
+        this.friendId = friendId;
+    }
+
+    public String getFriendFaceUrl() {
+        return friendFaceUrl;
+    }
+
+    public void setFriendFaceUrl(String friendFaceUrl) {
+        this.friendFaceUrl = friendFaceUrl;
+    }
+
+    public String getFriendNickName() {
+        return friendNickName;
+    }
+
+    public void setFriendNickName(String friendNickName) {
+        this.friendNickName = friendNickName;
+    }
+
+    public String getFriendRemark() {
+        return friendRemark;
+    }
+
+    public void setFriendRemark(String friendRemark) {
+        this.friendRemark = friendRemark;
+    }
+
+    public String getFriendCustomInfoJson() {
+        return friendCustomInfoJson;
+    }
+
+    public void setFriendCustomInfoJson(String friendCustomInfoJson) {
+        this.friendCustomInfoJson = friendCustomInfoJson;
+    }
+}
+package com.cnlive.core.libs.base.arouter.im;
+
+import com.alibaba.android.arouter.facade.template.IProvider;
+
+import java.util.List;
+
+/**
+ * IM相关的对外接口
+ */
+public interface ImOpenService extends IProvider {
+    //获取好友列表
+    void getFriendList(CNValueCallBack<List<FriendListData>> callBack);
+
+    //是否已经加入了群组,注：本地数据判断
+    boolean hasJoinGroup(String groupId);
+
+    interface CNCallBack {
+        void onError(int errorCode, String errorMsg);
+
+        void onSuccess();
+    }
+
+    interface CNValueCallBack<T> {
+        void onError(int var1, String var2);
+
+        void onSuccess(T var1);
+    }
+
+}
 package com.cnlive.core.libs.base.frame.activity;
+import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -14,21 +15,26 @@ import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.Display;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ViewDataBinding;
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.frame.view.BaseView;
 import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
@@ -37,27 +43,36 @@ import com.cnlive.core.libs.base.util.AppManager;
 import com.cnlive.core.libs.base.util.ReflectUtil;
 import com.cnlive.core.libs.base.util.StatusBarConfig;
 import com.cnlive.core.libs.base.util.StatusBarUtil;
-import com.cnlive.core.libs.base.util.swipeback.util.SwipeBackActivityBase;
-import com.cnlive.core.libs.base.util.swipeback.util.SwipeBackActivityHelper;
-import com.cnlive.core.libs.base.util.swipeback.util.SwipeBackLayout;
-import com.cnlive.core.libs.base.util.swipeback.util.SwipeBackUtil;
+import com.cnlive.strike.base.R;
 import com.hannesdorfmann.mosby3.mvp.MvpActivity;
+import com.me.yokeyword.fragmentation.ExtraTransaction;
+import com.me.yokeyword.fragmentation.Fragmentation;
+import com.me.yokeyword.fragmentation.ISupportActivity;
+import com.me.yokeyword.fragmentation.ISupportFragment;
+import com.me.yokeyword.fragmentation.SupportActivityDelegate;
+import com.me.yokeyword.fragmentation.SupportHelper;
+import com.me.yokeyword.fragmentation.SwipeBackLayout;
+import com.me.yokeyword.fragmentation.anim.FragmentAnimator;
+import com.me.yokeyword.fragmentation_swipeback.core.ISwipeBackActivity;
+import com.me.yokeyword.fragmentation_swipeback.core.SwipeBackActivityDelegate;
 import com.orhanobut.logger.Logger;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+
 /**
  * @author ys
  * 基类 activity
+ * SwipeBackActivityBase,
  */
-public abstract class BaseActivity<V extends BaseView, P extends BasePresenter<V>> extends MvpActivity<V, P> implements SwipeBackActivityBase {
+public abstract class BaseActivity<V extends BaseView, P extends BasePresenter<V>> extends MvpActivity<V, P> implements ISupportActivity, ISwipeBackActivity {
     private V view;
     private P presenter;
     public ViewDataBinding baseBinding;
     //获取TAG的activity名称
-    protected final String TAG = this.getClass().getSimpleName();
+    public final String TAG = this.getClass().getSimpleName();
     //是否显示标题栏
     private boolean isShowTitle = true;
     //是否显示状态栏
@@ -74,9 +89,12 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     private int USER_SET_REQUEST_CODE_PERMISSION = -0x00099;//用户设置的权限请求码
     private String defaultDefinePermissionTip = "需要必要的权限才可以正常使用该功能，您已拒绝获得该权限。\n如果需要重新授权，您可以点击“允许”按钮进入系统设置进行授权";//默认拒绝的权限提示语
     private String userSetDefinePermissionTip = "";//用户设置的权限提示语
-    private SwipeBackActivityHelper mHelper;//侧滑返回
+    //    private SwipeBackActivityHelper mHelper;//侧滑返回
     private boolean isOpenSwipBack = false;
-    private AlertDialog alertDialog;
+    //fragmnet管理
+    private final SupportActivityDelegate mDelegate = new SupportActivityDelegate(this);
+    //fragment侧滑
+    private final SwipeBackActivityDelegate mSwipeDelegate = new SwipeBackActivityDelegate(this);
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -86,9 +104,20 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         } else if (0 != getViewLayoutId()) {
             setContentView(getViewLayoutId());
         }
+        //两种视图都没有设置,就加载默认跟视图,用于fragment切换
+        if (0 == getBindLayoutId() && 0 == getViewLayoutId()) {
+            setContentView(R.layout.base_activity_main);
+        }
         context = this;
         me = this;
+        //fragment管理
+        mDelegate.onCreate(savedInstanceState);
+        mSwipeDelegate.onCreate(savedInstanceState);
+        //是否开启滑动返回
+        setSwipeBackEnable(isOpenSwipBack);
         this.savedInstanceState = savedInstanceState;
+        //路由参数初始化
+        ARouter.getInstance().inject(this);
         //activity管理
         AppManager.getInstance().pushActivity(me);
         //创建订阅映射
@@ -114,16 +143,11 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         initView();
         //设置数据
         initData();
-        //是否开启滑动返回
-        if (isOpenSwipBack) {
-            mHelper = new SwipeBackActivityHelper(this);
-            mHelper.onActivityCreate();
-        }
-
-    }
-
-    protected void setOpenSwipBack(boolean isOpen) {
-        isOpenSwipBack = isOpen;
+//        if (isOpenSwipBack) {
+//            mHelper = new SwipeBackActivityHelper(this);
+//            mHelper.onActivityCreate();
+//
+//        }
     }
@@ -147,6 +171,10 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     }
+    public boolean isOpenSwipBack() {
+        return isOpenSwipBack;
+    }
+
     /**
      * 设置是否显示标题栏
      *
@@ -238,13 +266,14 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     @Override
     protected void onDestroy() {
+        mDelegate.onDestroy();
         super.onDestroy();
-        if (null != alertDialog) {
-            alertDialog.dismiss();
+        if (null != baseBinding) {
+            baseBinding.unbind();
         }
         //activity管理
         AppManager.getInstance().deleteActivity(me);
-        //清除所有订阅
+        //清除当前订阅
         SubscriptionManager.getInstance().cancel(TAG);
     }
@@ -254,15 +283,23 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
      * @param color
      * @param statusBarAlpha
      */
-    protected void setStatusBarColor(@ColorRes int color,
-                                     @IntRange(from = 0, to = 255) int statusBarAlpha) {
+    public void setStatusBarColor(@ColorRes int color,
+                                  @IntRange(from = 0, to = 255) int statusBarAlpha) {
         StatusBarUtil.setColor(this, ContextCompat.getColor(this, color), statusBarAlpha);
     }
+    public void setTransparentForWindow(Activity activity) {
+        StatusBarUtil.setTransparentForWindow(activity);
+    }
+
+    public void addTranslucentView(Activity activity, @IntRange(from = 0, to = 255) int statusBarAlpha) {
+        StatusBarUtil.addTranslucentView(activity, statusBarAlpha);
+    }
+
     /**
      * 设置状态栏字体颜色
      */
-    protected void setStatusBarTextColor(int type) {
+    public void setStatusBarTextColor(int type) {
         if (type == StatusBarConfig.BLACK) {
             StatusBarUtil.setStatusBarWrite(this);
         } else if (type == StatusBarConfig.WHITE) {
@@ -403,6 +440,29 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     }
     /**
+     * 请求权限
+     * <p>
+     * 警告：此处除了用户拒绝外，唯一可能出现无法获取权限或失败的情况是在AndroidManifest.xml中未声明权限信息
+     * Android6.0+即便需要动态请求权限（重点）但不代表着不需要在AndroidManifest.xml中进行声明。
+     *
+     * @param permissions                  请求的权限
+     * @param onPermissionResponseListener 回调监听器
+     */
+    public void requestPermission(String[] permissions, String defineTip, OnPermissionResponseListener
+            onPermissionResponseListener) {
+        this.userSetDefinePermissionTip = defineTip;
+        this.onPermissionResponseListener = onPermissionResponseListener;
+        if (checkPermissions(permissions)) {
+            if (onPermissionResponseListener != null) {
+                onPermissionResponseListener.onSuccess(permissions);
+            }
+        } else {
+            List<String> needPermissions = getDeniedPermissions(permissions);
+            ActivityCompat.requestPermissions(this, needPermissions.toArray(new String[needPermissions.size()]), DEFAULT_REQUEST_CODE_PERMISSION);
+        }
+    }
+
+    /**
      * 自定义权限申请码
      *
      * @param requestCode
@@ -446,6 +506,29 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     }
     /**
+     * 自定义权限申请码和提示信息
+     * 可传入string字符串
+     *
+     * @param requestCode
+     * @param permissions
+     * @param onPermissionResponseListener
+     */
+    public void requestPermission(int requestCode, @StringRes int defineTip, String[]
+            permissions, OnPermissionResponseListener onPermissionResponseListener) {
+        this.onPermissionResponseListener = onPermissionResponseListener;
+        this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
+        this.userSetDefinePermissionTip = getResources().getString(defineTip);
+        if (checkPermissions(permissions)) {
+            if (onPermissionResponseListener != null) {
+                onPermissionResponseListener.onSuccess(permissions);
+            }
+        } else {
+            List<String> needPermissions = getDeniedPermissions(permissions);
+            ActivityCompat.requestPermissions(this, needPermissions.toArray(new String[needPermissions.size()]), USER_SET_REQUEST_CODE_PERMISSION);
+        }
+    }
+
+    /**
      * 获取权限集中需要申请权限的列表
      *
      * @param permissions
@@ -588,33 +671,36 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
-        if (null != mHelper) {
-            mHelper.onPostCreate();
-        }
-    }
-
-    @Override
-    public SwipeBackLayout getSwipeBackLayout() {
-        if (null != mHelper) {
-            return mHelper.getSwipeBackLayout();
-        }
-        return null;
-    }
-
-    @Override
-    public void setSwipeBackEnable(boolean enable) {
-        if (null != getSwipeBackLayout()) {
-            getSwipeBackLayout().setEnableGesture(enable);
-        }
-    }
-
-    @Override
-    public void scrollToFinishActivity() {
-        if (null != mHelper) {
-            SwipeBackUtil.convertActivityToTranslucent(this);
-            getSwipeBackLayout().scrollToFinishActivity();
-        }
-    }
+//        if (null != mHelper) {
+//            mHelper.onPostCreate();
+//        }
+        mDelegate.onPostCreate(savedInstanceState);
+        mSwipeDelegate.onPostCreate(savedInstanceState);
+
+    }
+
+//    @Override
+//    public SwipeBackLayout getSwipeBackLayout() {
+//        if (null != mHelper) {
+//            return mHelper.getSwipeBackLayout();
+//        }
+//        return null;
+//    }
+//
+//    @Override
+//    public void setSwipeBackEnable(boolean enable) {
+//        if (null != getSwipeBackLayout()) {
+//            getSwipeBackLayout().setEnableGesture(enable);
+//        }
+//    }
+
+//    @Override
+//    public void scrollToFinishActivity() {
+//        if (null != mHelper) {
+//            SwipeBackUtil.convertActivityToTranslucent(this);
+//            getSwipeBackLayout().scrollToFinishActivity();
+//        }
+//    }
     public void logError(Object info) {
@@ -644,4 +730,288 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     public void logXml(String xml) {
         Logger.xml(xml);
     }
+
+    /*****************************fragment管理****************************************/
+    @Override
+    public SupportActivityDelegate getSupportDelegate() {
+        return mDelegate;
+    }
+
+    /**
+     * Perform some extra transactions.
+     * 额外的事务：自定义Tag，添加SharedElement动画，操作非回退栈Fragment
+     */
+    @Override
+    public ExtraTransaction extraTransaction() {
+        return mDelegate.extraTransaction();
+    }
+
+    /**
+     * Note： return mDelegate.dispatchTouchEvent(ev) || super.dispatchTouchEvent(ev);
+     */
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        return mDelegate.dispatchTouchEvent(ev) || super.dispatchTouchEvent(ev);
+    }
+
+    /**
+     * 不建议复写该方法,请使用 {@link #onBackPressedSupport} 代替
+     */
+    @Override
+    public void onBackPressed() {
+        mDelegate.onBackPressed();
+    }
+
+    /**
+     * 该方法回调时机为,Activity回退栈内Fragment的数量 小于等于1 时,默认finish Activity
+     * 请尽量复写该方法,避免复写onBackPress(),以保证SupportFragment内的onBackPressedSupport()回退事件正常执行
+     */
+    @Override
+    public void onBackPressedSupport() {
+        mDelegate.onBackPressedSupport();
+    }
+
+    /**
+     * 获取设置的全局动画 copy
+     *
+     * @return FragmentAnimator
+     */
+    @Override
+    public FragmentAnimator getFragmentAnimator() {
+        return mDelegate.getFragmentAnimator();
+    }
+
+    /**
+     * Set all fragments animation.
+     * 设置Fragment内的全局动画
+     */
+    @Override
+    public void setFragmentAnimator(FragmentAnimator fragmentAnimator) {
+        mDelegate.setFragmentAnimator(fragmentAnimator);
+    }
+
+    /**
+     * Set all fragments animation.
+     * 构建Fragment转场动画
+     * <p/>
+     * 如果是在Activity内实现,则构建的是Activity内所有Fragment的转场动画,
+     * 如果是在Fragment内实现,则构建的是该Fragment的转场动画,此时优先级 > Activity的onCreateFragmentAnimator()
+     *
+     * @return FragmentAnimator对象
+     */
+    @Override
+    public FragmentAnimator onCreateFragmentAnimator() {
+        return mDelegate.onCreateFragmentAnimator();
+    }
+
+    @Override
+    public void post(Runnable runnable) {
+        mDelegate.post(runnable);
+    }
+
+    /****************************************以下为可选方法(Optional methods)******************************************************/
+    /**
+     * 加载根Fragment, 即Activity内的第一个Fragment 或 Fragment内的第一个子Fragment
+     * <p>
+     * root_container 容器id
+     *
+     * @param toFragment 目标Fragment
+     */
+    public void loadRootFragment(@NonNull ISupportFragment toFragment) {
+        mDelegate.loadRootFragment(R.id.root_container, toFragment);
+    }
+
+    /**
+     * 加载根Fragment, 即Activity内的第一个Fragment 或 Fragment内的第一个子Fragment
+     *
+     * @param containerId 容器id
+     * @param toFragment  目标Fragment
+     */
+    public void loadRootFragment(int containerId, @NonNull ISupportFragment toFragment) {
+        mDelegate.loadRootFragment(containerId, toFragment);
+    }
+
+    public void loadRootFragment(int containerId, ISupportFragment toFragment, boolean addToBackStack, boolean allowAnimation) {
+        mDelegate.loadRootFragment(containerId, toFragment, addToBackStack, allowAnimation);
+    }
+
+    /**
+     * 加载多个同级根Fragment,类似Wechat, QQ主页的场景
+     */
+    public void loadMultipleRootFragment(int containerId, int showPosition, ISupportFragment... toFragments) {
+        mDelegate.loadMultipleRootFragment(containerId, showPosition, toFragments);
+    }
+
+    /**
+     * show一个Fragment,hide其他同栈所有Fragment
+     * 使用该方法时，要确保同级栈内无多余的Fragment,(只有通过loadMultipleRootFragment()载入的Fragment)
+     * <p>
+     * 建议使用更明确的{@link #showHideFragment(ISupportFragment, ISupportFragment)}
+     *
+     * @param showFragment 需要show的Fragment
+     */
+    public void showHideFragment(ISupportFragment showFragment) {
+        mDelegate.showHideFragment(showFragment);
+    }
+
+    /**
+     * show一个Fragment,hide一个Fragment ; 主要用于类似微信主页那种 切换tab的情况
+     */
+    public void showHideFragment(ISupportFragment showFragment, ISupportFragment hideFragment) {
+        mDelegate.showHideFragment(showFragment, hideFragment);
+    }
+
+    /**
+     * It is recommended to use {@link SupportFragment#start(ISupportFragment)}.
+     */
+    public void start(ISupportFragment toFragment) {
+        mDelegate.start(toFragment);
+    }
+
+    /**
+     * It is recommended to use {@link SupportFragment#start(ISupportFragment, int)}.
+     *
+     * @param launchMode Similar to Activity's LaunchMode.
+     */
+    public void start(ISupportFragment toFragment, @ISupportFragment.LaunchMode int launchMode) {
+        mDelegate.start(toFragment, launchMode);
+    }
+
+    /**
+     * It is recommended to use {@link SupportFragment#startForResult(ISupportFragment, int)}.
+     * Launch an fragment for which you would like a result when it poped.
+     */
+    public void startForResult(ISupportFragment toFragment, int requestCode) {
+        mDelegate.startForResult(toFragment, requestCode);
+    }
+
+    /**
+     * It is recommended to use {@link SupportFragment#startWithPop(ISupportFragment)}.
+     * Start the target Fragment and pop itself
+     */
+    public void startWithPop(ISupportFragment toFragment) {
+        mDelegate.startWithPop(toFragment);
+    }
+
+    /**
+     * It is recommended to use {@link SupportFragment#startWithPopTo(ISupportFragment, Class, boolean)}.
+     *
+     * @see #popTo(Class, boolean)
+     * +
+     * @see #start(ISupportFragment)
+     */
+    public void startWithPopTo(ISupportFragment toFragment, Class<?> targetFragmentClass, boolean includeTargetFragment) {
+        mDelegate.startWithPopTo(toFragment, targetFragmentClass, includeTargetFragment);
+    }
+
+    /**
+     * It is recommended to use {@link SupportFragment#replaceFragment(ISupportFragment, boolean)}.
+     */
+    public void replaceFragment(ISupportFragment toFragment, boolean addToBackStack) {
+        mDelegate.replaceFragment(toFragment, addToBackStack);
+    }
+
+    /**
+     * Pop the fragment.
+     */
+    public void pop() {
+        mDelegate.pop();
+    }
+
+    /**
+     * Pop the last fragment transition from the manager's fragment
+     * back stack.
+     * <p>
+     * 出栈到目标fragment
+     *
+     * @param targetFragmentClass   目标fragment
+     * @param includeTargetFragment 是否包含该fragment
+     */
+    public void popTo(Class<?> targetFragmentClass, boolean includeTargetFragment) {
+        mDelegate.popTo(targetFragmentClass, includeTargetFragment);
+    }
+
+    /**
+     * If you want to begin another FragmentTransaction immediately after popTo(), use this method.
+     * 如果你想在出栈后, 立刻进行FragmentTransaction操作，请使用该方法
+     */
+    public void popTo(Class<?> targetFragmentClass, boolean includeTargetFragment, Runnable afterPopTransactionRunnable) {
+        mDelegate.popTo(targetFragmentClass, includeTargetFragment, afterPopTransactionRunnable);
+    }
+
+    public void popTo(Class<?> targetFragmentClass, boolean includeTargetFragment, Runnable afterPopTransactionRunnable, int popAnim) {
+        mDelegate.popTo(targetFragmentClass, includeTargetFragment, afterPopTransactionRunnable, popAnim);
+    }
+
+    /**
+     * 当Fragment根布局 没有 设定background属性时,
+     * Fragmentation默认使用Theme的android:windowbackground作为Fragment的背景,
+     * 可以通过该方法改变其内所有Fragment的默认背景。
+     */
+    public void setDefaultFragmentBackground(@DrawableRes int backgroundRes) {
+        mDelegate.setDefaultFragmentBackground(backgroundRes);
+    }
+
+    /**
+     * 得到位于栈顶Fragment
+     */
+    public ISupportFragment getTopFragment() {
+        return SupportHelper.getTopFragment(getSupportFragmentManager());
+    }
+
+    /**
+     * 获取栈内的fragment对象
+     */
+    public <T extends ISupportFragment> T findFragment(Class<T> fragmentClass) {
+        return SupportHelper.findFragment(getSupportFragmentManager(), fragmentClass);
+    }
+
+
+    /**
+     * 显示fragment栈视图
+     */
+    public void showFragmetStackView() {
+        Fragmentation.builder()
+                // show stack view. Mode: BUBBLE, SHAKE, NONE
+                .stackViewMode(Fragmentation.BUBBLE)
+                .debug(AppConfig.isDebug())
+                .install();
+    }
+/***********************************滑动返回********************************************/
+    /**
+     * 是否可滑动
+     *
+     * @param enable
+     */
+    @Override
+    public void setSwipeBackEnable(boolean enable) {
+        isOpenSwipBack = enable;
+        mSwipeDelegate.setSwipeBackEnable(enable);
+    }
+
+    @Override
+    public void setEdgeLevel(SwipeBackLayout.EdgeLevel edgeLevel) {
+        mSwipeDelegate.setEdgeLevel(edgeLevel);
+    }
+
+    @Override
+    public void setEdgeLevel(int widthPixel) {
+        mSwipeDelegate.setEdgeLevel(widthPixel);
+    }
+
+    /**
+     * 限制SwipeBack的条件,默认栈内Fragment数 <= 1时 , 优先滑动退出Activity , 而不是Fragment
+     *
+     * @return true: Activity优先滑动退出;  false: Fragment优先滑动退出
+     */
+    @Override
+    public boolean swipeBackPriority() {
+        return mSwipeDelegate.swipeBackPriority();
+    }
+
+    @Override
+    public SwipeBackLayout getSwipeBackLayout() {
+        return mSwipeDelegate.getSwipeBackLayout();
+    }
+
 }
 \ No newline at end of file
 package com.cnlive.core.libs.base.frame.fragment;
+import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.Animation;
 import android.view.inputmethod.InputMethodManager;
 import androidx.annotation.ColorRes;
+import androidx.annotation.FloatRange;
 import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.core.content.ContextCompat;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ViewDataBinding;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
+import com.cnlive.core.libs.base.network.manager.SubscriptionManager;
 import com.cnlive.core.libs.base.util.ParameterCache;
 import com.cnlive.core.libs.base.util.ReflectUtil;
 import com.cnlive.core.libs.base.frame.view.BaseView;
 import com.cnlive.core.libs.base.util.StatusBarConfig;
 import com.cnlive.core.libs.base.util.StatusBarUtil;
+import com.me.yokeyword.fragmentation.ExtraTransaction;
+import com.me.yokeyword.fragmentation.ISupportFragment;
+import com.me.yokeyword.fragmentation.SupportFragmentDelegate;
+import com.me.yokeyword.fragmentation.SupportHelper;
+import com.me.yokeyword.fragmentation.SwipeBackLayout;
+import com.me.yokeyword.fragmentation.anim.FragmentAnimator;
+import com.me.yokeyword.fragmentation_swipeback.core.ISwipeBackFragment;
+import com.me.yokeyword.fragmentation_swipeback.core.SwipeBackFragmentDelegate;
+import com.orhanobut.logger.Logger;
+
 import static android.content.Context.INPUT_METHOD_SERVICE;
@@ -32,19 +49,27 @@ import static android.content.Context.INPUT_METHOD_SERVICE;
  * @param <P>
  * @author ys
  */
-public abstract class BaseFragment<V extends BaseView, P extends BasePresenter<V>> extends com.hannesdorfmann.mosby3.mvp.MvpFragment<V, P> {
+public abstract class BaseFragment<V extends BaseView, P extends BasePresenter<V>> extends com.hannesdorfmann.mosby3.mvp.MvpFragment<V, P> implements ISupportFragment, ISwipeBackFragment {
     private V view;
     private P presenter;
-    protected final String TAG = this.getClass().getSimpleName();
+    public final String TAG = this.getClass().getSimpleName();
     public ViewDataBinding baseBinding;
     public View baseView;
     public BaseActivity me;
+    //fragment管理
+    private final SupportFragmentDelegate mDelegate = new SupportFragmentDelegate(this);
+    //fragment滑动返回
+    private final SwipeBackFragmentDelegate mSwipeDelegate = new SwipeBackFragmentDelegate(this);
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getActivity() == null) return;
         me = (BaseActivity) getActivity();
+        mDelegate.onCreate(savedInstanceState);
+        mSwipeDelegate.onCreate(savedInstanceState);
+        setSwipeBackEnable(me.isOpenSwipBack());
+        ARouter.getInstance().inject(this);
         initFragmentStyle();
         initParams();
     }
@@ -54,10 +79,18 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         if (0 != getBindLayoutId()) {
             baseBinding = DataBindingUtil.inflate(inflater, getBindLayoutId(), container, false);
-            return baseBinding.getRoot();
+            if (me.isOpenSwipBack()) {
+                return attachToSwipeBack(baseBinding.getRoot());
+            } else {
+                return baseBinding.getRoot();
+            }
         } else if (0 != getViewLayoutId()) {
             baseView = inflater.inflate(getViewLayoutId(), container, false);
-            return baseView;
+            if (me.isOpenSwipBack()) {
+                return attachToSwipeBack(baseView);
+            } else {
+                return baseView;
+            }
         }
         return super.onCreateView(inflater, container, savedInstanceState);
     }
@@ -65,6 +98,9 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        //创建订阅映射
+        SubscriptionManager.getInstance().setCurrentDisposables(TAG);
+        mSwipeDelegate.onViewCreated(view, savedInstanceState);
         if (null != getMvpView() && null != getPresenter()) {
             initBindingData();
             initView();
@@ -150,49 +186,51 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
      */
     protected void setStatusBarColor(@ColorRes int color,
                                      @IntRange(from = 0, to = 255) int statusBarAlpha) {
-        StatusBarUtil.setColor(getActivity(), ContextCompat.getColor(getActivity(), color), statusBarAlpha);
+        me.setStatusBarColor(color, statusBarAlpha);
     }
-    /**
-     * 设置状态栏字体颜色
-     */
-    protected void setStatusBarTextColor(int type) {
-        if (type == StatusBarConfig.BLACK) {
-            StatusBarUtil.setStatusBarWrite(getActivity());
-        } else if (type == StatusBarConfig.WHITE) {
-            StatusBarUtil.setStatusBarDarkMode(getActivity());
-        }
+    public void setTransparentForWindow(Activity activity) {
+        me.setTransparentForWindow(activity);
     }
-    /**
-     * 隐藏软键盘
-     */
-    public void hideSoftInput() {
-        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(INPUT_METHOD_SERVICE);
-        if (getActivity().getCurrentFocus() != null && null != imm) {
-            imm.hideSoftInputFromWindow(getActivity().getCurrentFocus().getWindowToken(), 0);
+    public void addTranslucentView(Activity activity, @IntRange(from = 0, to = 255) int statusBarAlpha) {
+        me.addTranslucentView(activity, statusBarAlpha);
+    }
+
+    @Override
+    public void onDestroy() {
+        mDelegate.onDestroy();
+        mSwipeDelegate.onDestroyView();
+        //清除当前订阅
+        SubscriptionManager.getInstance().cancel(TAG);
+        super.onDestroy();
+        if (null != baseBinding) {
+            baseBinding.unbind();
         }
     }
     /**
-     * 显示软键盘
+     * 设置状态栏字体颜色
      */
-    public void showSoftInput() {
-        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(INPUT_METHOD_SERVICE);
-        if (getActivity().getCurrentFocus() != null && null != imm) {
-            imm.showSoftInputFromInputMethod(getActivity().getCurrentFocus().getWindowToken(), 0);
-        }
+    protected void setStatusBarTextColor(int type) {
+        me.setStatusBarTextColor(type);
     }
+
     /**
      * 显示软键盘
      */
-    public void showSoftInput(View view) {
-        // InputMethodManager.SHOW_FORCED);
-        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(INPUT_METHOD_SERVICE);
-        imm.showSoftInput(view, InputMethodManager.SHOW_FORCED);
+    public void showSoftInput() {
+        me.showSoftInput();
     }
+//    /**
+//     * 显示软键盘
+//     */
+//    public void showSoftInput(View view) {
+//        me.showSoftInput(view);
+//    }
+
     /*********************************************************/
     //用于进行dip和px转换
@@ -220,6 +258,16 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
         me.requestPermission(requestCode, defineTip, permissions, onPermissionResponseListener);
     }
+    public void requestPermission(String[] permissions, String defineTip, OnPermissionResponseListener
+            onPermissionResponseListener) {
+        me.requestPermission(permissions, defineTip, onPermissionResponseListener);
+    }
+
+    public void requestPermission(int requestCode, @StringRes int defineTip, String[]
+            permissions, OnPermissionResponseListener onPermissionResponseListener) {
+        me.requestPermission(requestCode, defineTip, permissions, onPermissionResponseListener);
+    }
+
     //多权限检查
     public boolean checkPermissions(String[] permissions) {
         return me.checkPermissions(permissions);
@@ -230,4 +278,481 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
         return me.checkPermissions(permission);
     }
+    /************************************fragment管理********************************************/
+    @Override
+    public SupportFragmentDelegate getSupportDelegate() {
+        return mDelegate;
+    }
+
+    /**
+     * Perform some extra transactions.
+     * 额外的事务：自定义Tag，添加SharedElement动画，操作非回退栈Fragment
+     */
+    @Override
+    public ExtraTransaction extraTransaction() {
+        return mDelegate.extraTransaction();
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        mDelegate.onAttach(activity);
+        me = (BaseActivity) mDelegate.getActivity();
+    }
+
+    @Override
+    public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
+        return mDelegate.onCreateAnimation(transit, enter, nextAnim);
+    }
+
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        mDelegate.onActivityCreated(savedInstanceState);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        mDelegate.onSaveInstanceState(outState);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mDelegate.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mDelegate.onPause();
+    }
+
+    @Override
+    public void onDestroyView() {
+        mDelegate.onDestroyView();
+        super.onDestroyView();
+    }
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        mDelegate.onHiddenChanged(hidden);
+        mSwipeDelegate.onHiddenChanged(hidden);
+    }
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        mDelegate.setUserVisibleHint(isVisibleToUser);
+    }
+
+    public void finish() {
+        if (null != me) {
+            me.finish();
+        }
+    }
+
+    /*************************************log******************************************/
+    public void logError(Object info) {
+        Logger.e(TAG, info);
+    }
+
+    public void logDebug(Object info) {
+        Logger.d(TAG, info);
+    }
+
+    public void logWarn(Object info) {
+        Logger.w(TAG, info);
+    }
+
+    public void logInfo(Object info) {
+        Logger.i(TAG, info);
+    }
+
+    public void logVerbose(Object info) {
+        Logger.v(TAG, info);
+    }
+
+    public void logJson(String json) {
+        Logger.json(json);
+    }
+
+    public void logXml(String xml) {
+        Logger.xml(xml);
+    }
+/*********************************fragment 管理******************************************/
+    /**
+     * Causes the Runnable r to be added to the action queue.
+     * <p>
+     * The runnable will be run after all the previous action has been run.
+     * <p>
+     * 前面的事务全部执行后 执行该Action
+     *
+     * @deprecated Use {@link #post(Runnable)} instead.
+     */
+    @Deprecated
+    @Override
+    public void enqueueAction(Runnable runnable) {
+        mDelegate.enqueueAction(runnable);
+    }
+
+    /**
+     * Causes the Runnable r to be added to the action queue.
+     * <p>
+     * The runnable will be run after all the previous action has been run.
+     * <p>
+     * 前面的事务全部执行后 执行该Action
+     */
+    @Override
+    public void post(Runnable runnable) {
+        mDelegate.post(runnable);
+    }
+
+    /**
+     * Called when the enter-animation end.
+     * 入栈动画 结束时,回调
+     */
+    @Override
+    public void onEnterAnimationEnd(Bundle savedInstanceState) {
+        mDelegate.onEnterAnimationEnd(savedInstanceState);
+    }
+
+
+    /**
+     * Lazy initial，Called when fragment is first called.
+     * <p>
+     * 同级下的 懒加载 ＋ ViewPager下的懒加载  的结合回调方法
+     */
+    @Override
+    public void onLazyInitView(@Nullable Bundle savedInstanceState) {
+        mDelegate.onLazyInitView(savedInstanceState);
+    }
+
+    /**
+     * Called when the fragment is visible.
+     * 当Fragment对用户可见时回调
+     * <p>
+     * Is the combination of  [onHiddenChanged() + onResume()/onPause() + setUserVisibleHint()]
+     */
+    @Override
+    public void onSupportVisible() {
+        mDelegate.onSupportVisible();
+    }
+
+    /**
+     * Called when the fragment is invivible.
+     * <p>
+     * Is the combination of  [onHiddenChanged() + onResume()/onPause() + setUserVisibleHint()]
+     */
+    @Override
+    public void onSupportInvisible() {
+        mDelegate.onSupportInvisible();
+    }
+
+    /**
+     * Return true if the fragment has been supportVisible.
+     */
+    @Override
+    final public boolean isSupportVisible() {
+        return mDelegate.isSupportVisible();
+    }
+
+    /**
+     * Set fragment animation with a higher priority than the ISupportActivity
+     * 设定当前Fragmemt动画,优先级比在SupportActivity里高
+     */
+    @Override
+    public FragmentAnimator onCreateFragmentAnimator() {
+        return mDelegate.onCreateFragmentAnimator();
+    }
+
+    /**
+     * 获取设置的全局动画 copy
+     *
+     * @return FragmentAnimator
+     */
+    @Override
+    public FragmentAnimator getFragmentAnimator() {
+        return mDelegate.getFragmentAnimator();
+    }
+
+    /**
+     * 设置Fragment内的全局动画
+     */
+    @Override
+    public void setFragmentAnimator(FragmentAnimator fragmentAnimator) {
+        mDelegate.setFragmentAnimator(fragmentAnimator);
+    }
+
+    /**
+     * 按返回键触发,前提是SupportActivity的onBackPressed()方法能被调用
+     *
+     * @return false则继续向上传递, true则消费掉该事件
+     */
+    @Override
+    public boolean onBackPressedSupport() {
+        return mDelegate.onBackPressedSupport();
+    }
+
+    /**
+     * 类似 {@link Activity#setResult(int, Intent)}
+     * <p>
+     * Similar to {@link Activity#setResult(int, Intent)}
+     *
+     * @see #startForResult(ISupportFragment, int)
+     */
+    @Override
+    public void setFragmentResult(int resultCode, Bundle bundle) {
+        mDelegate.setFragmentResult(resultCode, bundle);
+    }
+
+    /**
+     * 类似  {@link Activity#onActivityResult(int, int, Intent)}
+     * <p>
+     * Similar to {@link Activity#onActivityResult(int, int, Intent)}
+     *
+     * @see #startForResult(ISupportFragment, int)
+     */
+    @Override
+    public void onFragmentResult(int requestCode, int resultCode, Bundle data) {
+        mDelegate.onFragmentResult(requestCode, resultCode, data);
+    }
+
+    /**
+     * 在start(TargetFragment,LaunchMode)时,启动模式为SingleTask/SingleTop, 回调TargetFragment的该方法
+     * 类似 {@link Activity#onNewIntent(Intent)}
+     * <p>
+     * Similar to {@link Activity#onNewIntent(Intent)}
+     *
+     * @param args putNewBundle(Bundle newBundle)
+     * @see #start(ISupportFragment, int)
+     */
+    @Override
+    public void onNewBundle(Bundle args) {
+        mDelegate.onNewBundle(args);
+    }
+
+    /**
+     * 添加NewBundle,用于启动模式为SingleTask/SingleTop时
+     *
+     * @see #start(ISupportFragment, int)
+     */
+    @Override
+    public void putNewBundle(Bundle newBundle) {
+        mDelegate.putNewBundle(newBundle);
+    }
+
+
+    /****************************************以下为可选方法(Optional methods)******************************************************/
+
+    /**
+     * 隐藏软键盘
+     */
+    protected void hideSoftInput() {
+        mDelegate.hideSoftInput();
+    }
+
+    /**
+     * 显示软键盘,调用该方法后,会在onPause时自动隐藏软键盘
+     */
+    protected void showSoftInput(final View view) {
+        mDelegate.showSoftInput(view);
+    }
+
+    /**
+     * 加载根Fragment, 即Activity内的第一个Fragment 或 Fragment内的第一个子Fragment
+     *
+     * @param containerId 容器id
+     * @param toFragment  目标Fragment
+     */
+    public void loadRootFragment(int containerId, ISupportFragment toFragment) {
+        mDelegate.loadRootFragment(containerId, toFragment);
+    }
+
+    public void loadRootFragment(int containerId, ISupportFragment toFragment, boolean addToBackStack, boolean allowAnim) {
+        mDelegate.loadRootFragment(containerId, toFragment, addToBackStack, allowAnim);
+    }
+
+    /**
+     * 加载多个同级根Fragment,类似Wechat, QQ主页的场景
+     */
+    public void loadMultipleRootFragment(int containerId, int showPosition, ISupportFragment... toFragments) {
+        mDelegate.loadMultipleRootFragment(containerId, showPosition, toFragments);
+    }
+
+    /**
+     * show一个Fragment,hide其他同栈所有Fragment
+     * 使用该方法时，要确保同级栈内无多余的Fragment,(只有通过loadMultipleRootFragment()载入的Fragment)
+     * <p>
+     * 建议使用更明确的{@link #showHideFragment(ISupportFragment, ISupportFragment)}
+     *
+     * @param showFragment 需要show的Fragment
+     */
+    public void showHideFragment(ISupportFragment showFragment) {
+        mDelegate.showHideFragment(showFragment);
+    }
+
+    /**
+     * show一个Fragment,hide一个Fragment ; 主要用于类似微信主页那种 切换tab的情况
+     */
+    public void showHideFragment(ISupportFragment showFragment, ISupportFragment hideFragment) {
+        mDelegate.showHideFragment(showFragment, hideFragment);
+    }
+
+    public void start(ISupportFragment toFragment) {
+        mDelegate.start(toFragment);
+    }
+
+    /**
+     * @param launchMode Similar to Activity's LaunchMode.
+     */
+    public void start(final ISupportFragment toFragment, @LaunchMode int launchMode) {
+        mDelegate.start(toFragment, launchMode);
+    }
+
+    /**
+     * Launch an fragment for which you would like a result when it poped.
+     */
+    public void startForResult(ISupportFragment toFragment, int requestCode) {
+        mDelegate.startForResult(toFragment, requestCode);
+    }
+
+    /**
+     * Start the target Fragment and pop itself
+     */
+    public void startWithPop(ISupportFragment toFragment) {
+        mDelegate.startWithPop(toFragment);
+    }
+
+    /**
+     * @see #popTo(Class, boolean)
+     * +
+     * @see #start(ISupportFragment)
+     */
+    public void startWithPopTo(ISupportFragment toFragment, Class<?> targetFragmentClass, boolean includeTargetFragment) {
+        mDelegate.startWithPopTo(toFragment, targetFragmentClass, includeTargetFragment);
+    }
+
+
+    public void replaceFragment(ISupportFragment toFragment, boolean addToBackStack) {
+        mDelegate.replaceFragment(toFragment, addToBackStack);
+    }
+
+    public void pop() {
+        mDelegate.pop();
+    }
+
+    /**
+     * Pop the child fragment.
+     */
+    public void popChild() {
+        mDelegate.popChild();
+    }
+
+    /**
+     * Pop the last fragment transition from the manager's fragment
+     * back stack.
+     * <p>
+     * 出栈到目标fragment
+     *
+     * @param targetFragmentClass   目标fragment
+     * @param includeTargetFragment 是否包含该fragment
+     */
+    public void popTo(Class<?> targetFragmentClass, boolean includeTargetFragment) {
+        mDelegate.popTo(targetFragmentClass, includeTargetFragment);
+    }
+
+    /**
+     * If you want to begin another FragmentTransaction immediately after popTo(), use this method.
+     * 如果你想在出栈后, 立刻进行FragmentTransaction操作，请使用该方法
+     */
+    public void popTo(Class<?> targetFragmentClass, boolean includeTargetFragment, Runnable afterPopTransactionRunnable) {
+        mDelegate.popTo(targetFragmentClass, includeTargetFragment, afterPopTransactionRunnable);
+    }
+
+    public void popTo(Class<?> targetFragmentClass, boolean includeTargetFragment, Runnable afterPopTransactionRunnable, int popAnim) {
+        mDelegate.popTo(targetFragmentClass, includeTargetFragment, afterPopTransactionRunnable, popAnim);
+    }
+
+    public void popToChild(Class<?> targetFragmentClass, boolean includeTargetFragment) {
+        mDelegate.popToChild(targetFragmentClass, includeTargetFragment);
+    }
+
+    public void popToChild(Class<?> targetFragmentClass, boolean includeTargetFragment, Runnable afterPopTransactionRunnable) {
+        mDelegate.popToChild(targetFragmentClass, includeTargetFragment, afterPopTransactionRunnable);
+    }
+
+    public void popToChild(Class<?> targetFragmentClass, boolean includeTargetFragment, Runnable afterPopTransactionRunnable, int popAnim) {
+        mDelegate.popToChild(targetFragmentClass, includeTargetFragment, afterPopTransactionRunnable, popAnim);
+    }
+
+    /**
+     * 得到位于栈顶Fragment
+     */
+    public ISupportFragment getTopFragment() {
+        return SupportHelper.getTopFragment(getFragmentManager());
+    }
+
+    public ISupportFragment getTopChildFragment() {
+        return SupportHelper.getTopFragment(getChildFragmentManager());
+    }
+
+    /**
+     * @return 位于当前Fragment的前一个Fragment
+     */
+    public ISupportFragment getPreFragment() {
+        return SupportHelper.getPreFragment(this);
+    }
+
+    /**
+     * 获取栈内的fragment对象
+     */
+    public <T extends ISupportFragment> T findFragment(Class<T> fragmentClass) {
+        return SupportHelper.findFragment(getFragmentManager(), fragmentClass);
+    }
+
+    /**
+     * 获取栈内的fragment对象
+     */
+    public <T extends ISupportFragment> T findChildFragment(Class<T> fragmentClass) {
+        return SupportHelper.findFragment(getChildFragmentManager(), fragmentClass);
+    }
+
+    /*****************************侧滑返回************************************/
+    @Override
+    public View attachToSwipeBack(View view) {
+        return mSwipeDelegate.attachToSwipeBack(view);
+    }
+
+    public SwipeBackLayout getSwipeBackLayout() {
+        return mSwipeDelegate.getSwipeBackLayout();
+    }
+
+    /**
+     * 是否可滑动
+     *
+     * @param enable
+     */
+    public void setSwipeBackEnable(boolean enable) {
+        mSwipeDelegate.setSwipeBackEnable(enable);
+    }
+
+    @Override
+    public void setEdgeLevel(SwipeBackLayout.EdgeLevel edgeLevel) {
+        mSwipeDelegate.setEdgeLevel(edgeLevel);
+    }
+
+    @Override
+    public void setEdgeLevel(int widthPixel) {
+        mSwipeDelegate.setEdgeLevel(widthPixel);
+    }
+
+    /**
+     * Set the offset of the parallax slip.
+     */
+    public void setParallaxOffset(@FloatRange(from = 0.0f, to = 1.0f) float offset) {
+        mSwipeDelegate.setParallaxOffset(offset);
+    }
 }
@@ -2,6 +2,7 @@ package com.cnlive.core.libs.base.frame.presenter;
 import com.cnlive.core.libs.base.frame.view.BaseView;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+import com.orhanobut.logger.Logger;
 public class BasePresenter<V extends BaseView> extends MvpBasePresenter<V> {
     protected final String TAG = this.getClass().getSimpleName();
@@ -17,4 +18,32 @@ public class BasePresenter&lt;V extends BaseView&gt; extends MvpBasePresenter&lt;V&gt; {
 //    public V getView() {
 //        return super.getView();
 //    }
+
+    public void logError(Object info) {
+        Logger.e(TAG, info);
+    }
+
+    public void logDebug(Object info) {
+        Logger.d(TAG, info);
+    }
+
+    public void logWarn(Object info) {
+        Logger.w(TAG, info);
+    }
+
+    public void logInfo(Object info) {
+        Logger.i(TAG, info);
+    }
+
+    public void logVerbose(Object info) {
+        Logger.v(TAG, info);
+    }
+
+    public void logJson(String json) {
+        Logger.json(json);
+    }
+
+    public void logXml(String xml) {
+        Logger.xml(xml);
+    }
 }
 package com.cnlive.core.libs.base.frame.view;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
+import com.orhanobut.logger.Logger;
 /**
  * @author ys
@@ -22,4 +23,32 @@ public class BaseView implements MvpView {
         }
         return false;
     }
+
+    public void logError(Object info) {
+        Logger.e(TAG, info);
+    }
+
+    public void logDebug(Object info) {
+        Logger.d(TAG, info);
+    }
+
+    public void logWarn(Object info) {
+        Logger.w(TAG, info);
+    }
+
+    public void logInfo(Object info) {
+        Logger.i(TAG, info);
+    }
+
+    public void logVerbose(Object info) {
+        Logger.v(TAG, info);
+    }
+
+    public void logJson(String json) {
+        Logger.json(json);
+    }
+
+    public void logXml(String xml) {
+        Logger.xml(xml);
+    }
 }
+package com.cnlive.core.libs.base.ui.widget;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.view.animation.AnimationSet;
+import android.view.animation.DecelerateInterpolator;
+import android.view.animation.TranslateAnimation;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import com.cnlive.core.libs.base.util.DensityUtils;
+import com.cnlive.strike.base.R;
+import com.qmuiteam.qmui.QMUILog;
+import com.qmuiteam.qmui.util.QMUIDisplayHelper;
+import com.qmuiteam.qmui.util.QMUILangHelper;
+import com.qmuiteam.qmui.util.QMUIResHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * QMUIBottomSheet 在 {@link Dialog} 的基础上重新定制了 {@link #show()} 和 {@link #hide()} 时的动画效果, 使 {@link Dialog} 在界面底部升起和降下。
+ * <p>
+ * 提供了以下两种面板样式:
+ * <ul>
+ * <li>列表样式, 使用 {@link BottomSheet.BottomListSheetBuilder} 生成。</li>
+ * </ul>
+ * </p>
+ */
+public class BottomSheet extends Dialog {
+    private static final String TAG = "QMUIBottomSheet";
+    // 动画时长
+    private final static int mAnimationDuration = 200;
+    // 持有 ContentView，为了做动画
+    private View mContentView;
+    private boolean mIsAnimating = false;
+
+    private OnBottomSheetShowListener mOnBottomSheetShowListener;
+
+    public BottomSheet(Context context) {
+        super(context, com.qmuiteam.qmui.R.style.QMUI_BottomSheet);
+    }
+
+    public void setOnBottomSheetShowListener(OnBottomSheetShowListener onBottomSheetShowListener) {
+        mOnBottomSheetShowListener = onBottomSheetShowListener;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        //noinspection ConstantConditions
+        getWindow().getDecorView().setPadding(0, 0, 0, 0);
+
+        // 在底部，宽度撑满
+        WindowManager.LayoutParams params = getWindow().getAttributes();
+        params.height = ViewGroup.LayoutParams.WRAP_CONTENT;
+        params.gravity = Gravity.BOTTOM | Gravity.CENTER;
+
+        int screenWidth = QMUIDisplayHelper.getScreenWidth(getContext());
+        int screenHeight = QMUIDisplayHelper.getScreenHeight(getContext());
+        params.width = screenWidth < screenHeight ? screenWidth : screenHeight;
+        getWindow().setAttributes(params);
+        setCanceledOnTouchOutside(true);
+    }
+
+    @Override
+    public void setContentView(int layoutResID) {
+        mContentView = LayoutInflater.from(getContext()).inflate(layoutResID, null);
+        super.setContentView(mContentView);
+    }
+
+    @Override
+    public void setContentView(@NonNull View view, ViewGroup.LayoutParams params) {
+        mContentView = view;
+        super.setContentView(view, params);
+    }
+
+    public View getContentView() {
+        return mContentView;
+    }
+
+    @Override
+    public void setContentView(@NonNull View view) {
+        mContentView = view;
+        super.setContentView(view);
+    }
+
+    /**
+     * BottomSheet升起动画
+     */
+    private void animateUp() {
+        if (mContentView == null) {
+            return;
+        }
+        TranslateAnimation translate = new TranslateAnimation(
+                Animation.RELATIVE_TO_SELF, 0f, Animation.RELATIVE_TO_SELF, 0f,
+                Animation.RELATIVE_TO_SELF, 1f, Animation.RELATIVE_TO_SELF, 0f
+        );
+        AlphaAnimation alpha = new AlphaAnimation(0, 1);
+        AnimationSet set = new AnimationSet(true);
+        set.addAnimation(translate);
+        set.addAnimation(alpha);
+        set.setInterpolator(new DecelerateInterpolator());
+        set.setDuration(mAnimationDuration);
+        set.setFillAfter(true);
+        mContentView.startAnimation(set);
+    }
+
+    /**
+     * BottomSheet降下动画
+     */
+    private void animateDown() {
+        if (mContentView == null) {
+            return;
+        }
+        TranslateAnimation translate = new TranslateAnimation(
+                Animation.RELATIVE_TO_SELF, 0f, Animation.RELATIVE_TO_SELF, 0f,
+                Animation.RELATIVE_TO_SELF, 0f, Animation.RELATIVE_TO_SELF, 1f
+        );
+        AlphaAnimation alpha = new AlphaAnimation(1, 0);
+        AnimationSet set = new AnimationSet(true);
+        set.addAnimation(translate);
+        set.addAnimation(alpha);
+        set.setInterpolator(new DecelerateInterpolator());
+        set.setDuration(mAnimationDuration);
+        set.setFillAfter(true);
+        set.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {
+                mIsAnimating = true;
+            }
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                mIsAnimating = false;
+                /**
+                 * Bugfix： Attempting to destroy the window while drawing!
+                 */
+                mContentView.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        // java.lang.IllegalArgumentException: View=com.android.internal.policy.PhoneWindow$DecorView{22dbf5b V.E...... R......D 0,0-1080,1083} not attached to window manager
+                        // 在dismiss的时候可能已经detach了，简单try-catch一下
+                        try {
+                            BottomSheet.super.dismiss();
+                        } catch (Exception e) {
+                            QMUILog.w(TAG, "dismiss error\n" + Log.getStackTraceString(e));
+                        }
+                    }
+                });
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {
+
+            }
+        });
+        mContentView.startAnimation(set);
+    }
+
+    @Override
+    public void show() {
+        super.show();
+        animateUp();
+        if (mOnBottomSheetShowListener != null) {
+            mOnBottomSheetShowListener.onShow();
+        }
+    }
+
+    @Override
+    public void dismiss() {
+        if (mIsAnimating) {
+            return;
+        }
+        animateDown();
+    }
+
+    /**
+     * 销毁提示窗
+     *
+     * @param animation 是否启动动画
+     */
+    public void dismiss(boolean animation) {
+        if (animation) {
+            dismiss();
+        } else {
+            super.dismiss();
+        }
+    }
+
+    public interface OnBottomSheetShowListener {
+        void onShow();
+    }
+
+    /**
+     * 生成列表类型的 {@link BottomSheet} 对话框。
+     */
+    public static class BottomListSheetBuilder {
+
+        private Context mContext;
+
+        private BottomSheet mDialog;
+        private List<BottomSheetListItemData> mItems;
+        private BaseAdapter mAdapter;
+        private List<View> mHeaderViews;
+        private ListView mContainerView;
+        private int mCheckedIndex;
+        private String mTitle;
+        private TextView mTitleTv;
+        private OnSheetItemClickListener mOnSheetItemClickListener;
+        private OnDismissListener mOnBottomDialogDismissListener;
+
+
+        public BottomListSheetBuilder(Context context) {
+            mContext = context;
+            mItems = new ArrayList<>();
+            mHeaderViews = new ArrayList<>();
+        }
+
+        public BottomListSheetBuilder setCheckedIndex(int checkedIndex) {
+            mCheckedIndex = checkedIndex;
+            return this;
+        }
+
+        /**
+         * @param textAndTag Item 的文字内容，同时会把内容设置为 tag。
+         */
+        public BottomListSheetBuilder addItem(String textAndTag) {
+            mItems.add(new BottomSheetListItemData(textAndTag, textAndTag, null, false));
+            return this;
+        }
+
+        /**
+         * @param textAndTag Item 的文字内容，同时会把内容设置为 tag。
+         * @param split      是否显示分割线
+         */
+        public BottomListSheetBuilder addItem(String textAndTag, boolean split) {
+            mItems.add(new BottomSheetListItemData(textAndTag, textAndTag, null, split));
+            return this;
+        }
+
+        /**
+         * @param subTitle   副标题文字内容
+         * @param textAndTag Item 的文字内容，同时会把内容设置为 tag。
+         * @param split      是否显示分割线
+         * @return
+         */
+        public BottomListSheetBuilder addItem(String textAndTag, String subTitle, boolean split) {
+            mItems.add(new BottomSheetListItemData(textAndTag, textAndTag, subTitle, split));
+            return this;
+        }
+
+        /**
+         * @param text Item 的文字内容。
+         * @param tag  item 的 tag。
+         */
+        public BottomListSheetBuilder addItem(String text, String tag) {
+            mItems.add(new BottomSheetListItemData(text, tag));
+            return this;
+        }
+
+
+        public BottomListSheetBuilder setOnSheetItemClickListener(OnSheetItemClickListener onSheetItemClickListener) {
+            mOnSheetItemClickListener = onSheetItemClickListener;
+            return this;
+        }
+
+        public BottomListSheetBuilder setOnBottomDialogDismissListener(OnDismissListener listener) {
+            mOnBottomDialogDismissListener = listener;
+            return this;
+        }
+
+        public BottomListSheetBuilder addHeaderView(View view) {
+            if (view != null) {
+                mHeaderViews.add(view);
+            }
+            return this;
+        }
+
+        public BottomListSheetBuilder setTitle(String title) {
+            mTitle = title;
+            return this;
+        }
+
+        public BottomListSheetBuilder setTitle(int resId) {
+            mTitle = mContext.getResources().getString(resId);
+            return this;
+        }
+
+        public BottomSheet build() {
+            mDialog = new BottomSheet(mContext);
+            View contentView = buildViews();
+            mDialog.setContentView(contentView,
+                    new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+            if (mOnBottomDialogDismissListener != null) {
+                mDialog.setOnDismissListener(mOnBottomDialogDismissListener);
+            }
+            return mDialog;
+        }
+
+        private View buildViews() {
+            View wrapperView = View.inflate(mContext, getContentViewLayoutId(), null);
+            mTitleTv = (TextView) wrapperView.findViewById(com.qmuiteam.qmui.R.id.title);
+            mContainerView = (ListView) wrapperView.findViewById(com.qmuiteam.qmui.R.id.listview);
+            if (mTitle != null && mTitle.length() != 0) {
+                mTitleTv.setVisibility(View.VISIBLE);
+                mTitleTv.setText(mTitle);
+            } else {
+                mTitleTv.setVisibility(View.GONE);
+            }
+            if (mHeaderViews.size() > 0) {
+                for (View headerView : mHeaderViews) {
+                    mContainerView.addHeaderView(headerView);
+                }
+            }
+            if (needToScroll()) {
+                mContainerView.getLayoutParams().height = getListMaxHeight();
+                mDialog.setOnBottomSheetShowListener(new OnBottomSheetShowListener() {
+                    @Override
+                    public void onShow() {
+                        mContainerView.setSelection(mCheckedIndex);
+                    }
+                });
+            }
+
+            mAdapter = new ListAdapter();
+            mContainerView.setAdapter(mAdapter);
+            return wrapperView;
+        }
+
+        private boolean needToScroll() {
+            int itemHeight = QMUIResHelper.getAttrDimen(mContext, com.qmuiteam.qmui.R.attr.qmui_bottom_sheet_list_item_height);
+            int totalHeight = mItems.size() * itemHeight;
+            if (mHeaderViews.size() > 0) {
+                for (View view : mHeaderViews) {
+                    if (view.getMeasuredHeight() == 0) {
+                        view.measure(0, 0);
+                    }
+                    totalHeight += view.getMeasuredHeight();
+                }
+            }
+            if (mTitleTv != null && !QMUILangHelper.isNullOrEmpty(mTitle)) {
+                totalHeight += QMUIResHelper.getAttrDimen(mContext, com.qmuiteam.qmui.R.attr.qmui_bottom_sheet_title_height);
+            }
+            return totalHeight > getListMaxHeight();
+        }
+
+        /**
+         * 注意:这里只考虑List的高度,如果有title或者headerView,不计入考虑中
+         */
+        protected int getListMaxHeight() {
+            return (int) (QMUIDisplayHelper.getScreenHeight(mContext) * 0.5);
+        }
+
+        public void notifyDataSetChanged() {
+            if (mAdapter != null) {
+                mAdapter.notifyDataSetChanged();
+            }
+            if (needToScroll()) {
+                mContainerView.getLayoutParams().height = getListMaxHeight();
+                mContainerView.setSelection(mCheckedIndex);
+            }
+        }
+
+        protected int getContentViewLayoutId() {
+            return R.layout.qmui_bottom_sheet_list;
+        }
+
+        public interface OnSheetItemClickListener {
+            void onClick(BottomSheet dialog, View itemView, int position, String tag);
+        }
+
+        private static class BottomSheetListItemData {
+
+            String text;
+            String tag = "";
+            boolean isDisabled = false;
+            boolean split = false;
+            String subTitle;
+
+            public BottomSheetListItemData(String text, String tag, String subTitle, boolean split) {
+                this.text = text;
+                this.tag = tag;
+                this.split = split;
+                this.subTitle = subTitle;
+            }
+
+            public BottomSheetListItemData(String text, String tag) {
+                this.text = text;
+                this.tag = tag;
+            }
+
+
+        }
+
+        private static class ViewHolder {
+            TextView textView;
+            TextView subTextView;
+            View bottonBar;
+            View itemView;
+        }
+
+        private class ListAdapter extends BaseAdapter {
+
+            @Override
+            public int getCount() {
+                return mItems.size();
+            }
+
+            @Override
+            public BottomSheetListItemData getItem(int position) {
+                return mItems.get(position);
+            }
+
+            @Override
+            public long getItemId(int position) {
+                return 0;
+            }
+
+            @Override
+            public View getView(final int position, View convertView, ViewGroup parent) {
+                final BottomSheetListItemData data = getItem(position);
+                final ViewHolder holder;
+                if (convertView == null) {
+                    LayoutInflater inflater = LayoutInflater.from(mContext);
+                    convertView = inflater.inflate(R.layout.qmui_bottom_sheet_list_item, parent, false);
+                    holder = new ViewHolder();
+                    holder.textView = (TextView) convertView.findViewById(com.qmuiteam.qmui.R.id.bottom_dialog_list_item_title);
+                    holder.bottonBar = convertView.findViewById(R.id.botton_bar);
+                    holder.subTextView = convertView.findViewById(R.id.bottom_dialog_list_item_subtitle);
+                    holder.itemView = convertView.findViewById(R.id.itemView);
+                    convertView.setTag(holder);
+                } else {
+                    holder = (ViewHolder) convertView.getTag();
+                }
+               // holder.textView.setTextColor(mContext.getResources().getColor(R.color.qmui_config_color_red));
+                if (data.text.equals("取消")){
+                    holder.textView.setTextColor(mContext.getResources().getColor(R.color.gay));
+                }else {
+                    holder.textView.setTextColor(mContext.getResources().getColor(R.color.green));
+                }
+                holder.textView.setText(data.text);
+
+                if (data.isDisabled) {
+                    holder.textView.setEnabled(false);
+                    convertView.setEnabled(false);
+                } else {
+                    holder.textView.setEnabled(true);
+                    convertView.setEnabled(true);
+                }
+
+                if (data.split) {
+                    holder.bottonBar.setVisibility(View.VISIBLE);
+                } else {
+                    holder.bottonBar.setVisibility(View.GONE);
+                }
+                if (TextUtils.isEmpty(data.subTitle)) {
+                    holder.subTextView.setText("");
+                    holder.subTextView.setVisibility(View.GONE);
+                    holder.itemView.getLayoutParams().height = DensityUtils.dp2px(56);
+                } else {
+                    holder.itemView.getLayoutParams().height = DensityUtils.dp2px(61);
+                    holder.subTextView.setText(data.subTitle);
+                    holder.subTextView.setVisibility(View.VISIBLE);
+                }
+
+                convertView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if (mOnSheetItemClickListener != null) {
+                            mOnSheetItemClickListener.onClick(mDialog, v, position, data.tag);
+                        }
+                    }
+                });
+                return convertView;
+            }
+        }
+
+    }
+
+}
+package com.cnlive.core.libs.base.ui.widget.switchbutton;
+
+import android.content.res.ColorStateList;
+
+/**
+ * Generate thumb and background color state list use tintColor
+ * Created by kyle on 15/11/4.
+ */
+public class ColorUtils {
+    private static final int ENABLE_ATTR = android.R.attr.state_enabled;
+    private static final int CHECKED_ATTR = android.R.attr.state_checked;
+    private static final int PRESSED_ATTR = android.R.attr.state_pressed;
+
+    static ColorStateList generateThumbColorWithTintColor(final int tintColor) {
+        int[][] states = new int[][]{
+                {-ENABLE_ATTR, CHECKED_ATTR},
+                {-ENABLE_ATTR},
+                {PRESSED_ATTR, -CHECKED_ATTR},
+                {PRESSED_ATTR, CHECKED_ATTR},
+                {CHECKED_ATTR},
+                {-CHECKED_ATTR}
+        };
+
+        int[] colors = new int[]{
+                tintColor - 0xAA000000,
+                0xFFBABABA,
+                tintColor - 0x99000000,
+                tintColor - 0x99000000,
+                tintColor | 0xFF000000,
+                0xFFEEEEEE
+        };
+        return new ColorStateList(states, colors);
+    }
+
+    static ColorStateList generateBackColorWithTintColor(final int tintColor) {
+        int[][] states = new int[][]{
+                {-ENABLE_ATTR, CHECKED_ATTR},
+                {-ENABLE_ATTR},
+                {CHECKED_ATTR, PRESSED_ATTR},
+                {-CHECKED_ATTR, PRESSED_ATTR},
+                {CHECKED_ATTR},
+                {-CHECKED_ATTR}
+        };
+
+        int[] colors = new int[]{
+                tintColor - 0xE1000000,
+                0x10000000,
+                tintColor - 0xD0000000,
+                0x20000000,
+                tintColor - 0xD0000000,
+                0x20000000
+        };
+        return new ColorStateList(states, colors);
+    }
+}
+package com.cnlive.core.libs.base.ui.widget.switchbutton;
+
+import android.animation.ObjectAnimator;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.PointF;
+import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.StateListDrawable;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.Layout;
+import android.text.StaticLayout;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.MotionEvent;
+import android.view.SoundEffectConstants;
+import android.view.ViewConfiguration;
+import android.view.ViewParent;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.widget.CompoundButton;
+
+import androidx.core.content.ContextCompat;
+
+import com.cnlive.strike.base.R;
+
+
+/**
+ * SwitchButton
+ *
+ * @author kyleduo
+ * @since 2014-09-24
+ */
+
+@SuppressWarnings("unused")
+public class SwitchButton extends CompoundButton {
+    public static final float DEFAULT_THUMB_RANGE_RATIO = 1.8f;
+    public static final int DEFAULT_THUMB_SIZE_DP = 20;
+    public static final int DEFAULT_THUMB_MARGIN_DP = 2;
+    public static final int DEFAULT_ANIMATION_DURATION = 250;
+    public static final int DEFAULT_TINT_COLOR = 0x327FC2;
+
+    private static int[] CHECKED_PRESSED_STATE = new int[]{android.R.attr.state_checked, android.R.attr.state_enabled, android.R.attr.state_pressed};
+    private static int[] UNCHECKED_PRESSED_STATE = new int[]{-android.R.attr.state_checked, android.R.attr.state_enabled, android.R.attr.state_pressed};
+
+    private Drawable mThumbDrawable, mBackDrawable;
+    private ColorStateList mBackColor, mThumbColor;
+    private float mThumbRadius, mBackRadius;
+    private RectF mThumbMargin;
+    private float mThumbRangeRatio;
+    private long mAnimationDuration;
+    // fade back drawable or color when dragging or animating
+    private boolean mFadeBack;
+    private int mTintColor;
+    private int mThumbWidth;
+    private int mThumbHeight;
+    private int mBackWidth;
+    private int mBackHeight;
+
+    private int mCurrThumbColor, mCurrBackColor, mNextBackColor, mOnTextColor, mOffTextColor;
+    private Drawable mCurrentBackDrawable, mNextBackDrawable;
+    private RectF mThumbRectF, mBackRectF, mSafeRectF, mTextOnRectF, mTextOffRectF;
+    private Paint mPaint;
+    // whether using Drawable for thumb or back
+    private boolean mIsThumbUseDrawable, mIsBackUseDrawable;
+    private boolean mDrawDebugRect = false;
+    private ObjectAnimator mProgressAnimator;
+    // animation control
+    private float mProgress;
+    // temp position of thumb when dragging or animating
+    private RectF mPresentThumbRectF;
+    private float mStartX, mStartY, mLastX;
+    private int mTouchSlop;
+    private int mClickTimeout;
+    private Paint mRectPaint;
+    private CharSequence mTextOn;
+    private CharSequence mTextOff;
+    private TextPaint mTextPaint;
+    private Layout mOnLayout;
+    private Layout mOffLayout;
+    private float mTextWidth;
+    private float mTextHeight;
+    private int mTextThumbInset;
+    private int mTextExtra;
+    private int mTextAdjust;
+    // FIX #78,#85 : When restoring saved states, setChecked() called by super. So disable
+    // animation and event listening when restoring.
+    private boolean mRestoring = false;
+    private boolean mReady = false;
+    private boolean mCatch = false;
+
+    private OnCheckedChangeListener mChildOnCheckedChangeListener;
+
+    public SwitchButton(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init(attrs);
+    }
+
+    public SwitchButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(attrs);
+    }
+
+    public SwitchButton(Context context) {
+        super(context);
+        init(null);
+    }
+
+    private void init(AttributeSet attrs) {
+        mTouchSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop();
+        mClickTimeout = ViewConfiguration.getPressedStateDuration() + ViewConfiguration.getTapTimeout();
+
+        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mRectPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mRectPaint.setStyle(Paint.Style.STROKE);
+        mRectPaint.setStrokeWidth(getResources().getDisplayMetrics().density);
+
+        mTextPaint = getPaint();
+
+        mThumbRectF = new RectF();
+        mBackRectF = new RectF();
+        mSafeRectF = new RectF();
+        mThumbMargin = new RectF();
+        mTextOnRectF = new RectF();
+        mTextOffRectF = new RectF();
+
+        mProgressAnimator = ObjectAnimator.ofFloat(this, "progress", 0, 0).setDuration(DEFAULT_ANIMATION_DURATION);
+        mProgressAnimator.setInterpolator(new AccelerateDecelerateInterpolator());
+
+        mPresentThumbRectF = new RectF();
+
+        Resources res = getResources();
+        float density = res.getDisplayMetrics().density;
+
+        Drawable thumbDrawable = null;
+        ColorStateList thumbColor = null;
+        float margin = density * DEFAULT_THUMB_MARGIN_DP;
+        float marginLeft = 0;
+        float marginRight = 0;
+        float marginTop = 0;
+        float marginBottom = 0;
+        float thumbWidth = 0;
+        float thumbHeight = 0;
+        float thumbRadius = -1;
+        float backRadius = -1;
+        Drawable backDrawable = null;
+        ColorStateList backColor = null;
+        float thumbRangeRatio = DEFAULT_THUMB_RANGE_RATIO;
+        int animationDuration = DEFAULT_ANIMATION_DURATION;
+        boolean fadeBack = true;
+        int tintColor = 0;
+        String textOn = null;
+        String textOff = null;
+        int textThumbInset = 0;
+        int textExtra = 0;
+        int textAdjust = 0;
+
+        TypedArray ta = attrs == null ? null : getContext().obtainStyledAttributes(attrs, R.styleable.SwitchButton);
+        if (ta != null) {
+            thumbDrawable = ta.getDrawable(R.styleable.SwitchButton_kswThumbDrawable);
+            thumbColor = ta.getColorStateList(R.styleable.SwitchButton_kswThumbColor);
+            margin = ta.getDimension(R.styleable.SwitchButton_kswThumbMargin, margin);
+            marginLeft = ta.getDimension(R.styleable.SwitchButton_kswThumbMarginLeft, margin);
+            marginRight = ta.getDimension(R.styleable.SwitchButton_kswThumbMarginRight, margin);
+            marginTop = ta.getDimension(R.styleable.SwitchButton_kswThumbMarginTop, margin);
+            marginBottom = ta.getDimension(R.styleable.SwitchButton_kswThumbMarginBottom, margin);
+            thumbWidth = ta.getDimension(R.styleable.SwitchButton_kswThumbWidth, thumbWidth);
+            thumbHeight = ta.getDimension(R.styleable.SwitchButton_kswThumbHeight, thumbHeight);
+            thumbRadius = ta.getDimension(R.styleable.SwitchButton_kswThumbRadius, thumbRadius);
+            backRadius = ta.getDimension(R.styleable.SwitchButton_kswBackRadius, backRadius);
+            backDrawable = ta.getDrawable(R.styleable.SwitchButton_kswBackDrawable);
+            backColor = ta.getColorStateList(R.styleable.SwitchButton_kswBackColor);
+            thumbRangeRatio = ta.getFloat(R.styleable.SwitchButton_kswThumbRangeRatio, thumbRangeRatio);
+            animationDuration = ta.getInteger(R.styleable.SwitchButton_kswAnimationDuration, animationDuration);
+            fadeBack = ta.getBoolean(R.styleable.SwitchButton_kswFadeBack, true);
+            tintColor = ta.getColor(R.styleable.SwitchButton_kswTintColor, tintColor);
+            textOn = ta.getString(R.styleable.SwitchButton_kswTextOn);
+            textOff = ta.getString(R.styleable.SwitchButton_kswTextOff);
+            textThumbInset = ta.getDimensionPixelSize(R.styleable.SwitchButton_kswTextThumbInset, 0);
+            textExtra = ta.getDimensionPixelSize(R.styleable.SwitchButton_kswTextExtra, 0);
+            textAdjust = ta.getDimensionPixelSize(R.styleable.SwitchButton_kswTextAdjust, 0);
+            ta.recycle();
+        }
+
+        // click
+        ta = attrs == null ? null : getContext().obtainStyledAttributes(attrs, new int[]{android.R.attr.focusable, android.R.attr.clickable});
+        if (ta != null) {
+            boolean focusable = ta.getBoolean(0, true);
+            //noinspection ResourceType
+            @SuppressLint("ResourceType")
+            boolean clickable = ta.getBoolean(1, focusable);
+            setFocusable(focusable);
+            setClickable(clickable);
+            ta.recycle();
+        } else {
+            setFocusable(true);
+            setClickable(true);
+        }
+
+        // text
+        mTextOn = textOn;
+        mTextOff = textOff;
+        mTextThumbInset = textThumbInset;
+        mTextExtra = textExtra;
+        mTextAdjust = textAdjust;
+
+        // thumb drawable and color
+        mThumbDrawable = thumbDrawable;
+        mThumbColor = thumbColor;
+        mIsThumbUseDrawable = mThumbDrawable != null;
+        mTintColor = tintColor;
+        if (mTintColor == 0) {
+            TypedValue typedValue = new TypedValue();
+            boolean found = getContext().getTheme().resolveAttribute(R.attr.colorAccent, typedValue, true);
+            if (found) {
+                mTintColor = typedValue.data;
+            } else {
+                mTintColor = DEFAULT_TINT_COLOR;
+            }
+        }
+        if (!mIsThumbUseDrawable && mThumbColor == null) {
+            mThumbColor = ColorUtils.generateThumbColorWithTintColor(mTintColor);
+            mCurrThumbColor = mThumbColor.getDefaultColor();
+        }
+
+        // thumbSize
+        mThumbWidth = ceil(thumbWidth);
+        mThumbHeight = ceil(thumbHeight);
+
+        // back drawable and color
+        mBackDrawable = backDrawable;
+        mBackColor = backColor;
+        mIsBackUseDrawable = mBackDrawable != null;
+        if (!mIsBackUseDrawable && mBackColor == null) {
+            mBackColor = ColorUtils.generateBackColorWithTintColor(mTintColor);
+            mCurrBackColor = mBackColor.getDefaultColor();
+            mNextBackColor = mBackColor.getColorForState(CHECKED_PRESSED_STATE, mCurrBackColor);
+        }
+
+        // margin
+        mThumbMargin.set(marginLeft, marginTop, marginRight, marginBottom);
+
+        // size & measure params must larger than 1
+        mThumbRangeRatio = mThumbMargin.width() >= 0 ? Math.max(thumbRangeRatio, 1) : thumbRangeRatio;
+
+        mThumbRadius = thumbRadius;
+        mBackRadius = backRadius;
+        mAnimationDuration = animationDuration;
+        mFadeBack = fadeBack;
+
+        mProgressAnimator.setDuration(mAnimationDuration);
+
+        // sync checked status
+        if (isChecked()) {
+            setProgress(1);
+        }
+    }
+
+
+    private Layout makeLayout(CharSequence text) {
+        return new StaticLayout(text, mTextPaint, (int) Math.ceil(Layout.getDesiredWidth(text, mTextPaint)), Layout.Alignment.ALIGN_CENTER, 1.f, 0, false);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        /*
+         * ensure textLayout
+         */
+        if (mOnLayout == null && !TextUtils.isEmpty(mTextOn)) {
+            mOnLayout = makeLayout(mTextOn);
+        }
+        if (mOffLayout == null && !TextUtils.isEmpty(mTextOff)) {
+            mOffLayout = makeLayout(mTextOff);
+        }
+
+        float onWidth = mOnLayout != null ? mOnLayout.getWidth() : 0;
+        float offWidth = mOffLayout != null ? mOffLayout.getWidth() : 0;
+        if (onWidth != 0 || offWidth != 0) {
+            mTextWidth = Math.max(onWidth, offWidth);
+        } else {
+            mTextWidth = 0;
+        }
+
+        float onHeight = mOnLayout != null ? mOnLayout.getHeight() : 0;
+        float offHeight = mOffLayout != null ? mOffLayout.getHeight() : 0;
+        if (onHeight != 0 || offHeight != 0) {
+            mTextHeight = Math.max(onHeight, offHeight);
+        } else {
+            mTextHeight = 0;
+        }
+
+        setMeasuredDimension(measureWidth(widthMeasureSpec), measureHeight(heightMeasureSpec));
+    }
+
+    /**
+     * SwitchButton use this formula to determine the final size of thumb, background and itself.
+     *
+     * textWidth = max(onWidth, offWidth)
+     * thumbRange = thumbWidth * rangeRatio
+     * textExtraSpace = textWidth + textExtra - (moveRange - thumbWidth + max(thumbMargin.left, thumbMargin.right) + textThumbInset)
+     * backWidth = thumbRange + thumbMargin.left + thumbMargin.right + max(textExtraSpace, 0)
+     * contentSize = thumbRange + max(thumbMargin.left, 0) + max(thumbMargin.right, 0) + max(textExtraSpace, 0)
+     *
+     * @param widthMeasureSpec widthMeasureSpec
+     * @return measuredWidth
+     */
+    private int measureWidth(int widthMeasureSpec) {
+        int widthSize = MeasureSpec.getSize(widthMeasureSpec);
+        int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+        int measuredWidth = widthSize;
+
+        if (mThumbWidth == 0 && mIsThumbUseDrawable) {
+            mThumbWidth = mThumbDrawable.getIntrinsicWidth();
+        }
+
+        int moveRange;
+        int textWidth = ceil(mTextWidth);
+        // how much the background should extend to fit text.
+        int textExtraSpace;
+        int contentSize;
+
+        if (mThumbRangeRatio == 0) {
+            mThumbRangeRatio = DEFAULT_THUMB_RANGE_RATIO;
+        }
+
+        if (widthMode == MeasureSpec.EXACTLY) {
+            contentSize = widthSize - getPaddingLeft() - getPaddingRight();
+
+            if (mThumbWidth != 0) {
+                moveRange = ceil(mThumbWidth * mThumbRangeRatio);
+                textExtraSpace = textWidth + mTextExtra - (moveRange - mThumbWidth + ceil(Math.max(mThumbMargin.left, mThumbMargin.right)));
+                mBackWidth = ceil(moveRange + mThumbMargin.left + mThumbMargin.right + Math.max(textExtraSpace, 0));
+                if (mBackWidth < 0) {
+                    mThumbWidth = 0;
+                }
+                if (moveRange + Math.max(mThumbMargin.left, 0) + Math.max(mThumbMargin.right, 0) + Math.max(textExtraSpace, 0) > contentSize) {
+                    mThumbWidth = 0;
+                }
+            }
+
+            if (mThumbWidth == 0) {
+                contentSize = widthSize - getPaddingLeft() - getPaddingRight();
+                moveRange = ceil(contentSize - Math.max(mThumbMargin.left, 0) - Math.max(mThumbMargin.right, 0));
+                if (moveRange < 0) {
+                    mThumbWidth = 0;
+                    mBackWidth = 0;
+                    return measuredWidth;
+                }
+                mThumbWidth = ceil(moveRange / mThumbRangeRatio);
+                mBackWidth = ceil(moveRange + mThumbMargin.left + mThumbMargin.right);
+                if (mBackWidth < 0) {
+                    mThumbWidth = 0;
+                    mBackWidth = 0;
+                    return measuredWidth;
+                }
+                textExtraSpace = textWidth + mTextExtra - (moveRange - mThumbWidth + ceil(Math.max(mThumbMargin.left, mThumbMargin.right)));
+                if (textExtraSpace > 0) {
+                    // since backWidth is determined by view width, so we can only reduce thumbSize.
+                    mThumbWidth = mThumbWidth - textExtraSpace;
+                }
+                if (mThumbWidth < 0) {
+                    mThumbWidth = 0;
+                    mBackWidth = 0;
+                    return measuredWidth;
+                }
+            }
+        } else {
+            /*
+            If parent view want SwitchButton to determine it's size itself, we calculate the minimal
+            size of it's content. Further more, we ignore the limitation of widthSize since we want
+            to display SwitchButton in its actual size rather than compress the shape.
+             */
+            if (mThumbWidth == 0) {
+                /*
+                If thumbWidth is not set, use the default one.
+                 */
+                mThumbWidth = ceil(getResources().getDisplayMetrics().density * DEFAULT_THUMB_SIZE_DP);
+            }
+            if (mThumbRangeRatio == 0) {
+                mThumbRangeRatio = DEFAULT_THUMB_RANGE_RATIO;
+            }
+
+            moveRange = ceil(mThumbWidth * mThumbRangeRatio);
+            textExtraSpace = ceil(textWidth + mTextExtra - (moveRange - mThumbWidth + Math.max(mThumbMargin.left, mThumbMargin.right) + mTextThumbInset));
+            mBackWidth = ceil(moveRange + mThumbMargin.left + mThumbMargin.right + Math.max(0, textExtraSpace));
+            if (mBackWidth < 0) {
+                mThumbWidth = 0;
+                mBackWidth = 0;
+                return measuredWidth;
+            }
+            contentSize = ceil(moveRange + Math.max(0, mThumbMargin.left) + Math.max(0, mThumbMargin.right) + Math.max(0, textExtraSpace));
+
+            measuredWidth = Math.max(contentSize, contentSize + getPaddingLeft() + getPaddingRight());
+        }
+        return measuredWidth;
+    }
+
+    private int measureHeight(int heightMeasureSpec) {
+        int heightSize = MeasureSpec.getSize(heightMeasureSpec);
+        int heightMode = MeasureSpec.getMode(heightMeasureSpec);
+        int measuredHeight = heightSize;
+
+        if (mThumbHeight == 0 && mIsThumbUseDrawable) {
+            mThumbHeight = mThumbDrawable.getIntrinsicHeight();
+        }
+        int contentSize;
+        int textExtraSpace;
+        if (heightMode == MeasureSpec.EXACTLY) {
+            if (mThumbHeight != 0) {
+                /*
+                If thumbHeight has been set, we calculate backHeight and check if there is enough room.
+                 */
+                mBackHeight = ceil(mThumbHeight + mThumbMargin.top + mThumbMargin.bottom);
+                mBackHeight = ceil(Math.max(mBackHeight, mTextHeight));
+                if (mBackHeight + getPaddingTop() + getPaddingBottom() - Math.min(0, mThumbMargin.top) - Math.min(0, mThumbMargin.bottom) > heightSize) {
+                    // No enough room, we set thumbHeight to zero to calculate these value again.
+                    mThumbHeight = 0;
+                }
+            }
+
+            if (mThumbHeight == 0) {
+                mBackHeight = ceil(heightSize - getPaddingTop() - getPaddingBottom() + Math.min(0, mThumbMargin.top) + Math.min(0, mThumbMargin.bottom));
+                if (mBackHeight < 0) {
+                    mBackHeight = 0;
+                    mThumbHeight = 0;
+                    return measuredHeight;
+                }
+                mThumbHeight = ceil(mBackHeight - mThumbMargin.top - mThumbMargin.bottom);
+            }
+            if (mThumbHeight < 0) {
+                mBackHeight = 0;
+                mThumbHeight = 0;
+                return measuredHeight;
+            }
+        } else {
+            if (mThumbHeight == 0) {
+                mThumbHeight = ceil(getResources().getDisplayMetrics().density * DEFAULT_THUMB_SIZE_DP);
+            }
+            mBackHeight = ceil(mThumbHeight + mThumbMargin.top + mThumbMargin.bottom);
+            if (mBackHeight < 0) {
+                mBackHeight = 0;
+                mThumbHeight = 0;
+                return measuredHeight;
+            }
+            textExtraSpace = ceil(mTextHeight - mBackHeight);
+            if (textExtraSpace > 0) {
+                mBackHeight += textExtraSpace;
+                mThumbHeight += textExtraSpace;
+            }
+            contentSize = Math.max(mThumbHeight, mBackHeight);
+
+            measuredHeight = Math.max(contentSize, contentSize + getPaddingTop() + getPaddingBottom());
+            measuredHeight = Math.max(measuredHeight, getSuggestedMinimumHeight());
+        }
+
+        return measuredHeight;
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        if (w != oldw || h != oldh) {
+            setup();
+        }
+    }
+
+    private int ceil(double dimen) {
+        return (int) Math.ceil(dimen);
+    }
+
+    /**
+     * set up the rect of back and thumb
+     */
+    private void setup() {
+        if (mThumbWidth == 0 || mThumbHeight == 0 || mBackWidth == 0 || mBackHeight == 0) {
+            return;
+        }
+
+        if (mThumbRadius == -1) {
+            mThumbRadius = Math.min(mThumbWidth, mThumbHeight) / 2;
+        }
+        if (mBackRadius == -1) {
+            mBackRadius = Math.min(mBackWidth, mBackHeight) / 2;
+        }
+
+        int contentWidth = getMeasuredWidth() - getPaddingLeft() - getPaddingRight();
+        int contentHeight = getMeasuredHeight() - getPaddingTop() - getPaddingBottom();
+
+        // max range of drawing content, when thumbMargin is negative, drawing range is larger than backWidth
+        int drawingWidth = ceil(mBackWidth - Math.min(0, mThumbMargin.left) - Math.min(0, mThumbMargin.right));
+        int drawingHeight = ceil(mBackHeight - Math.min(0, mThumbMargin.top) - Math.min(0, mThumbMargin.bottom));
+
+        float thumbTop;
+        if (contentHeight <= drawingHeight) {
+            thumbTop = getPaddingTop() + Math.max(0, mThumbMargin.top);
+        } else {
+            // center vertical in content area
+            thumbTop = getPaddingTop() + Math.max(0, mThumbMargin.top) + (contentHeight - drawingHeight + 1) / 2;
+        }
+
+        float thumbLeft;
+        if (contentWidth <= mBackWidth) {
+            thumbLeft = getPaddingLeft() + Math.max(0, mThumbMargin.left);
+        } else {
+            thumbLeft = getPaddingLeft() + Math.max(0, mThumbMargin.left) + (contentWidth - drawingWidth + 1) / 2;
+        }
+
+        mThumbRectF.set(thumbLeft, thumbTop, thumbLeft + mThumbWidth, thumbTop + mThumbHeight);
+
+        float backLeft = mThumbRectF.left - mThumbMargin.left;
+        mBackRectF.set(backLeft,
+                mThumbRectF.top - mThumbMargin.top,
+                backLeft + mBackWidth,
+                mThumbRectF.top - mThumbMargin.top + mBackHeight);
+
+        mSafeRectF.set(mThumbRectF.left, 0, mBackRectF.right - mThumbMargin.right - mThumbRectF.width(), 0);
+
+        float minBackRadius = Math.min(mBackRectF.width(), mBackRectF.height()) / 2.f;
+        mBackRadius = Math.min(minBackRadius, mBackRadius);
+
+        if (mBackDrawable != null) {
+            mBackDrawable.setBounds((int) mBackRectF.left, (int) mBackRectF.top, ceil(mBackRectF.right), ceil(mBackRectF.bottom));
+        }
+
+        if (mOnLayout != null) {
+            float onLeft = mBackRectF.left + (mBackRectF.width() + mTextThumbInset - mThumbWidth - mThumbMargin.right - mOnLayout.getWidth()) / 2f - mTextAdjust;
+            float onTop = mBackRectF.top + (mBackRectF.height() - mOnLayout.getHeight()) / 2;
+            mTextOnRectF.set(onLeft, onTop, onLeft + mOnLayout.getWidth(), onTop + mOnLayout.getHeight());
+        }
+
+        if (mOffLayout != null) {
+            float offLeft = mBackRectF.right - (mBackRectF.width() + mTextThumbInset - mThumbWidth - mThumbMargin.left - mOffLayout.getWidth()) / 2f - mOffLayout.getWidth() + mTextAdjust;
+            float offTop = mBackRectF.top + (mBackRectF.height() - mOffLayout.getHeight()) / 2;
+            mTextOffRectF.set(offLeft, offTop, offLeft + mOffLayout.getWidth(), offTop + mOffLayout.getHeight());
+        }
+
+        mReady = true;
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        if (!mReady) {
+            setup();
+        }
+        if (!mReady) {
+            return;
+        }
+
+        // fade back
+        if (mIsBackUseDrawable) {
+            if (mFadeBack && mCurrentBackDrawable != null && mNextBackDrawable != null) {
+                // fix #75, 70%A + 30%B != 30%B + 70%A, order matters when mix two layer of different alpha.
+                // So make sure the order of on/off layers never change during slide from one endpoint to another.
+                Drawable below = isChecked() ? mCurrentBackDrawable : mNextBackDrawable;
+                Drawable above = isChecked() ? mNextBackDrawable : mCurrentBackDrawable;
+
+                int alpha = (int) (255 * getProgress());
+                below.setAlpha(alpha);
+                below.draw(canvas);
+                alpha = 255 - alpha;
+                above.setAlpha(alpha);
+                above.draw(canvas);
+            } else {
+                mBackDrawable.setAlpha(255);
+                mBackDrawable.draw(canvas);
+            }
+        } else {
+            if (mFadeBack) {
+                int alpha;
+                int colorAlpha;
+
+                // fix #75
+                int belowColor = isChecked() ? mCurrBackColor : mNextBackColor;
+                int aboveColor = isChecked() ? mNextBackColor : mCurrBackColor;
+
+                // curr back
+                alpha = (int) (255 * getProgress());
+                colorAlpha = Color.alpha(belowColor);
+                colorAlpha = colorAlpha * alpha / 255;
+                mPaint.setARGB(colorAlpha, Color.red(belowColor), Color.green(belowColor), Color.blue(belowColor));
+                canvas.drawRoundRect(mBackRectF, mBackRadius, mBackRadius, mPaint);
+
+                // next back
+                alpha = 255 - alpha;
+                colorAlpha = Color.alpha(aboveColor);
+                colorAlpha = colorAlpha * alpha / 255;
+                mPaint.setARGB(colorAlpha, Color.red(aboveColor), Color.green(aboveColor), Color.blue(aboveColor));
+                canvas.drawRoundRect(mBackRectF, mBackRadius, mBackRadius, mPaint);
+
+                mPaint.setAlpha(255);
+            } else {
+                mPaint.setColor(mCurrBackColor);
+                canvas.drawRoundRect(mBackRectF, mBackRadius, mBackRadius, mPaint);
+            }
+        }
+
+        // text
+        Layout switchText = getProgress() > 0.5 ? mOnLayout : mOffLayout;
+        RectF textRectF = getProgress() > 0.5 ? mTextOnRectF : mTextOffRectF;
+        if (switchText != null && textRectF != null) {
+            int alpha = (int) (255 * (getProgress() >= 0.75 ? getProgress() * 4 - 3 : (getProgress() < 0.25 ? 1 - getProgress() * 4 : 0)));
+            int textColor = getProgress() > 0.5 ? mOnTextColor : mOffTextColor;
+            int colorAlpha = Color.alpha(textColor);
+            colorAlpha = colorAlpha * alpha / 255;
+            switchText.getPaint().setARGB(colorAlpha, Color.red(textColor), Color.green(textColor), Color.blue(textColor));
+            canvas.save();
+            canvas.translate(textRectF.left, textRectF.top);
+            switchText.draw(canvas);
+            canvas.restore();
+        }
+
+        // thumb
+        mPresentThumbRectF.set(mThumbRectF);
+        mPresentThumbRectF.offset(mProgress * mSafeRectF.width(), 0);
+        if (mIsThumbUseDrawable) {
+            mThumbDrawable.setBounds((int) mPresentThumbRectF.left, (int) mPresentThumbRectF.top, ceil(mPresentThumbRectF.right), ceil(mPresentThumbRectF.bottom));
+            mThumbDrawable.draw(canvas);
+        } else {
+            mPaint.setColor(mCurrThumbColor);
+            canvas.drawRoundRect(mPresentThumbRectF, mThumbRadius, mThumbRadius, mPaint);
+        }
+
+        if (mDrawDebugRect) {
+            mRectPaint.setColor(Color.parseColor("#AA0000"));
+            canvas.drawRect(mBackRectF, mRectPaint);
+            mRectPaint.setColor(Color.parseColor("#0000FF"));
+            canvas.drawRect(mPresentThumbRectF, mRectPaint);
+            mRectPaint.setColor(Color.parseColor("#000000"));
+            canvas.drawLine(mSafeRectF.left, mThumbRectF.top, mSafeRectF.right, mThumbRectF.top, mRectPaint);
+            mRectPaint.setColor(Color.parseColor("#00CC00"));
+            canvas.drawRect(getProgress() > 0.5 ? mTextOnRectF : mTextOffRectF, mRectPaint);
+        }
+    }
+
+    @Override
+    protected void drawableStateChanged() {
+        super.drawableStateChanged();
+
+        if (!mIsThumbUseDrawable && mThumbColor != null) {
+            mCurrThumbColor = mThumbColor.getColorForState(getDrawableState(), mCurrThumbColor);
+        } else {
+            setDrawableState(mThumbDrawable);
+        }
+
+        int[] nextState = isChecked() ? UNCHECKED_PRESSED_STATE : CHECKED_PRESSED_STATE;
+        ColorStateList textColors = getTextColors();
+        if (textColors != null) {
+            int defaultTextColor = textColors.getDefaultColor();
+            mOnTextColor = textColors.getColorForState(CHECKED_PRESSED_STATE, defaultTextColor);
+            mOffTextColor = textColors.getColorForState(UNCHECKED_PRESSED_STATE, defaultTextColor);
+        }
+        if (!mIsBackUseDrawable && mBackColor != null) {
+            mCurrBackColor = mBackColor.getColorForState(getDrawableState(), mCurrBackColor);
+            mNextBackColor = mBackColor.getColorForState(nextState, mCurrBackColor);
+        } else {
+            if (mBackDrawable instanceof StateListDrawable && mFadeBack) {
+                mBackDrawable.setState(nextState);
+                mNextBackDrawable = mBackDrawable.getCurrent().mutate();
+            } else {
+                mNextBackDrawable = null;
+            }
+            setDrawableState(mBackDrawable);
+            if (mBackDrawable != null) {
+                mCurrentBackDrawable = mBackDrawable.getCurrent().mutate();
+            }
+        }
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+
+        if (!isEnabled() || !isClickable() || !isFocusable() || !mReady) {
+            return false;
+        }
+
+        int action = event.getAction();
+
+        float deltaX = event.getX() - mStartX;
+        float deltaY = event.getY() - mStartY;
+
+        switch (action) {
+            case MotionEvent.ACTION_DOWN:
+                mStartX = event.getX();
+                mStartY = event.getY();
+                mLastX = mStartX;
+                setPressed(true);
+                break;
+
+            case MotionEvent.ACTION_MOVE:
+                float x = event.getX();
+                setProgress(getProgress() + (x - mLastX) / mSafeRectF.width());
+                if (!mCatch && (Math.abs(deltaX) > mTouchSlop / 2 || Math.abs(deltaY) > mTouchSlop / 2)) {
+                    if (deltaY == 0 || Math.abs(deltaX) > Math.abs(deltaY)) {
+                        catchView();
+                    } else if (Math.abs(deltaY) > Math.abs(deltaX)) {
+                        return false;
+                    }
+                }
+                mLastX = x;
+                break;
+
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_UP:
+                mCatch = false;
+                setPressed(false);
+                float time = event.getEventTime() - event.getDownTime();
+                if (Math.abs(deltaX) < mTouchSlop && Math.abs(deltaY) < mTouchSlop && time < mClickTimeout) {
+                    performClick();
+                } else {
+                    boolean nextStatus = getStatusBasedOnPos();
+                    if (nextStatus != isChecked()) {
+                        playSoundEffect(SoundEffectConstants.CLICK);
+                        setChecked(nextStatus);
+                    } else {
+                        animateToState(nextStatus);
+                    }
+                }
+                break;
+
+            default:
+                break;
+        }
+        return true;
+    }
+
+
+    /**
+     * return the status based on position of thumb
+     *
+     * @return whether checked or not
+     */
+    private boolean getStatusBasedOnPos() {
+        return getProgress() > 0.5f;
+    }
+
+    private float getProgress() {
+        return mProgress;
+    }
+
+    private void setProgress(final float progress) {
+        float tp = progress;
+        if (tp > 1) {
+            tp = 1;
+        } else if (tp < 0) {
+            tp = 0;
+        }
+        this.mProgress = tp;
+        invalidate();
+    }
+
+    @Override
+    public boolean performClick() {
+        return super.performClick();
+    }
+
+    /**
+     * processing animation
+     *
+     * @param checked checked or unChecked
+     */
+    protected void animateToState(boolean checked) {
+        if (mProgressAnimator == null) {
+            return;
+        }
+        if (mProgressAnimator.isRunning()) {
+            mProgressAnimator.cancel();
+        }
+        mProgressAnimator.setDuration(mAnimationDuration);
+        if (checked) {
+            mProgressAnimator.setFloatValues(mProgress, 1f);
+        } else {
+            mProgressAnimator.setFloatValues(mProgress, 0);
+        }
+        mProgressAnimator.start();
+    }
+
+    private void catchView() {
+        ViewParent parent = getParent();
+        if (parent != null) {
+            parent.requestDisallowInterceptTouchEvent(true);
+        }
+        mCatch = true;
+    }
+
+    @Override
+    public void setChecked(final boolean checked) {
+        // animate before super.setChecked() become user may call setChecked again in OnCheckedChangedListener
+        if (isChecked() != checked) {
+            animateToState(checked);
+        }
+        if (mRestoring) {
+            setCheckedImmediatelyNoEvent(checked);
+        } else {
+            super.setChecked(checked);
+        }
+    }
+
+    public void setCheckedNoEvent(final boolean checked) {
+        if (mChildOnCheckedChangeListener == null) {
+            setChecked(checked);
+        } else {
+            super.setOnCheckedChangeListener(null);
+            setChecked(checked);
+            super.setOnCheckedChangeListener(mChildOnCheckedChangeListener);
+        }
+    }
+
+    public void setCheckedImmediatelyNoEvent(boolean checked) {
+        if (mChildOnCheckedChangeListener == null) {
+            setCheckedImmediately(checked);
+        } else {
+            super.setOnCheckedChangeListener(null);
+            setCheckedImmediately(checked);
+            super.setOnCheckedChangeListener(mChildOnCheckedChangeListener);
+        }
+    }
+
+    public void toggleNoEvent() {
+        if (mChildOnCheckedChangeListener == null) {
+            toggle();
+        } else {
+            super.setOnCheckedChangeListener(null);
+            toggle();
+            super.setOnCheckedChangeListener(mChildOnCheckedChangeListener);
+        }
+    }
+
+    public void toggleImmediatelyNoEvent() {
+        if (mChildOnCheckedChangeListener == null) {
+            toggleImmediately();
+        } else {
+            super.setOnCheckedChangeListener(null);
+            toggleImmediately();
+            super.setOnCheckedChangeListener(mChildOnCheckedChangeListener);
+        }
+    }
+
+    @Override
+    public void setOnCheckedChangeListener(OnCheckedChangeListener onCheckedChangeListener) {
+        super.setOnCheckedChangeListener(onCheckedChangeListener);
+        mChildOnCheckedChangeListener = onCheckedChangeListener;
+    }
+
+    public void setCheckedImmediately(boolean checked) {
+        super.setChecked(checked);
+        if (mProgressAnimator != null && mProgressAnimator.isRunning()) {
+            mProgressAnimator.cancel();
+        }
+        setProgress(checked ? 1 : 0);
+        invalidate();
+    }
+
+    public void toggleImmediately() {
+        setCheckedImmediately(!isChecked());
+    }
+
+    private void setDrawableState(Drawable drawable) {
+        if (drawable != null) {
+            int[] myDrawableState = getDrawableState();
+            drawable.setState(myDrawableState);
+            invalidate();
+        }
+    }
+
+    public boolean isDrawDebugRect() {
+        return mDrawDebugRect;
+    }
+
+    public void setDrawDebugRect(boolean drawDebugRect) {
+        mDrawDebugRect = drawDebugRect;
+        invalidate();
+    }
+
+    public long getAnimationDuration() {
+        return mAnimationDuration;
+    }
+
+    public void setAnimationDuration(long animationDuration) {
+        mAnimationDuration = animationDuration;
+    }
+
+    public Drawable getThumbDrawable() {
+        return mThumbDrawable;
+    }
+
+    public void setThumbDrawable(Drawable thumbDrawable) {
+        mThumbDrawable = thumbDrawable;
+        mIsThumbUseDrawable = mThumbDrawable != null;
+        refreshDrawableState();
+        mReady = false;
+        requestLayout();
+        invalidate();
+    }
+
+    public void setThumbDrawableRes(int thumbDrawableRes) {
+        setThumbDrawable(ContextCompat.getDrawable(getContext(), thumbDrawableRes));
+    }
+
+    public Drawable getBackDrawable() {
+        return mBackDrawable;
+    }
+
+    public void setBackDrawable(Drawable backDrawable) {
+        mBackDrawable = backDrawable;
+        mIsBackUseDrawable = mBackDrawable != null;
+        refreshDrawableState();
+        mReady = false;
+        requestLayout();
+        invalidate();
+    }
+
+    public void setBackDrawableRes(int backDrawableRes) {
+        setBackDrawable(ContextCompat.getDrawable(getContext(), backDrawableRes));
+    }
+
+    public ColorStateList getBackColor() {
+        return mBackColor;
+    }
+
+    public void setBackColor(ColorStateList backColor) {
+        mBackColor = backColor;
+        if (mBackColor != null) {
+            setBackDrawable(null);
+        }
+        invalidate();
+    }
+
+    public void setBackColorRes(int backColorRes) {
+        setBackColor(ContextCompat.getColorStateList(getContext(), backColorRes));
+    }
+
+    public ColorStateList getThumbColor() {
+        return mThumbColor;
+    }
+
+    public void setThumbColor(ColorStateList thumbColor) {
+        mThumbColor = thumbColor;
+        if (mThumbColor != null) {
+            setThumbDrawable(null);
+        }
+        invalidate();
+    }
+
+    public void setThumbColorRes(int thumbColorRes) {
+        setThumbColor(ContextCompat.getColorStateList(getContext(), thumbColorRes));
+    }
+
+    public float getThumbRangeRatio() {
+        return mThumbRangeRatio;
+    }
+
+    public void setThumbRangeRatio(float thumbRangeRatio) {
+        mThumbRangeRatio = thumbRangeRatio;
+        // We need to mark "ready" to false since requestLayout may not cause size changed.
+        mReady = false;
+        requestLayout();
+    }
+
+    public RectF getThumbMargin() {
+        return mThumbMargin;
+    }
+
+    public void setThumbMargin(RectF thumbMargin) {
+        if (thumbMargin == null) {
+            setThumbMargin(0, 0, 0, 0);
+        } else {
+            setThumbMargin(thumbMargin.left, thumbMargin.top, thumbMargin.right, thumbMargin.bottom);
+        }
+    }
+
+    public void setThumbMargin(float left, float top, float right, float bottom) {
+        mThumbMargin.set(left, top, right, bottom);
+        mReady = false;
+        requestLayout();
+    }
+
+    public void setThumbSize(int width, int height) {
+        mThumbWidth = width;
+        mThumbHeight = height;
+        mReady = false;
+        requestLayout();
+    }
+
+    public float getThumbWidth() {
+        return mThumbWidth;
+    }
+
+    public float getThumbHeight() {
+        return mThumbHeight;
+    }
+
+    public float getThumbRadius() {
+        return mThumbRadius;
+    }
+
+    public void setThumbRadius(float thumbRadius) {
+        mThumbRadius = thumbRadius;
+        if (!mIsThumbUseDrawable) {
+            invalidate();
+        }
+    }
+
+    public PointF getBackSizeF() {
+        return new PointF(mBackRectF.width(), mBackRectF.height());
+    }
+
+    public float getBackRadius() {
+        return mBackRadius;
+    }
+
+    public void setBackRadius(float backRadius) {
+        mBackRadius = backRadius;
+        if (!mIsBackUseDrawable) {
+            invalidate();
+        }
+    }
+
+    public boolean isFadeBack() {
+        return mFadeBack;
+    }
+
+    public void setFadeBack(boolean fadeBack) {
+        mFadeBack = fadeBack;
+    }
+
+    public int getTintColor() {
+        return mTintColor;
+    }
+
+    public void setTintColor(@SuppressWarnings("SameParameterValue") int tintColor) {
+        mTintColor = tintColor;
+        mThumbColor = ColorUtils.generateThumbColorWithTintColor(mTintColor);
+        mBackColor = ColorUtils.generateBackColorWithTintColor(mTintColor);
+        mIsBackUseDrawable = false;
+        mIsThumbUseDrawable = false;
+        // call this method to refresh color states
+        refreshDrawableState();
+        invalidate();
+    }
+
+    public void setText(CharSequence onText, CharSequence offText) {
+        mTextOn = onText;
+        mTextOff = offText;
+
+        mOnLayout = null;
+        mOffLayout = null;
+
+        mReady = false;
+        requestLayout();
+        invalidate();
+    }
+
+    public CharSequence getTextOn() {
+        return mTextOn;
+    }
+
+    public CharSequence getTextOff() {
+        return mTextOff;
+    }
+
+    public void setTextThumbInset(int textThumbInset) {
+        mTextThumbInset = textThumbInset;
+        mReady = false;
+        requestLayout();
+        invalidate();
+    }
+
+    public void setTextExtra(int textExtra) {
+        mTextExtra = textExtra;
+        mReady = false;
+        requestLayout();
+        invalidate();
+    }
+
+    public void setTextAdjust(int textAdjust) {
+        mTextAdjust = textAdjust;
+        mReady = false;
+        requestLayout();
+        invalidate();
+    }
+
+    @Override
+    public Parcelable onSaveInstanceState() {
+        Parcelable superState = super.onSaveInstanceState();
+        SavedState ss = new SavedState(superState);
+        ss.onText = mTextOn;
+        ss.offText = mTextOff;
+        return ss;
+    }
+
+    @Override
+    public void onRestoreInstanceState(Parcelable state) {
+        SavedState ss = (SavedState) state;
+        setText(ss.onText, ss.offText);
+        mRestoring = true;
+        super.onRestoreInstanceState(ss.getSuperState());
+        mRestoring = false;
+    }
+
+    static class SavedState extends BaseSavedState {
+        CharSequence onText;
+        CharSequence offText;
+
+        SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        private SavedState(Parcel in) {
+            super(in);
+            onText = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
+            offText = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
+        }
+
+        @Override
+        public void writeToParcel(Parcel out, int flags) {
+            super.writeToParcel(out, flags);
+            TextUtils.writeToParcel(onText, out, flags);
+            TextUtils.writeToParcel(offText, out, flags);
+        }
+
+        public static final Creator<SavedState> CREATOR
+                = new Creator<SavedState>() {
+            public SavedState createFromParcel(Parcel in) {
+                return new SavedState(in);
+            }
+
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
+}
 \ No newline at end of file
 package com.cnlive.core.libs.base.util;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.location.LocationManager;
 import android.net.Uri;
 import android.os.PowerManager;
 import android.provider.Settings;
 import android.widget.Toast;
+
+import com.cnlive.strike.base.R;
+
 import static android.content.Context.POWER_SERVICE;
 public class CheckUtil {
+    /**
+     * 判断GPS是否开启，GPS或者AGPS开启一个就认为是开启的
+     *
+     * @param context
+     * @return true 表示开启
+     */
+    public static final boolean isOPenGps(final Context context) {
+        try {
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                LocationManager locationManager
+                        = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+                // 通过GPS卫星定位，定位级别可以精确到街（通过24颗卫星定位，在室外和空旷的地方定位准确、速度快）
+                boolean gps = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
+                // 通过WLAN或移动网络(3G/2G)确定的位置（也称作AGPS，辅助GPS定位。主要用于在室内或遮盖物（建筑群或茂密的深林等）密集的地方定位）
+                boolean network = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
+                if (gps) {
+                    return true;
+                } else {
+                    return false;
+                }
+            } else {
+                return true;
+            }
+        } catch (Exception e) {
+            //异常就返回true
+            return true;
+        }
+    }
+    public static void openGPS(Activity context) {
+        //开启GPS
+        try {
+            Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+            context.startActivityForResult(intent, 10);
+            Toast.makeText(context, context.getString(R.string.open_gps_tip), Toast.LENGTH_LONG).show();
+        } catch (Exception e) {
+            Toast.makeText(context, "请手动打开GPS", Toast.LENGTH_LONG).show();
+        }
+    }
     /**
      * 锤子手机不能检测电池白名单,会崩溃
      *
+package com.cnlive.core.libs.base.util;
+
+import android.util.Base64;
+
+import java.security.Key;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.DESKeySpec;
+
+import static javax.crypto.Cipher.getInstance;
+
+/**
+ * 加密工具
+ */
+public class SimpleDES {
+    //key 的长度得大于8
+    public static final String DES_KEY = "cnliveIm";
+    private static String encoding = "UTF-8";
+
+    /**
+     * 加密字符串
+     */
+    public static String ebotongEncrypto(String str, String key) {
+        String result = str;
+        if (str != null && str.length() > 0) {
+            try {
+                byte[] encodeByte = symmetricEncrypto(str.getBytes(encoding), key);
+                result = Base64.encodeToString(encodeByte, Base64.DEFAULT);
+
+            } catch (Exception e) {
+                // e.printStackTrace();
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 解密字符串
+     */
+    public static String ebotongDecrypto(String str, String key) {
+        String result = str;
+        if (str != null && str.length() > 0) {
+            try {
+                byte[] encodeByte = Base64.decode(str, Base64.DEFAULT);
+
+                byte[] decoder = symmetricDecrypto(encodeByte, key);
+                result = new String(decoder, encoding);
+            } catch (Exception e) {
+                // e.printStackTrace();
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 加密byte[]
+     */
+    public static byte[] ebotongEncrypto(byte[] str, String key) {
+        byte[] result = null;
+        if (str != null && str.length > 0) {
+            try {
+                byte[] encodeByte = symmetricEncrypto(str, key);
+                result = Base64.encode(encodeByte, Base64.DEFAULT);
+
+            } catch (Exception e) {
+                // e.printStackTrace();
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 解密byte[]
+     */
+    public static byte[] ebotongDecrypto(byte[] str, String key) {
+        byte[] result = null;
+        if (str != null && str.length > 0) {
+            try {
+
+                byte[] encodeByte = Base64.decode(new String(str, encoding), Base64.DEFAULT);
+                //byte[] encodeByte = base64decoder.decodeBuffer(new String(str));
+                byte[] decoder = symmetricDecrypto(encodeByte, key);
+                result = new String(decoder).getBytes(encoding);
+                result = new String(decoder).getBytes();
+            } catch (Exception e) {
+                // e.printStackTrace();
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 对称加密字节数组并返回
+     *
+     * @param byteSource 需要加密的数据
+     * @return 经过加密的数据
+     * @throws Exception
+     */
+    public static byte[] symmetricEncrypto(byte[] byteSource, String sKey) throws Exception {
+        try {
+            int mode = Cipher.ENCRYPT_MODE;
+            SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES");
+            byte[] keyData = sKey.getBytes();
+            DESKeySpec keySpec = new DESKeySpec(keyData);
+            Key key = keyFactory.generateSecret(keySpec);
+            Cipher cipher = getInstance("DES");
+            cipher.init(mode, key);
+
+            return cipher.doFinal(byteSource);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * 对称解密字节数组并返回
+     *
+     * @param byteSource 需要解密的数据
+     * @return 经过解密的数据
+     * @throws Exception
+     */
+    public static byte[] symmetricDecrypto(byte[] byteSource, String sKey) throws Exception {
+        try {
+            int mode = Cipher.DECRYPT_MODE;
+            SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES");
+            byte[] keyData = sKey.getBytes();
+            DESKeySpec keySpec = new DESKeySpec(keyData);
+            Key key = keyFactory.generateSecret(keySpec);
+            Cipher cipher = getInstance("DES");
+            cipher.init(mode, key);
+            return cipher.doFinal(byteSource);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}