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

韩亚云
2 parents e02f778f 2d5217e1
Showing 23 changed files with 471 additions and 129 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/res/layout/activity_my.xml
cloud/user/src/main/AndroidManifest.xml
cloud/user/src/main/java/com/cnlive/strike/user/sms/SmsVerifyCatcher.java
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/LoginActivity.java
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/me/yokeyword/fragmentation/SupportActivityDelegate.java
core/network/build.gradle
core/network/src/main/java/com/cnlive/core/network/NetBuilder.java
core/network/src/main/java/com/cnlive/core/network/interceptor/DESEncryptInterceptor.java
core/network/src/main/java/com/cnlive/core/network/interceptor/NetPPPayEncryptInterceptor.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/UploadLogic.java → core/network/src/main/java/com/cnlive/core/network/upload/UploadLogic.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/UploadProvider.java → core/network/src/main/java/com/cnlive/core/network/upload/UploadProvider.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/interfaces/ProgressCallback.java → core/network/src/main/java/com/cnlive/core/network/upload/interfaces/ProgressCallback.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/utils/FileUtil.java → core/network/src/main/java/com/cnlive/core/network/upload/utils/FileUtil.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/utils/IDUtils.java → core/network/src/main/java/com/cnlive/core/network/upload/utils/IDUtils.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/utils/MD5.java → core/network/src/main/java/com/cnlive/core/network/upload/utils/MD5.java
@@ -39,6 +39,10 @@ android {
     dexOptions {
         javaMaxHeapSize '4g'
     }
+
+    dataBinding {
+        enabled true
+    }
     buildTypes {
         debug {
             signingConfig signingConfigs.debugConfig
@@ -169,6 +173,7 @@ dependencies {
     implementation project(path: ':core:network')
     implementation project(path: ':core:base')
     implementation project(path: ':cloud:user')
+    implementation project(path: ':cloud:pay')
     implementation project(path: ':core:imageload')
     implementation project(path: ':module:xiaojiasoundbox')
@@ -34,6 +34,7 @@ public class MainActivity extends AppCompatActivity {
             public void onClick(View v) {
                 if (TextUtils.isEmpty(UserService.getUid(MainActivity.this))) {
                     startActivity(new Intent(MainActivity.this, LoginActivity.class));
+//                    finish();
                 } else {
                     startActivity(new Intent(MainActivity.this, MyActivity.class));
                 }
@@ -3,29 +3,85 @@ package com.cnlive.strike;
 import android.content.Intent;
 import android.text.TextUtils;
+import android.view.View;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
+import com.cnlive.core.network.HttpConn;
+import com.cnlive.core.network.NetCallBack;
+import com.cnlive.core.network.model.BaseResult;
+import com.cnlive.libs.wjjpay.model.GroupBalanceInfo;
+import com.cnlive.libs.wjjpay.pay.WjjPay;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
+import com.cnlive.strike.databinding.ActivityMyBinding;
 import com.cnlive.strike.user.auth.UserService;
 import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.AllDeviceActivity;
+import com.cnlive.strike.xiaojiaspeaker.util.QMUITipDialogUtil;
 @Route(path = "/strick/MyActivity")
 public class MyActivity extends BaseActivity {
+    public ActivityMyBinding binding;
     @Override
-    protected int getViewLayoutId() {
+    protected int getBindLayoutId() {
         return R.layout.activity_my;
     }
     @Override
+    protected void initBindingData() {
+        super.initBindingData();
+        binding = (ActivityMyBinding) baseBinding;
+    }
+
+    @Override
     protected void initView() {
 //        getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyFragment()).commitAllowingStateLoss();
         initXiaoJiaSoundBoxData();
-        startActivity(new Intent(MyActivity.this, RunLineActivity.class));
-        finish();
+//        startActivity(new Intent(MyActivity.this, RunLineActivity.class));
+//        finish();
+        binding.btnChange.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(MyActivity.this, RunLineActivity.class));
+
+//                WjjPay.passwordIsExisting(UserService.getUid(me), new NetCallBack<BaseResult<GroupBalanceInfo>>() {
+//                    @Override
+//                    public void onRequestState(int state) {
+//
+//                    }
+//
+//                    @Override
+//                    public void onSuccess(BaseResult<GroupBalanceInfo> data) {
+//                        QMUITipDialogUtil.successDialog(me, data.getErrorCode() + "" + data.getData().getBalance(), 5);
+//                    }
+//
+//                    @Override
+//                    public void onFailure(String errCode, String errMsg) {
+//                        QMUITipDialogUtil.failedDialog(me, errMsg, 3);
+//                    }
+//                });
+//                WjjPay.setPassword(UserService.getUid(me), "123456", new NetCallBack<BaseResult>() {
+//                    @Override
+//                    public void onRequestState(int state) {
+//                        if (state == HttpConn.ON_START) {
+//                            QMUITipDialogUtil.loadingDialog(me, "修改中", true);
+//                        }
+//                    }
+//
+//                    @Override
+//                    public void onSuccess(BaseResult data) {
+//                        QMUITipDialogUtil.successDialog(me, data.getMessage(), 5);
+//                    }
+//
+//                    @Override
+//                    public void onFailure(String errCode, String errMsg) {
+//                        QMUITipDialogUtil.failedDialog(me, errMsg, 3);
+//                    }
+//                });
+            }
+        });
     }
     @Override
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.cnlive.strike.MyActivity">
+<layout>
-    <RelativeLayout
-        android:id="@+id/fragment_container"
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        tools:context="com.cnlive.strike.MyActivity">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="sfwerfwef" />
+        <RelativeLayout
+            android:id="@+id/fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="sfwerfwef" />
+
+            <Button
+                android:id="@+id/btn_change"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="修改支付密码" />
+        </RelativeLayout>
     </RelativeLayout>
-</RelativeLayout>
+</layout>
 \ No newline at end of file
@@ -39,7 +39,6 @@
             android:name="WEIBO_CHANNEL"
             android:value="weibo" />
-        <activity android:name="com.cnlive.strike.moudle.user.ui.activity.MainTestActivity" />
         <activity
             android:name=".ui.activity.LoginActivity"
             android:configChanges="keyboardHidden|screenSize|orientation|smallestScreenSize|screenLayout"
@@ -50,12 +49,6 @@
                 <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
         </activity>
-
-        <activity
-            android:name="com.cnlive.strike.moudle.user.ui.activity.BindPhoneNumberActivity"
-            android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activity.FirstLoginActivity"
             android:configChanges="keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation"
@@ -27,6 +27,9 @@ import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
+import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
+import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
+
 /**
  * Created by Anton Bevza on 8/15/16.
  */
@@ -35,7 +38,7 @@ public class SmsVerifyCatcher {
     public static int PERMISSION_REQUEST_CODE = 12;
     private Activity activity;
-    private Fragment fragment;
+    private BaseFragment fragment;
     private OnSmsCatchListener<String> onSmsCatchListener;
     private SmsReceiver smsReceiver;
     private String phoneNumber;
@@ -49,13 +52,17 @@ public class SmsVerifyCatcher {
         smsReceiver.setCallback(this.onSmsCatchListener);
     }
-    public SmsVerifyCatcher(Activity activity, Fragment fragment, OnSmsCatchListener<String> onSmsCatchListener) {
+    public SmsVerifyCatcher(Activity activity, BaseFragment fragment, OnSmsCatchListener<String> onSmsCatchListener) {
         this(activity, onSmsCatchListener);
         this.fragment = fragment;
+
     }
     //For fragments
-    public static boolean isStoragePermissionGranted(Activity activity, Fragment fragment) {
+    public static boolean isStoragePermissionGranted(Activity activity, BaseFragment fragment) {
+        if (null==fragment){
+            return false;
+        }
         if (Build.VERSION.SDK_INT >= 23) {
             if (ContextCompat.checkSelfPermission(activity, Manifest.permission.RECEIVE_SMS)
                     == PackageManager.PERMISSION_GRANTED &&
@@ -15,6 +15,8 @@ import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
 import com.cnlive.core.libs.base.util.FragmentUtil;
 import com.cnlive.strike.user.R;
 import com.cnlive.strike.user.ui.fragment.QuickLoginFragment;
+import com.me.yokeyword.fragmentation.anim.DefaultHorizontalAnimator;
+import com.me.yokeyword.fragmentation.anim.FragmentAnimator;
 /**
  * @author Lynn
@@ -24,7 +26,6 @@ import com.cnlive.strike.user.ui.fragment.QuickLoginFragment;
 @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";
@@ -71,13 +72,17 @@ public class LoginActivity extends BaseActivity {
         context.startActivity(intent);
     }
-
     @Override
-    protected void initView() {
+    protected void initParam() {
+        super.initParam();
         fromTokenError = getIntent().getBooleanExtra(FROM_TOKEN_ERROR, false);
         tagMsg = getIntent().getStringExtra(TAG_MSG) == null ? "" : getIntent().getStringExtra(TAG_MSG);
         shareType = getIntent().getStringExtra(TAG_SHARE);
         clickAd = getIntent().getBooleanExtra(TAG_CLICK_AD, false);
+    }
+
+    @Override
+    protected void initView() {
         addFragment();
     }
@@ -105,4 +110,5 @@ public class LoginActivity extends BaseActivity {
         if (quickLoginFragment != null)
             quickLoginFragment.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
+
 }
@@ -87,9 +87,9 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     public BaseActivity me;//本类
     private Bundle savedInstanceState;
     private OnPermissionResponseListener onPermissionResponseListener;      //权限申请回调
-    private int DEFAULT_REQUEST_CODE_PERMISSION = 0x00099;//默认权限请求码
+    private final int DEFAULT_REQUEST_CODE_PERMISSION = 0x00099;//默认权限请求码
     private int USER_SET_REQUEST_CODE_PERMISSION = -0x00099;//用户设置的权限请求码
-    private String defaultDefinePermissionTip = "需要必要的权限才可以正常使用该功能，您已拒绝获得该权限。\n如果需要重新授权，您可以点击“设置”按钮进入系统设置进行授权";//默认拒绝的权限提示语
+    private final String defaultDefinePermissionTip = "需要必要的权限才可以正常使用该功能，您已拒绝获得该权限。\n如果需要重新授权，您可以点击“设置”按钮进入系统设置进行授权";//默认拒绝的权限提示语
     private String userSetDefinePermissionTip = "";//用户设置的权限提示语
     //    private SwipeBackActivityHelper mHelper;//侧滑返回
     private boolean isOpenSwipBack = false;
@@ -99,6 +99,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     private final SwipeBackActivityDelegate mSwipeDelegate = new SwipeBackActivityDelegate(this);
     private boolean isDefinePermissionCloseActivity = false;
     private boolean isUserClickAllowBtn = false;//用户是否点击允许按钮
+    private boolean isShowRefuseDialog = true;//是否显示拒绝提示框
     private String[] userSetPermission;
     @Override
@@ -281,6 +282,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
             isUserClickAllowBtn = false;
             int requestCode = DEFAULT_REQUEST_CODE_PERMISSION;
             String tip = defaultDefinePermissionTip;
+            boolean isShowDialog = isShowRefuseDialog;
             if (null != onPermissionResponseListener && null != userSetPermission) {
                 if (null != userSetDefinePermissionTip) {
                     tip = userSetDefinePermissionTip;
@@ -289,7 +291,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
                     requestCode = USER_SET_REQUEST_CODE_PERMISSION;
                 }
                 //开始请求
-                requestPermission(requestCode, tip, isDefinePermissionCloseActivity, userSetPermission, onPermissionResponseListener);
+                requestPermission(requestCode, tip, isDefinePermissionCloseActivity, userSetPermission, isShowDialog, onPermissionResponseListener);
             }
         }
     }
@@ -482,6 +484,20 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         }
     }
+    public void requestPermission(String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
+            onPermissionResponseListener) {
+        this.onPermissionResponseListener = onPermissionResponseListener;
+        this.isShowRefuseDialog = isShowRefuseDialog;
+        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>
@@ -491,6 +507,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
      * @param permissions                  请求的权限
      * @param onPermissionResponseListener 回调监听器
      */
+
     public void requestPermission(boolean isDefineActivity, String[] permissions, OnPermissionResponseListener
             onPermissionResponseListener) {
         this.onPermissionResponseListener = onPermissionResponseListener;
@@ -505,6 +522,21 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         }
     }
+    public void requestPermission(boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
+            onPermissionResponseListener) {
+        this.onPermissionResponseListener = onPermissionResponseListener;
+        this.isDefinePermissionCloseActivity = isDefineActivity;
+        this.isShowRefuseDialog = isShowRefuseDialog;
+        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>
@@ -514,6 +546,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
      * @param permissions                  请求的权限
      * @param onPermissionResponseListener 回调监听器
      */
+
     public void requestPermission(String defineTip, boolean isDefineActivity, String[] permissions, OnPermissionResponseListener
             onPermissionResponseListener) {
         this.isDefinePermissionCloseActivity = isDefineActivity;
@@ -530,6 +563,23 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         }
     }
+    public void requestPermission(String defineTip, boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
+            onPermissionResponseListener) {
+        this.isDefinePermissionCloseActivity = isDefineActivity;
+        this.userSetDefinePermissionTip = defineTip;
+        this.onPermissionResponseListener = onPermissionResponseListener;
+        this.isShowRefuseDialog = isShowRefuseDialog;
+        this.userSetPermission = permissions;
+        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>
@@ -553,6 +603,21 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         }
     }
+    public void requestPermission(String defineTip, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
+            onPermissionResponseListener) {
+        this.userSetDefinePermissionTip = defineTip;
+        this.onPermissionResponseListener = onPermissionResponseListener;
+        this.isShowRefuseDialog = isShowRefuseDialog;
+        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);
+        }
+    }
+
     /**
      * 自定义权限申请码
      *
@@ -575,6 +640,22 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         }
     }
+    public void requestPermission(int requestCode, boolean isDefineActivity, String[]
+            permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
+        this.onPermissionResponseListener = onPermissionResponseListener;
+        this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
+        this.isDefinePermissionCloseActivity = isDefineActivity;
+        this.isShowRefuseDialog = isShowRefuseDialog;
+        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);
+        }
+    }
+
     /**
      * 自定义权限申请码
      *
@@ -596,6 +677,21 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         }
     }
+    public void requestPermission(int requestCode, String[]
+            permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
+        this.onPermissionResponseListener = onPermissionResponseListener;
+        this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
+        this.isShowRefuseDialog = isShowRefuseDialog;
+        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);
+        }
+    }
+
     /**
      * 自定义权限申请码和提示信息
      *
@@ -619,6 +715,23 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         }
     }
+    public void requestPermission(int requestCode, String defineTip, boolean isDefineActivity, String[]
+            permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
+        this.onPermissionResponseListener = onPermissionResponseListener;
+        this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
+        this.isDefinePermissionCloseActivity = isDefineActivity;
+        this.userSetDefinePermissionTip = defineTip;
+        this.isShowRefuseDialog = isShowRefuseDialog;
+        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);
+        }
+    }
+
     /**
      * 自定义权限申请码和提示信息
      *
@@ -641,6 +754,22 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         }
     }
+    public void requestPermission(int requestCode, String defineTip, String[]
+            permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
+        this.onPermissionResponseListener = onPermissionResponseListener;
+        this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
+        this.userSetDefinePermissionTip = defineTip;
+        this.isShowRefuseDialog = isShowRefuseDialog;
+        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字符串
@@ -665,6 +794,23 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         }
     }
+    public void requestPermission(int requestCode, @StringRes int defineTip, boolean isDefineActivity, String[]
+            permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
+        this.onPermissionResponseListener = onPermissionResponseListener;
+        this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
+        this.userSetDefinePermissionTip = getResources().getString(defineTip);
+        this.isDefinePermissionCloseActivity = isDefineActivity;
+        this.isShowRefuseDialog = isShowRefuseDialog;
+        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字符串
@@ -688,6 +834,22 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         }
     }
+    public void requestPermission(int requestCode, @StringRes int defineTip, String[]
+            permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
+        this.onPermissionResponseListener = onPermissionResponseListener;
+        this.USER_SET_REQUEST_CODE_PERMISSION = requestCode;
+        this.userSetDefinePermissionTip = getResources().getString(defineTip);
+        this.isShowRefuseDialog = isShowRefuseDialog;
+        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);
+        }
+    }
+
     /**
      * 获取权限集中需要申请权限的列表
      *
@@ -717,17 +879,34 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
                                            @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (null != getSupportFragmentManager() && null != getSupportFragmentManager().getFragments()) {
+            for (Fragment fragment : getSupportFragmentManager().getFragments()) {
+                if (null != fragment) {
+                    fragment.onRequestPermissionsResult(requestCode, permissions, grantResults);
+                }
+            }
+        }
         //默认权限申请码
         if (requestCode == DEFAULT_REQUEST_CODE_PERMISSION) {
             if (verifyPermissions(grantResults)) {
                 if (onPermissionResponseListener != null) {
                     onPermissionResponseListener.onSuccess(permissions);
                 }
+                //重置显示值
+                resetPermissionConfig();
             } else {
                 if (onPermissionResponseListener != null) {
                     onPermissionResponseListener.onFail();
                 }
-                showTipsDialog();
+                if (isShowRefuseDialog) {
+                    showTipsDialog();
+                } else {
+                    if (isDefinePermissionCloseActivity) {
+                        finish();
+                    }
+                    //重置显示值
+                    resetPermissionConfig();
+                }
             }
         }
         //用户自定义权限申请码
@@ -736,17 +915,36 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
                 if (onPermissionResponseListener != null) {
                     onPermissionResponseListener.onSuccess(permissions);
                 }
+                //重置显示值
+                resetPermissionConfig();
             } else {
                 if (onPermissionResponseListener != null) {
                     onPermissionResponseListener.onFail();
                 }
-                showTipsDialog();
+                if (isShowRefuseDialog) {
+                    showTipsDialog();
+                } else {
+                    if (isDefinePermissionCloseActivity) {
+                        finish();
+                    }
+                    //重置显示值
+                    resetPermissionConfig();
+                }
             }
-            //重置用户提示语
-            userSetDefinePermissionTip = "";
+
         }
     }
+    private void resetPermissionConfig() {
+        isShowRefuseDialog = true;//默认显示权限拒绝提示框
+        isUserClickAllowBtn = false;//默认用户没有点击允许按钮
+        USER_SET_REQUEST_CODE_PERMISSION = -0x00099;//默认用户没有自己设置权限请求码
+        userSetDefinePermissionTip = "";//默认没有设置提示语
+        isDefinePermissionCloseActivity = false;//默认不允许关闭当前窗口
+        userSetPermission = null;//重置用户设置权限
+        onPermissionResponseListener = null;
+    }
+
     /**
      * 检测所有的权限是否都已授权
      *
@@ -813,17 +1011,9 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         if (isDefinePermissionCloseActivity) {
-                            isDefinePermissionCloseActivity = false;
-                            //先判断当前是否是多个activity
-//                            if (null != getSupportFragmentManager().getFragments() && getSupportFragmentManager().getFragments().size() > 1) {
-//                                //移除最上层的
-//                                pop();
-//                            } else {
                             finish();
-//                            }
-
                         }
-
+                        resetPermissionConfig();
                     }
                 })
                 .setPositiveButton("去设置", new DialogInterface.OnClickListener() {
@@ -997,6 +1187,10 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         mDelegate.loadRootFragment(R.id.root_container, toFragment);
     }
+    public void loadRootFragment(@NonNull ISupportFragment toFragment, boolean allowAnimation) {
+        mDelegate.loadRootFragment(R.id.root_container, toFragment, allowAnimation);
+    }
+
     /**
      * 加载根Fragment, 即Activity内的第一个Fragment 或 Fragment内的第一个子Fragment
      *
@@ -1007,6 +1201,16 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         mDelegate.loadRootFragment(containerId, toFragment);
     }
+    /**
+     * 加载根Fragment, 即Activity内的第一个Fragment 或 Fragment内的第一个子Fragment
+     *
+     * @param containerId 容器id
+     * @param toFragment  目标Fragment
+     */
+    public void loadRootFragment(int containerId, @NonNull ISupportFragment toFragment, boolean allowAnimation) {
+        mDelegate.loadRootFragment(containerId, toFragment, allowAnimation);
+    }
+
     public void loadRootFragment(int containerId, ISupportFragment toFragment, boolean addToBackStack, boolean allowAnimation) {
         mDelegate.loadRootFragment(containerId, toFragment, addToBackStack, allowAnimation);
     }
@@ -1019,6 +1223,13 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     }
     /**
+     * 加载多个同级根Fragment,类似Wechat, QQ主页的场景
+     */
+    public void loadMultipleRootFragment(int showPosition, ISupportFragment... toFragments) {
+        mDelegate.loadMultipleRootFragment(R.id.root_container, showPosition, toFragments);
+    }
+
+    /**
      * show一个Fragment,hide其他同栈所有Fragment
      * 使用该方法时，要确保同级栈内无多余的Fragment,(只有通过loadMultipleRootFragment()载入的Fragment)
      * <p>
@@ -268,51 +268,95 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
         me.requestPermission(permissions, onPermissionResponseListener);
     }
+    public void requestPermission(String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
+        me.requestPermission(permissions, isShowRefuseDialog, onPermissionResponseListener);
+    }
+
     //权限申请
     public void requestPermission(boolean isDefineActivity, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
         me.requestPermission(isDefineActivity, permissions, onPermissionResponseListener);
     }
+    public void requestPermission(boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
+        me.requestPermission(isDefineActivity, permissions, isShowRefuseDialog, onPermissionResponseListener);
+    }
+
     //权限申请
     public void requestPermission(int requestCode, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
         me.requestPermission(requestCode, permissions, onPermissionResponseListener);
     }
+    public void requestPermission(int requestCode, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
+        me.requestPermission(requestCode, permissions, isShowRefuseDialog, onPermissionResponseListener);
+    }
+
     //权限申请
     public void requestPermission(int requestCode, boolean isDefineActivity, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
         me.requestPermission(requestCode, isDefineActivity, permissions, onPermissionResponseListener);
     }
+    public void requestPermission(int requestCode, boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
+        me.requestPermission(requestCode, isDefineActivity, permissions, isShowRefuseDialog, onPermissionResponseListener);
+    }
+
     //权限申请
     public void requestPermission(int requestCode, String defineTip, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
         me.requestPermission(requestCode, defineTip, permissions, onPermissionResponseListener);
     }
+    public void requestPermission(int requestCode, String defineTip, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
+        me.requestPermission(requestCode, defineTip, permissions, isShowRefuseDialog, onPermissionResponseListener);
+    }
+
     //权限申请
     public void requestPermission(int requestCode, String defineTip, boolean isDefineActivity, String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
         me.requestPermission(requestCode, defineTip, isDefineActivity, permissions, onPermissionResponseListener);
     }
+    public void requestPermission(int requestCode, String defineTip, boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
+        me.requestPermission(requestCode, defineTip, isDefineActivity, permissions, isShowRefuseDialog, onPermissionResponseListener);
+    }
+
     public void requestPermission(String defineTip, String[] permissions, OnPermissionResponseListener
             onPermissionResponseListener) {
         me.requestPermission(defineTip, permissions, onPermissionResponseListener);
     }
+    public void requestPermission(String defineTip, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
+            onPermissionResponseListener) {
+        me.requestPermission(defineTip, permissions, isShowRefuseDialog, onPermissionResponseListener);
+    }
+
     public void requestPermission(String defineTip, boolean isDefineActivity, String[] permissions, OnPermissionResponseListener
             onPermissionResponseListener) {
         me.requestPermission(defineTip, isDefineActivity, permissions, onPermissionResponseListener);
     }
+    public void requestPermission(String defineTip, boolean isDefineActivity, String[] permissions, boolean isShowRefuseDialog, OnPermissionResponseListener
+            onPermissionResponseListener) {
+        me.requestPermission(defineTip, isDefineActivity, permissions, isShowRefuseDialog, onPermissionResponseListener);
+    }
+
     public void requestPermission(int requestCode, @StringRes int defineTip, String[]
             permissions, OnPermissionResponseListener onPermissionResponseListener) {
         me.requestPermission(requestCode, defineTip, permissions, onPermissionResponseListener);
     }
+    public void requestPermission(int requestCode, @StringRes int defineTip, String[]
+            permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
+        me.requestPermission(requestCode, defineTip, permissions, isShowRefuseDialog, onPermissionResponseListener);
+    }
+
     public void requestPermission(int requestCode, @StringRes int defineTip, boolean isDefineActivity, String[]
             permissions, OnPermissionResponseListener onPermissionResponseListener) {
         me.requestPermission(requestCode, defineTip, isDefineActivity, permissions, onPermissionResponseListener);
     }
+    public void requestPermission(int requestCode, @StringRes int defineTip, boolean isDefineActivity, String[]
+            permissions, boolean isShowRefuseDialog, OnPermissionResponseListener onPermissionResponseListener) {
+        me.requestPermission(requestCode, defineTip, isDefineActivity, permissions, isShowRefuseDialog, onPermissionResponseListener);
+    }
+
     //多权限检查
     public boolean checkPermissions(String[] permissions) {
         return me.checkPermissions(permissions);
@@ -192,6 +192,10 @@ public class SupportActivityDelegate {
         loadRootFragment(containerId, toFragment, true, false);
     }
+    public void loadRootFragment(int containerId, ISupportFragment toFragment, boolean allowAnimation) {
+        loadRootFragment(containerId, toFragment, true, allowAnimation);
+    }
+
     public void loadRootFragment(int containerId, ISupportFragment toFragment, boolean addToBackStack, boolean allowAnimation) {
         mTransactionDelegate.loadRootTransaction(getSupportFragmentManager(), containerId, toFragment, addToBackStack, allowAnimation);
     }
@@ -31,4 +31,6 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    //七牛上传
+    implementation "com.qiniu:qiniu-android-sdk:$rootProject.qiniuAndroidSdk"
 }
 package com.cnlive.core.network;
+import com.cnlive.core.network.interceptor.NetPPEncryptInterceptor;
+import com.cnlive.core.network.interceptor.NetPPPayEncryptInterceptor;
 import com.cnlive.core.network.interceptor.SignEncryptInterceptor;
 import com.cnlive.core.network.request.HttpConfig;
@@ -65,6 +67,12 @@ public class NetBuilder&lt;NetService&gt; {
                 if (interceptor instanceof SignEncryptInterceptor) {
                     isAdd = true;
                     break;
+                } else if (interceptor instanceof NetPPEncryptInterceptor) {
+                    isAdd = true;
+                    break;
+                } else if (interceptor instanceof NetPPPayEncryptInterceptor) {
+                    isAdd = true;
+                    break;
                 }
             }
             if (!isAdd) {
 package com.cnlive.core.network.interceptor;
-import com.cnlive.core.network.util.SignUtil;
 import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.network.util.SignUtil;
 import com.cnlive.libs.encipher.CNLiveEncipher;
 import java.io.IOException;
@@ -6,99 +6,97 @@ import com.cnlive.core.network.util.SignUtil;
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 import okhttp3.FormBody;
-import okhttp3.HttpUrl;
 import okhttp3.Interceptor;
 import okhttp3.MultipartBody;
 import okhttp3.Request;
-import okhttp3.RequestBody;
 import okhttp3.Response;
 public class NetPPPayEncryptInterceptor implements Interceptor {
-    @Override
-    public Response intercept(Chain chain) throws IOException {
-        Request request = chain.request();
-
-        if (request.body() instanceof FormBody) {
-            //处理方式 1
-            Map<String, String> parameter = new HashMap<>();
-
-            FormBody body = ((FormBody) request.body());
-            FormBody.Builder builder = new FormBody.Builder();
+    public NetPPPayEncryptInterceptor() {
+    }
-            for (int i = 0; i < body.size(); i++) {
-                parameter.put(body.name(i), body.value(i));
+    public Response intercept(Chain var1) throws IOException {
+        Request var2 = var1.request();
+        Map.Entry var7;
+        FormBody.Builder var11;
+        Iterator var13;
+        FormBody var14;
+        Request var15;
+        if (var2.body() instanceof FormBody) {
+            HashMap var8 = new HashMap();
+            FormBody var9 = (FormBody)var2.body();
+            var11 = new FormBody.Builder();
+
+            for(int var16 = 0; var16 < var9.size(); ++var16) {
+                var8.put(var9.name(var16), var9.value(var16));
             }
-            for (Map.Entry<String, String> entity : SignUtil.getNetPPPaySignString(parameter).entrySet()) {
-                builder.addEncoded(entity.getKey(), entity.getValue());
-            }
+            var13 = SignUtil.getNetPPPaySignString(var8).entrySet().iterator();
-            RequestBody newBody = builder.build();
+            while(var13.hasNext()) {
+                var7 = (Map.Entry)var13.next();
+                var11.addEncoded((String)var7.getKey(), (String)var7.getValue());
+            }
-            Request newRequest = request.newBuilder()
-                    .method(request.method(), newBody)
-                    .url(request.url())
-                    .build();
-            return chain.proceed(newRequest);
-        } else if (request.body() instanceof MultipartBody) {
-            //处理方式 2 (暂时不签名)
+            var14 = var11.build();
+            var15 = var2.newBuilder().method(var2.method(), var14).url(var2.url()).build();
+            return var1.proceed(var15);
+        } else if (var2.body() instanceof MultipartBody) {
+            return var1.proceed(var2);
         } else {
-            if ("POST".equals(request.method())) {
-                //处理方式 3
-                HttpUrl.Builder authorizedUrlBuilder = request.url().newBuilder();
-
-                Map<String, String> parameter = new HashMap<>();
-
-                for (String key : request.url().queryParameterNames()) {
-                    parameter.put(key, request.url().queryParameter(key));
-                    authorizedUrlBuilder.removeAllQueryParameters(key);
+            okhttp3.HttpUrl.Builder var3;
+            HashMap var4;
+            Iterator var5;
+            String var6;
+            if ("POST".equals(var2.method())) {
+                var3 = var2.url().newBuilder();
+                var4 = new HashMap();
+                var5 = var2.url().queryParameterNames().iterator();
+
+                while(var5.hasNext()) {
+                    var6 = (String)var5.next();
+                    var4.put(var6, var2.url().queryParameter(var6));
+                    var3.removeAllQueryParameters(var6);
                 }
-                FormBody.Builder builder = new FormBody.Builder();
+                var11 = new FormBody.Builder();
+                var13 = SignUtil.getNetPPPaySignString(var4).entrySet().iterator();
-                for (Map.Entry<String, String> entity : SignUtil.getNetPPPaySignString(parameter).entrySet()) {
-                    builder.add(entity.getKey(), entity.getValue());
+                while(var13.hasNext()) {
+                    var7 = (Map.Entry)var13.next();
+                    var11.add((String)var7.getKey(), (String)var7.getValue());
                 }
-                RequestBody newBody = builder.build();
-
-                Request newRequest = request.newBuilder()
-                        .method(request.method(), newBody)
-                        .url(authorizedUrlBuilder.build())
-                        .build();
-                return chain.proceed(newRequest);
-            }else{
-                //处理方式 3
-                HttpUrl.Builder authorizedUrlBuilder = request.url().newBuilder();
-
-                Map<String, String> parameter = new HashMap<>();
-
-                for (String key : request.url().queryParameterNames()) {
-                    parameter.put(key, request.url().queryParameter(key));
-                    authorizedUrlBuilder.removeAllQueryParameters(key);
+                var14 = var11.build();
+                var15 = var2.newBuilder().method(var2.method(), var14).url(var3.build()).build();
+                return var1.proceed(var15);
+            } else {
+                var3 = var2.url().newBuilder();
+                var4 = new HashMap();
+                var5 = var2.url().queryParameterNames().iterator();
+
+                while(var5.hasNext()) {
+                    var6 = (String)var5.next();
+                    var4.put(var6, var2.url().queryParameter(var6));
+                    var3.removeAllQueryParameters(var6);
                 }
-                for (Map.Entry<String, String> entity : SignUtil.getNetPPPaySignString(parameter).entrySet()) {
-                    authorizedUrlBuilder.addQueryParameter(entity.getKey(), entity.getValue());
-                }
+                var5 = SignUtil.getNetPPPaySignString(var4).entrySet().iterator();
-                authorizedUrlBuilder.scheme(request.url().scheme());
-                authorizedUrlBuilder.host(request.url().host());
+                while(var5.hasNext()) {
+                    Map.Entry var12 = (Map.Entry)var5.next();
+                    var3.addQueryParameter((String)var12.getKey(), (String)var12.getValue());
+                }
-                Request newRequest = request.newBuilder()
-                        .method(request.method(), request.body())
-                        .url(authorizedUrlBuilder.build())
-                        .build();
-                return chain.proceed(newRequest);
+                var3.scheme(var2.url().scheme());
+                var3.host(var2.url().host());
+                Request var10 = var2.newBuilder().method(var2.method(), var2.body()).url(var3.build()).build();
+                return var1.proceed(var10);
             }
         }
-
-
-        return chain.proceed(request);
     }
-
-
 }
 \ No newline at end of file
-package com.cnlive.moudle.pedometer.upload;
+package com.cnlive.core.network.upload;
 import android.content.Context;
 import android.media.MediaMetadataRetriever;
-package com.cnlive.moudle.pedometer.upload;
+package com.cnlive.core.network.upload;
 import android.app.Activity;
 import android.content.Context;
@@ -8,17 +8,17 @@ import android.text.TextUtils;
 import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.util.AlertUtil;
+import com.cnlive.core.libs.base.util.FileTypeUtil;
 import com.cnlive.core.libs.base.util.StringUtils;
 import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.api.ApiBaseServiceOpen;
 import com.cnlive.core.network.request.BaseRequest;
-import com.cnlive.media.picker.utils.FileTypeUtil;
 import com.cnlive.core.network.model.UploadAuthData;
-import com.cnlive.moudle.pedometer.upload.interfaces.ProgressCallback;
-import com.cnlive.moudle.pedometer.utils.FileUtil;
-import com.cnlive.moudle.pedometer.utils.IDUtils;
+import com.cnlive.core.network.upload.interfaces.ProgressCallback;
+import com.cnlive.core.network.upload.utils.FileUtil;
+import com.cnlive.core.network.upload.utils.IDUtils;
 import com.qiniu.android.http.ResponseInfo;
 import com.qiniu.android.storage.UpCompletionHandler;
 import com.qiniu.android.storage.UpProgressHandler;
-package com.cnlive.moudle.pedometer.upload.interfaces;
+package com.cnlive.core.network.upload.interfaces;
 public interface ProgressCallback {
     void onProgress(double var1);
-package com.cnlive.moudle.pedometer.upload.utils;
+package com.cnlive.core.network.upload.utils;
 import android.content.ContentValues;
 import android.content.Context;
-package com.cnlive.moudle.pedometer.upload.utils;
+package com.cnlive.core.network.upload.utils;
 public class IDUtils {
     private static byte[] lock = new byte[0];  
-package com.cnlive.moudle.pedometer.upload.utils;
+package com.cnlive.core.network.upload.utils;
 import android.app.Activity;
 import android.os.Bundle;
-package com.cnlive.moudle.pedometer.upload.utils;
+package com.cnlive.core.network.upload.utils;
 /**
  * Created by xiansong on 2018/3/28.
@@ -81,8 +81,6 @@ dependencies {
     //加载动画
     implementation "com.wang.avi:library:$rootProject.avi"
 //    implementation "com.cnlive.libs:video_qiniu:$rootProject.libVideoQiniu"
-    //七牛上传
-    implementation "com.qiniu:qiniu-android-sdk:$rootProject.qiniuAndroidSdk"
     implementation("com.cnlive:lib_upload:$rootProject.libUpload") {
         exclude group: 'com.android.support'
         exclude group: 'com.cnlive'
@@ -41,7 +41,7 @@ import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunningFinishFragment;
 import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
-import com.cnlive.moudle.pedometer.upload.UploadLogic;
+import com.cnlive.core.network.upload.UploadLogic;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.ScreenUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;