1 重构大众体育

YangShuai
1 parent 1a0d02f8
Showing 86 changed files with 768 additions and 257 deletions
app/strike/src/main/java/com/cnlive/strike/MainActivity.java
app/strike/src/main/java/com/cnlive/strike/MyActivity.java
app/strike/src/main/java/com/cnlive/strike/MyFragment.java
app/strike/src/main/java/com/cnlive/strike/network/api/ApiService.java
cloud/pay/.gitignore
cloud/pay/build.gradle
cloud/pay/consumer-rules.pro
cloud/pay/proguard-rules.pro
cloud/pay/src/androidTest/java/com/cnlive/strike/pay/ExampleInstrumentedTest.java
cloud/pay/src/main/AndroidManifest.xml
cloud/pay/src/main/java/com/cnlive/libs/wjjpay/api/PayRequest.java
cloud/pay/src/main/java/com/cnlive/libs/wjjpay/api/PayService.java
cloud/pay/src/main/java/com/cnlive/libs/wjjpay/model/EncryptKey.java
cloud/pay/src/main/java/com/cnlive/libs/wjjpay/model/GroupBalanceInfo.java
cloud/pay/src/main/java/com/cnlive/libs/wjjpay/model/PaymentPreInfo.java
cloud/pay/src/main/java/com/cnlive/libs/wjjpay/pay/WjjPay.java
cloud/pay/src/main/res/values/strings.xml
cloud/pay/src/test/java/com/cnlive/strike/pay/ExampleUnitTest.java
cloud/user/src/main/java/com/cnlive/strike/user/UserUtilAction.java
cloud/user/src/main/java/com/cnlive/strike/user/auth/UserService.java
@@ -5,6 +5,7 @@ import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
@@ -13,6 +14,7 @@ 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.auth.UserService;
 import com.cnlive.strike.user.ui.activity.LoginActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.AllDeviceActivity;
  
@@ -30,8 +32,11 @@ 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, LoginActivity.class));
-//                finish();
+                if (TextUtils.isEmpty(UserService.getUid(MainActivity.this))) {
+                    startActivity(new Intent(MainActivity.this, LoginActivity.class));
+                } else {
+                    startActivity(new Intent(MainActivity.this, MyActivity.class));
+                }
             }
         });
         findViewById(R.id.to_img).setOnClickListener(view -> startActivity(new Intent(this, ImgActivity.class)));
@@ -25,6 +25,7 @@ public class MyActivity extends BaseActivity {
 //        getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyFragment()).commitAllowingStateLoss();
         initXiaoJiaSoundBoxData();
         startActivity(new Intent(MyActivity.this, RunLineActivity.class));
+        finish();
     }
  
     @Override
@@ -9,7 +9,7 @@ import android.widget.TextView;
  
 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
 import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.libs.base.util.StatusBarConfig;
@@ -19,7 +19,6 @@ import com.cnlive.strike.network.bean.LetHimNoSeeBean;
 import com.cnlive.strike.network.bean.TestBean;
 import com.me.yokeyword.fragmentation.anim.DefaultVerticalAnimator;
 import com.me.yokeyword.fragmentation.anim.FragmentAnimator;
-import com.orhanobut.logger.Logger;
  
 import java.util.HashMap;
 import java.util.Map;
 package com.cnlive.strike.network.api;
  
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.strike.network.bean.LetHimNoSeeBean;
 import com.cnlive.strike.network.bean.TestBean;
  
+/build
+apply plugin: 'com.android.library'
+
+android {
+//    compileSdkVersion 29
+//    buildToolsVersion "29.0.2"
+//
+//
+//    defaultConfig {
+//        minSdkVersion 16
+//        targetSdkVersion 29
+//        versionCode 1
+//        versionName "1.0"
+//
+//        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+//        consumerProguardFiles 'consumer-rules.pro'
+//    }
+//
+//    buildTypes {
+//        release {
+//            minifyEnabled false
+//            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+//        }
+//    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+
+    implementation project(path: ':core:network')
+}
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+package com.cnlive.strike.pay;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+        assertEquals("com.cnlive.strike.pay.test", appContext.getPackageName());
+    }
+}
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.cnlive.strike.pay" />
+package com.cnlive.libs.wjjpay.api;
+
+
+import android.text.TextUtils;
+
+import com.cnlive.core.libs.base.application.AppConfig;
+import com.cnlive.core.network.NetBuilder;
+import com.cnlive.core.network.interceptor.NetPPEncryptInterceptor;
+import com.cnlive.core.network.interceptor.NetPPPayEncryptInterceptor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import okhttp3.Interceptor;
+
+/**
+ * 基本请求
+ * ys
+ */
+public class PayRequest {
+    private String userSetUrl;
+    private static PayRequest request;
+    private long connectTimeout;//连接超时
+    private long readTimeout;//读取超时
+    private long writeTimeout;//写入超时
+    private List<Interceptor> interceptorList;//拦截器
+
+    /**
+     * 初始化接口地址
+     */
+    private String initBaseUrl(Class clazz) {
+        return AppConfig.isDebug() ? "https://apiwjjtest.cnlive.com/" : "https://apiwjj.cnlive.com/";
+    }
+
+    /**
+     * 构造函数初始化
+     */
+    public PayRequest() {
+        interceptorList = new ArrayList<>();
+    }
+
+
+    /**
+     * 设置连接超时
+     *
+     * @param connectTimeout
+     * @return
+     */
+    public PayRequest setConnectTimeout(long connectTimeout) {
+        init();
+        connectTimeout = connectTimeout;
+        return request;
+    }
+
+    /**
+     * 设置读取超时
+     *
+     * @param readTimeout
+     * @return
+     */
+    public PayRequest setReadTimeout(long readTimeout) {
+        init();
+        readTimeout = readTimeout;
+        return request;
+    }
+
+    /**
+     * 设置写入超时
+     *
+     * @param writeTimeout
+     * @return
+     */
+    public PayRequest setWriteTimeout(long writeTimeout) {
+        init();
+        writeTimeout = writeTimeout;
+        return request;
+    }
+
+
+    /**
+     * 设置连接地址
+     *
+     * @param url
+     * @return
+     */
+    public PayRequest setUrl(String url) {
+        init();
+        userSetUrl = url;
+        return request;
+    }
+
+    /**
+     * 添加拦截器
+     *
+     * @param interceptor
+     * @return
+     */
+    public PayRequest addInterceptor(Interceptor interceptor) {
+        if (null != interceptor) {
+            interceptorList.add(interceptor);
+        }
+        return request;
+    }
+
+    /**
+     * @return
+     */
+    public static synchronized PayRequest init() {
+        if (null == request) {
+            request = new PayRequest();
+        }
+        return request;
+    }
+
+    public <NetService> NetService service(Class<NetService> clz) {
+        NetService service = null;
+        NetBuilder builder = new NetBuilder(clz);
+        if (connectTimeout > 0) {
+            builder.setConnectTimeout(connectTimeout);
+        }
+        if (readTimeout > 0) {
+            builder.setReadTimeout(readTimeout);
+        }
+        if (writeTimeout > 0) {
+            builder.setWriteTimeout(writeTimeout);
+        }
+
+        if (null != interceptorList && interceptorList.size() > 0) {
+            builder.addInterceptors(interceptorList);
+        }
+
+        //设置接口请求头地址
+        if (!TextUtils.isEmpty(userSetUrl)) {
+            builder.setBaseUrl(userSetUrl);
+            userSetUrl = "";
+        } else {
+            builder.setBaseUrl(initBaseUrl(clz));
+        }
+        service = (NetService) builder.getService();
+        builder = null;
+        //重置属性
+        resetData();
+        return service;
+
+    }
+
+    public <NetService> NetService serviceEncrypt(Class<NetService> clz) {
+        NetService service = null;
+        NetBuilder builder = new NetBuilder(clz);
+        if (connectTimeout > 0) {
+            builder.setConnectTimeout(connectTimeout);
+        }
+        if (readTimeout > 0) {
+            builder.setReadTimeout(readTimeout);
+        }
+        if (writeTimeout > 0) {
+            builder.setWriteTimeout(writeTimeout);
+        }
+        //添加拦截器
+        interceptorList.add(new NetPPEncryptInterceptor());
+        if (null != interceptorList && interceptorList.size() > 0) {
+            builder.addInterceptors(interceptorList);
+        }
+        //设置接口请求头地址
+        if (!TextUtils.isEmpty(userSetUrl)) {
+            builder.setBaseUrl(userSetUrl);
+            userSetUrl = "";
+        } else {
+            builder.setBaseUrl(initBaseUrl(clz));
+        }
+        service = (NetService) builder.getService();
+        builder = null;
+        //重置属性
+        resetData();
+        return service;
+
+    }
+    public <NetService> NetService servicePayEncrypt(Class<NetService> clz) {
+        NetService service = null;
+        NetBuilder builder = new NetBuilder(clz);
+        if (connectTimeout > 0) {
+            builder.setConnectTimeout(connectTimeout);
+        }
+        if (readTimeout > 0) {
+            builder.setReadTimeout(readTimeout);
+        }
+        if (writeTimeout > 0) {
+            builder.setWriteTimeout(writeTimeout);
+        }
+        //添加拦截器
+        interceptorList.add(new NetPPPayEncryptInterceptor());
+        if (null != interceptorList && interceptorList.size() > 0) {
+            builder.addInterceptors(interceptorList);
+        }
+        //设置接口请求头地址
+        if (!TextUtils.isEmpty(userSetUrl)) {
+            builder.setBaseUrl(userSetUrl);
+            userSetUrl = "";
+        } else {
+            builder.setBaseUrl(initBaseUrl(clz));
+        }
+        service = (NetService) builder.getService();
+        builder = null;
+        //重置属性
+        resetData();
+        return service;
+
+    }
+    private void resetData() {
+        interceptorList.clear();
+
+        connectTimeout = 0;
+        readTimeout = 0;
+        writeTimeout = 0;
+    }
+
+
+}
 \ No newline at end of file
+package com.cnlive.libs.wjjpay.api;
+
+
+import com.cnlive.core.network.model.BaseResult;
+import com.cnlive.libs.wjjpay.model.EncryptKey;
+import com.cnlive.libs.wjjpay.model.GroupBalanceInfo;
+import com.cnlive.libs.wjjpay.model.PaymentPreInfo;
+
+import java.util.Map;
+
+import io.reactivex.Observable;
+import retrofit2.adapter.rxjava2.Result;
+import retrofit2.http.POST;
+import retrofit2.http.QueryMap;
+
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2018/5/9
+ * <p>
+ * 简介:
+ */
+
+public interface PayService {
+
+    /**
+     * 返回公钥&随机AESKey
+     *
+     * @return
+     */
+    @POST("Daren/wjjPay/getKey.action")
+    Observable<BaseResult<EncryptKey>> returnEncryptKey(@QueryMap() Map<String, String> map);
+
+    /**
+     * wjj预支付订单
+     *
+     * @param map
+     * @return
+     */
+    @POST("Daren/wjjPay/unifiedOrder.action")
+    Observable<BaseResult<PaymentPreInfo>> getwjjPrePay(@QueryMap() Map<String, String> map);
+
+    /**
+     * wjj支付订单
+     *
+     * @param map
+     * @return
+     */
+    @POST("Daren/wjjPay/unifiedPay.action")
+    Observable<BaseResult<Object>> getwjjPay(@QueryMap() Map<String, String> map);
+
+    /**
+     * 设置修改支付密码
+     *
+     * @param map
+     * @return
+     */
+    @POST("Daren/wjjPay/setPassword.action")
+    Observable<BaseResult> setPassword(@QueryMap() Map<String, String> map);
+
+
+    /**
+     * 密码是否存在 顺带返回余额
+     *
+     * @param map
+     * @return
+     */
+    @POST("Daren/wjjPay/passwordIsExisting.action")
+    Observable<BaseResult<GroupBalanceInfo>> passwordIsExisting(@QueryMap() Map<String, String> map);
+}
+package com.cnlive.libs.wjjpay.model;
+
+public class EncryptKey {
+    private String publicKey;
+    private String randomAesKey;
+
+    public String getPublicKey() {
+        return publicKey;
+    }
+
+    public void setPublicKey(String publicKey) {
+        this.publicKey = publicKey;
+    }
+
+    public String getRandomAesKey() {
+        return randomAesKey;
+    }
+
+    public void setRandomAesKey(String randomAesKey) {
+        this.randomAesKey = randomAesKey;
+    }
+}
+package com.cnlive.libs.wjjpay.model;
+
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2018/5/9
+ * <p>
+ * 简介:
+ */
+
+public class GroupBalanceInfo {
+    public double getBalance() {
+        return balance;
+    }
+
+    public void setBalance(double balance) {
+        this.balance = balance;
+    }
+
+    private double balance;
+}
+package com.cnlive.libs.wjjpay.model;
+
+/**
+ * 作者: 吴奎庆
+ * <p>
+ * 时间: 2018/6/5
+ * <p>
+ * 简介:
+ */
+
+public class PaymentPreInfo {
+
+    public String getPreId() {
+        return preId;
+    }
+
+    public void setPreId(String preId) {
+        this.preId = preId;
+    }
+
+    private String preId;
+}
+package com.cnlive.libs.wjjpay.pay;
+
+import androidx.annotation.NonNull;
+
+import com.cnlive.core.network.HttpConn;
+import com.cnlive.core.network.NetCallBack;
+import com.cnlive.core.network.model.BaseResult;
+import com.cnlive.libs.wjjpay.api.PayRequest;
+import com.cnlive.libs.wjjpay.api.PayService;
+import com.cnlive.libs.wjjpay.model.EncryptKey;
+import com.cnlive.libs.wjjpay.model.GroupBalanceInfo;
+import com.cnlive.libs.wjjpay.model.PaymentPreInfo;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.HashMap;
+import java.util.Map;
+
+import io.reactivex.Observable;
+import io.reactivex.ObservableSource;
+import io.reactivex.functions.Function;
+
+public class WjjPay {
+
+    private static final char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+            'a', 'b', 'c', 'd', 'e', 'f'};
+
+    /**
+     * 预支付
+     *
+     * @param userId  用户ID
+     * @param fromId  支付人的 id
+     * @param toId    支付给谁的 id(达人 id)
+     * @param price   支付的金额(double 格式)
+     * @param expand  扩展字段
+     * @param orderId 订单 id
+     */
+    public static void getPrePay(String userId, String fromId, String toId, String price, String expand, String orderId, NetCallBack<BaseResult<PaymentPreInfo>> callBack) {
+        Map<String, String> map = new HashMap<>();
+        map.put("userId", userId);
+        HttpConn.action(
+                PayRequest.init().serviceEncrypt(PayService.class)
+                        .returnEncryptKey(map)
+                        .concatMap(new Function<BaseResult<EncryptKey>, ObservableSource<BaseResult<PaymentPreInfo>>>() {
+                            @Override
+                            public ObservableSource<BaseResult<PaymentPreInfo>> apply(BaseResult<EncryptKey> encryptKeyBaseResult) throws Exception {
+                                if (encryptKeyBaseResult.isSuccess()) {
+                                    EncryptKey cnKey = encryptKeyBaseResult.getData();
+                                    Map<String, String> requestMap = new HashMap<>();
+                                    requestMap.put("fromId", fromId);
+                                    requestMap.put("toId", toId);
+                                    requestMap.put("price", price);
+                                    requestMap.put("expand", expand);
+                                    requestMap.put("sourceId", orderId);
+                                    requestMap.put("userId", userId);
+                                    requestMap.put("publicKey", cnKey.getPublicKey());
+                                    requestMap.put("randomAesKey", cnKey.getRandomAesKey());
+                                    return PayRequest.init().servicePayEncrypt(PayService.class).getwjjPrePay(requestMap);
+                                }
+                                return HttpConn.error(encryptKeyBaseResult);
+                            }
+                        })
+                , callBack
+        );
+
+    }
+
+    /**
+     * 订单支付
+     *
+     * @param userId   用户ID
+     * @param preId    预支付ID
+     * @param password 密码
+     */
+    public static void commitPaymentOrder(String userId, String preId, String password, NetCallBack<BaseResult<Object>> callBack) {
+        Map<String, String> map = new HashMap<>();
+        map.put("userId", userId);
+        HttpConn.action(
+                PayRequest.init().serviceEncrypt(PayService.class)
+                        .returnEncryptKey(map)
+                        .concatMap(new Function<BaseResult<EncryptKey>, ObservableSource<BaseResult<Object>>>() {
+                            @Override
+                            public ObservableSource<BaseResult<Object>> apply(BaseResult<EncryptKey> encryptKeyBaseResult) throws Exception {
+                                if (encryptKeyBaseResult.isSuccess()) {
+                                    EncryptKey cnKey = encryptKeyBaseResult.getData();
+                                    Map<String, String> requestMap = new HashMap<>();
+                                    requestMap.put("preId", preId);
+                                    requestMap.put("password", getStringMD5(password));
+
+                                    requestMap.put("userId", userId);
+                                    requestMap.put("publicKey", cnKey.getPublicKey());
+                                    requestMap.put("randomAesKey", cnKey.getRandomAesKey());
+                                    return PayRequest.init().servicePayEncrypt(PayService.class).getwjjPay(requestMap);
+                                }
+                                return HttpConn.error(encryptKeyBaseResult);
+                            }
+                        }), callBack
+        );
+
+    }
+
+    /**
+     * 设置密码
+     *
+     * @param userId
+     * @param password
+     */
+    public static void setPassword(String userId, String password, NetCallBack<BaseResult> callBack) {
+        Map<String, String> map = new HashMap<>();
+        map.put("userId", userId);
+        HttpConn.action(
+                PayRequest.init().serviceEncrypt(PayService.class)
+                        .returnEncryptKey(map)
+                        .concatMap(new Function<BaseResult<EncryptKey>, ObservableSource<BaseResult>>() {
+                            @Override
+                            public ObservableSource<BaseResult> apply(BaseResult<EncryptKey> encryptKeyBaseResult) throws Exception {
+                                if (encryptKeyBaseResult.isSuccess()) {
+                                    EncryptKey cnKey = encryptKeyBaseResult.getData();
+                                    Map<String, String> requestMap = new HashMap<>();
+                                    requestMap.put("password", getStringMD5(password));
+                                    requestMap.put("type", "1");
+                                    requestMap.put("userId", userId);
+                                    requestMap.put("publicKey", cnKey.getPublicKey());
+                                    requestMap.put("randomAesKey", cnKey.getRandomAesKey());
+                                    return PayRequest.init().servicePayEncrypt(PayService.class).setPassword(requestMap);
+                                }
+                                return HttpConn.error(encryptKeyBaseResult);
+                            }
+                        }), callBack
+        );
+    }
+
+    /**
+     * 判断是否有支付密码  接口返回402代表没有设置过支付密码
+     *
+     * @param userId
+     */
+    public static void passwordIsExisting(String userId, NetCallBack<BaseResult<GroupBalanceInfo>> callBack) {
+        Map<String, String> map = new HashMap<>();
+        map.put("userId", userId);
+        HttpConn.action(
+                PayRequest.init().service(PayService.class).passwordIsExisting(map), callBack
+        );
+    }
+
+
+    @NonNull
+    private static String getStringMD5(@NonNull String s) {
+        MessageDigest mdInst;
+        try {
+            // 获得MD5摘要算法的 MessageDigest 对象
+            mdInst = MessageDigest.getInstance("MD5");
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+            return "";
+        }
+
+        byte[] btInput = s.getBytes();
+        // 使用指定的字节更新摘要
+        mdInst.update(btInput);
+        // 获得密文
+        byte[] md = mdInst.digest();
+        // 把密文转换成十六进制的字符串形式
+        int length = md.length;
+        char str[] = new char[length * 2];
+        int k = 0;
+        for (byte b : md) {
+            str[k++] = hexDigits[b >>> 4 & 0xf];
+            str[k++] = hexDigits[b & 0xf];
+        }
+        return new String(str);
+    }
+}
+<resources>
+    <string name="app_name">pay</string>
+</resources>
+package com.cnlive.strike.pay;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
 \ No newline at end of file
@@ -5,13 +5,13 @@ import android.os.Environment;
 import android.text.TextUtils;
  
 import com.cnlive.core.libs.base.application.AppConfig;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
-import com.cnlive.core.network.UserData;
+import com.cnlive.core.network.model.UserData;
 import com.cnlive.core.network.api.ApiBaseServiceOpen;
 import com.cnlive.core.network.request.BaseRequest;
-import com.cnlive.core.network.FaceData;
-import com.cnlive.core.network.TokenData;
+import com.cnlive.core.network.model.FaceData;
+import com.cnlive.core.network.model.TokenData;
  
 import java.io.File;
 import java.util.ArrayList;
@@ -13,7 +13,7 @@ import com.cnlive.core.libs.base.util.SharedPreferencesHelper;
 import com.cnlive.strike.user.R;
 import com.cnlive.strike.user.model.CNLiveUserInfo;
 import com.cnlive.strike.user.model.CNLiveUserInfoExt;
-import com.cnlive.core.network.UserData;
+import com.cnlive.core.network.model.UserData;
 import com.google.gson.Gson;
  
 import java.util.HashMap;
@@ -4,16 +4,16 @@ import android.content.Context;
 import android.text.TextUtils;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.strike.user.R;
 import com.cnlive.strike.user.UserUtilAction;
 import com.cnlive.strike.user.auth.UserService;
 import com.cnlive.strike.user.frame.view.FirstLoginView;
-import com.cnlive.core.network.FaceData;
-import com.cnlive.core.network.TokenData;
-import com.cnlive.core.network.UserData;
+import com.cnlive.core.network.model.FaceData;
+import com.cnlive.core.network.model.TokenData;
+import com.cnlive.core.network.model.UserData;
 import com.cnlive.strike.user.router.user.UserOfflineUtil;
  
 import java.io.File;
@@ -3,11 +3,10 @@ package com.cnlive.strike.user.frame.presenter;
 import android.accounts.Account;
 import android.content.Context;
 import android.text.TextUtils;
-import android.util.Log;
  
 import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.libs.base.util.TimerUtil;
@@ -19,11 +18,9 @@ import com.cnlive.strike.user.frame.data.QuickLoginData;
 import com.cnlive.strike.user.frame.view.QuickLoginView;
 import com.cnlive.strike.user.model.CNLiveUserInfo;
 import com.cnlive.strike.user.router.user.UserAction;
-import com.cnlive.strike.user.ui.activity.FirstLoginActivity;
 import com.cnlive.strike.user.ui.fragment.QuickLoginFragment;
 import com.cnlive.strike.user.util.RegexUtils;
 import com.cnlive.strike.user.util.TimeEvent;
-import com.hannesdorfmann.mosby3.mvp.MvpActivity;
  
 import java.util.Arrays;
 import java.util.Collections;
@@ -6,10 +6,10 @@ import android.content.Context;
 import android.net.Uri;
 import android.text.TextUtils;
  
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
-import com.cnlive.core.network.UserData;
+import com.cnlive.core.network.model.UserData;
 import com.cnlive.strike.user.UserUtilAction;
 import com.cnlive.strike.user.auth.UserService;
 import com.cnlive.strike.user.model.CNLiveUserInfo;
 package com.cnlive.strike.moudle.qr.api;
  
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.strike.moudle.qr.model.CheckQrUrlInfo;
 import com.cnlive.strike.moudle.qr.model.CottonCandyInfo;
 import com.cnlive.strike.moudle.qr.model.CreateQrInfo;
@@ -12,7 +12,6 @@ import com.cnlive.strike.moudle.qr.model.QrSignInfo;
 import java.util.Map;
  
 import io.reactivex.Observable;
-import retrofit2.adapter.rxjava2.Result;
 import retrofit2.http.FieldMap;
 import retrofit2.http.FormUrlEncoded;
 import retrofit2.http.POST;
@@ -2,7 +2,7 @@ package com.cnlive.strike.moudle.qr.frame.presenter;
  
 import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -5,7 +5,7 @@ import android.content.Context;
  
 import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -3,7 +3,7 @@ package com.cnlive.strike.moudle.qr.frame.presenter;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.SimpleDES;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -7,7 +7,7 @@ import android.view.View;
 import com.cnlive.core.libs.base.frame.view.BaseView;
 import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.core.libs.base.util.GlideUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.strike.moudle.qr.R;
 import com.cnlive.strike.moudle.qr.model.DarenInfoModel;
 import com.cnlive.strike.moudle.qr.model.QrOrderInfo;
@@ -9,7 +9,7 @@ import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.core.libs.base.util.DoublePressed;
 import com.cnlive.core.libs.base.util.SimpleDES;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -880,7 +880,7 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
  
  
     public void logError(String info) {
-        Logger.e(TAG, info);
+        Logger.e(info);
     }
  
     public void logDebug(String info) {
@@ -19,24 +19,24 @@ public class BasePresenter&lt;V extends BaseView&gt; extends MvpBasePresenter&lt;V&gt; {
 //        return super.getView();
 //    }
  
-    public void logError(Object info) {
-        Logger.e(TAG, info);
+    public void logError(String info) {
+        Logger.e(info);
     }
  
-    public void logDebug(Object info) {
-        Logger.d(TAG, info);
+    public void logDebug(String info) {
+        Logger.d( info);
     }
  
-    public void logWarn(Object info) {
-        Logger.w(TAG, info);
+    public void logWarn(String info) {
+        Logger.w( info);
     }
  
-    public void logInfo(Object info) {
-        Logger.i(TAG, info);
+    public void logInfo(String info) {
+        Logger.i( info);
     }
  
-    public void logVerbose(Object info) {
-        Logger.v(TAG, info);
+    public void logVerbose(String info) {
+        Logger.v(info);
     }
  
     public void logJson(String json) {
@@ -24,24 +24,24 @@ public class BaseView implements MvpView {
         return false;
     }
  
-    public void logError(Object info) {
-        Logger.e(TAG, info);
+    public void logError(String info) {
+        Logger.e( info);
     }
  
-    public void logDebug(Object info) {
-        Logger.d(TAG, info);
+    public void logDebug(String info) {
+        Logger.d(info);
     }
  
-    public void logWarn(Object info) {
-        Logger.w(TAG, info);
+    public void logWarn(String info) {
+        Logger.w(info);
     }
  
-    public void logInfo(Object info) {
-        Logger.i(TAG, info);
+    public void logInfo(String info) {
+        Logger.i( info);
     }
  
-    public void logVerbose(Object info) {
-        Logger.v(TAG, info);
+    public void logVerbose(String info) {
+        Logger.v( info);
     }
  
     public void logJson(String json) {
@@ -16,6 +16,8 @@ import com.cnlive.strike.base.R;
 import static android.content.Context.POWER_SERVICE;
  
 public class CheckUtil {
+    public static final int OPEN_GPS_QUEST_CODE = 10;//系统固定
+
     /**
      * 判断GPS是否开启
      * ，GPS或者AGPS开启一个就认为是开启的
@@ -85,13 +87,30 @@ public class CheckUtil {
         //开启GPS
         try {
             Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
-            context.startActivityForResult(intent, 10);
+            context.startActivityForResult(intent, OPEN_GPS_QUEST_CODE);
             Toast.makeText(context, context.getString(R.string.open_high_gps_tip), Toast.LENGTH_LONG).show();
         } catch (Exception e) {
             Toast.makeText(context, "请手动打开GPS", Toast.LENGTH_LONG).show();
         }
     }
  
+
+    /**
+     * 开启高精度GPS
+     *
+     * @param context
+     */
+    public static void openNormalGPS(Activity context, int requestCode) {
+        //开启GPS
+        try {
+            Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+            context.startActivityForResult(intent, requestCode);
+            Toast.makeText(context, context.getString(R.string.open_normal_gps_tip), Toast.LENGTH_LONG).show();
+        } catch (Exception e) {
+            Toast.makeText(context, "请手动打开GPS", Toast.LENGTH_LONG).show();
+        }
+    }
+
     /**
      * 开启高精度GPS
      *
@@ -101,7 +120,7 @@ public class CheckUtil {
         //开启GPS
         try {
             Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
-            context.startActivityForResult(intent, 10);
+            context.startActivityForResult(intent, OPEN_GPS_QUEST_CODE);
             Toast.makeText(context, context.getString(R.string.open_normal_gps_tip), Toast.LENGTH_LONG).show();
         } catch (Exception e) {
             Toast.makeText(context, "请手动打开GPS", Toast.LENGTH_LONG).show();
 package com.cnlive.core.imageload.api;
  
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
  
 import java.util.Map;
  
@@ -11,7 +11,6 @@ import android.util.Log;
 import com.bumptech.glide.Glide;
 import com.cnlive.core.imageload.api.ApiServiceStock;
 import com.cnlive.core.imageload.preview.DataProcessingActivity;
-import com.cnlive.core.imageload.preview.model.FeedBackInfo;
 import com.cnlive.core.imageload.preview.model.PreviewData;
 import com.cnlive.core.imageload.preview.view.ProcessHtmlView;
 import com.cnlive.core.libs.base.application.AppConfig;
@@ -19,7 +18,7 @@ import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.FileTypeUtil;
 import com.cnlive.core.libs.base.util.FileUtils;
 import com.cnlive.core.libs.base.util.MD5Util;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -3,6 +3,8 @@ package com.cnlive.core.network;
  
 import com.cnlive.core.libs.base.application.BaseApplication;
 import com.cnlive.core.libs.base.network.manager.SubscriptionManager;
+import com.cnlive.core.network.model.BaseObserver;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.util.NetworkUtil;
  
 import io.reactivex.Observable;
 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.BaseResult;
+import com.cnlive.core.network.model.FaceData;
+import com.cnlive.core.network.model.TokenData;
+import com.cnlive.core.network.model.UserData;
 import com.cnlive.core.network.model.StorageInfoData;
 import com.cnlive.core.network.model.UploadAuthData;
  
@@ -14,7 +14,6 @@ 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;
-package com.cnlive.core.network;
+package com.cnlive.core.network.model;
  
 import android.content.Context;
  
+import com.cnlive.core.network.ServerException;
+
 import io.reactivex.Observer;
 import io.reactivex.disposables.Disposable;
  
-package com.cnlive.core.network;
+package com.cnlive.core.network.model;
  
  
 /**
-package com.cnlive.core.network;
+package com.cnlive.core.network.model;
  
 /**
  * Created by Lynn on 2018/10/15.
-package com.cnlive.core.network;
+package com.cnlive.core.network.model;
  
 /**
  * Created by Lynn on 2018/10/15.
-package com.cnlive.core.network;
+package com.cnlive.core.network.model;
  
 /**
  * Created by Lynn on 2018/10/15.
@@ -2,17 +2,15 @@ package com.cnlive.moudle.collectionTrace.frame.presenter;
  
 import android.content.Context;
 import android.view.View;
-import android.view.ViewGroup;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
 import com.cnlive.moudle.collectionTrace.frame.view.CollRunRaceDetailFragmentView;
 import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
-import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
 import java.util.HashMap;
 import java.util.Map;
@@ -8,7 +8,7 @@ import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.ui.widget.SelectDialog;
 import com.cnlive.core.libs.base.util.GsonUtil;
 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -5,7 +5,7 @@ import android.text.TextUtils;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -15,15 +15,12 @@ import com.cnlive.moudle.collectionTrace.model.CheckShoeLineBean;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
-import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
 import org.greenrobot.eventbus.EventBus;
  
 import java.util.HashMap;
 import java.util.Map;
  
-import io.reactivex.disposables.Disposable;
-
 public class CollTraceListDetailFragmentPresenter extends BasePresenter<CollTraceListDetailFragmentView> {
     /**
      * 踩点轨迹与赛事绑定
@@ -4,19 +4,15 @@ import android.content.Context;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
 import com.cnlive.moudle.collectionTrace.frame.view.RaceListView;
 import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
 import com.cnlive.moudle.pedometer.net.bean.RunLineInfo;
-import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
 import java.util.HashMap;
-import java.util.Map;
-
-import io.reactivex.disposables.Disposable;
  
 /**
  * Created by hanyayun 019/06/24.
@@ -5,7 +5,7 @@ import android.content.Context;
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -17,15 +17,12 @@ import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
 import com.cnlive.moudle.pedometer.net.bean.ShoeDelectInfo;
-import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
 import org.greenrobot.eventbus.EventBus;
  
 import java.util.HashMap;
 import java.util.Map;
  
-import io.reactivex.disposables.Disposable;
-
 /**
  * Created by hanyayun 019/06/25.
  */
@@ -6,7 +6,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
  
 import com.cnlive.core.libs.base.frame.view.BaseView;
 import com.cnlive.core.libs.base.util.AlertUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.moudle.collectionTrace.ui.adapter.RunListAdapter;
 import com.cnlive.moudle.collectionTrace.ui.fragment.RaceListFragment;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
@@ -29,7 +29,7 @@ import com.cnlive.core.libs.base.ui.widget.SelectDialog;
 import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.core.libs.base.util.GsonUtil;
 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.moudle.collectionTrace.frame.presenter.RaceNameListPresenter;
 import com.cnlive.moudle.collectionTrace.model.CollectPoint;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
@@ -6,11 +6,11 @@ import android.content.Intent;
  
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
+import com.cnlive.core.libs.base.util.CheckUtil;
 import com.cnlive.core.libs.base.util.StatusBarConfig;
 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunMainFragment;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunRaceDetailFragment;
-import com.cnlive.moudle.pedometer.utils.CheckUtil;
 import com.example.moudle_pedometer.R;
  
 /**
@@ -12,11 +12,11 @@ import android.widget.Toast;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
 import com.cnlive.core.libs.base.ui.widget.SelectDialog;
+import com.cnlive.core.libs.base.util.CheckUtil;
 import com.cnlive.core.libs.base.util.StatusBarConfig;
 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.collectionTrace.ui.fragment.StartTraceFragment;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
-import com.cnlive.moudle.pedometer.utils.CheckUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.NotificationUtil;
 import com.example.moudle_pedometer.R;
@@ -87,14 +87,12 @@ public class StartCollectTraceActivity extends BaseActivity {
      * 检查GPS
      */
     private void checkGPS() {
-        boolean isOpenGps = MyMapUtil.isOPenGps(getApplicationContext());
+        boolean isOpenGps = CheckUtil.isOpenHighAccuracyGPS(getApplicationContext());
         if (isFirstRequestGPS) {
             isFirstRequestGPS = false;
             if (!isOpenGps) {
                 //开启GPS
-                Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
-                startActivityForResult(intent, 10);
-                Toast.makeText(getApplicationContext(), getString(R.string.open_high_gps_tip), Toast.LENGTH_LONG).show();
+               CheckUtil.openHighAccuracyGPS(this);
             } else {
                 checkIgnore();
             }
@@ -9,7 +9,7 @@ import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.ui.widget.SelectDialog;
 import com.cnlive.core.libs.base.util.GsonUtil;
 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -25,8 +25,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
  
-import retrofit2.adapter.rxjava2.Result;
-
 /**
  * Created by ys
  */
@@ -4,7 +4,7 @@ import android.content.Context;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -2,10 +2,9 @@ package com.cnlive.moudle.pedometer.frame.presenter;
  
 import android.content.Context;
 import android.view.View;
-import android.view.ViewGroup;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -4,19 +4,15 @@ import android.content.Context;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
 import com.cnlive.moudle.pedometer.frame.view.RaceRecorView;
 import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
 import com.cnlive.moudle.pedometer.net.bean.RaceRecordInfo;
-import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
 import java.util.HashMap;
-import java.util.Map;
-
-import io.reactivex.disposables.Disposable;
  
 /**
  * Created by hanyayun 019/05/30.
@@ -6,7 +6,7 @@ import android.widget.Toast;
  
 import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -16,12 +16,8 @@ import com.cnlive.moudle.pedometer.net.ApiServiceBaiDu;
 import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
 import com.cnlive.moudle.pedometer.net.bean.BaiduTraceBean;
 import com.cnlive.moudle.pedometer.utils.Sha1Util;
-import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
 import java.util.HashMap;
-import java.util.Map;
-
-import io.reactivex.disposables.Disposable;
  
  
 /**
@@ -4,19 +4,15 @@ import android.content.Context;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
 import com.cnlive.moudle.pedometer.frame.view.RunLineView;
 import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
 import com.cnlive.moudle.pedometer.net.bean.RunLineInfo;
-import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
 import java.util.HashMap;
-import java.util.Map;
-
-import io.reactivex.disposables.Disposable;
  
 /**
  * Created by hanyayun 019/06/14.
@@ -2,23 +2,19 @@ package com.cnlive.moudle.pedometer.frame.presenter;
  
 import android.content.Context;
 import android.view.View;
-import android.view.ViewGroup;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
 import com.cnlive.moudle.pedometer.frame.view.RunRaceDetailFragmentView;
 import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
-import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
 import java.util.HashMap;
 import java.util.Map;
  
-import io.reactivex.disposables.Disposable;
-
 public class RunRaceDetailFragmentPresenter extends BasePresenter<RunRaceDetailFragmentView> {
  
     public void getRunRaceDetailInfo(Context context, String id, String userId, String state) {
@@ -15,7 +15,7 @@ import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.ui.widget.SelectDialog;
 import com.cnlive.core.libs.base.util.GsonUtil;
 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -4,19 +4,15 @@ import android.content.Context;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
 import com.cnlive.moudle.pedometer.frame.view.SelfRecordView;
 import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
 import com.cnlive.moudle.pedometer.net.bean.SelfRecordInfo;
-import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
 import java.util.HashMap;
-import java.util.Map;
-
-import io.reactivex.disposables.Disposable;
  
 /**
  * Created by hanyayun 019/06/12.
@@ -4,7 +4,7 @@ import android.content.Context;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -11,7 +11,7 @@ import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.ui.widget.SelectDialog;
 import com.cnlive.core.libs.base.util.GsonUtil;
 import com.cnlive.core.libs.base.util.QMUITipDialogUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -6,7 +6,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
  
 import com.cnlive.core.libs.base.frame.view.BaseView;
 import com.cnlive.core.libs.base.util.AlertUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.net.bean.MyRecordInfo;
 import com.cnlive.moudle.pedometer.ui.activity.OnGoingActivity;
@@ -7,7 +7,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
  
 import com.cnlive.core.libs.base.frame.view.BaseView;
 import com.cnlive.core.libs.base.util.AlertUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.net.bean.EventRouteRecordBeanVoListBean;
@@ -18,7 +18,6 @@ import com.cnlive.moudle.pedometer.ui.adapter.RaceRecordAdapter;
 import com.cnlive.moudle.pedometer.ui.fragment.RaceRecorFragment;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
-import com.hannesdorfmann.mosby3.mvp.MvpView;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
 import com.scwang.smartrefresh.layout.header.ClassicsHeader;
  
@@ -6,7 +6,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
  
 import com.cnlive.core.libs.base.frame.view.BaseView;
 import com.cnlive.core.libs.base.util.AlertUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.net.bean.RunLineInfo;
 import com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity;
@@ -14,7 +14,6 @@ import com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity;
 import com.cnlive.moudle.pedometer.ui.adapter.RunLineAdapter;
 import com.cnlive.moudle.pedometer.ui.fragment.RunLineFragment;
 import com.example.moudle_pedometer.R;
-import com.hannesdorfmann.mosby3.mvp.MvpView;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
 import com.scwang.smartrefresh.layout.header.ClassicsHeader;
  
@@ -8,7 +8,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
  
 import com.cnlive.core.libs.base.frame.view.BaseView;
 import com.cnlive.core.libs.base.util.AlertUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.net.bean.EventRouteRecordBeanVoListBean;
@@ -20,7 +20,6 @@ import com.cnlive.moudle.pedometer.ui.adapter.RaceRecordAdapter;
 import com.cnlive.moudle.pedometer.ui.fragment.SelfRecordFragment;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
-import com.hannesdorfmann.mosby3.mvp.MvpView;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
 import com.scwang.smartrefresh.layout.header.ClassicsHeader;
  
@@ -6,13 +6,12 @@ import androidx.recyclerview.widget.LinearLayoutManager;
  
 import com.cnlive.core.libs.base.frame.view.BaseView;
 import com.cnlive.core.libs.base.util.AlertUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.net.bean.TakePartPeopleInfo;
 import com.cnlive.moudle.pedometer.ui.adapter.TakePartAdapter;
 import com.cnlive.moudle.pedometer.ui.fragment.TakePartFragment;
 import com.example.moudle_pedometer.R;
-import com.hannesdorfmann.mosby3.mvp.MvpView;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
 import com.scwang.smartrefresh.layout.header.ClassicsHeader;
  
 package com.cnlive.moudle.pedometer.net;
  
  
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.moudle.collectionTrace.model.BindingShoeInfo;
 import com.cnlive.moudle.collectionTrace.model.CheckShoeLineBean;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
@@ -16,7 +16,6 @@ import com.cnlive.moudle.pedometer.net.bean.TakePartPeopleInfo;
 import java.util.Map;
  
 import io.reactivex.Observable;
-import retrofit2.adapter.rxjava2.Result;
 import retrofit2.http.GET;
 import retrofit2.http.POST;
 import retrofit2.http.QueryMap;
 package com.cnlive.moudle.pedometer.net.bean.upload.api;
  
  
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
  
 import java.util.Map;
  
@@ -10,13 +10,15 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
  
+import androidx.annotation.Nullable;
+
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.libs.base.interfaces.OnPermissionResponseListener;
 import com.cnlive.core.libs.base.ui.widget.SelectDialog;
+import com.cnlive.core.libs.base.util.CheckUtil;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
-import com.cnlive.moudle.pedometer.utils.CheckUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.NotificationUtil;
 import com.example.moudle_pedometer.R;
@@ -130,14 +132,12 @@ public class RunRaceDetailActivity extends BaseActivity {
      * 检查GPS
      */
     private void checkGPS() {
-        boolean isOpenGps = MyMapUtil.isOPenGps(getApplicationContext());
+        boolean isOpenGps = CheckUtil.isOpenHighAccuracyGPS(getApplicationContext());
         if (isFirstRequestGPS) {
             isFirstRequestGPS = false;
             if (!isOpenGps) {
                 //开启GPS
-                Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
-                startActivityForResult(intent, 10);
-                Toast.makeText(getApplicationContext(), getString(R.string.open_high_gps_tip), Toast.LENGTH_LONG).show();
+                CheckUtil.openHighAccuracyGPS(this);
             } else {
                 checkIgnore();
             }
@@ -194,6 +194,7 @@ public class RunRaceDetailActivity extends BaseActivity {
         }
     }
  
+
     /**
      * 一次申请一组权限（使用拒绝弹框）点击事件
      */
@@ -4,28 +4,17 @@ import android.content.Context;
 import android.media.MediaMetadataRetriever;
 import android.os.Environment;
 import android.text.TextUtils;
-import android.util.Log;
  
 import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.util.StringUtils;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.model.StorageInfoData;
-import com.cnlive.moudle.pedometer.net.bean.upload.FeedBackInfo;
 import com.cnlive.core.network.model.UploadAuthData;
-import com.cnlive.moudle.pedometer.net.bean.upload.api.ApiServiceMoment;
-import com.cnlive.moudle.pedometer.upload.interfaces.ProgressCallback;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
  
 import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
  
 import io.reactivex.ObservableSource;
 import io.reactivex.functions.Function;
@@ -2,45 +2,32 @@ package com.cnlive.moudle.pedometer.upload;
  
 import android.app.Activity;
 import android.content.Context;
-import android.media.MediaMetadataRetriever;
 import android.os.Build;
 import android.os.Environment;
 import android.text.TextUtils;
-import android.util.Log;
  
 import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.core.libs.base.util.StringUtils;
-import com.cnlive.core.network.BaseResult;
+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.libs.upload.listener.CNPutObjectResponseListener;
-import com.cnlive.libs.upload.model.UploadError;
-import com.cnlive.libs.upload.model.acl.CNCannedAccessControlList;
-import com.cnlive.libs.upload.services.CNPutObjectRequest;
-import com.cnlive.libs.upload.upload.CNUpload;
-import com.cnlive.libs.upload.upload.callback.OnInitListener;
 import com.cnlive.media.picker.utils.FileTypeUtil;
 import com.cnlive.core.network.model.UploadAuthData;
-import com.cnlive.moudle.pedometer.net.bean.upload.api.ApiServiceMoment;
 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.moudle.pedometer.utils.MD5;
 import com.qiniu.android.http.ResponseInfo;
 import com.qiniu.android.storage.UpCompletionHandler;
 import com.qiniu.android.storage.UpProgressHandler;
 import com.qiniu.android.storage.UploadManager;
 import com.qiniu.android.storage.UploadOptions;
-import com.qiniu.pili.droid.shortvideo.PLShortVideoTranscoder;
-import com.qiniu.pili.droid.shortvideo.PLVideoSaveListener;
 import com.top.zibin.luban.CompressionPredicate;
 import com.top.zibin.luban.Luban;
 import com.top.zibin.luban.OnCompressListener;
  
-import org.apache.http.Header;
 import org.json.JSONException;
 import org.json.JSONObject;
  
@@ -52,9 +39,7 @@ import java.util.List;
 import java.util.Map;
  
 import io.reactivex.Observable;
-import io.reactivex.disposables.Disposable;
 import okhttp3.MediaType;
-import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
  
  
-package com.cnlive.moudle.pedometer.utils;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.PowerManager;
-import android.provider.Settings;
-import android.widget.Toast;
-
-import com.example.moudle_pedometer.R;
-
-import static android.content.Context.POWER_SERVICE;
-
-public class CheckUtil {
-
-    /**
-     * 锤子手机不能检测电池白名单,会崩溃
-     *
-     * @param context
-     * @return
-     */
-    public static boolean isIgnoringBatteryOptimizationss(Activity context) {
-        try {
-            String carrier = android.os.Build.MANUFACTURER;
-            if (!"smartisan".equals(carrier)) {
-                PowerManager powerManager = (PowerManager) context.getSystemService(POWER_SERVICE);
-                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-                    boolean hasIgnored = powerManager.isIgnoringBatteryOptimizations(context.getPackageName());
-                    return hasIgnored;
-                } else {
-                    return true;
-                }
-            } else {
-                return true;
-            }
-        } catch (Exception e) {
-            return true;
-        }
-    }
-
-    public static void toSetIgnore(Activity context) {
-        try {
-            Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-            intent.setData(Uri.parse("package:" + context.getPackageName()));
-            PackageManager pm = context.getPackageManager();
-            if (intent.resolveActivity(pm) != null) {
-                context.startActivity(intent);
-                Toast.makeText(context, "为保证功能正常使用,请选择允许加入电池优化白名单!", Toast.LENGTH_LONG).show();
-
-            }
-        } catch (Exception e) {
-        }
-    }
-}
@@ -35,8 +35,6 @@ import com.baidu.trace.api.analysis.DrivingBehaviorRequest;
 import com.baidu.trace.api.analysis.DrivingBehaviorResponse;
 import com.baidu.trace.api.analysis.OnAnalysisListener;
 import com.baidu.trace.api.analysis.StayPointResponse;
-import com.baidu.trace.api.track.DistanceRequest;
-import com.baidu.trace.api.track.DistanceResponse;
 import com.baidu.trace.api.track.HistoryTrackRequest;
 import com.baidu.trace.api.track.HistoryTrackResponse;
 import com.baidu.trace.api.track.OnTrackListener;
 package com.cnlive.strike.xiaojiaspeaker.frame.presenter;
  
-import android.app.Activity;
 import android.content.Context;
-import android.util.Log;
 import android.view.View;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
 package com.cnlive.strike.xiaojiaspeaker.frame.presenter;
  
 import android.app.Activity;
-import android.util.Log;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.AlertUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -13,15 +12,12 @@ import com.cnlive.strike.xiaojiaspeaker.frame.view.ChangeDeviceNameView;
 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
 import com.cnlive.strike.xiaojiaspeaker.netWork.ApiServiceXiaoJia;
 import com.cnlive.strike.xiaojiaspeaker.util.QMUITipDialogUtil;
-import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
 import org.greenrobot.eventbus.EventBus;
  
 import java.util.HashMap;
 import java.util.Map;
  
-import io.reactivex.disposables.Disposable;
-
 public class ChangeDeviceNamePresenter extends BasePresenter<ChangeDeviceNameView> {
  
     private String TAG = "ChangeDeviceNamePresenter";
@@ -4,7 +4,7 @@ import android.app.Activity;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.AlertUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -5,7 +5,7 @@ import android.view.View;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.AlertUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -14,15 +14,12 @@ import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
 import com.cnlive.strike.xiaojiaspeaker.netWork.ApiServiceXiaoJia;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.DeviceDetail;
 import com.cnlive.strike.xiaojiaspeaker.util.QMUITipDialogUtil;
-import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
 import org.greenrobot.eventbus.EventBus;
  
 import java.util.HashMap;
 import java.util.Map;
  
-import io.reactivex.disposables.Disposable;
-
 public class DeviceManagerFragmentPresenter extends BasePresenter<DeviceManagerFragmentView> {
     public void deleteDevice(Context context, String deviceId, String oldName) {
         if (null == getView()) {
 package com.cnlive.strike.xiaojiaspeaker.frame.presenter;
  
 import android.content.Context;
-import android.util.Log;
 import android.view.View;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.InvitFriendView;
 import com.cnlive.strike.xiaojiaspeaker.netWork.ApiServiceXiaoJia;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RoleNetBean;
-import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
 import java.util.HashMap;
 import java.util.Map;
  
-import io.reactivex.disposables.Disposable;
-
 public class InvitFriendPresenter extends BasePresenter<InvitFriendView> {
  
     private String TAG = "InvitFriendPresenter";
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.view.View;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -15,8 +15,6 @@ import com.cnlive.strike.xiaojiaspeaker.netWork.bean.XiaoJiaContactInfo;
 import java.util.HashMap;
 import java.util.Map;
  
-import io.reactivex.disposables.Disposable;
-
 public class SelectIMFriendPresenter extends BasePresenter<SelectIMFriendView> {
  
     private String TAG = "SelectIMFriendPresenter";
@@ -4,7 +4,7 @@ import android.app.Activity;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.AlertUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -5,7 +5,7 @@ import android.view.View;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.AlertUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -6,7 +6,7 @@ import android.view.View;
  
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.AlertUtil;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
 package com.cnlive.strike.xiaojiaspeaker.netWork;
  
  
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.DeviceDetail;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyListBean;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyRoleBean;
@@ -3,14 +3,12 @@ package com.cnlive.strike.xiaojiaspeaker.ui.activity;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
  
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.core.libs.base.util.StatusBarConfig;
-import com.cnlive.core.network.BaseResult;
+import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
@@ -24,8 +22,6 @@ import com.cnlive.strike.xiaojiaspeaker.util.QMUITipDialogUtil;
 import java.util.HashMap;
 import java.util.Map;
  
-import io.reactivex.disposables.Disposable;
-
 /**
  * 远程控制
  */
-include ':app:strike', ':network', ':xiaojiasoundbox', ':lib_combinebitmap', ':TcSdk', ':lib_network', ':lib_base_im', ':app_qr', ':hmsagents', ':app_user'
+include ':app:strike', ':network', ':xiaojiasoundbox', ':lib_combinebitmap', ':TcSdk', ':lib_network', ':lib_base_im', ':app_qr', ':hmsagents', ':app_user', ':pay'
 //基础库
 include ':core:base',':core:network',':core:imageload' ,':core:app_qr'
-include ':cloud:user'
+include ':cloud:user',':cloud:pay'
 include ':module:xiaojiasoundbox',':module:pedometer'
 include ':library_baidumap'
 rootProject.name='ModuleStrike'