1 重构大众体育

YangShuai
1 parent fbff357d
Showing 31 changed files with 1275 additions and 48 deletions
app/strike/build.gradle
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/MyApp.java
app/strike/src/main/res/values/styles.xml
build.gradle
cloud/user/src/main/java/com/cnlive/strike/user/frame/presenter/QuickLoginPresenter.java
cloud/user/src/main/java/com/cnlive/strike/user/frame/view/QuickLoginView.java
config.gradle
core/base/src/main/java/com/cnlive/core/libs/base/frame/activity/BaseActivity.java
core/base/src/main/java/com/cnlive/core/libs/base/frame/fragment/BaseFragment.java
core/base/src/main/java/com/cnlive/core/libs/base/ui/widget/BottomMenuDialog.java
core/base/src/main/java/com/cnlive/core/libs/base/util/QMUITipDialogUtil.java
core/base/src/main/java/com/top/zibin/luban/Checker.java
core/base/src/main/java/com/top/zibin/luban/CompressionPredicate.java
core/base/src/main/java/com/top/zibin/luban/Engine.java
core/base/src/main/java/com/top/zibin/luban/InputStreamProvider.java
core/base/src/main/java/com/top/zibin/luban/Luban.java
core/base/src/main/java/com/top/zibin/luban/OnCompressListener.java
core/base/src/main/java/com/top/zibin/luban/OnRenameListener.java
@@ -160,7 +160,10 @@ dependencies {
     implementation project(path: ':cloud:user')
     implementation project(path: ':core:imageload')
-    compile project(path: ':module:xiaojiasoundbox')
+    implementation project(path: ':module:xiaojiasoundbox')
+    implementation project(path: ':module:pedometer')
+    implementation project(path: ':library_baidumap')
+
 //    implementation project(path: ':core:util')
 //    implementation project(path: ':core:encipher')
 //    implementation project(path: ':cloud:user')
@@ -9,6 +9,8 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
+import com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity;
+import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
 import com.cnlive.strike.demo.activity.DemoActivity;
 import com.cnlive.strike.imgutil.ImgActivity;
 import com.cnlive.strike.user.ui.activity.LoginActivity;
@@ -28,7 +30,7 @@ public class MainActivity extends AppCompatActivity {
         findViewById(R.id.go_to).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(MainActivity.this, DemoActivity.class));
+                startActivity(new Intent(MainActivity.this, RunLineActivity.class));
 //                finish();
             }
         });
@@ -5,6 +5,8 @@ import android.content.Intent;
 import android.text.TextUtils;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
+import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
 import com.cnlive.strike.user.auth.UserService;
 import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.AllDeviceActivity;
@@ -21,7 +23,7 @@ public class MyActivity extends BaseActivity {
     protected void initView() {
 //        getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyFragment()).commitAllowingStateLoss();
         initXiaoJiaSoundBoxData();
-        startActivity(new Intent(MyActivity.this,AllDeviceActivity.class));
+        startActivity(new Intent(MyActivity.this, RunLineActivity.class));
     }
     @Override
@@ -49,5 +51,8 @@ public class MyActivity extends BaseActivity {
         if (!TextUtils.isEmpty(UserService.getInstance(this).getAppAccount().getNickName())) {
             XiaoJIaCommInfo.setUserNickName(this, UserService.getInstance(this).getAppAccount().getNickName());
         }
+        if (null != UserService.getInstance(this).getAppAccount().getMobile() && !TextUtils.isEmpty(UserService.getInstance(this).getAppAccount().getMobile())) {
+            CommonInfo.setUserInfo(this, UserService.getUid(this), UserService.getInstance(this).getAppAccount().getNickName(), UserService.getInstance(this).getAppAccount().getFaceUrl(), UserService.getInstance(this).getAppAccount().getMobile());
+        }
     }
 }
@@ -3,8 +3,11 @@ package com.cnlive.strike;
 import android.app.Application;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.baidu.mapapi.CoordType;
+import com.baidu.mapapi.SDKInitializer;
 import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.application.BaseApplication;
+import com.cnlive.moudle.pedometer.model.Constant;
 public class MyApp extends BaseApplication {
     @Override
@@ -12,12 +15,22 @@ public class MyApp extends BaseApplication {
         super.onCreate();
         AppConfig.init(this, BuildConfig.APP_ID, BuildConfig.APP_KEY,
                 BuildConfig.APP_SCERET, BuildConfig.SPECIAL_GROUP_MEMBER_LIMIT,
-                BuildConfig.VERSION_AS_DEBUG, "", "",
+                BuildConfig.VERSION_AS_DEBUG, BuildConfig.BAIDU_MAP_APP_KEY, "",
                 "10514333", "",
                 "", "", "",
                 "", "", "",
                 BuildConfig.BAIDU_MAP_APP_KEY, "");
         initARouter();
+        if (AppConfig.isDebug()) {
+            Constant.SERVICE_ID = 213511;
+        } else {
+            Constant.SERVICE_ID = 214690;
+        }
+        //在使用SDK各组件之前初始化context信息，传入ApplicationContext
+        SDKInitializer.initialize(getApplicationContext());
+        //自4.3.0起，百度地图SDK所有接口均支持百度坐标和国测局坐标，用此方法设置您使用的坐标类型.
+        //包括BD09LL和GCJ02两种坐标，默认是BD09LL坐标。
+        SDKInitializer.setCoordType(CoordType.GCJ02);
     }
@@ -2,7 +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>
@@ -146,6 +146,7 @@ task clean(type: Delete) {
 //配置全局变量
 ext {
+    compileSdkVersion=29
     libEmoj = '2.0.9'
     libMediaPicker = '1.5.8'
     //    loading动画
@@ -155,4 +156,13 @@ ext {
     //动画大全
     viewAnimationsEasing='2.0@aar'
     viewAnimationsAndroid='2.3@aar'
+    libLargeImage = '1.0.1'
+    //SmartRefresh
+    SmartRefreshLayout = '1.1.0-alpha-1'
+    SmartRefreshHeader = '1.1.0-alpha-1'
+    TimePickerDialog = '1.0.1'
+//    libVideoQiniu = '1.0.6'
+    //七牛
+    qiniuAndroidSdk = '7.3.11'
+    libUpload = '2.0.6'
 }
@@ -164,9 +164,9 @@ public class QuickLoginPresenter extends BasePresenter&lt;QuickLoginView&gt; {
                 } else {
                     //友盟账号登录统计,暂时只有平台登录，后续对接三方登录
 //                        MobclickAgent.onProfileSignIn("CNLive", user.getUid());
-//                    ifViewAttached(view -> view.showMainView(false, false));
+                    ifViewAttached(view -> view.showMainView(false, false));
                     //todo 测试首次用户
-                    ifViewAttached(view -> view.showEditView(false));
+//                    ifViewAttached(view -> view.showEditView(false));
                 }
                 AppConfig.setCountryCode("");
                 AppConfig.setVerificationCode("");
@@ -208,7 +208,6 @@ public class QuickLoginView extends BaseView {
         successInfo.setClickAd(fragment.clickAd);
         successInfo.setTagShare(fragment.tagShare);
         successInfo.setTagMsg(fragment.tagMsg);
-
         if (isNewUser) {
 //            HelperUtil.isNewUser(fragment.getActivity(), successInfo, isHasOtherUserInfo);
         } else {
@@ -18,7 +18,7 @@ ext {
     moudle = [
             //用户
-//            cloud_user: project(':cloud:user'),
+            core_network: project(':core:network'),
             //基础库
             core_base: project(':core:base')
@@ -88,7 +88,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     private OnPermissionResponseListener onPermissionResponseListener;      //权限申请回调
     private int DEFAULT_REQUEST_CODE_PERMISSION = 0x00099;//默认权限请求码
     private int USER_SET_REQUEST_CODE_PERMISSION = -0x00099;//用户设置的权限请求码
-    private String defaultDefinePermissionTip = "需要必要的权限才可以正常使用该功能，您已拒绝获得该权限。\n如果需要重新授权，您可以点击“允许”按钮进入系统设置进行授权";//默认拒绝的权限提示语
+    private String defaultDefinePermissionTip = "需要必要的权限才可以正常使用该功能，您已拒绝获得该权限。\n如果需要重新授权，您可以点击“设置”按钮进入系统设置进行授权";//默认拒绝的权限提示语
     private String userSetDefinePermissionTip = "";//用户设置的权限提示语
     //    private SwipeBackActivityHelper mHelper;//侧滑返回
     private boolean isOpenSwipBack = false;
@@ -96,6 +96,9 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     private final SupportActivityDelegate mDelegate = new SupportActivityDelegate(this);
     //fragment侧滑
     private final SwipeBackActivityDelegate mSwipeDelegate = new SwipeBackActivityDelegate(this);
+    private boolean isDefinePermissionCloseActivity = false;
+    private boolean isUserClickAllowBtn = false;//用户是否点击允许按钮
+    private String[] userSetPermission;
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -264,6 +267,25 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         imm.showSoftInput(view, InputMethodManager.SHOW_FORCED);
     }
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (isUserClickAllowBtn) {
+            isUserClickAllowBtn = false;
+            int requestCode = DEFAULT_REQUEST_CODE_PERMISSION;
+            String tip = defaultDefinePermissionTip;
+            if (null != onPermissionResponseListener && null != userSetPermission) {
+                if (null != userSetDefinePermissionTip) {
+                    tip = userSetDefinePermissionTip;
+                }
+                if (-0x00099 != USER_SET_REQUEST_CODE_PERMISSION) {
+                    requestCode = USER_SET_REQUEST_CODE_PERMISSION;
+                }
+                //开始请求
+                requestPermission(requestCode, tip, isDefinePermissionCloseActivity, userSetPermission, onPermissionResponseListener);
+            }
+        }
+    }
     @Override
     protected void onDestroy() {
@@ -272,6 +294,9 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         if (null != baseBinding) {
             baseBinding.unbind();
         }
+        onPermissionResponseListener = null;
+        userSetPermission = null;
+        userSetDefinePermissionTip = null;
         //activity管理
         AppManager.getInstance().deleteActivity(me);
         //清除当前订阅
@@ -407,7 +432,12 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     @Override
     public void finish() {
-        AppManager.getInstance().killActivity(me);
+        //先判断当前activity是否有多个fragment
+        if (getSupportFragmentManager().getBackStackEntryCount() > 1) {
+            pop();
+        } else {
+            AppManager.getInstance().killActivity(me);
+        }
     }
     public void finishActivity() {
@@ -450,10 +480,35 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
      * @param permissions                  请求的权限
      * @param onPermissionResponseListener 回调监听器
      */
-    public void requestPermission(String[] permissions, String defineTip, OnPermissionResponseListener
+    public void requestPermission(boolean isDefineActivity, String[] permissions, OnPermissionResponseListener
+            onPermissionResponseListener) {
+        this.onPermissionResponseListener = onPermissionResponseListener;
+        isDefinePermissionCloseActivity = isDefineActivity;
+        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);
+        }
+    }
+
+    /**
+     * 请求权限
+     * <p>
+     * 警告：此处除了用户拒绝外，唯一可能出现无法获取权限或失败的情况是在AndroidManifest.xml中未声明权限信息
+     * Android6.0+即便需要动态请求权限（重点）但不代表着不需要在AndroidManifest.xml中进行声明。
+     *
+     * @param permissions                  请求的权限
+     * @param onPermissionResponseListener 回调监听器
+     */
+    public void requestPermission(String defineTip, boolean isDefineActivity, String[] permissions, OnPermissionResponseListener
             onPermissionResponseListener) {
+        this.isDefinePermissionCloseActivity = isDefineActivity;
         this.userSetDefinePermissionTip = defineTip;
         this.onPermissionResponseListener = onPermissionResponseListener;
+        this.userSetPermission = permissions;
         if (checkPermissions(permissions)) {
             if (onPermissionResponseListener != null) {
                 onPermissionResponseListener.onSuccess(permissions);
@@ -465,6 +520,51 @@ 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 defineTip, String[] permissions, 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
+     * @param permissions
+     * @param onPermissionResponseListener
+     */
+    public void requestPermission(int requestCode, boolean isDefineActivity, String[]
+            permissions, OnPermissionResponseListener onPermissionResponseListener) {
+        this.onPermissionResponseListener = onPermissionResponseListener;
+        this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
+        this.isDefinePermissionCloseActivity = isDefineActivity;
+        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 requestCode
@@ -492,6 +592,29 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
      * @param permissions
      * @param onPermissionResponseListener
      */
+    public void requestPermission(int requestCode, String defineTip, boolean isDefineActivity, String[]
+            permissions, OnPermissionResponseListener onPermissionResponseListener) {
+        this.onPermissionResponseListener = onPermissionResponseListener;
+        this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
+        this.isDefinePermissionCloseActivity = isDefineActivity;
+        this.userSetDefinePermissionTip = 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 requestCode
+     * @param permissions
+     * @param onPermissionResponseListener
+     */
     public void requestPermission(int requestCode, String defineTip, String[]
             permissions, OnPermissionResponseListener onPermissionResponseListener) {
         this.onPermissionResponseListener = onPermissionResponseListener;
@@ -515,6 +638,30 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
      * @param permissions
      * @param onPermissionResponseListener
      */
+    public void requestPermission(int requestCode, @StringRes int defineTip, boolean isDefineActivity, String[]
+            permissions, OnPermissionResponseListener onPermissionResponseListener) {
+        this.onPermissionResponseListener = onPermissionResponseListener;
+        this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
+        this.userSetDefinePermissionTip = getResources().getString(defineTip);
+        this.isDefinePermissionCloseActivity = isDefineActivity;
+        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);
+        }
+    }
+
+    /**
+     * 自定义权限申请码和提示信息
+     * 可传入string字符串
+     *
+     * @param requestCode
+     * @param permissions
+     * @param onPermissionResponseListener
+     */
     public void requestPermission(int requestCode, @StringRes int defineTip, String[]
             permissions, OnPermissionResponseListener onPermissionResponseListener) {
         this.onPermissionResponseListener = onPermissionResponseListener;
@@ -569,7 +716,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
                 if (onPermissionResponseListener != null) {
                     onPermissionResponseListener.onFail();
                 }
-                showTipsDialog("");
+                showTipsDialog();
             }
         }
         //用户自定义权限申请码
@@ -582,7 +729,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
                 if (onPermissionResponseListener != null) {
                     onPermissionResponseListener.onFail();
                 }
-                showTipsDialog(userSetDefinePermissionTip);
+                showTipsDialog();
             }
             //重置用户提示语
             userSetDefinePermissionTip = "";
@@ -640,29 +787,45 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     /**
      * 显示提示对话框
      */
-    private void showTipsDialog(String msg) {
+    private void showTipsDialog() {
         String tip = "";
-        if (TextUtils.isEmpty(msg)) {
+        if (TextUtils.isEmpty(userSetDefinePermissionTip)) {
             tip = defaultDefinePermissionTip;
         } else {
-            tip = msg;
+            tip = userSetDefinePermissionTip;
         }
         new AlertDialog.Builder(this)
                 .setTitle("温馨提示")
                 .setMessage(tip)
+                .setCancelable(false)
                 .setNegativeButton("取消", new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
+                        if (isDefinePermissionCloseActivity) {
+                            isDefinePermissionCloseActivity = false;
+                            //先判断当前是否是多个activity
+//                            if (null != getSupportFragmentManager().getFragments() && getSupportFragmentManager().getFragments().size() > 1) {
+//                                //移除最上层的
+//                                pop();
+//                            } else {
+                            finish();
+//                            }
+
+                        }
+
                     }
                 })
-                .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                .setPositiveButton("去设置", new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
+                        dialog.dismiss();
                         startAppSettings();
+                        isUserClickAllowBtn = true;
                     }
                 }).show();
     }
+
     //启动当前应用设置页面
     public void startAppSettings() {
         Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
@@ -184,8 +184,8 @@ public abstract class BaseFragment&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) {
         me.setStatusBarColor(color, statusBarAlpha);
     }
@@ -212,7 +212,7 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
     /**
      * 设置状态栏字体颜色
      */
-    protected void setStatusBarTextColor(int type) {
+    public void setStatusBarTextColor(int type) {
         me.setStatusBarTextColor(type);
     }
@@ -249,18 +249,38 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
     }
     //权限申请
+    public void requestPermission(boolean isDefineActivity, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
+        me.requestPermission(isDefineActivity, permissions, onPermissionResponseListener);
+    }
+
+    //权限申请
     public void requestPermission(int requestCode, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
         me.requestPermission(requestCode, permissions, onPermissionResponseListener);
     }
     //权限申请
+    public void requestPermission(int requestCode, boolean isDefineActivity, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
+        me.requestPermission(requestCode, isDefineActivity, permissions, onPermissionResponseListener);
+    }
+
+    //权限申请
     public void requestPermission(int requestCode, String defineTip, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
         me.requestPermission(requestCode, defineTip, permissions, onPermissionResponseListener);
     }
-    public void requestPermission(String[] permissions, String defineTip, OnPermissionResponseListener
+    //权限申请
+    public void requestPermission(int requestCode, String defineTip, boolean isDefineActivity, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
+        me.requestPermission(requestCode, defineTip, isDefineActivity, permissions, onPermissionResponseListener);
+    }
+
+    public void requestPermission(String defineTip, String[] permissions, OnPermissionResponseListener
+            onPermissionResponseListener) {
+        me.requestPermission(defineTip, permissions, onPermissionResponseListener);
+    }
+
+    public void requestPermission(String defineTip, boolean isDefineActivity, String[] permissions, OnPermissionResponseListener
             onPermissionResponseListener) {
-        me.requestPermission(permissions, defineTip, onPermissionResponseListener);
+        me.requestPermission(defineTip, isDefineActivity, permissions, onPermissionResponseListener);
     }
     public void requestPermission(int requestCode, @StringRes int defineTip, String[]
@@ -268,6 +288,11 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
         me.requestPermission(requestCode, defineTip, permissions, onPermissionResponseListener);
     }
+    public void requestPermission(int requestCode, @StringRes int defineTip, boolean isDefineActivity, String[]
+            permissions, OnPermissionResponseListener onPermissionResponseListener) {
+        me.requestPermission(requestCode, defineTip, isDefineActivity, permissions, onPermissionResponseListener);
+    }
+
     //多权限检查
     public boolean checkPermissions(String[] permissions) {
         return me.checkPermissions(permissions);
@@ -374,7 +399,7 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
     }
     public void logVerbose(String info) {
-        Logger.v( info);
+        Logger.v(info);
     }
     public void logJson(String json) {
+package com.cnlive.core.libs.base.ui.widget;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.TextView;
+
+
+import com.cnlive.strike.base.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 创建：wukuiqing
+ * <p>
+ * 时间：2018/1/8
+ * <p>
+ * 描述：底部弹出的  Dialog
+ */
+
+public class BottomMenuDialog extends Dialog {
+
+    public BottomMenuDialog(Context context, int themeResId) {
+        super(context, themeResId);
+    }
+
+    public static class Params {
+        private final List<BottomMenu> menuList = new ArrayList<>();
+        private String menuTitle;
+        private String cancelText;
+        private int titleColor;
+    }
+
+    public static class Builder {
+        private boolean canCancel = true;
+        private boolean shadow = true;
+        private final Params p;
+
+        public Builder(Context context) {
+            p = new Params();
+        }
+
+        public Builder setCanCancel(boolean canCancel) {
+            this.canCancel = canCancel;
+            return this;
+        }
+
+        public Builder setShadow(boolean shadow) {
+            this.shadow = shadow;
+            return this;
+        }
+
+        public Builder setTitle(String title) {
+            this.p.menuTitle = title;
+            return this;
+        }
+
+        public Builder setTitle(String title, int titleColor) {
+            this.p.menuTitle = title;
+            this.p.titleColor = titleColor;
+            return this;
+        }
+
+        public Builder addMenu(String text, View.OnClickListener listener) {
+            BottomMenu bm = new BottomMenu(text, listener);
+            this.p.menuList.add(bm);
+            return this;
+        }
+
+        public Builder setCancelText(String text) {
+            p.cancelText = text;
+            return this;
+        }
+
+        public BottomMenuDialog create(Context context) {
+            return create(context, null);
+        }
+
+        public BottomMenuDialog create(Context context, View.OnClickListener cancelListener) {
+            BottomMenuDialog dialog = new BottomMenuDialog(context, shadow ? R.style.Theme_Light_NoTitle_Dialog : R.style.Theme_Light_NoTitle_NoShadow_Dialog);
+            Window window = dialog.getWindow();
+            if (window != null) {
+                window.setWindowAnimations(R.style.Animation_Bottom_Rising);
+                window.getDecorView().setPadding(0, 0, 0, 0);
+                WindowManager.LayoutParams lp = window.getAttributes();
+                lp.width = WindowManager.LayoutParams.MATCH_PARENT;
+                lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+                window.setAttributes(lp);
+                window.setGravity(Gravity.BOTTOM);
+            }
+
+            View view = LayoutInflater.from(context).inflate(R.layout.dialog_bottom_menu, null);
+
+            TextView btnCancel = view.findViewById(R.id.btn_cancel);
+            ViewGroup layContainer = view.findViewById(R.id.lay_container);
+            LayoutParams lpItem = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+            LayoutParams lpDivider = new LayoutParams(LayoutParams.MATCH_PARENT, 1);
+            int dip1 = (int) (1 * context.getResources().getDisplayMetrics().density + 0.5f);
+            int spacing = dip1 * 13;
+
+            boolean hasTitle = !TextUtils.isEmpty(p.menuTitle);
+            if (hasTitle) {
+                TextView tTitle = new TextView(context);
+                tTitle.setLayoutParams(lpItem);
+                tTitle.setGravity(Gravity.CENTER);
+                if (p.titleColor != 0 && p.titleColor != 1) {
+                    tTitle.setTextColor(context.getResources().getColor(p.titleColor));
+
+                } else {
+                    tTitle.setTextColor(context.getResources().getColor(R.color.blacktext));
+                }
+
+                tTitle.setText(p.menuTitle);
+                tTitle.setTextSize(15);
+                tTitle.setPadding(0, spacing, 0, spacing);
+                tTitle.setBackgroundResource(R.drawable.common_dialog_selection_selector_top);
+                layContainer.addView(tTitle);
+
+                View viewDivider = new View(context);
+                viewDivider.setLayoutParams(lpDivider);
+                viewDivider.setBackgroundColor(0xFFCED2D6);
+                layContainer.addView(viewDivider);
+            }
+
+            for (int i = 0; i < p.menuList.size(); i++) {
+                BottomMenu bottomMenu = p.menuList.get(i);
+                TextView bbm = new TextView(context);
+                bbm.setLayoutParams(lpItem);
+                int backgroundResId = R.drawable.common_dialog_selection_selector_center;
+                if (p.menuList.size() > 1) {
+                    if (i == 0) {
+                        if (hasTitle) {
+                            backgroundResId = R.drawable.common_dialog_selection_selector_center;
+                        } else {
+                            backgroundResId = R.drawable.common_dialog_selection_selector_top;
+                        }
+                    } else if (i == p.menuList.size() - 1) {
+                        backgroundResId = R.drawable.common_dialog_selection_selector_bottom;
+                    }
+                } else if (p.menuList.size() == 1) {
+                    backgroundResId = R.drawable.common_dialog_selection_selector_singleton;
+                }
+                bbm.setBackgroundResource(backgroundResId);
+                bbm.setPadding(0, spacing, 0, spacing);
+                bbm.setGravity(Gravity.CENTER);
+                bbm.setText(bottomMenu.funName);
+                bbm.setTextColor(context.getResources().getColor(R.color.blacktext));
+                bbm.setTextSize(15);
+                bbm.setOnClickListener(bottomMenu.listener);
+                layContainer.addView(bbm);
+
+                if (i != p.menuList.size() - 1) {
+                    View viewDivider = new View(context);
+                    viewDivider.setLayoutParams(lpDivider);
+                    viewDivider.setBackgroundColor(0xFFCED2D6);
+                    layContainer.addView(viewDivider);
+                }
+            }
+
+            if (!TextUtils.isEmpty(p.cancelText)) {
+                btnCancel.setText(p.cancelText);
+            }
+
+            if (cancelListener != null) {
+                btnCancel.setOnClickListener(cancelListener);
+            } else {
+                btnCancel.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        dialog.dismiss();
+                    }
+                });
+            }
+            dialog.setContentView(view);
+            dialog.setCanceledOnTouchOutside(canCancel);
+            dialog.setCancelable(canCancel);
+            return dialog;
+        }
+    }
+
+
+    private static class BottomMenu {
+        public String funName;
+        public View.OnClickListener listener;
+
+        public BottomMenu(String funName, View.OnClickListener listener) {
+            this.funName = funName;
+            this.listener = listener;
+        }
+    }
+}
@@ -3,8 +3,12 @@ package com.cnlive.core.libs.base.util;
 import android.content.Context;
 import android.os.Handler;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
+import java.lang.ref.WeakReference;
+
 /**
  * 文 件 名: QMUITipDialogUtil
  * 创 建 人: 杨帅
@@ -16,7 +20,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
  */
 public class QMUITipDialogUtil {
     private static QMUITipDialog tipDialog;
-
+    private static WeakReference<Context> currentContext;
     /**
      * Loading 类型提示框
@@ -26,13 +30,14 @@ public class QMUITipDialogUtil {
      */
     public static void loadingDialog(Context context, String tipStr, boolean isCancel) {
         try {
-            if (context == null) {
+            currentContext = new WeakReference<>(context);
+            if (currentContext == null) {
                 return;
             }
             if (tipDialog != null && tipDialog.isShowing()) {
                 tipDialog.dismiss();
             }
-            tipDialog = new QMUITipDialog.Builder(context)
+            tipDialog = new QMUITipDialog.Builder(currentContext.get())
                     .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
                     .setTipWord(tipStr)
                     .create();
@@ -54,14 +59,14 @@ public class QMUITipDialogUtil {
      */
     public static void successDialog(Context context, String tipStr, int second) {
         try {
-            if (context == null) {
+            currentContext = new WeakReference<>(context);
+            if (currentContext == null) {
                 return;
             }
-
             if (tipDialog != null && tipDialog.isShowing()) {
                 tipDialog.dismiss();
             }
-            tipDialog = new QMUITipDialog.Builder(context)
+            tipDialog = new QMUITipDialog.Builder(currentContext.get())
                     .setIconType(QMUITipDialog.Builder.ICON_TYPE_SUCCESS)
                     .setTipWord(tipStr)
                     .create();
@@ -71,7 +76,7 @@ public class QMUITipDialogUtil {
                 new Handler().postDelayed(new Runnable() {
                     @Override
                     public void run() {
-                        if (context == null) {
+                        if (currentContext == null) {
                             return;
                         }
                         /**
@@ -96,10 +101,14 @@ public class QMUITipDialogUtil {
      */
     public static void failedDialog(Context context, String tipStr, int second) {
         try {
+            currentContext = new WeakReference<>(context);
+            if (currentContext == null) {
+                return;
+            }
             if (tipDialog != null && tipDialog.isShowing()) {
                 tipDialog.dismiss();
             }
-            tipDialog = new QMUITipDialog.Builder(context)
+            tipDialog = new QMUITipDialog.Builder(currentContext.get())
                     .setIconType(QMUITipDialog.Builder.ICON_TYPE_FAIL)
                     .setTipWord(tipStr)
                     .create();
@@ -109,7 +118,7 @@ public class QMUITipDialogUtil {
                 new Handler().postDelayed(new Runnable() {
                     @Override
                     public void run() {
-                        if (context == null) {
+                        if (currentContext == null) {
                             return;
                         }
                         /**
@@ -124,7 +133,7 @@ public class QMUITipDialogUtil {
         } catch (Exception e) {
         }
-        if (context == null) {
+        if (currentContext == null) {
             return;
         }
@@ -138,10 +147,14 @@ public class QMUITipDialogUtil {
      */
     public static void messageDialog(Context context, String tipStr, int second) {
         try {
+            currentContext = new WeakReference<>(context);
+            if (currentContext == null) {
+                return;
+            }
             if (tipDialog != null && tipDialog.isShowing()) {
                 tipDialog.dismiss();
             }
-            tipDialog = new QMUITipDialog.Builder(context)
+            tipDialog = new QMUITipDialog.Builder(currentContext.get())
                     .setIconType(QMUITipDialog.Builder.ICON_TYPE_INFO)
                     .setTipWord(tipStr)
                     .create();
@@ -151,7 +164,7 @@ public class QMUITipDialogUtil {
                 new Handler().postDelayed(new Runnable() {
                     @Override
                     public void run() {
-                        if (context == null) {
+                        if (currentContext == null) {
                             return;
                         }
                         /**
@@ -164,7 +177,7 @@ public class QMUITipDialogUtil {
         } catch (Exception e) {
         }
-        if (context == null) {
+        if (currentContext == null) {
             return;
         }
@@ -178,13 +191,14 @@ public class QMUITipDialogUtil {
      */
     public static void textDialog(Context context, String tipStr, int second) {
         try {
-            if (context == null) {
+            currentContext = new WeakReference<>(context);
+            if (currentContext == null) {
                 return;
             }
             if (tipDialog != null && tipDialog.isShowing()) {
                 tipDialog.dismiss();
             }
-            tipDialog = new QMUITipDialog.Builder(context)
+            tipDialog = new QMUITipDialog.Builder(currentContext.get())
                     .setTipWord(tipStr)
                     .create();
             tipDialog.setCanceledOnTouchOutside(false);//屏蔽返回键
@@ -193,7 +207,7 @@ public class QMUITipDialogUtil {
                 new Handler().postDelayed(new Runnable() {
                     @Override
                     public void run() {
-                        if (context == null) {
+                        if (currentContext == null) {
                             return;
                         }
                         /**
@@ -211,6 +225,9 @@ public class QMUITipDialogUtil {
     public static void dismessDialog() {
         try {
+            if (currentContext == null) {
+                return;
+            }
             if (tipDialog != null && tipDialog.isShowing()) {
                 tipDialog.dismiss();
             }
+package com.top.zibin.luban;
+
+import android.graphics.BitmapFactory;
+import android.util.Log;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+enum Checker {
+  SINGLE;
+
+  private static final String TAG = "Luban";
+
+  private static List<String> format = new ArrayList<>();
+  private static final String JPG = ".jpg";
+  private static final String JPEG = ".jpeg";
+  private static final String PNG = ".png";
+  private static final String WEBP = ".webp";
+  private static final String GIF = ".gif";
+
+  private final byte[] JPEG_SIGNATURE = new byte[]{(byte) 0xFF, (byte) 0xD8, (byte) 0xFF};
+
+  static {
+    format.add(JPG);
+    format.add(JPEG);
+    format.add(PNG);
+    format.add(WEBP);
+    format.add(GIF);
+  }
+
+  /**
+   * Determine if it is JPG.
+   *
+   * @param is image file input stream
+   */
+  boolean isJPG(InputStream is) {
+    return isJPG(toByteArray(is));
+  }
+
+  /**
+   * Returns the degrees in clockwise. Values are 0, 90, 180, or 270.
+   */
+  int getOrientation(InputStream is) {
+    return getOrientation(toByteArray(is));
+  }
+
+  private boolean isJPG(byte[] data) {
+    if (data == null || data.length < 3) {
+      return false;
+    }
+    byte[] signatureB = new byte[]{data[0], data[1], data[2]};
+    return Arrays.equals(JPEG_SIGNATURE, signatureB);
+  }
+
+  private int getOrientation(byte[] jpeg) {
+    if (jpeg == null) {
+      return 0;
+    }
+
+    int offset = 0;
+    int length = 0;
+
+    // ISO/IEC 10918-1:1993(E)
+    while (offset + 3 < jpeg.length && (jpeg[offset++] & 0xFF) == 0xFF) {
+      int marker = jpeg[offset] & 0xFF;
+
+      // Check if the marker is a padding.
+      if (marker == 0xFF) {
+        continue;
+      }
+      offset++;
+
+      // Check if the marker is SOI or TEM.
+      if (marker == 0xD8 || marker == 0x01) {
+        continue;
+      }
+      // Check if the marker is EOI or SOS.
+      if (marker == 0xD9 || marker == 0xDA) {
+        break;
+      }
+
+      // Get the length and check if it is reasonable.
+      length = pack(jpeg, offset, 2, false);
+      if (length < 2 || offset + length > jpeg.length) {
+        Log.e(TAG, "Invalid length");
+        return 0;
+      }
+
+      // Break if the marker is EXIF in APP1.
+      if (marker == 0xE1 && length >= 8
+          && pack(jpeg, offset + 2, 4, false) == 0x45786966
+          && pack(jpeg, offset + 6, 2, false) == 0) {
+        offset += 8;
+        length -= 8;
+        break;
+      }
+
+      // Skip other markers.
+      offset += length;
+      length = 0;
+    }
+
+    // JEITA CP-3451 Exif Version 2.2
+    if (length > 8) {
+      // Identify the byte order.
+      int tag = pack(jpeg, offset, 4, false);
+      if (tag != 0x49492A00 && tag != 0x4D4D002A) {
+        Log.e(TAG, "Invalid byte order");
+        return 0;
+      }
+      boolean littleEndian = (tag == 0x49492A00);
+
+      // Get the offset and check if it is reasonable.
+      int count = pack(jpeg, offset + 4, 4, littleEndian) + 2;
+      if (count < 10 || count > length) {
+        Log.e(TAG, "Invalid offset");
+        return 0;
+      }
+      offset += count;
+      length -= count;
+
+      // Get the count and go through all the elements.
+      count = pack(jpeg, offset - 2, 2, littleEndian);
+      while (count-- > 0 && length >= 12) {
+        // Get the tag and check if it is orientation.
+        tag = pack(jpeg, offset, 2, littleEndian);
+        if (tag == 0x0112) {
+          int orientation = pack(jpeg, offset + 8, 2, littleEndian);
+          switch (orientation) {
+            case 1:
+              return 0;
+            case 3:
+              return 180;
+            case 6:
+              return 90;
+            case 8:
+              return 270;
+          }
+          Log.e(TAG, "Unsupported orientation");
+          return 0;
+        }
+        offset += 12;
+        length -= 12;
+      }
+    }
+
+    Log.e(TAG, "Orientation not found");
+    return 0;
+  }
+
+  String extSuffix(InputStreamProvider input) {
+    try {
+      BitmapFactory.Options options = new BitmapFactory.Options();
+      options.inJustDecodeBounds = true;
+      BitmapFactory.decodeStream(input.open(), null, options);
+      return options.outMimeType.replace("image/", ".");
+    } catch (Exception e) {
+      return JPG;
+    }
+  }
+
+  boolean needCompress(int leastCompressSize, String path) {
+    if (leastCompressSize > 0) {
+      File source = new File(path);
+      return source.exists() && source.length() > (leastCompressSize << 10);
+    }
+    return true;
+  }
+
+  private int pack(byte[] bytes, int offset, int length, boolean littleEndian) {
+    int step = 1;
+    if (littleEndian) {
+      offset += length - 1;
+      step = -1;
+    }
+
+    int value = 0;
+    while (length-- > 0) {
+      value = (value << 8) | (bytes[offset] & 0xFF);
+      offset += step;
+    }
+    return value;
+  }
+
+  private byte[] toByteArray(InputStream is) {
+    if (is == null) {
+      return new byte[0];
+    }
+
+    ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+
+    int read;
+    byte[] data = new byte[4096];
+
+    try {
+      while ((read = is.read(data, 0, data.length)) != -1) {
+        buffer.write(data, 0, read);
+      }
+    } catch (Exception ignored) {
+      return new byte[0];
+    } finally {
+      try {
+        buffer.close();
+      } catch (IOException ignored) {
+      }
+    }
+
+    return buffer.toByteArray();
+  }
+}
+package com.top.zibin.luban;
+
+/**
+ * Created on 2018/1/3 19:43
+ *
+ * @author andy
+ *
+ * A functional interface (callback) that returns true or false for the given input path should be compressed.
+ */
+
+public interface CompressionPredicate {
+
+    /**
+     * Determine the given input path should be compressed and return a boolean.
+     * @param path input path
+     * @return the boolean result
+     */
+    boolean apply(String path);
+}
+package com.top.zibin.luban;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Matrix;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+/**
+ * Responsible for starting compress and managing active and cached resources.
+ */
+class Engine {
+    private InputStreamProvider srcImg;
+    private File tagImg;
+    private int srcWidth;
+    private int srcHeight;
+    private boolean focusAlpha;
+
+    Engine(InputStreamProvider srcImg, File tagImg, boolean focusAlpha) throws IOException {
+        this.tagImg = tagImg;
+        this.srcImg = srcImg;
+        this.focusAlpha = focusAlpha;
+
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+        options.inSampleSize = 1;
+
+        BitmapFactory.decodeStream(srcImg.open(), null, options);
+        this.srcWidth = options.outWidth;
+        this.srcHeight = options.outHeight;
+    }
+
+    private int computeSize() {
+        srcWidth = srcWidth % 2 == 1 ? srcWidth + 1 : srcWidth;
+        srcHeight = srcHeight % 2 == 1 ? srcHeight + 1 : srcHeight;
+
+        int longSide = Math.max(srcWidth, srcHeight);
+        int shortSide = Math.min(srcWidth, srcHeight);
+
+        float scale = ((float) shortSide / longSide);
+        if (scale <= 1 && scale > 0.5625) {
+            if (longSide < 1664) {
+                return 1;
+            } else if (longSide < 4990) {
+                return 2;
+            } else if (longSide > 4990 && longSide < 10240) {
+                return 4;
+            } else {
+                return longSide / 1280 == 0 ? 1 : longSide / 1280;
+            }
+        } else if (scale <= 0.5625 && scale > 0.5) {
+            return longSide / 1280 == 0 ? 1 : longSide / 1280;
+        } else {
+            //TODO 增加最大像素限制
+            return Math.max((int) Math.ceil(longSide / (1280.0 / scale)), 1 + (longSide / 20480));
+        }
+    }
+
+    private Bitmap rotatingImage(Bitmap bitmap, int angle) {
+        Matrix matrix = new Matrix();
+
+        matrix.postRotate(angle);
+
+        return Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
+    }
+
+    File compress() throws IOException {
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inSampleSize = computeSize();
+
+        Bitmap tagBitmap = BitmapFactory.decodeStream(srcImg.open(), null, options);
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+
+        if (Checker.SINGLE.isJPG(srcImg.open())) {
+            tagBitmap = rotatingImage(tagBitmap, Checker.SINGLE.getOrientation(srcImg.open()));
+        }
+        tagBitmap.compress(focusAlpha ? Bitmap.CompressFormat.PNG : Bitmap.CompressFormat.JPEG, 60, stream);
+        tagBitmap.recycle();
+
+        FileOutputStream fos = new FileOutputStream(tagImg);
+        fos.write(stream.toByteArray());
+        fos.flush();
+        fos.close();
+        stream.close();
+
+        return tagImg;
+    }
+}
 \ No newline at end of file
+package com.top.zibin.luban;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * 通过此接口获取输入流，以兼容文件、FileProvider方式获取到的图片
+ * <p>
+ * Get the input stream through this interface, and obtain the picture using compatible files and FileProvider
+ */
+public interface InputStreamProvider {
+
+  InputStream open() throws IOException;
+
+  String getPath();
+}
+package com.top.zibin.luban;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+@SuppressWarnings("unused")
+public class Luban implements Handler.Callback {
+  private static final String TAG = "Luban";
+  private static final String DEFAULT_DISK_CACHE_DIR = "luban_disk_cache";
+
+  private static final int MSG_COMPRESS_SUCCESS = 0;
+  private static final int MSG_COMPRESS_START = 1;
+  private static final int MSG_COMPRESS_ERROR = 2;
+
+  private String mTargetDir;
+  private boolean focusAlpha;
+  private int mLeastCompressSize;
+  private OnRenameListener mRenameListener;
+  private OnCompressListener mCompressListener;
+  private CompressionPredicate mCompressionPredicate;
+  private List<InputStreamProvider> mStreamProviders;
+
+  private Handler mHandler;
+
+  private Luban(Builder builder) {
+    this.mTargetDir = builder.mTargetDir;
+    this.mRenameListener = builder.mRenameListener;
+    this.mStreamProviders = builder.mStreamProviders;
+    this.mCompressListener = builder.mCompressListener;
+    this.mLeastCompressSize = builder.mLeastCompressSize;
+    this.mCompressionPredicate = builder.mCompressionPredicate;
+    mHandler = new Handler(Looper.getMainLooper(), this);
+  }
+
+  public static Builder with(Context context) {
+    return new Builder(context);
+  }
+
+  /**
+   * Returns a file with a cache image name in the private cache directory.
+   *
+   * @param context A context.
+   */
+  private File getImageCacheFile(Context context, String suffix) {
+    if (TextUtils.isEmpty(mTargetDir)) {
+      mTargetDir = getImageCacheDir(context).getAbsolutePath();
+    }
+
+    String cacheBuilder = mTargetDir + "/" +
+        System.currentTimeMillis() +
+        (int) (Math.random() * 1000) +
+        (TextUtils.isEmpty(suffix) ? ".jpg" : suffix);
+
+    return new File(cacheBuilder);
+  }
+
+  private File getImageCustomFile(Context context, String filename) {
+    if (TextUtils.isEmpty(mTargetDir)) {
+      mTargetDir = getImageCacheDir(context).getAbsolutePath();
+    }
+
+    String cacheBuilder = mTargetDir + "/" + filename;
+
+    return new File(cacheBuilder);
+  }
+
+  /**
+   * Returns a directory with a default name in the private cache directory of the application to
+   * use to store retrieved audio.
+   *
+   * @param context A context.
+   * @see #getImageCacheDir(Context, String)
+   */
+  private File getImageCacheDir(Context context) {
+    return getImageCacheDir(context, DEFAULT_DISK_CACHE_DIR);
+  }
+
+  /**
+   * Returns a directory with the given name in the private cache directory of the application to
+   * use to store retrieved media and thumbnails.
+   *
+   * @param context   A context.
+   * @param cacheName The name of the subdirectory in which to store the cache.
+   * @see #getImageCacheDir(Context)
+   */
+  private static File getImageCacheDir(Context context, String cacheName) {
+    File cacheDir = context.getExternalCacheDir();
+    if (cacheDir != null) {
+      File result = new File(cacheDir, cacheName);
+      if (!result.mkdirs() && (!result.exists() || !result.isDirectory())) {
+        // File wasn't able to create a directory, or the result exists but not a directory
+        return null;
+      }
+      return result;
+    }
+    if (Log.isLoggable(TAG, Log.ERROR)) {
+      Log.e(TAG, "default disk cache dir is null");
+    }
+    return null;
+  }
+
+  /**
+   * start asynchronous compress thread
+   */
+  private void launch(final Context context) {
+    if (mStreamProviders == null || mStreamProviders.size() == 0 && mCompressListener != null) {
+      mCompressListener.onError(new NullPointerException("image file cannot be null"));
+    }
+
+    Iterator<InputStreamProvider> iterator = mStreamProviders.iterator();
+
+    while (iterator.hasNext()) {
+      final InputStreamProvider path = iterator.next();
+
+      AsyncTask.SERIAL_EXECUTOR.execute(new Runnable() {
+        @Override
+        public void run() {
+          try {
+            mHandler.sendMessage(mHandler.obtainMessage(MSG_COMPRESS_START));
+
+            File result = compress(context, path);
+
+            mHandler.sendMessage(mHandler.obtainMessage(MSG_COMPRESS_SUCCESS, result));
+          } catch (IOException e) {
+            mHandler.sendMessage(mHandler.obtainMessage(MSG_COMPRESS_ERROR, e));
+          }
+        }
+      });
+
+      iterator.remove();
+    }
+  }
+
+  /**
+   * start compress and return the file
+   */
+  private File get(InputStreamProvider input, Context context) throws IOException {
+    return new Engine(input, getImageCacheFile(context, Checker.SINGLE.extSuffix(input)), focusAlpha).compress();
+  }
+
+  private List<File> get(Context context) throws IOException {
+    List<File> results = new ArrayList<>();
+    Iterator<InputStreamProvider> iterator = mStreamProviders.iterator();
+
+    while (iterator.hasNext()) {
+      results.add(compress(context, iterator.next()));
+      iterator.remove();
+    }
+
+    return results;
+  }
+
+  private File compress(Context context, InputStreamProvider path) throws IOException {
+    File result;
+
+    File outFile = getImageCacheFile(context, Checker.SINGLE.extSuffix(path));
+
+    if (mRenameListener != null) {
+      String filename = mRenameListener.rename(path.getPath());
+      outFile = getImageCustomFile(context, filename);
+    }
+
+    if (mCompressionPredicate != null) {
+      if (mCompressionPredicate.apply(path.getPath())
+          && Checker.SINGLE.needCompress(mLeastCompressSize, path.getPath())) {
+        result = new Engine(path, outFile, focusAlpha).compress();
+      } else {
+        result = new File(path.getPath());
+      }
+    } else {
+      result = Checker.SINGLE.needCompress(mLeastCompressSize, path.getPath()) ?
+          new Engine(path, outFile, focusAlpha).compress() :
+          new File(path.getPath());
+    }
+
+    return result;
+  }
+
+  @Override
+  public boolean handleMessage(Message msg) {
+    if (mCompressListener == null) return false;
+
+    switch (msg.what) {
+      case MSG_COMPRESS_START:
+        mCompressListener.onStart();
+        break;
+      case MSG_COMPRESS_SUCCESS:
+        mCompressListener.onSuccess((File) msg.obj);
+        break;
+      case MSG_COMPRESS_ERROR:
+        mCompressListener.onError((Throwable) msg.obj);
+        break;
+    }
+    return false;
+  }
+
+  public static class Builder {
+    private Context context;
+    private String mTargetDir;
+    private boolean focusAlpha;
+    private int mLeastCompressSize = 100;
+    private OnRenameListener mRenameListener;
+    private OnCompressListener mCompressListener;
+    private CompressionPredicate mCompressionPredicate;
+    private List<InputStreamProvider> mStreamProviders;
+
+    Builder(Context context) {
+      this.context = context;
+      this.mStreamProviders = new ArrayList<>();
+    }
+
+    private Luban build() {
+      return new Luban(this);
+    }
+
+    public Builder load(InputStreamProvider inputStreamProvider) {
+      mStreamProviders.add(inputStreamProvider);
+      return this;
+    }
+
+    public Builder load(final File file) {
+      mStreamProviders.add(new InputStreamProvider() {
+        @Override
+        public InputStream open() throws IOException {
+          return new FileInputStream(file);
+        }
+
+        @Override
+        public String getPath() {
+          return file.getAbsolutePath();
+        }
+      });
+      return this;
+    }
+
+    public Builder load(final String string) {
+      mStreamProviders.add(new InputStreamProvider() {
+        @Override
+        public InputStream open() throws IOException {
+          return new FileInputStream(string);
+        }
+
+        @Override
+        public String getPath() {
+          return string;
+        }
+      });
+      return this;
+    }
+
+    public <T> Builder load(List<T> list) {
+      for (T src : list) {
+        if (src instanceof String) {
+          load((String) src);
+        } else if (src instanceof File) {
+          load((File) src);
+        } else if (src instanceof Uri) {
+          load((Uri) src);
+        } else {
+          throw new IllegalArgumentException("Incoming data type exception, it must be String, File, Uri or Bitmap");
+        }
+      }
+      return this;
+    }
+
+    public Builder load(final Uri uri) {
+      mStreamProviders.add(new InputStreamProvider() {
+        @Override
+        public InputStream open() throws IOException {
+          return context.getContentResolver().openInputStream(uri);
+        }
+
+        @Override
+        public String getPath() {
+          return uri.getPath();
+        }
+      });
+      return this;
+    }
+
+    public Builder putGear(int gear) {
+      return this;
+    }
+
+    public Builder setRenameListener(OnRenameListener listener) {
+      this.mRenameListener = listener;
+      return this;
+    }
+
+    public Builder setCompressListener(OnCompressListener listener) {
+      this.mCompressListener = listener;
+      return this;
+    }
+
+    public Builder setTargetDir(String targetDir) {
+      this.mTargetDir = targetDir;
+      return this;
+    }
+
+    /**
+     * Do I need to keep the image's alpha channel
+     *
+     * @param focusAlpha <p> true - to keep alpha channel, the compress speed will be slow. </p>
+     *                   <p> false - don't keep alpha channel, it might have a black background.</p>
+     */
+    public Builder setFocusAlpha(boolean focusAlpha) {
+      this.focusAlpha = focusAlpha;
+      return this;
+    }
+
+    /**
+     * do not compress when the origin image file size less than one value
+     *
+     * @param size the value of file size, unit KB, default 100K
+     */
+    public Builder ignoreBy(int size) {
+      this.mLeastCompressSize = size;
+      return this;
+    }
+
+    /**
+     * do compress image when return value was true, otherwise, do not compress the image file
+     *
+     * @param compressionPredicate A predicate callback that returns true or false for the given input path should be compressed.
+     */
+    public Builder filter(CompressionPredicate compressionPredicate) {
+      this.mCompressionPredicate = compressionPredicate;
+      return this;
+    }
+
+
+    /**
+     * begin compress image with asynchronous
+     */
+    public void launch() {
+      build().launch(context);
+    }
+
+    public File get(final String path) throws IOException {
+      return build().get(new InputStreamProvider() {
+        @Override
+        public InputStream open() throws IOException {
+          return new FileInputStream(path);
+        }
+
+        @Override
+        public String getPath() {
+          return path;
+        }
+      }, context);
+    }
+
+    /**
+     * begin compress image with synchronize
+     *
+     * @return the thumb image file list
+     */
+    public List<File> get() throws IOException {
+      return build().get(context);
+    }
+  }
+}
 \ No newline at end of file
+package com.top.zibin.luban;
+
+import java.io.File;
+
+public interface OnCompressListener {
+
+  /**
+   * Fired when the compression is started, override to handle in your own code
+   */
+  void onStart();
+
+  /**
+   * Fired when a compression returns successfully, override to handle in your own code
+   */
+  void onSuccess(File file);
+
+  /**
+   * Fired when a compression fails to complete, override to handle in your own code
+   */
+  void onError(Throwable e);
+}
+package com.top.zibin.luban;
+
+/**
+ * Author: zibin
+ * Datetime: 2018/5/18
+ * <p>
+ * 提供修改压缩图片命名接口
+ * <p>
+ * A functional interface (callback) that used to rename the file after compress.
+ */
+public interface OnRenameListener {
+
+  /**
+   * 压缩前调用该方法用于修改压缩后文件名
+   * <p>
+   * Call before compression begins.
+   *
+   * @param filePath 传入文件路径/ file path
+   * @return 返回重命名后的字符串/ file name
+   */
+  String rename(String filePath);
+}
@@ -167,4 +167,8 @@
         <item name="android:background">@android:color/transparent</item>
     </style>
     <!--    -->
+    <style name="SwipeBackActivityTheme" parent="QMUI.Compat.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
 </resources>
 \ No newline at end of file
 apply plugin: 'com.android.library'
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+//    compileSdkVersion 29
+//    buildToolsVersion "29.0.2"
 //    defaultConfig {
 package com.cnlive.core.network.api;
-
-
 import com.cnlive.core.network.BaseResult;
 import com.cnlive.core.network.FaceData;
 import com.cnlive.core.network.TokenData;
 import com.cnlive.core.network.UserData;
+import com.cnlive.core.network.model.StorageInfoData;
+import com.cnlive.core.network.model.UploadAuthData;
 import java.util.List;
 import java.util.Map;
@@ -14,6 +14,7 @@ import java.util.Map;
 import io.reactivex.Observable;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
+import retrofit2.adapter.rxjava2.Result;
 import retrofit2.http.Multipart;
 import retrofit2.http.POST;
 import retrofit2.http.Part;
@@ -26,6 +27,23 @@ import retrofit2.http.QueryMap;
 public interface ApiBaseServiceOpen {
+    /**
+     * 上传鉴权
+     *
+     * @param maps
+     * @return
+     */
+    @POST("open/api2/vod_epg/getUploadAuthForApp")
+    Observable<BaseResult<UploadAuthData>> getUploadAuthForApp(@QueryMap Map<String, String> maps);
+
+    /**
+     * 获取存储信息
+     *
+     * @param map
+     * @return
+     */
+    @POST("open/api2/storage/getStorageInfo")
+    Observable<BaseResult<List<StorageInfoData>>> getStorageInfo(@QueryMap Map<String, String> map);
     /**
      * 顶踩一条节目 0：踩    1：顶
@@ -142,16 +160,18 @@ public interface ApiBaseServiceOpen {
                                                     @Part List<MultipartBody.Part> params);
-
     /**
      * 音频播放鉴权接口
+     *
      * @param map
      * @return
      */
     @POST("open/api2/user/loginIn3rdForWJJ")
     Observable<BaseResult<UserData>> loginIn3rdForWJJ(@QueryMap Map<String, String> map);
+
     /**
      * 登陆
+     *
      * @param map
      * @return
      */
+package com.cnlive.moudle.pedometer.upload.interfaces;
+
+public interface ProgressCallback {
+    void onProgress(double var1);
+}
@@ -11,6 +11,7 @@ import android.net.Uri;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.View;
+
 import com.clj.fastble.BleManager;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
@@ -114,7 +115,7 @@ public class BlueToothStep2Activity extends BaseActivity {
         String[] permissions = new String[]{Manifest.permission.INTERNET
                 , Manifest.permission.ACCESS_FINE_LOCATION
                 , Manifest.permission.ACCESS_COARSE_LOCATION};
-        requestPermission(permissions, "您尚未授予程序运行所需权限\n是否设置?", new OnPermissionResponseListener() {
+        requestPermission("您尚未授予程序运行所需权限\n是否设置?", permissions, new OnPermissionResponseListener() {
             @Override
             public void onSuccess(String[] permissions) {
                 //判断蓝牙是否打开
@@ -82,7 +82,7 @@ public class ChangeWifiActivity extends BaseActivity {
         String[] permissions = new String[]{Manifest.permission.INTERNET
                 , Manifest.permission.ACCESS_FINE_LOCATION
                 , Manifest.permission.ACCESS_COARSE_LOCATION};
-        requestPermission(permissions, "您尚未授予程序运行所需权限\n是否设置?", new OnPermissionResponseListener() {
+        requestPermission("您尚未授予程序运行所需权限\n是否设置?",permissions,  new OnPermissionResponseListener() {
             @Override
             public void onSuccess(String[] permissions) {
                 //判断蓝牙是否打开
@@ -2,5 +2,6 @@ include &#39;:app:strike&#39;, &#39;:network&#39;, &#39;:xiaojiasoundbox&#39;
 //基础库
 include ':core:base',':core:network',':core:imageload'
 include ':cloud:user'
-include ':module:xiaojiasoundbox'
+include ':module:xiaojiasoundbox',':module:pedometer'
+include ':library_baidumap'
 rootProject.name='ModuleStrike'