包整理

韩亚云
1 parent 850305f8
Showing 63 changed files with 4 additions and 4732 deletions
.idea/gradle.xml
app_user/.gitignore
app_user/build.gradle
app_user/proguard-rules.pro
app_user/src/debug/res/mipmap-hdpi/icon_account.png
app_user/src/debug/res/mipmap-ldpi/icon_account.png
app_user/src/debug/res/mipmap-xhdpi/icon_account.png
app_user/src/debug/res/mipmap-xxhdpi/icon_account.png
app_user/src/debug/res/mipmap-xxxhdpi/icon_account.png
app_user/src/main/AndroidManifest.xml
app_user/src/main/java/com/cnlive/strike/user/UserUtilAction.java
app_user/src/main/java/com/cnlive/strike/user/auth/AccountAuthenticatorActivity.java
app_user/src/main/java/com/cnlive/strike/user/auth/UserAccountAuthenticator.java
app_user/src/main/java/com/cnlive/strike/user/auth/UserAccountProvider.java
app_user/src/main/java/com/cnlive/strike/user/auth/UserAccountService.java
app_user/src/main/java/com/cnlive/strike/user/auth/UserService.java
app_user/src/main/java/com/cnlive/strike/user/auth/UserSyncService.java
app_user/src/main/java/com/cnlive/strike/user/model/CNLiveUserInfo.java
app_user/src/main/java/com/cnlive/strike/user/model/CNLiveUserInfoExt.java
app_user/src/main/res/values/strings.xml
@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
-/build
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
-    defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
-    }
-
-    buildTypes {
-        debug{
-            resValue("string", "ACCOUNT_LABEL", "网家家 内测")
-            resValue("string", "ACCOUNT_TYPE", "com.cnlive.strike.debug.AccountType")
-            resValue("string", "ACCOUNT_PROVIDE", "com.cnlive.strike.debug.AccountProvide")
-        }
-        release {
-            resValue("string", "ACCOUNT_LABEL", "网家家")
-            resValue("string", "ACCOUNT_TYPE", "com.cnlive.strike.AccountType")
-            resValue("string", "ACCOUNT_PROVIDE", "com.cnlive.strike.AccountProvide")
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.android.support:appcompat-v7:$rootProject.appcompatV7"
-    //视讯云SDK
-    implementation "com.cnlive:lib_cnutil:$rootProject.libCnUtil"
-
-    implementation "com.cnlive.libs:base:$rootProject.libBase"
-    implementation project(':lib_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
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.cnlive.strike.user.auth">
-
-    <!--账户自动更新 App保活相关-->
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
-    <uses-permission android:name="android.permission.ACTION_LIGHT_DEVICE_IDLE_MODE_CHANGED" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <!--账户权限相关-->
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
-    <uses-permission
-        android:name="android.permission.ACCOUNT_MANAGER"
-        tools:ignore="ProtectedPermissions" />
-
-    <application>
-        <activity android:name=".AccountAuthenticatorActivity"/>
-
-        <service
-            android:name=".UserAccountService"
-            tools:ignore="ExportedService">
-            <intent-filter>
-                <action android:name="android.accounts.AccountAuthenticator" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/authenticator" />
-        </service>
-
-        <service
-            android:name=".UserSyncService"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.content.SyncAdapter" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.content.SyncAdapter"
-                android:resource="@xml/account_sync_adapter" />
-        </service>
-
-        <provider
-            android:name=".UserAccountProvider"
-            android:authorities="@string/ACCOUNT_PROVIDE"
-            android:exported="false"
-            android:syncable="true" />
-    </application>
-</manifest>
-package com.cnlive.strike.user;
-
-import android.content.Context;
-import android.os.Environment;
-import android.text.TextUtils;
-
-import com.cnlive.libs.base.application.AppConfig;
-import com.cnlive.libs.base.logic.Logic;
-import com.cnlive.libs.base.logic.callback.DataCallback;
-import com.cnlive.libs.data.network.Subscriber;
-import com.cnlive.strike.data.network.api.ApiRequest;
-import com.cnlive.strike.data.network.api.ApiServiceOpen;
-import com.cnlive.strike.data.network.api.ApiSubscriber;
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.FaceData;
-import com.cnlive.strike.data.network.model.TokenData;
-import com.cnlive.strike.data.network.model.UserData;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import io.reactivex.Flowable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
-import okhttp3.MediaType;
-import okhttp3.MultipartBody;
-import okhttp3.RequestBody;
-import top.zibin.luban.Luban;
-
-import static com.cnlive.libs.base.logic.Config.SUCCESS;
-
-
-/**
- * Created by Lynn on 2018/10/15.
- */
-
-public class UserUtilAction {
-    public static int TOKEN_ERROR_CODE = -900001;
-    public static String TOKEN_ERROR_MSG = "用户token为空";
-
-    /**
-     * 快捷登录前发送手机验证码
-     *
-     * @param context
-     * @param mobile  手机号
-     * @return
-     */
-    public static Logic.Action<Object, BaseInfo> sendMsgBefQuickLoginAction(final Context context, final String mobile, String countryCode) {
-        return (data, callback) -> {
-            Map<String, String> requestMap = new HashMap<>();
-            requestMap.put("appId", AppConfig.getAppId());
-            requestMap.put("mobile", mobile);
-            requestMap.put("countryCode", countryCode);
-            requestMap.put("clientPlat", "a");
-            return ApiRequest.service(ApiServiceOpen.class, service -> service.sendVerifyCodeBefQuickLogin(requestMap)).subscribe(context, callback);
-        };
-
-    }
-
-    /**
-     * 快捷登录
-     *
-     * @param context
-     * @param userPhone 手机号
-     * @param userCode  验证码
-     * @return
-     */
-    public static Logic.Action<Object, BaseInfo<UserData>> quickLoginAction(Context context, String userPhone, String userCode, String countryCode) {
-        return (data, callback) -> {
-            Map<String, String> requestMap = new HashMap<>();
-            requestMap.put("appId", AppConfig.getAppId());
-            requestMap.put("userName", userPhone);
-            requestMap.put("verificationCode", userCode);
-            requestMap.put("uuid", AppConfig.getAppUUID());
-            requestMap.put("frmId", AppConfig.getAppChannel());
-            requestMap.put("countryCode", countryCode);
-            requestMap.put("clientPlat", "a");
-            return ApiRequest.service(ApiServiceOpen.class, service -> service.quickLogin(requestMap)).subscribe(context, callback);
-        };
-    }
-
-    /**
-     * 登录
-     *
-     * @param context
-     * @param userName 用户名
-     * @param pwd      密码
-     * @return
-     */
-    public static Logic.Action<Object, BaseInfo<UserData>> loginAction(Context context, String userName, String pwd) {
-        return (data, callback) -> {
-            Map<String, String> map = new HashMap<>();
-            map.put("appId", AppConfig.getAppId());
-            map.put("userName", userName);
-            map.put("pwd", pwd);
-            map.put("uuid", AppConfig.getAppUUID());
-            map.put("frmId", "");
-            map.put("clientPlat", "a");
-            return ApiRequest.service(ApiServiceOpen.class, service -> service.login(map)).subscribe(context, callback);
-        };
-    }
-
-    /**
-     * 查询用户信息
-     *
-     * @param context
-     * @param userId  用户ID
-     * @param srcUid  被查询用户ID
-     * @param token   查询者平台TOKEN
-     * @return
-     */
-    public static Logic.Action<Object, BaseInfo<UserData>> queryUserInfo(Context context, String userId, String srcUid, String token) {
-        return (data, callback) -> {
-            Map<String, String> map = new HashMap<>();
-            map.put("appId", AppConfig.getAppId());
-            map.put("uid", userId);
-            map.put("srcUid", srcUid);
-            map.put("clientPlat", "a");
-            map.put("token", token);
-            if (TextUtils.isEmpty(token)) {
-                callback.callback(TOKEN_ERROR_CODE, TOKEN_ERROR_MSG, null);
-            }
-            return ApiRequest.service(ApiServiceOpen.class, service -> service.queryUserInfo(map)).subscribe(context, callback);
-        };
-    }
-
-    /**
-     * 修改用户附加信息
-     *
-     * @param context
-     * @param userId  用户id
-     * @param extInfo 扩展信息
-     * @param token   平台token
-     * @return
-     */
-    public static Logic.Action<Object, BaseInfo> updateUserExtInfo(Context context, String userId, String extInfo, String token) {
-        return (data, callback) -> {
-            Map<String, String> map = new HashMap<>();
-            map.put("appId", AppConfig.getAppId());
-            map.put("uid", userId);
-            map.put("extInfo", extInfo);
-            map.put("token", token);
-            map.put("clientPlat", "a");
-            if (TextUtils.isEmpty(token)) {
-                callback.callback(TOKEN_ERROR_CODE, TOKEN_ERROR_MSG, null);
-            }
-            return ApiRequest.service(ApiServiceOpen.class, service -> service.updateUserExtInfo(map)).subscribe(context, callback);
-        };
-    }
-
-    /**
-     * 修改用户单项信息
-     *
-     * @param context
-     * @param uid     用户Id
-     * @param type    nickName-昵称，gender-性别，email-邮箱, location-联系方式
-     * @param value   对应的信息，性别，m：男、f：女、n：未知
-     * @param token   平台TOKEN
-     * @return
-     */
-    public static Logic.Action<Object, BaseInfo> modifyUserInfo(Context context, String uid, String type, String value, String token) {
-        return (data, callback) -> {
-            Map<String, String> map = new HashMap<>();
-            map.put("appId", AppConfig.getAppId());
-            map.put("uid", uid);
-            map.put("type", type);
-            map.put("value", value);
-            map.put("clientPlat", "a");
-            map.put("token", token);
-            if (TextUtils.isEmpty(token)) {
-                callback.callback(TOKEN_ERROR_CODE, TOKEN_ERROR_MSG, null);
-            }
-            return ApiRequest.service(ApiServiceOpen.class, service -> service.modifyUserInfo(map)).subscribe(context, callback);
-        };
-    }
-
-    /**
-     * 注册或修改手机号前发手机验证码
-     *
-     * @param context
-     * @param mobile  手机号
-     * @return
-     */
-    public static Logic.Action<Object, BaseInfo> sendVerifyCodeForUnRegistered(Context context, String mobile, String countryCode) {
-        return (data, callback) -> {
-            Map<String, String> map = new HashMap<>();
-            map.put("appId", AppConfig.getAppId());
-            map.put("mobile", mobile);
-            map.put("clientPlat", "a");
-            map.put("countryCode", countryCode);
-            return ApiRequest.service(ApiServiceOpen.class, service -> service.sendVerifyCodeForUnRegistered(map)).subscribe(context, callback);
-        };
-    }
-
-    /**
-     * 更新手机号
-     *
-     * @param context
-     * @param uid              用户ID
-     * @param mobile           手机号
-     * @param verificationCode 手机验证码
-     * @param token            平台TOKEN
-     * @return
-     */
-    public static Logic.Action<Object, BaseInfo> updateMobile(Context context, String uid, String mobile, String verificationCode, String token, String countryCode) {
-        return (data, callback) -> {
-            Map<String, String> map = new HashMap<>();
-            map.put("appId", AppConfig.getAppId());
-            map.put("uid", uid);
-            map.put("mobile", mobile);
-            map.put("verificationCode", verificationCode);
-            map.put("clientPlat", "a");
-            map.put("countryCode", countryCode);
-            map.put("token", token);
-            if (TextUtils.isEmpty(token)) {
-                callback.callback(TOKEN_ERROR_CODE, TOKEN_ERROR_MSG, null);
-            }
-            return ApiRequest.service(ApiServiceOpen.class, service -> service.updateMobile(map)).subscribe(context, callback);
-        };
-    }
-
-    /**
-     * 注册
-     *
-     * @param context
-     * @param userName         邮箱或手机
-     * @param pwd              密码
-     * @param verificationCode 手机验证码（手机号注册时必填）
-     * @return
-     */
-    public static Logic.Action<Object, BaseInfo<UserData>> register(Context context, String userName, String pwd, String verificationCode) {
-        return (data, callback) -> {
-            Map<String, String> map = new HashMap<>();
-            map.put("appId", AppConfig.getAppId());
-            map.put("userName", userName);
-            map.put("pwd", pwd);
-            map.put("verificationCode", verificationCode);
-            map.put("invitationCode", "");
-            map.put("uuid", AppConfig.getAppUUID());
-            map.put("frmId", "");
-            map.put("clientPlat", "a");
-            return ApiRequest.service(ApiServiceOpen.class, service -> service.register(map)).subscribe(context, callback);
-        };
-    }
-
-
-    /**
-     * 获取access_token
-     *
-     * @param context
-     * @return
-     */
-    public static Logic.Action<Object, BaseInfo<TokenData>> accessToken(Context context) {
-        return (data, callback) -> {
-            Map<String, String> map = new HashMap<>();
-            map.put("appId", AppConfig.getAppId());
-            map.put("secret", AppConfig.getAppSceret());
-            return ApiRequest.service(ApiServiceOpen.class, service -> service.accessToken(map)).subscribe(context, callback);
-        };
-    }
-
-    /**
-     * 上传头像
-     *
-     * @param context
-     * @param uid          用户ID
-     * @param face         头像文件
-     * @param token        平台TOKEN
-     * @param access_token
-     * @return
-     */
-    public static Disposable updateUserFace(Context context, String uid, File face, String token, String access_token, DataCallback<BaseInfo<FaceData>> callback) {
-        Map<String, RequestBody> params = new HashMap<>();
-
-        if (TextUtils.isEmpty(token)) {
-            callback.callback(TOKEN_ERROR_CODE, TOKEN_ERROR_MSG, null);
-        }
-
-        params.put("uid", getRequestString(uid));
-        params.put("clientPlat", getRequestString("a"));
-        params.put("token", getRequestString(token));
-        params.put("access_token", getRequestString(access_token));
-
-        RequestBody requestFace = RequestBody.create(MediaType.parse("multipart/form-data"), face);
-        MultipartBody.Part faceBody = MultipartBody.Part.createFormData("face", face.getName(), requestFace);
-
-        List<MultipartBody.Part> parts = new ArrayList<>();
-        parts.add(faceBody);
-
-
-        Subscriber<BaseInfo<FaceData>> subscriber = new Subscriber<BaseInfo<FaceData>>(context, ApiSubscriber.subscriberBuild) {
-            @Override
-            public void onCompleted(String s, String s1, BaseInfo<FaceData> faceDataBaseInfo) {
-                if (callback == null) return;
-                callback.callback(SUCCESS, "", faceDataBaseInfo);
-            }
-
-            @Override
-            public void onError(String s, String s1) {
-                if (callback == null) return;
-                int errorCode = -1;
-                try {
-                    errorCode = Integer.valueOf(s);
-                } catch (Exception ignored) {
-                } finally {
-                    callback.callback(errorCode, s1, null);
-                }
-            }
-        };
-
-        return ApiRequest.subscribe(ApiRequest.service(ApiServiceOpen.class).updateUserFace(params, parts), subscriber);
-//        return ApiRequest.service(ApiServiceOpen.class, service -> service.updateUserFace(params, parts)).subscribe(context, callback);
-    }
-
-    private static RequestBody getRequestString(String value) {
-        RequestBody requestString = RequestBody.create(MediaType.parse("text/plain"), value);
-        return requestString;
-    }
-
-    public static Disposable zipFiles(Context context, List<String> imageFiles, DataCallback<List<String>> callback) {
-        if (imageFiles == null || imageFiles.size() == 0) {
-            callback.callback(0, "", imageFiles);
-        } else {
-            return Flowable.just(imageFiles)
-                    .observeOn(Schedulers.io())
-                    .map(list -> Luban.with(context)
-                            .ignoreBy(500)
-                            .setTargetDir(getPath())
-                            .load(list)
-                            .get())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .doOnError(throwable -> callback.callback(0, "", imageFiles))
-                    .onErrorResumeNext(Flowable.empty())
-                    .subscribe(
-                            list -> {
-                                List<String> files = new ArrayList<>();
-                                for (File file : list) files.add(file.getPath());
-                                callback.callback(0, "", files);
-                            });
-        }
-        return null;
-    }
-
-    private static String getPath() {
-        String path = Environment.getExternalStorageDirectory() + "/strike/image/";
-        File file = new File(path);
-        if (file.mkdirs()) {
-            return path;
-        }
-        return path;
-    }
-}
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cnlive.strike.user.auth;
-
-import android.accounts.AccountAuthenticatorResponse;
-import android.accounts.AccountManager;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-
-/**
- * Base class for implementing an Activity that is used to help implement an
- * AbstractAccountAuthenticator. If the AbstractAccountAuthenticator needs to use an activity
- * to handle the request then it can have the activity extend AccountAuthenticatorActivity.
- * The AbstractAccountAuthenticator passes in the response to the intent using the following:
- * <pre>
- *      intent.putExtra({@link AccountManager#KEY_ACCOUNT_AUTHENTICATOR_RESPONSE}, response);
- * </pre>
- * The activity then sets the result that is to be handed to the response via
- * {@link #setAccountAuthenticatorResult(Bundle)}.
- * This result will be sent as the result of the request when the activity finishes. If this
- * is never set or if it is set to null then error {@link AccountManager#ERROR_CODE_CANCELED}
- * will be called on the response.
- */
-public class AccountAuthenticatorActivity extends AppCompatActivity {
-    private AccountAuthenticatorResponse mAccountAuthenticatorResponse = null;
-    private Bundle mResultBundle = null;
-
-    /**
-     * Set the result that is to be sent as the result of the request that caused this
-     * Activity to be launched. If result is null or this method is never called then
-     * the request will be canceled.
-     *
-     * @param result this is returned as the result of the AbstractAccountAuthenticator request
-     */
-    public final void setAccountAuthenticatorResult(Bundle result) {
-        mResultBundle = result;
-    }
-
-    /**
-     * Retreives the AccountAuthenticatorResponse from either the intent of the icicle, if the
-     * icicle is non-zero.
-     *
-     * @param icicle the save instance data of this Activity, may be null
-     */
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        mAccountAuthenticatorResponse =
-                getIntent().getParcelableExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE);
-
-        if (mAccountAuthenticatorResponse != null) {
-            mAccountAuthenticatorResponse.onRequestContinued();
-        }
-    }
-
-    /**
-     * Sends the result or a Constants.ERROR_CODE_CANCELED error if a result isn't present.
-     */
-    public void finish() {
-        if (mAccountAuthenticatorResponse != null) {
-            // send the result bundle back if set, otherwise send an error.
-            if (mResultBundle != null) {
-                mAccountAuthenticatorResponse.onResult(mResultBundle);
-            } else {
-                mAccountAuthenticatorResponse.onError(AccountManager.ERROR_CODE_CANCELED,
-                        "canceled");
-            }
-            mAccountAuthenticatorResponse = null;
-        }
-        super.finish();
-    }
-}
-package com.cnlive.strike.user.auth;
-
-import android.accounts.AbstractAccountAuthenticator;
-import android.accounts.Account;
-import android.accounts.AccountAuthenticatorResponse;
-import android.accounts.AccountManager;
-import android.accounts.NetworkErrorException;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.cnlive.libs.base.util.LogUtil;
-
-public class UserAccountAuthenticator extends AbstractAccountAuthenticator {
-    private String _tag = "UserAccountAuthenticator";
-    private Context _context;
-
-    public UserAccountAuthenticator(Context context) {
-        super(context);
-        _context = context;
-    }
-
-    public Bundle addAccount(AccountAuthenticatorResponse response, String accountType, String authTokenType, String[] requiredFeatures, Bundle options) {
-        LogUtil.d(_tag, accountType + " - " + authTokenType);
-        Bundle ret = new Bundle();
-        try {
-            Class<?> clazz = Class.forName("com.cnlive.strike.moudle.user.ui.activity.LoginActivity");
-            Intent intent = new Intent(_context, clazz);
-            intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);
-            ret.putParcelable(AccountManager.KEY_INTENT, intent);
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-        return ret;
-    }
-
-
-    @Override
-    public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account, Bundle options) {
-        LogUtil.d(_tag, ".confirmCredentials");
-        return null;
-    }
-
-
-    @Override
-    public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
-        LogUtil.d(_tag, ".editProperties");
-        return null;
-    }
-
-
-    @Override
-    public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle loginOptions) throws NetworkErrorException {
-        LogUtil.d(_tag, ".getAuthToken");
-        return null;
-    }
-
-
-    @Override
-    public String getAuthTokenLabel(String authTokenType) {
-        LogUtil.d(_tag, ".getAuthTokenLabel");
-        return null;
-    }
-
-
-    @Override
-    public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account, String[] features) throws NetworkErrorException {
-        LogUtil.d(_tag, ".hasFeatures");
-        return null;
-    }
-
-
-    @Override
-    public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle loginOptions) {
-        LogUtil.d(_tag, ".updateCredentials");
-        return null;
-    }
-
-}
-package com.cnlive.strike.user.auth;
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.support.annotation.Nullable;
-
-public class UserAccountProvider extends ContentProvider {
-
-    @Override
-    public boolean onCreate() {
-        return false;
-    }
-
-    @Nullable
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-        return null;
-    }
-
-    @Nullable
-    @Override
-    public String getType(Uri uri) {
-        return null;
-    }
-
-    @Nullable
-    @Override
-    public Uri insert(Uri uri, ContentValues values) {
-        return null;
-    }
-
-    @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
-        return 0;
-    }
-
-    @Override
-    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        return 0;
-    }
-}
-package com.cnlive.strike.user.auth;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
-public class UserAccountService extends Service {
-    private UserAccountAuthenticator _saa;
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        IBinder ret = null;
-        if (intent.getAction().equals(android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT))
-            ret = getMovieAuthenticator().getIBinder();
-        return ret;
-    }
-
-    private UserAccountAuthenticator getMovieAuthenticator() {
-        if (_saa == null)
-            _saa = new UserAccountAuthenticator(this);
-        return _saa;
-    }
-}
-package com.cnlive.strike.user.auth;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AccountManagerCallback;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.os.Bundle;
-import android.text.TextUtils;
-
-import com.cnlive.libs.base.application.AppConfig;
-import com.cnlive.libs.util.SharedPreferencesHelper;
-import com.cnlive.strike.data.network.model.UserData;
-import com.cnlive.strike.user.model.CNLiveUserInfo;
-import com.cnlive.strike.user.model.CNLiveUserInfoExt;
-import com.google.gson.Gson;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 用户管理类
- */
-public class UserService {
-    private final String defaultFaceUrl = "http://wjj.ys1.cnliveimg.com/admin/test/head.png";
-
-    private final String baseFaceUrl = "/mobile/images/mobilehead/default/";
-
-    private boolean checkDefaultUrl(String url) {
-        if (!TextUtils.isEmpty(url) && url.contains(baseFaceUrl)) return true;
-        return false;
-    }
-
-    private final String KEY_DEFAULT_ACCOUNT = "defaultaccount";//用户默认账户
-    private final String KEY_USER_DATA_USER_ID = "uid";        //用户uid
-    private final String KEY_USER_DATA_NICKNAME = "nickname";  //用户昵称
-    private final String KEY_USER_DATA_BIGFACEURL = "bigfaceurl";    //用户头像
-    private final String KEY_USER_DATA_FACEURL = "faceurl";    //用户头像
-    private final String KEY_USER_DATA_GENDER = "gender";      //用户性别
-    private final String KEY_USER_DATA_MOBILE = "mobile";      //用户手机号
-    private final String KEY_USER_COUNTRY_CODE = "countryCode";//手机号国家码
-    private final String KEY_USER_DATA_EMAIL = "email";        //用户邮箱
-    private final String KEY_USER_DATA_LOCATION = "location";  //用户地址
-    private final String KEY_USER_TOKEN = "token";             //用户token
-    private final String KEY_USER_FIRST_LOGIN = "firstLogin";             //用户token
-    private final String KEY_USER_SIGN = "sign";               //用户签名
-
-    private static UserService mInstance;
-    private Account activeAccount;
-    private CNLiveUserInfo activeUserInfo;
-    private SharedPreferencesHelper sharedPrefs;
-    private AccountManager mAccountManager;
-    private String mAccountType, mAccountProvide;
-
-    private Map<String, Account> mAccountMap = new HashMap<>();
-
-    /**
-     * 获取用户管理服务实例
-     *
-     * @param context 上下文
-     * @return 管理对象实例
-     */
-    public static synchronized UserService getInstance(Context context) {
-        if (mInstance == null && context != null)
-            mInstance = new UserService(context.getApplicationContext());
-        return mInstance;
-    }
-
-    /**
-     * 默认构造函数(单例)
-     *
-     * @param context
-     */
-    private UserService(Context context) {
-        sharedPrefs = SharedPreferencesHelper.getInstance(context);
-        mAccountManager = AccountManager.get(context);
-        mAccountType = context.getString(R.string.ACCOUNT_TYPE);
-        mAccountProvide = context.getString(R.string.ACCOUNT_PROVIDE);
-        //初始化用户列表
-        initSystemAccounts();
-        //初始化登录用户
-        initAppAccount();
-    }
-
-    /**
-     * 初始化系统用户列表
-     */
-    private void initSystemAccounts() {
-        mAccountMap.clear();
-        Account[] accounts = mAccountManager.getAccountsByType(mAccountType);
-        for (Account account : accounts) {
-            mAccountMap.put(account.name, account);
-        }
-    }
-
-    /**
-     * 初始化默认系统账号
-     */
-    private void initAppAccount() {
-        String accountName = sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT);
-
-        if (mAccountMap.containsKey(accountName)) {
-            activeAccount = mAccountMap.get(accountName);
-            activeUserInfo = getAccountInfo(activeAccount);
-        } else {
-            activeAccount = null;
-            activeUserInfo = null;
-        }
-    }
-
-    /**
-     * 判断App用户登录
-     *
-     * @return 如果登录返回 true
-     */
-    public boolean hasAppAccount() {
-        String accountName = sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT);
-        return mAccountMap.containsKey(accountName) && activeUserInfo != null;
-    }
-
-    /**
-     * 登录App用户 ,录入系统账号信息
-     *
-     * @param username    用户名
-     * @param password    密码
-     * @param userProfile 用户数据
-     */
-    public void loginAppAccount(String username, String password, UserData userProfile) {
-        if (mAccountMap.containsKey(username)) {
-            activeAccount = mAccountMap.get(username);
-            mAccountManager.setPassword(activeAccount, password);
-        } else {
-            activeAccount = new Account(username, mAccountType);
-            mAccountManager.addAccountExplicitly(activeAccount, password, null);
-        }
-
-        // 自动同步
-        ContentResolver.setIsSyncable(activeAccount, mAccountProvide, 1);
-        ContentResolver.setSyncAutomatically(activeAccount, mAccountProvide, true);
-        // 间隔时间为30秒
-        ContentResolver.addPeriodicSync(activeAccount, mAccountProvide, new Bundle(), 1);
-
-        setSystemAccountInfo(activeAccount, userProfile);
-
-        mAccountMap.put(username, activeAccount);
-
-        activeUserInfo = getAccountInfo(activeAccount);
-
-        sharedPrefs.setValue(KEY_DEFAULT_ACCOUNT, username);
-    }
-
-    /**
-     * 登出App用户
-     */
-    public void logoutAppAccount() {
-        AppConfig.setSid("");
-        if (sharedPrefs != null) sharedPrefs.remove(KEY_DEFAULT_ACCOUNT);
-        if (mAccountMap != null) mAccountMap.remove(activeAccount.name);
-        activeAccount = null;
-        activeUserInfo = null;
-        mInstance = null;
-    }
-
-    /**
-     * 获取已经登陆用户信息
-     *
-     * @return 用户信息
-     */
-    public CNLiveUserInfo getAppAccount() {
-        return activeUserInfo;
-    }
-
-    public static String getUid(Context context) {
-        CNLiveUserInfo activeUserInfo = getInstance(context).getAppAccount();
-        return activeUserInfo == null ? "" : activeUserInfo.getUid();
-    }
-
-    public Account getSystemAccount() {
-        return activeAccount;
-    }
-
-    public String getPassword(Account account) {
-        return mAccountManager.getPassword(account);
-    }
-
-    /**
-     * 删除系统账号信息
-     *
-     * @param username 用户名
-     */
-    public void removeUser(String username, AccountManagerCallback<Boolean> callback) {
-        Account account = mAccountMap.remove(username);
-        if (account != null) mAccountManager.removeAccount(account, callback, null);
-    }
-
-    /**
-     * 删除系统账号信息
-     *
-     * @param account 系统账号
-     */
-    public void removeUser(Account account, AccountManagerCallback<Boolean> callback) {
-        if (account != null) {
-            mAccountManager.removeAccount(account, callback, null);
-        }
-    }
-
-
-    /**
-     * 更新系统账号信息
-     *
-     * @param account     系统账号数据
-     * @param userProfile 用户账号数据
-     */
-    private void setSystemAccountInfo(Account account, UserData userProfile) {
-        if (account == null) return;
-        if (checkDefaultUrl(userProfile.getFaceUrl())) {
-            userProfile.setFaceUrl(defaultFaceUrl);
-            userProfile.setBigFaceUrl(defaultFaceUrl);
-        }
-        mAccountManager.setUserData(account, KEY_USER_DATA_USER_ID, userProfile.getUid());
-        mAccountManager.setUserData(account, KEY_USER_DATA_NICKNAME, userProfile.getNickName());
-        mAccountManager.setUserData(account, KEY_USER_DATA_FACEURL, userProfile.getFaceUrl());
-        mAccountManager.setUserData(account, KEY_USER_DATA_BIGFACEURL, userProfile.getBigFaceUrl());
-        mAccountManager.setUserData(account, KEY_USER_DATA_GENDER, userProfile.getGender());
-        mAccountManager.setUserData(account, KEY_USER_DATA_MOBILE, userProfile.getMobile());
-        mAccountManager.setUserData(account, KEY_USER_COUNTRY_CODE, userProfile.getCountryCode());
-        mAccountManager.setUserData(account, KEY_USER_DATA_EMAIL, userProfile.getEmail());
-        mAccountManager.setUserData(account, KEY_USER_FIRST_LOGIN, userProfile.isNewUser() ? "0" : "1");
-        mAccountManager.setUserData(account, KEY_USER_DATA_LOCATION, userProfile.getLocation());
-        mAccountManager.setUserData(account, KEY_USER_TOKEN, userProfile.getToken());
-        setUserExt(userProfile.getExtInfo());
-    }
-
-    public void setUserExt(String ext) {
-        try {
-            CNLiveUserInfoExt extData = new Gson().fromJson(ext, CNLiveUserInfoExt.class);
-
-            mAccountManager.setUserData(activeAccount, KEY_USER_SIGN, extData.getUserSign());
-        } catch (Exception e) {
-        }
-    }
-
-    public void setUserInfo(UserData userProfile) {
-        if (mAccountMap.containsKey(sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT))) {
-            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_USER_ID, userProfile.getUid());
-            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_NICKNAME, userProfile.getNickName());
-            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_FACEURL, userProfile.getFaceUrl());
-            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_BIGFACEURL, userProfile.getBigFaceUrl());
-            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_GENDER, userProfile.getGender());
-            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_MOBILE, userProfile.getMobile());
-            mAccountManager.setUserData(activeAccount, KEY_USER_COUNTRY_CODE, userProfile.getCountryCode());
-            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_EMAIL, userProfile.getEmail());
-            mAccountManager.setUserData(activeAccount, KEY_USER_FIRST_LOGIN, userProfile.isNewUser() ? "0" : "1");
-            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_LOCATION, userProfile.getLocation());
-            setUserExt(userProfile.getExtInfo());
-
-            activeUserInfo = getAccountInfo(activeAccount);
-        }
-    }
-
-    public void setUserSign(String userSign) {
-        if (mAccountMap.containsKey(sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT))) {
-            activeUserInfo.setUserSign(userSign);
-            mAccountManager.setUserData(activeAccount, KEY_USER_SIGN, userSign);
-        }
-    }
-
-    public void setUserFaceUrl(String faceUrl, String bigFaceUrl) {
-        if (mAccountMap.containsKey(sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT))) {
-            activeUserInfo.setFaceUrl(faceUrl);
-            activeUserInfo.setBigFaceUrl(bigFaceUrl);
-            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_FACEURL, faceUrl);
-            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_BIGFACEURL, bigFaceUrl);
-        }
-    }
-
-    public void setUserNickName(String nickName) {
-        if (mAccountMap.containsKey(sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT))) {
-            activeUserInfo.setNickName(nickName);
-            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_NICKNAME, nickName);
-        }
-    }
-
-    public void setPhoneNumber(String phoneNumber, String countryCode) {
-        if (mAccountMap.containsKey(sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT))) {
-            activeUserInfo.setMobile(phoneNumber);
-            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_MOBILE, phoneNumber);
-            mAccountManager.setUserData(activeAccount, KEY_USER_COUNTRY_CODE, countryCode);
-        }
-    }
-
-    /**
-     * 更新用户性别
-     *
-     * @param sex
-     */
-    public void setUserSex(String sex) {
-        if (mAccountMap.containsKey(sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT))) {
-            activeUserInfo.setGender(sex);
-            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_GENDER, sex);
-        }
-    }
-
-    /**
-     * 更新 用户信息的地址
-     *
-     * @param location
-     */
-    public void setUserLocation(String location) {
-        if (mAccountMap.containsKey(sharedPrefs.getValue(KEY_DEFAULT_ACCOUNT))) {
-            activeUserInfo.setLocation(location);
-            mAccountManager.setUserData(activeAccount, KEY_USER_DATA_LOCATION, location);
-        }
-    }
-
-    /**
-     * 通过系统账号获取用户账号信息
-     *
-     * @param account 系统账号数据
-     * @return 用户账号信息
-     */
-    public CNLiveUserInfo getAccountInfo(Account account) {
-        if (account == null) return null;
-
-        CNLiveUserInfo user = new CNLiveUserInfo();
-        user.setUid(mAccountManager.getUserData(account, KEY_USER_DATA_USER_ID));
-        user.setNickName(mAccountManager.getUserData(account, KEY_USER_DATA_NICKNAME));
-        user.setFaceUrl(mAccountManager.getUserData(account, KEY_USER_DATA_FACEURL));
-        user.setBigFaceUrl(mAccountManager.getUserData(account, KEY_USER_DATA_BIGFACEURL));
-        user.setGender(mAccountManager.getUserData(account, KEY_USER_DATA_GENDER));
-        user.setMobile(mAccountManager.getUserData(account, KEY_USER_DATA_MOBILE));
-        user.setCountryCode(mAccountManager.getUserData(account, KEY_USER_COUNTRY_CODE));
-        user.setEmail(mAccountManager.getUserData(account, KEY_USER_DATA_EMAIL));
-        user.setNewUser("0".equals(mAccountManager.getUserData(account, KEY_USER_FIRST_LOGIN)));
-        user.setLocation(mAccountManager.getUserData(account, KEY_USER_DATA_LOCATION));
-        user.setToken(mAccountManager.getUserData(account, KEY_USER_TOKEN));
-        user.setUserSign(mAccountManager.getUserData(account, KEY_USER_SIGN));
-
-        AppConfig.setSid(user.getUid());
-
-        return user;
-    }
-
-    /**
-     * 获取系统账号列表
-     *
-     * @return 用户列表
-     */
-    public Account[] getUserList() {
-        return mAccountManager.getAccountsByType(mAccountType);
-    }
-
-
-    public static boolean hasAppAccount(Context context) {
-        return UserService.getInstance(context).getAppAccount() != null;
-    }
-}
-package com.cnlive.strike.user.auth;
-
-import android.accounts.Account;
-import android.app.Service;
-import android.content.AbstractThreadedSyncAdapter;
-import android.content.ContentProviderClient;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SyncResult;
-import android.os.Bundle;
-import android.os.IBinder;
-
-public class UserSyncService extends Service {
-
-    private static final Object syncLock = new Object();
-    private static SyncAdapter syncAdapter = null;
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return syncAdapter.getSyncAdapterBinder();
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        synchronized (syncLock) {
-            if (syncAdapter == null) {
-                syncAdapter = new SyncAdapter(getApplicationContext(), true);
-            }
-        }
-    }
-
-
-    class SyncAdapter extends AbstractThreadedSyncAdapter {
-
-        public SyncAdapter(Context context, boolean autoInitialize) {
-            super(context, autoInitialize);
-        }
-
-        @Override
-        public void onPerformSync(Account account, Bundle extras, String authority, ContentProviderClient provider, SyncResult syncResult) {
-        }
-
-    }
-}
 \ No newline at end of file
-package com.cnlive.strike.user.model;
-
-import android.text.TextUtils;
-
-import java.io.Serializable;
-
-/**
- * 开放平台-用户信息
- *
- * @author Lynn
- * @date 2017/12/22
- */
-
-public class CNLiveUserInfo implements Serializable {
-    //用户id
-    private String uid;
-    //昵称
-    private String nickName;
-    //性别
-    private String gender;
-    //地址
-    private String location;
-    //头像
-    private String faceUrl;
-    //手机号
-    private String mobile;
-    //邮箱
-    private String email;
-    //平台TOKEN
-    private String token;
-    //新用户
-    private boolean isNewUser;
-    //个性签名
-    private String userSign;
-    //用户头像大图
-    private String bigFaceUrl;
-    //手机号国家码
-    private String countryCode;
-
-    public String getUid() {
-        return uid;
-    }
-
-    public void setUid(String uid) {
-        this.uid = uid;
-    }
-
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    public String getGender() {
-        return gender;
-    }
-
-    public void setGender(String gender) {
-        this.gender = gender;
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public String getFaceUrl() {
-        return faceUrl;
-    }
-
-    public void setFaceUrl(String faceUrl) {
-        this.faceUrl = faceUrl;
-    }
-
-    public String getBigFaceUrl() {
-        if (TextUtils.isEmpty(bigFaceUrl)) return faceUrl;
-        return bigFaceUrl;
-    }
-
-    public void setBigFaceUrl(String bigFaceUrl) {
-        this.bigFaceUrl = bigFaceUrl;
-    }
-
-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public boolean isNewUser() {
-        return isNewUser;
-    }
-
-    public void setNewUser(boolean newUser) {
-        isNewUser = newUser;
-    }
-
-    public String getUserSign() {
-        return userSign;
-    }
-
-    public void setUserSign(String userSign) {
-        this.userSign = userSign;
-    }
-
-    public String getCountryCode() {
-        return countryCode;
-    }
-
-    public void setCountryCode(String countryCode) {
-        this.countryCode = countryCode;
-    }
-}
-package com.cnlive.strike.user.model;
-
-/**
- * Created by xiansong on 2018/4/3.
- */
-
-public class CNLiveUserInfoExt {
-
-
-    @Override
-    public String toString() {
-        return "CNLiveUserInfoExt{" +
-                "userSign='" + userSign + '\'' +
-                '}';
-    }
-
-    private String userSign ;
-
-    public String getUserSign() {
-        return userSign;
-    }
-
-    public void setUserSign(String userSign) {
-        this.userSign = userSign;
-    }
-
-
-}
-<resources>
-    <string name="app_name">app_user</string>
-</resources>
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen></PreferenceScreen>
-<?xml version="1.0" encoding="utf-8"?>
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="@string/ACCOUNT_TYPE"
-    android:allowParallelSyncs="false"
-    android:contentAuthority="@string/ACCOUNT_PROVIDE"
-    android:isAlwaysSyncable="true"
-    android:supportsUploading="false"
-    android:userVisible="true" />
 \ No newline at end of file
-<?xml version="1.0" encoding="utf-8"?>
-<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="@string/ACCOUNT_TYPE"
-    android:icon="@mipmap/icon_account"
-    android:smallIcon="@mipmap/icon_account"
-    android:label="@string/ACCOUNT_LABEL"
-    android:accountPreferences="@xml/account_preferences" />
 \ No newline at end of file
@@ -98,5 +98,6 @@ ext {
  
     libCnUtil = '3.1.3'
     libAnalytics = '1.0.8'
+    okhttp = '3.8.1'
  
 }
-/build
-apply plugin: 'com.android.library'
-apply plugin: 'com.alibaba.arouter'
-
-android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
-    defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName(), AROUTER_GENERATE_DOC: "enable"]
-            }
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    dataBinding {
-        enabled true
-    }
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.cnlive.libs:base:$rootProject.libBase"
-    api "com.cnlive.libs:network:$rootProject.libNetwork"
-    implementation 'com.alibaba:arouter-api:1.4.0'
-    annotationProcessor 'com.alibaba:arouter-compiler:1.2.1'
-}
-# 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
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cnlive.libs.data.network">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-</manifest>
-package com.cnlive.strike.data.network.action;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.text.TextUtils;
-
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.cnlive.libs.base.logic.Logic;
-import com.cnlive.strike.data.network.api.ApiRequest;
-import com.cnlive.strike.data.network.api.ApiServiceIntegra;
-import com.cnlive.strike.data.network.model.AddIntegration;
-import com.cnlive.strike.data.network.model.BaseInfo;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Map;
-
-public class CoinRainAction {
-
-    @SuppressLint("SimpleDateFormat")
-    private static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-    public  static boolean isGo = true;
-
-    public static void code(Context context, String uid, String taskId, String contentId, String addtype) {
-        if (context == null) return;
-
-        Map<String, String> maps = new HashMap<>();
-        maps.put("sid", uid);
-        maps.put("taskId", taskId);
-        maps.put("contentId", contentId);
-        Logic.create(maps)
-                .action((Logic.Action<Map<String, String>, BaseInfo<AddIntegration.DataBean>>) (data, callback) -> ApiRequest.service(ApiServiceIntegra.class, api -> api.addIntegration(data)).subscribe(context, callback))
-                .<BaseInfo<AddIntegration.DataBean>>event()
-                .setSuccessCallback(data -> startCoinRain(context, uid, addtype, data))
-                .start();
-    }
-
-    private static void startCoinRain(Context context, String uid, String addtype, BaseInfo<AddIntegration.DataBean> data) {
-        if (data == null) return;
-        if (data.getData() == null) return;
-        if (TextUtils.isEmpty(data.getData().getScore())) return;
-
-        String score = data.getData().getScore();
-        String desc = data.getData().getDesc();
-        String descEnd = data.getData().getDescEnd();
-        String currentTime = getCurrentTime();
-
-        SharedPreferences.Editor editor = context.getSharedPreferences(addtype, Context.MODE_PRIVATE).edit();
-
-        editor.putBoolean(uid, data.getData().isStatus());
-        editor.putString(uid + "time", currentTime);
-        editor.apply();
-        isGo = false;
-        ARouter.getInstance().build("/add/CoinRainActivity")
-                .withString("type", "addintegration")
-                .withString("score", score)
-                .withString("desc",desc)
-                .withString("descend",descEnd)
-                .navigation(context);
-    }
-
-    public static String getCurrentTime() {
-        return format.format(Calendar.getInstance().getTime());
-    }
-}
-package com.cnlive.strike.data.network.api;
-
-import android.content.Context;
-import android.util.Log;
-
-import com.cnlive.libs.base.application.AppConfig;
-import com.cnlive.libs.base.logic.callback.DataCallback;
-import com.cnlive.libs.data.network.ApiBuild;
-import com.cnlive.libs.data.network.Subscriber;
-import com.cnlive.libs.data.network.interceptor.DESEncryptInterceptor;
-import com.cnlive.libs.data.network.interceptor.DefaultEncryptInterceptor;
-import com.cnlive.libs.data.network.interceptor.NetPPEncryptInterceptor;
-import com.cnlive.libs.data.network.interceptor.NetPPPayEncryptInterceptor;
-import com.cnlive.libs.data.network.interceptor.SignEncrypt2Interceptor;
-import com.cnlive.libs.data.network.interceptor.SignEncryptInterceptor;
-import com.cnlive.strike.data.network.model.BaseInfo;
-
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
-import okhttp3.Interceptor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import retrofit2.adapter.rxjava2.Result;
-
-import static com.cnlive.libs.base.logic.Config.SUCCESS;
-
-
-/**
- * Created by xiansong on 2017/9/8.
- */
-
-public class ApiRequest<Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo> {
-
-    private static final int OKHTTP_KEEP_ALIVE_DURATION_SECONDS = 10;
-
-    //网家家 接口域名
-    public static final String BASE_URL = "https://apiwjj.cnlive.com/";
-    //网家家 测试环境 接口域名
-    public static final String DEBUG_URL = "http://apiwjjtest.cnlive.com/";
-    //IM 接口域名
-    private static final String IM_URL = "https://wjjim.cnlive.com/";
-    //IM 测试环境 接口域名
-    public static final String IM_DEBUG_URL = "http://imtest.cnlive.com/";
-    //OPEN API 接口域名
-    private static final String OPEN_URL = "https://api.cnlive.com/";
-    //WJJ JSON
-    private static final String JSON_URL = "https://wjj.ys1.cnliveimg.com/";
-
-    private static final String DEBUG_CMS_URL = "http://cmstest.cnlive.com:8768/";
-    // TODO: 2018/11/27 cms正式地址
-    private static final String CMS_URL = "http://cms.cnlive.com:8768/";
-
-    public static <T> String baseEndpoint() {
-        return AppConfig.isDebug() ? DEBUG_URL : BASE_URL;
-    }
-
-    public static <T> String baseIMEndpoint() {
-        return AppConfig.isDebug() ? IM_DEBUG_URL : IM_URL;
-    }
-
-    public static <T> String baseCMSEndpoint() {
-        return AppConfig.isDebug() ? DEBUG_CMS_URL : CMS_URL;
-    }
-
-    private static <T> String serviceEndpoint(Class<T> clazz) {
-        if (clazz == ApiServiceCNLiveIm.class) return baseIMEndpoint();
-        else if (clazz == ApiServiceApplyRefundReason.class) return JSON_URL;
-        else if (clazz == ApiServiceOpen.class) return OPEN_URL;
-        else if (clazz == ApiServiceCms.class) return baseCMSEndpoint();
-        else return baseEndpoint();
-    }
-
-    public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
-    ApiRequest<Observable, BaseData> observable(Class<Service> clazz, ApiBuild.Api<Service, Observable, BaseData> api) {
-        //添加签名校验-杨帅
-        return observable(clazz, false, api, new SignEncryptInterceptor());
-    }
-
-    public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
-    ApiRequest<Observable, BaseData> observable(Class<Service> clazz, ApiBuild.Api<Service, Observable, BaseData> api, Interceptor interceptor) {
-        return observable(clazz, false, api, interceptor);
-    }
-
-    public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
-    ApiRequest<Observable, BaseData> observable(Class<Service> clazz, boolean decode, ApiBuild.Api<Service, Observable, BaseData> api, Interceptor interceptor) {
-        ApiRequest<Observable, BaseData> request = new ApiRequest<>();
-        ApiBuild<Service, Observable, BaseData> build = ApiBuild.service(clazz, api);
-        build.setEndpoint(serviceEndpoint(clazz));
-        if (interceptor != null) build.addInterceptor(interceptor);
-        request.observable = build.build(decode, OKHTTP_KEEP_ALIVE_DURATION_SECONDS);
-        return request;
-    }
-
-    public static <Service> Service serviceNoSign(Class<Service> clazz) {
-        return service(clazz, (Interceptor) new DefaultEncryptInterceptor());
-    }
-
-    public static <Service> Service service(Class<Service> clazz) {
-        return service(clazz, new SignEncryptInterceptor());
-    }
-
-    public static <Service> Service service(Class<Service> clazz, boolean valueUrlencode, boolean responseUrldecode) {
-        return service(clazz, responseUrldecode, new SignEncryptInterceptor(valueUrlencode));
-    }
-
-    public static <Service> Service serviceDES(Class<Service> clazz) {
-        return service(clazz, new DESEncryptInterceptor());
-    }
-
-    public static <Service> Service serviceNetPP(Class<Service> clazz) {
-        return service(clazz, new NetPPEncryptInterceptor());
-    }
-
-    public static <Service> Service serviceNetPPPay(Class<Service> clazz) {
-        return service(clazz, new NetPPPayEncryptInterceptor());
-    }
-
-
-    private static <Service> Service service(Class<Service> clazz, Interceptor... interceptor) {
-        return service(clazz, false, interceptor);
-    }
-
-    private static <Service> Service service(Class<Service> clazz, boolean decode, Interceptor... interceptor) {
-        return ApiBuild.service(clazz, null)
-                .setEndpoint(serviceEndpoint(clazz))
-                .addInterceptor(interceptor)
-                .service(decode, OKHTTP_KEEP_ALIVE_DURATION_SECONDS);
-    }
-
-    public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
-    ApiRequest<Observable, BaseData> serviceNoSign(Class<Service> clazz, ApiBuild.Api<Service, Observable, BaseData> api) {
-        return service(clazz, api, new DefaultEncryptInterceptor());
-    }
-
-    public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
-    ApiRequest<Observable, BaseData> service(Class<Service> clazz, ApiBuild.Api<Service, Observable, BaseData> api) {
-        return service(clazz, api, new SignEncryptInterceptor());
-    }
-
-    public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
-    ApiRequest<Observable, BaseData> serviceNewVersion(Class<Service> clazz, long connectTimeout, long readTimeout, ApiBuild.Api<Service, Observable, BaseData> api) {
-        return serviceNewVersion(clazz, false, api, connectTimeout, readTimeout, new SignEncryptInterceptor());
-    }
-
-
-    public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
-    ApiRequest<Observable, BaseData> service(Class<Service> clazz, ApiBuild.Api<Service, Observable, BaseData> api, boolean valueUrlencode, boolean responseUrldecode) {
-        return service(clazz, responseUrldecode, api, new SignEncryptInterceptor(valueUrlencode));
-    }
-
-    public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
-    ApiRequest<Observable, BaseData> serviceDES(Class<Service> clazz, ApiBuild.Api<Service, Observable, BaseData> api) {
-        return service(clazz, api, new DESEncryptInterceptor());
-    }
-
-    public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
-    ApiRequest<Observable, BaseData> service2encode(Class<Service> clazz, ApiBuild.Api<Service, Observable, BaseData> api) {
-        return service(clazz, api, new SignEncrypt2Interceptor());
-    }
-
-    public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
-    ApiRequest<Observable, BaseData> serviceNetPP(Class<Service> clazz, ApiBuild.Api<Service, Observable, BaseData> api) {
-        return service(clazz, api, new NetPPEncryptInterceptor());
-    }
-
-    public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
-    ApiRequest<Observable, BaseData> serviceNetPPPay(Class<Service> clazz, ApiBuild.Api<Service, Observable, BaseData> api) {
-        return service(clazz, api, new NetPPPayEncryptInterceptor());
-    }
-
-    private static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
-    ApiRequest<Observable, BaseData> service(Class<Service> clazz, ApiBuild.Api<Service, Observable, BaseData> api, Interceptor... interceptor) {
-        return service(clazz, false, api, interceptor);
-    }
-
-    private static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
-    ApiRequest<Observable, BaseData> service(Class<Service> clazz, boolean decode, ApiBuild.Api<Service, Observable, BaseData> api, Interceptor... interceptor) {
-
-        ApiRequest<Observable, BaseData> request = new ApiRequest<>();
-
-        request.observable = ApiBuild.service(clazz, api)
-                .setEndpoint(serviceEndpoint(clazz))
-                .addInterceptor(interceptor)
-                .build(decode, OKHTTP_KEEP_ALIVE_DURATION_SECONDS);
-
-        return request;
-    }
-
-
-    private static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
-    ApiRequest<Observable, BaseData> serviceNewVersion(Class<Service> clazz, boolean decode, ApiBuild.Api<Service, Observable, BaseData> api, long connectTimeout, long readTimeout, Interceptor... interceptor) {
-
-        ApiRequest<Observable, BaseData> request = new ApiRequest<>();
-
-        request.observable = ApiBuild.service(clazz, api)
-                .setEndpoint(serviceEndpoint(clazz))
-                .setConnectTimeout(connectTimeout)
-                .setReadTimeout(readTimeout)
-                .addInterceptor(interceptor)
-                .build(decode);
-
-        return request;
-    }
-
-    private Observable observable;
-
-    private ApiRequest() {
-    }
-
-    public static <Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
-    Disposable subscribe(Observable observable, Subscriber<BaseData> subscriber) {
-        return observable.take(1)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(subscriber.next, subscriber.error, subscriber.complete, subscriber.subscribe);
-    }
-
-    public Disposable subscribe(Subscriber<BaseData> subscriber) {
-        return observable.take(1)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(subscriber.next, subscriber.error, subscriber.complete, subscriber.subscribe);
-    }
-
-    public Disposable subscribe(Context context, DataCallback<BaseData> callback) {
-        Subscriber<BaseData> subscriber = new Subscriber<BaseData>(context) {
-            @Override
-            public void onCompleted(String s, String s1, BaseData data) {
-                if (callback == null) return;
-                callback.callback(SUCCESS, "", data);
-            }
-
-            @Override
-            public void onError(String code, String message) {
-                if (callback == null) return;
-                int errorCode = -1;
-                try {
-                    errorCode = Integer.valueOf(code);
-                } catch (Exception ignored) {
-                }
-
-                Log.e("LynnTest read", code + " \n " + message);
-                callback.callback(errorCode, message, null);
-            }
-        };
-
-        return observable.take(1)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(subscriber.next, subscriber.error, subscriber.complete, subscriber.subscribe);
-    }
-
-    public static Disposable loadData(String url, DataCallback<String> callback) {
-        return io.reactivex.Observable
-                .just(url)
-                .map(s -> {
-                    Response response = null;
-                    String data = null;
-                    try {
-                        OkHttpClient client = new OkHttpClient();//创建OkHttpClient对象
-                        Request request = new Request.Builder().url(url).build();
-                        response = client.newCall(request).execute();//得到Response 对
-                        if (response.isSuccessful()) data = response.body().string();
-                    } catch (Exception e) {
-                        Log.e("Api", "", e);
-                    }
-
-                    if (data != null) {
-//                        Log.e("DemoView", "response.code()==" + response.code());
-//                        Log.e("DemoView", "response.message()==" + response.message());
-//                        Log.e("DemoView", "res==" + data);
-                        //此时的代码执行在子线程，修改UI的操作请使用handler跳转到UI线程。
-                    }
-                    return data;
-                })
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(s -> callback.callback(0, "", s));
-    }
-}
-package com.cnlive.strike.data.network.api;
-
-
-import com.cnlive.strike.data.network.model.BaseInfo;
-
-import java.util.Map;
-
-import io.reactivex.Observable;
-import retrofit2.adapter.rxjava2.Result;
-import retrofit2.http.POST;
-import retrofit2.http.QueryMap;
-
-/**
- * 达人有关的接口
- */
-public interface ApiServiceAnnouncementCheck {
-
-    /**
-     * 检查敏感词
-     */
-    @POST("Daren/announcementCheck/checkFeaturedGroup.action")
-    Observable<Result<BaseInfo>> checkSensitiveWord(@QueryMap() Map<String, String> maps);
-
-}
-
-package com.cnlive.strike.data.network.api;
-
-
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.GroupLimitInfo;
-import com.cnlive.strike.data.network.model.GroupMemberConfig;
-import com.cnlive.strike.data.network.model.LinkAddressModel;
-
-import java.util.List;
-
-import io.reactivex.Observable;
-import retrofit2.Call;
-import retrofit2.adapter.rxjava2.Result;
-import retrofit2.http.GET;
-
-/**
- * Created by Lynn on 2018/2/7.
- */
-
-public interface ApiServiceApplyRefundReason {
-
-    @GET("json/refundReason.json")
-    Call<List<String>> getRefundReason();
-
-    @GET("json/wjj_user_terms.json")
-    Call<List<LinkAddressModel>> getDarenJson();
-
-    @GET("json/GroupMemberLimit.json")
-    Observable<Result<BaseInfo<GroupMemberConfig>>> getGroupMember();
-
-    @GET("json/GroupMemberLimit.json")
-    Observable<Result<BaseInfo<GroupLimitInfo>>> getGroupLimit();
-
-}
-package com.cnlive.strike.data.network.api;
-
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.BlackListInfo;
-import com.cnlive.strike.data.network.model.LetHimNoSee;
-import com.cnlive.strike.data.network.model.LetHimNoSeeFlag;
-import com.cnlive.strike.data.network.model.NoSeeHim;
-
-import java.util.List;
-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;
-import retrofit2.http.QueryMap;
-
-public interface ApiServiceBlackList {
-
-    /**
-     * 加入黑名单
-     *
-     * @param maps
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("Daren/blackList/blackListAdd.action")
-    Observable<Result<BaseInfo<BlackListInfo>>> addFriendInBlackList(@FieldMap Map<String, String> maps);
-
-    /**
-     * 移除黑名单
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/blackList/blackListDelete.action")
-    Observable<Result<BaseInfo<BlackListInfo>>> deleteFriendInBlackList(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 拉取黑名单列表
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/blackList/blackListGet.action")
-    Observable<Result<BaseInfo<BlackListInfo>>> getFriendInBlackList(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 生活圈和视屏-不看他的
-     * 杨帅 2019-4-23
-     * sid	String	true	sid
-     * appId	String	true	appId
-     * friendIds	String	true	好友sid, 格式:[11111,2222,3333]
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/moment/addNoLookFsids.action")
-    Observable<Result<BaseInfo>> addNoLookFsids(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 取消:生活圈和视屏-不看他的列表
-     * 杨帅 2019-4-23
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/moment/getNoLookFsids.action")
-    Observable<Result<BaseInfo<NoSeeHim>>> getNoLookFsids(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 取消:生活圈和视屏-不看他的
-     * 杨帅 2019-4-23
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/moment/delNoLookFsids.action")
-    Observable<Result<BaseInfo>> cancelNoLookFsids(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 取消:生活圈和视屏-不让他人看 按钮标志
-     * 杨帅 2019-4-24
-     * sid	String	true	sid
-     * friendIds	String	true	好友id
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/moment/doNotletFsidsType.action")
-    Observable<Result<BaseInfo<LetHimNoSeeFlag>>> getLetHimNoSeeFlag(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 生活圈和视屏-不让他人看
-     * 杨帅 2019-4-23
-     * sid	String	true	sid
-     * friendIds	String	true	好友id 格式:[111,222,333]
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/moment/addDoNotletFsids.action")
-    Observable<Result<BaseInfo>> addDoNotletFsids(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 取消:生活圈和视屏-不让他人看
-     * 杨帅 2019-4-23
-     * sid	String	true	sid
-     * friendIds	String	true	好友id 格式:[111,222,333]
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/moment/delDoNotletFsids.action")
-    Observable<Result<BaseInfo>> cancelDoNotletFsids(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 生活圈和视屏-不让他人看列表
-     * 杨帅 2019-4-23
-     * sid	String	true	sid
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/moment/getDoNotletFsids.action")
-    Observable<Result<BaseInfo<LetHimNoSee>>> getDoNotletFsids(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 取消:生活圈和视屏-不看他 按钮标志
-     * 杨帅 2019-4-24
-     * sid	String	true	sid
-     * friendIds	String	true	好友id
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/moment/noLookFsidsType.action")
-    Observable<Result<BaseInfo<LetHimNoSeeFlag>>> getNoSeeHimFlag(@QueryMap() Map<String, String> maps);
-}
-package com.cnlive.strike.data.network.api;
-
-
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.CheckBlackListRelation;
-import com.cnlive.strike.data.network.model.FriendListInfo;
-import com.cnlive.strike.data.network.model.SearchByPhoneNumberData;
-import com.cnlive.strike.data.network.model.UploadContactData;
-
-import java.util.List;
-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;
-import retrofit2.http.QueryMap;
-
-/**
- * im有关的接口
- */
-public interface ApiServiceCNLiveIm {
-
-    /**
-     * 上传通讯录接口
-     *
-     * @param maps
-     * @return
-     */
-    @POST("CnliveIM/notify/uploadContacts.action")
-    Observable<Result<BaseInfo<List<UploadContactData>>>> uploadContacts(@QueryMap Map<String, String> maps);
-
-    /**
-     * 按手机号查找
-     *
-     * @param maps
-     * @return
-     */
-    @POST("CnliveIM/notify/searchByPhoneNumber.action")
-    Observable<Result<BaseInfo<SearchByPhoneNumberData>>> searchByPhoneNumber(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 我要催单
-     *
-     * @param maps
-     * @return
-     */
-    @POST("CnliveIM/notify/remind.action")
-    Observable<Result<BaseInfo>> remind(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 后台代替用户发送自定义消息
-     *
-     * @param maps
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("CnliveIM/notify/custMsgPush.action")
-    Observable<Result<BaseInfo>> custMsgPush(@FieldMap Map<String, String> maps);
-
-    /**
-     * 发送文本消息
-     *
-     * @param maps
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("CnliveIM/notify/textMsgPush.action")
-    Observable<Result<BaseInfo>> textMsgPush(@FieldMap Map<String, String> maps);
-
-    /**
-     * 同意进群
-     *
-     * @param maps
-     * @return
-     */
-    @POST("CnliveIM/notify/addGroup.action")
-    Observable<Result<BaseInfo<String>>> addGroup(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 发送消息撤回
-     *
-     * @param maps
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("CnliveIM/notify/revokeBatchSendMsg.action")
-    Observable<Result<BaseInfo>> revokeBatchSendMsg(@FieldMap() Map<String, String> maps);
-
-    /**
-     * 获取好友名单
-     */
-    @FormUrlEncoded
-    @POST("CnliveIM/notify/checkFriend.action")
-    Observable<Result<BaseInfo<FriendListInfo>>> getFriendsList(@FieldMap() Map<String, String> maps);
-
-    /**
-     * 查询黑名单状态
-     */
-    @FormUrlEncoded
-    @POST("CnliveIM/notify/checkBlackList.action")
-    Observable<Result<BaseInfo<CheckBlackListRelation>>> checkBlackList(@FieldMap() Map<String, String> maps);
-
-}
-
-package com.cnlive.strike.data.network.api;
-
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.CategoryDarensData;
-import com.cnlive.strike.data.network.model.CenterPageData;
-import com.cnlive.strike.data.network.model.ChannelTabList;
-
-import java.util.Map;
-
-import io.reactivex.Observable;
-import retrofit2.adapter.rxjava2.Result;
-import retrofit2.http.Headers;
-import retrofit2.http.POST;
-import retrofit2.http.QueryMap;
-
-/**
- * Created by Lynn on 2018/3/14.
- */
-
-public interface ApiServiceCenter {
-
-    /**
-     * 分类首页
-     *
-     * @return
-     */
-    @Headers("cache:5")
-    @POST("Daren/classify/getNewCenterPage.action")
-    Observable<Result<BaseInfo<CenterPageData>>> getCenterPage(@QueryMap() Map<String, String> map);
-
-    /**
-     * 分类二级页面达人列表
-     *
-     * @return
-     */
-    @Headers("cache:5")
-    @POST("Daren/classify/getNewDarensByCategory.action")
-    Observable<Result<BaseInfo<CategoryDarensData>>> getDarensByCategory(@QueryMap() Map<String, String> map);
-
-    /**
-     * 分类 Tab List
-     *
-     * @return
-     */
-    @Headers("cache:5")
-    @POST("Daren/center/getChannel.action")
-    Observable<Result<BaseInfo<ChannelTabList>>> getChannel(@QueryMap() Map<String, String> map);
-}
-package com.cnlive.strike.data.network.api;
-
-import com.cnlive.strike.data.network.model.AudioAlbumDetailsInfo;
-import com.cnlive.strike.data.network.model.AudioChapterInfo;
-import com.cnlive.strike.data.network.model.AudioHistoryInfo;
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.BaseVideoInfo;
-import com.cnlive.strike.data.network.model.ClassifyChannelTabList;
-import com.cnlive.strike.data.network.model.LivingPlayBackData;
-import com.cnlive.strike.data.network.model.PlayAudioDetailData;
-import com.cnlive.strike.data.network.model.PlayVodItemInfo;
-import com.cnlive.strike.data.network.model.PlayerPgcLiveDetail;
-import com.cnlive.strike.data.network.model.PlayerVodDetail;
-import com.cnlive.strike.data.network.model.VideoInfo;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import io.reactivex.Observable;
-import okhttp3.RequestBody;
-import retrofit2.adapter.rxjava2.Result;
-import retrofit2.http.Body;
-import retrofit2.http.DELETE;
-import retrofit2.http.FormUrlEncoded;
-import retrofit2.http.GET;
-import retrofit2.http.HTTP;
-import retrofit2.http.Headers;
-import retrofit2.http.POST;
-import retrofit2.http.Path;
-import retrofit2.http.QueryMap;
-import retrofit2.http.Url;
-
-/**
- * Created by Lynn on 2018/11/27.
- */
-
-public interface ApiServiceCms {
-    /**
-     * 分类 Tab List
-     *
-     * @return
-     */
-    @GET("contentApi/app")
-    Observable<Result<BaseInfo<List<ClassifyChannelTabList>>>> getChannelTab(@QueryMap() Map<String, String> map);
-
-    @GET("playApi/play")
-    Observable<Result<BaseInfo<PlayerVodDetail>>> getPlayerVodDetail(@QueryMap() Map<String, String> map);
-
-    @GET("playApi/play")
-    Observable<Result<BaseInfo<PlayerPgcLiveDetail>>> getPlayerLiveDetail(@QueryMap() Map<String, String> map);
-
-    @GET("playApi/play")
-    Observable<Result<BaseInfo<PlayAudioDetailData>>> getPlayAudioDetail(@QueryMap() Map<String, String> map);
-
-    @GET("playApi/moreList")
-    Observable<Result<BaseInfo<PlayVodItemInfo>>> checkPlayItem(@QueryMap Map<String, String> maps);
-
-    @GET("contentApi/{id}")
-    Observable<Result<BaseInfo<BaseVideoInfo>>> getVideoInfo(@Path("id") String id);
-
-
-    /**
-     * 获取 直播状态的视频 或者回放的视频列表
-     *
-     * @param maps liveType 1 是直播 4 是回放
-     * @return
-     */
-    @GET("contentApi/playList")
-    Observable<Result<BaseInfo<VideoInfo>>> getVideoList(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 预约
-     *
-     * @param maps
-     * @return
-     */
-    @GET("contentApi/liveAppoint")
-    Observable<Result<BaseInfo<Object>>> reservationLive(@QueryMap() Map<String, Object> maps);
-
-    /**
-     * 获取音频专辑详情页
-     *
-     * @param maps
-     * @return
-     */
-    @GET("contentApi/getAlbumMsg")
-    Observable<Result<BaseInfo<AudioAlbumDetailsInfo>>> getAlbumMsg(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 获取音频列表
-     *
-     * @param maps
-     * @return
-     */
-    @GET("contentApi/albumAudioList")
-    Observable<Result<BaseInfo<List<AudioChapterInfo>>>> getAlbumMsgList(@QueryMap() Map<String, Object> maps);
-
-    /**
-     * 获取音频播放的历史纪录
-     *
-     * @param maps
-     * @return
-     */
-    @GET("recordApi/getRecords")
-    Observable<Result<BaseInfo<List<AudioHistoryInfo>>>> getRecords(@QueryMap() Map<String, String> maps);
-
-
-    //    @DELETE("recordApi")
-    @POST("recordApi/delete")
-    Observable<Result<BaseInfo<Object>>> deleteAudioHistory(@QueryMap Map<String, String> body);
-
-    /**
-     * contentId : 内容id
-     * schedule	: 进度  double
-     * sid
-     * model  5
-     *
-     * @return
-     */
-    @POST("recordApi/end")
-    Observable<Result<BaseInfo<Object>>> audioPlayEnd(@QueryMap Map<String, String> body);
-
-    /**
-     * 获取直播回放,短视频的数据
-     *
-     * @param path
-     * @param body
-     * @return
-     */
-    @GET()
-    Observable<Result<BaseInfo<LivingPlayBackData>>> getLivingPlayBackList(@Url String path, @QueryMap Map<String, String> body);
-
-
-}
-package com.cnlive.strike.data.network.api;
-
-import com.cnlive.strike.data.network.model.AppVersionInfo;
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.CommonMsgInfo;
-import com.cnlive.strike.data.network.model.ShareAppInfo;
-import com.cnlive.strike.data.network.model.ShareDarenInfo;
-import com.cnlive.strike.data.network.model.TRTCRoomInfo;
-
-import java.util.Map;
-
-import io.reactivex.Observable;
-import retrofit2.Call;
-import retrofit2.adapter.rxjava2.Result;
-import retrofit2.http.POST;
-import retrofit2.http.QueryMap;
-
-public interface ApiServiceCommon {
-    /**
-     * 版本更新
-     *
-     * @return
-     */
-    @POST("Daren/common/getNewestVersion.action")
-    Observable<Result<BaseInfo<AppVersionInfo>>> getVersion(@QueryMap() Map<String, String> map);
-
-    /**
-     * 获取App分享地址
-     *
-     * @return
-     */
-    @POST("Daren/common/appDownLoadUrl.action")
-    Observable<Result<BaseInfo<ShareAppInfo>>> getAppShare();
-
-    /**
-     * 获取达人主页分享地址
-     *
-     * @return
-     */
-    @POST("Daren/common/shareDarenHomePage.action")
-    Observable<Result<BaseInfo<ShareDarenInfo>>> getDarenShare(@QueryMap() Map<String, String> map);
-
-    @POST("Daren/common/getCommonMsg.action")
-    Observable<Result<BaseInfo<CommonMsgInfo>>> getCommonMsg(@QueryMap() Map<String, String> map);
-
-    /**
-     * 获取音视频通话roomId
-     */
-    @POST("Daren/common/getRoomId.action")
-    Observable<Result<BaseInfo<TRTCRoomInfo>>> getTRTCRoomInfo(@QueryMap() Map<String, String> map);
-
-
-    /**
-     * 版本更新
-     *
-     * @return
-     */
-
-    @POST("Daren/common/getNewestVersion.action")
-    Observable<Result<BaseInfo<AppVersionInfo>>> getshotTimeVersion(@QueryMap() Map<String, String> map);
-
-
-    @POST("Daren/common/cancellationAccount.action")
-    Observable<Result<BaseInfo>> cancellationAccount(@QueryMap() Map<String, String> map);
-}
-package com.cnlive.strike.data.network.api;
-
-
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.ContactAddressData;
-
-import java.util.List;
-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;
-import retrofit2.http.QueryMap;
-
-/**
- * 用户收获地址有关的接口
- */
-public interface ApiServiceContact {
-
-    /**
-     * 更新联系人收货地址
-     *
-     * @param maps
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("Daren/contact/updateContact.action")
-    Observable<Result<BaseInfo<Object>>> updateContact(@FieldMap Map<String, String> maps);
-
-    /**
-     * 读取联系人收获地址
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/contact/readContacts.action")
-    Observable<Result<BaseInfo<List<ContactAddressData>>>> readContact(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 添加联系人收货地址
-     *
-     * @param maps
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("Daren/contact/addContact.action")
-    Observable<Result<BaseInfo<ContactAddressData>>> addContact(@FieldMap Map<String, String> maps);
-
-    /**
-     * 删除联系人某条收货地址
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/contact/deleteContact.action")
-    Observable<Result<BaseInfo<Object>>> deleteContact(@QueryMap() Map<String, String> maps);
-
-}
-
-package com.cnlive.strike.data.network.api;
-
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.EyewitnessInfo;
-import com.cnlive.strike.data.network.model.EyewitnessSuccessfullyInfo;
-
-import java.util.Map;
-
-import io.reactivex.Observable;
-import retrofit2.adapter.rxjava2.Result;
-import retrofit2.http.POST;
-import retrofit2.http.QueryMap;
-
-/**
- * 作者: 吴奎庆
- * <p>
- * 时间: 2018/10/12
- * <p>
- * 简介:
- */
-
-public interface ApiServiceEyewitness {
-    //检测目击者的状态(是否是目击者)
-    @POST("Daren/witness/checkWitness.action")
-    Observable<Result<BaseInfo<EyewitnessInfo>>> checkWitness(@QueryMap Map<String, String> maps);
-
-    //获取目击者的发布内容
-    @POST("Daren/witness/getWitnessPublishContent.action")
-    Observable<Result<BaseInfo<EyewitnessSuccessfullyInfo>>> getWitnessPublishContent(@QueryMap Map<String, String> maps);
-
-    //删除or修改目击者发布内容
-    @POST("Daren/witness/deleteOrUpdateWitnessPublish.action")
-    Observable<Result<BaseInfo>> deleteOrUpdateWitnessPublish(@QueryMap Map<String, String> maps);
-
-
-
-}
-package com.cnlive.strike.data.network.api;
-
-
-import com.cnlive.strike.data.network.model.ActivityRecordDetailsInfo;
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.CreateGroupPayMentInfo;
-import com.cnlive.strike.data.network.model.GroupOwnerInfo;
-import com.cnlive.strike.data.network.model.GroupPayOrderInfo;
-import com.cnlive.strike.data.network.model.InitiatePaymentInfo;
-import com.cnlive.strike.data.network.model.PaymentActivityRecordInfo;
-import com.cnlive.strike.data.network.model.PaymentPreInfo;
-import com.cnlive.strike.data.network.model.SuccessiveGroupListItem;
-import com.cnlive.strike.data.network.model.TransferCheckKeyInfo;
-import com.cnlive.strike.data.network.model.TransferKeyInfo;
-import com.cnlive.strike.data.network.model.VoteMsgInfo;
-import com.cnlive.strike.data.network.model.VotedHistoryInfo;
-import com.cnlive.strike.data.network.model.VotedStopInfo;
-
-import java.util.List;
-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;
-import retrofit2.http.QueryMap;
-
-/**
- * Created by gujun on 2018/5/23.
- */
-
-public interface ApiServiceGroupManagement {
-
-    /**
-     * 后台发送通知邀请用户进群
-     *
-     * @param maps
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("Daren/groupManagement/invitationAddGroup.action")
-    Observable<Result<BaseInfo<Object>>> invitationAddGroup(@FieldMap Map<String, String> maps);
-
-    /**
-     * 活动投票付款
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/vote/addVote.action")
-    Observable<Result<BaseInfo<InitiatePaymentInfo>>> invitationPayment(@QueryMap Map<String, String> maps);
-
-    /**
-     * 创建群 发起活动的接口
-     *
-     * @return
-     */
-    @POST("Daren/groupManagement/addGroupCharge.action")
-    Observable<Result<BaseInfo<CreateGroupPayMentInfo>>> createGroupPayMent(@QueryMap Map<String, String> maps);
-
-    @POST("Daren/vote/getVoteMsg.action")
-    Observable<Result<BaseInfo<VoteMsgInfo>>> getVoteMsg(@QueryMap Map<String, String> maps);
-
-    /**
-     * 投票
-     *
-     * @param maps
-     * @return
-     */
-
-    @POST("Daren/vote/groupVote.action")
-    Observable<Result<BaseInfo<VoteMsgInfo>>> vote(@QueryMap Map<String, String> maps);
-
-    /**
-     * 投票列表
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/vote/getVotes.action")
-    Observable<Result<BaseInfo<VotedHistoryInfo>>> votedHistory(@QueryMap Map<String, String> maps);
-
-    /**
-     * 转账页面查询当前密钥
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/groupManagement/getCurrentKey.action")
-    Observable<Result<BaseInfo<TransferKeyInfo>>> getCurrentKey(@QueryMap Map<String, String> maps);
-
-    /**
-     * 转账页面发送当前密钥
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/groupManagement/sendSecretKey.action")
-    Observable<Result<BaseInfo<TransferKeyInfo>>> sendKey(@QueryMap Map<String, String> maps);
-
-    /**
-     * 转账页面验证当前密钥
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/groupManagement/checkKey.action")
-    Observable<Result<BaseInfo<TransferCheckKeyInfo>>> checkKey(@QueryMap Map<String, String> maps);
-
-    /**
-     * @param maps
-     * @return
-     */
-    @POST("Daren/groupManagement/groupFundsRecords.action")
-    Observable<Result<BaseInfo<List<PaymentActivityRecordInfo>>>> getPaymentRecord(@QueryMap Map<String, String> maps);
-
-    /**
-     * @param maps
-     * @return
-     */
-    @POST("Daren/vote/stopVote.action")
-    Observable<Result<BaseInfo<VotedStopInfo>>> stopVoted(@QueryMap Map<String, String> maps);
-
-    /**
-     * 获取活动付款详情
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/groupManagement/queryActivityFee.action")
-    Observable<Result<BaseInfo<ActivityRecordDetailsInfo>>> getActivityRecordDetails(@QueryMap Map<String, String> maps);
-    /**
-     * 存储历任群主
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/groupManagement/saveSuccessiveGroup.action")
-    Observable<Result<BaseInfo<Object>>> saveSuccessiveGroup(@QueryMap Map<String, String> maps);
-
-
-    /**
-     * 生成预订单
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/groupManagement/payByGroupMembers.action")
-    Observable<Result<BaseInfo<GroupPayOrderInfo>>> payByGroupMembers(@QueryMap Map<String, String> maps);
-
-    /**
-     * 获取历任群主列表
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/groupManagement/getSuccessiveGroupList.action")
-    Observable<Result<BaseInfo<List<SuccessiveGroupListItem>>>> getSuccessiveGroupList(@QueryMap Map<String, String> maps);
-    /**
-     * 获取历任群主列表
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/groupManagement/voteChoiceOwner.action")
-    Observable<Result<BaseInfo<GroupOwnerInfo>>> getGroupOwner(@QueryMap Map<String, String> maps);
-
-    /**
-     * wjj预支付订单
-     * @param map
-     * @return
-     */
-    @POST("Daren/wjjPay/unifiedOrder.action")
-    Observable<Result<BaseInfo<PaymentPreInfo>>> getwjjPrePay(@QueryMap() Map<String, String> map);
-    /**
-     * wjj支付订单
-     * @param map
-     * @return
-     */
-    @POST("Daren/wjjPay/unifiedPay.action")
-    Observable<Result<BaseInfo<Object>>> getwjjPay(@QueryMap() Map<String, String> map);
-
-
-}
-package com.cnlive.strike.data.network.api;
-
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.H5PGCVideoInfo;
-
-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;
-import retrofit2.http.QueryMap;
-
-public interface ApiServiceH5 {
-
-    /**
-     * 提交举报信息
-     *
-     * @param maps sid 用户ID
-     *             liveId 节目ID
-     *             reason 举报信息
-     */
-    @FormUrlEncoded
-    @POST("/Daren/h5/report.action")
-    Observable<Result<BaseInfo>> commentReport(@FieldMap() Map<String, String> maps);
-
-    /**
-     * 提交举报信息
-     *
-     * @param maps sid 用户ID
-     *             liveId 节目ID
-     *             reason 举报信息
-     */
-    @POST("/Daren/h5/getLiveDetail.action")
-    Observable<Result<BaseInfo<H5PGCVideoInfo>>> getLiveDetail(@QueryMap() Map<String, String> maps);
-}
-package com.cnlive.strike.data.network.api;
-
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.FriendCommentState;
-import com.cnlive.strike.data.network.model.GetDarenComment;
-
-import java.util.List;
-import java.util.Map;
-
-import io.reactivex.Observable;
-import okhttp3.MultipartBody;
-import okhttp3.RequestBody;
-import retrofit2.adapter.rxjava2.Result;
-import retrofit2.http.FieldMap;
-import retrofit2.http.FormUrlEncoded;
-import retrofit2.http.Headers;
-import retrofit2.http.Multipart;
-import retrofit2.http.POST;
-import retrofit2.http.Part;
-import retrofit2.http.PartMap;
-import retrofit2.http.QueryMap;
-
-/**
- * Created by xiansong on 2018/2/28.
- */
-
-public interface ApiServiceHudong {
-
-    /**
-     * 获取获得评论列表
-     *
-     * @param maps darenId  达人ID
-     *             plat     客户端平台
-     *             pageNo   页码
-     * @return
-     */
-    @Headers("cache:5")
-    @POST("Daren/hudong/getDarenComment.action")
-    Observable<Result<BaseInfo<GetDarenComment>>> getDarenComment(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 达人点评
-     *
-     * @param maps sid      用户ID
-     *             darenId  达人ID
-     *             orderId  订单ID
-     *             grade    分数
-     *             comment  评论内容
-     *             plat     客户端平台
-     * @return
-     */
-    @POST("Daren/hudong/commentDaren.action")
-    @Multipart
-    Observable<Result<BaseInfo>> commentDaren(@PartMap Map<String, RequestBody> maps,
-                                              @Part List<MultipartBody.Part> params);
-
-    /**
-     * 达人点评
-     *
-     * @param maps sid      用户ID
-     *             darenId  达人ID
-     *             orderId  订单ID
-     *             grade    分数
-     *             comment  评论内容
-     *             plat     客户端平台
-     * @return
-     */
-    @POST("Daren/hudong/commentDaren.action")
-    @Multipart
-    Observable<Result<BaseInfo>> commentDaren(@PartMap Map<String, RequestBody> maps);
-    /**
-     * 朋友圈评论
-     *
-     * @param maps appId	应用ID
-     *             plat		i=IOS客户端，a=Android客户端
-     *             id		主题ID
-     *             fromSid	评论者ID（回复时是回复者ID）
-     *             toSid	发布者ID（回复时是最后一个被回复者ID）
-     *             comment	评论内容
-     *             type		评论类型（comment=评论；reply=回复）
-     *             sign		签名规则
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("Daren/hudong/commentMoment.action")
-    Observable<Result<BaseInfo<FriendCommentState>>> commentMoment(@FieldMap() Map<String, String> maps);
-
-}
-package com.cnlive.strike.data.network.api;
-
-import com.cnlive.strike.data.network.model.AddIntegration;
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.CheckinData;
-import com.cnlive.strike.data.network.model.IntegraContentData;
-import com.cnlive.strike.data.network.model.IntegraData;
-
-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;
-
-public interface ApiServiceIntegra {
-    /**
-     * 积分任务列表
-     */
-    @GET("Daren/integral/getTasks.action")
-    Observable<Result<BaseInfo<IntegraData>>> getIntegraList(@QueryMap() Map<String, String> map);
-
-    /**
-     * 积分明细
-     */
-    @GET("Daren/integral/integralRecord.action")
-    Observable<Result<BaseInfo<IntegraContentData>>> getIntegraContentList(@QueryMap() Map<String, String> map);
-
-    /**
-     * 签到
-     */
-    @POST("Daren/integral/checkIn.action")
-    Observable<Result<BaseInfo<CheckinData>>> getCheckIn(@QueryMap() Map<String, String> map);
-
-    /**
-     * 增加积分
-     */
-    @POST("Daren/integral/addTask.action")
-    Observable<Result<BaseInfo<AddIntegration.DataBean>>> addIntegration(@QueryMap() Map<String, String> map);
-
-}
-package com.cnlive.strike.data.network.api;
-
-
-import com.cnlive.strike.data.network.model.BalanceDetailsInfo;
-import com.cnlive.strike.data.network.model.BalanceInfo;
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.DarenInfo;
-import com.cnlive.strike.data.network.model.EncryptKey;
-import com.cnlive.strike.data.network.model.GroupBalanceInfo;
-import com.cnlive.strike.data.network.model.RecordSourceMsgData;
-import com.cnlive.strike.data.network.model.ViewTransferRecordData;
-
-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 ApiServiceMember {
-
-    /**
-     * 余额
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/member/getBalance.action")
-    Observable<Result<BaseInfo<BalanceInfo>>> getBalance(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 检查达人审核状态
-     */
-    @POST("Daren/member/checkDaren.action")
-    Observable<Result<DarenInfo>> checkDaren(@QueryMap() Map<String, String> maps);
-
-
-    /**
-     * 获取余额的消费明细
-     */
-    @POST("Daren/transaction/getTransactionRecord.action")
-    Observable<Result<BaseInfo<BalanceDetailsInfo>>> getBalanceDetails(@QueryMap() Map<String, String> maps);
-
-
-    /**
-     * 设置修改支付密码
-     *
-     * @param map
-     * @return
-     */
-    @POST("Daren/wjjPay/setPassword.action")
-    Observable<Result<BaseInfo>> setPassword(@QueryMap() Map<String, String> map);
-
-    /**
-     * 密码受否存在 顺带返回余额
-     *
-     * @param map
-     * @return
-     */
-    @POST("Daren/wjjPay/passwordIsExisting.action")
-    Observable<Result<BaseInfo<GroupBalanceInfo>>> passwordIsExisting(@QueryMap() Map<String, String> map);
-
-
-    /**
-     * 交易记录详情
-     *
-     * @param map
-     * @return
-     */
-    @POST("Daren/transaction/getRecordSourceDetail.action")
-    Observable<Result<BaseInfo<RecordSourceMsgData>>> getRecordSourceMsg(@QueryMap() Map<String, String> map);
-
-    /**
-     * 查看与某一个商户的交易记录
-     */
-    @POST("Daren/groupManagement/viewTransferRecord.action")
-    Observable<Result<BaseInfo<ViewTransferRecordData>>> viewTransferRecord(@QueryMap() Map<String, String> map);
-
-    /**
-     * 返回公钥&随机AESKey
-     * @return
-     */
-    @POST("Daren/wjjPay/getKey.action")
-    Observable<Result<BaseInfo<EncryptKey>>> returnEncryptKey(@QueryMap() Map<String, String> map);
-
-}
-package com.cnlive.strike.data.network.api;
-
-
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.CircleData;
-import com.cnlive.strike.data.network.model.FriendCircleNewMessage;
-import com.cnlive.strike.data.network.model.LookUpMyMsgData;
-import com.cnlive.strike.data.network.model.MomentData;
-import com.cnlive.strike.data.network.model.SnowBannerData;
-import com.cnlive.strike.data.network.model.StrangerAccessMomentInfo;
-
-import java.util.List;
-import java.util.Map;
-
-import io.reactivex.Observable;
-import okhttp3.MultipartBody;
-import okhttp3.RequestBody;
-import retrofit2.adapter.rxjava2.Result;
-import retrofit2.http.FieldMap;
-import retrofit2.http.FormUrlEncoded;
-import retrofit2.http.Headers;
-import retrofit2.http.Multipart;
-import retrofit2.http.POST;
-import retrofit2.http.Part;
-import retrofit2.http.PartMap;
-import retrofit2.http.Path;
-import retrofit2.http.QueryMap;
-
-/**
- * 达人有关的接口
- */
-public interface ApiServiceMoment {
-
-  /*  *//**
-     * 上传发布内容
-     *//*
-    @POST("Daren/moment/releaseMoment.action")
-    @Multipart
-    Observable<Result<BaseInfo>> releaseMoment(@PartMap Map<String, RequestBody> maps,
-                                               @Part List<MultipartBody.Part> params);
-
-    *//**
-     * 上传发布内容(图片传七牛)
-     *//*
-    @POST("Daren/moment/releaseMoment.action")
-        Observable<Result<BaseInfo>> releaseMomentNew(@QueryMap Map<String, Object> maps);
-*/
-
-    /**
-     * 上传发布内容(图片传七牛)
-     */
-    @POST("{user}")
-    Observable<Result<BaseInfo>> releaseMomentNe(@Path(value = "user", encoded = true) String path, @QueryMap Map<String, Object> maps);
-
-
-
-
-
-    /**
-     * 上传发布内容(不含图片)
-     */
-    @POST("{user}")
-    Observable<Result<BaseInfo>> releaseMomentText(@Path(value = "user", encoded = true) String path, @QueryMap() Map<String, String> maps);
-
-   /* *//**
-     * 上传目击者发布内容(图片传七牛)
-     *//*
-    @POST("Daren/witness/releaseWitness.action")
-    Observable<Result<BaseInfo>> releaseWitness(@QueryMap Map<String, Object> maps);*/
-
-    /**
-     * 上传目击者发布内容(图片传七牛)
-     */
-    @POST("Daren/witness/releaseWitness.action")
-    Observable<Result<BaseInfo>> releaseWitnessnew(@QueryMap Map<String, String> maps);
-
-    /**
-     * 获取生活圈渠道列表
-     */
-    @POST("Daren/publishType/getPublishTypeList.action")
-    Observable<Result<BaseInfo<CircleData>>> releaseCirclePath(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 冰雪活动上传发布内容
-     */
-    @POST("Daren/snow/releaseSnow.action")
-    @Multipart
-    Observable<Result<BaseInfo>> releaseSnow(@PartMap Map<String, RequestBody> maps,
-                                             @Part List<MultipartBody.Part> params);
-
-    /**
-     * 冰雪活动上传发布内容(图片新接口格式)
-     */
-    @POST("Daren/snow/releaseSnow.action")
-    Observable<Result<BaseInfo>> releaseSnow(@QueryMap() Map<String, Object> maps);
-    /**
-     * 冰雪活动上传发布内容(图片新接口格式)
-     */
-    @POST("Daren/snow/releaseSnow.action")
-    Observable<Result<BaseInfo>> releaseSnowNew(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 冰雪活动上传发布内容(不含图片)
-     */
-    @POST("Daren/snow/getSnowBanner.action")
-    Observable<Result<BaseInfo<List<SnowBannerData>>>> getSnowBanner(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 获取相册内容
-     */
-    @Headers("cache:5")
-    @POST("Daren/moment/myMoment.action")
-    Observable<Result<BaseInfo<MomentData>>> myMoment(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 获取朋友圈内容
-     */
-    @Headers("cache:5")
-    @POST("Daren/moment/friendMoment.action")
-    Observable<Result<BaseInfo<MomentData>>> friendMoment(@QueryMap() Map<String, String> maps);
-
-    @POST("Daren/moment/deleteMyMoment.action")
-    Observable<Result<BaseInfo>> deleteMyMoment(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 获取新消息列表
-     *
-     * @param maps sid 用户ID
-     * @return
-     */
-    @POST("Daren/moment/getNewMsgList.action")
-    Observable<Result<BaseInfo<List<FriendCircleNewMessage>>>> getNewMsgList(@QueryMap() Map<String, String> maps);
-
-
-    @POST("Daren/moment/deleteNewMsg.action")
-    Observable<Result<BaseInfo>> deleteNewMsg(@QueryMap() Map<String, String> maps);
-
-
-    /**
-     * 查看个人中心
-     */
-    @POST("Daren/moment/lookUpMyMsg.action")
-    Observable<Result<BaseInfo<LookUpMyMsgData>>> lookUpMyMsg(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 点赞
-     */
-    @POST("Daren/moment/praiseMoment.action")
-    Observable<Result<BaseInfo>> praiseMoment(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 获取朋友圈内容
-     * momentId
-     */
-    @POST("Daren/moment/getMomentDetail.action")
-    Observable<Result<BaseInfo<MomentData.FriendItem>>> getMomentDetail(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 设置陌生人生活圈权限
-     */
-    @FormUrlEncoded
-    @POST("Daren/moment/strangerSwitch.action")
-    Observable<Result<BaseInfo>> setStrangerAccessMoment(@FieldMap() Map<String, String> maps);
-
-    /**
-     * 检查陌生人生活圈权限状态
-     */
-    @FormUrlEncoded
-    @POST("Daren/moment/findStrangerSwitch.action")
-    Observable<Result<BaseInfo<StrangerAccessMomentInfo>>> getStrangerAccessMomentStatus(@FieldMap() Map<String, String> maps);
-
-}
-
-package com.cnlive.strike.data.network.api;
-
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.CommentListData;
-import com.cnlive.strike.data.network.model.DataEntity;
-import com.cnlive.strike.data.network.model.FaceData;
-import com.cnlive.strike.data.network.model.FriendCommentState;
-import com.cnlive.strike.data.network.model.FriendListData;
-import com.cnlive.strike.data.network.model.InteractiveReadAllCommentData;
-import com.cnlive.strike.data.network.model.LiveActivityPlayInfo;
-import com.cnlive.strike.data.network.model.PlayerVodRates;
-import com.cnlive.strike.data.network.model.StorageInfoData;
-import com.cnlive.strike.data.network.model.TokenData;
-import com.cnlive.strike.data.network.model.UploadAuthData;
-import com.cnlive.strike.data.network.model.UserData;
-import com.cnlive.strike.data.network.model.VideoUploadResult;
-
-import java.util.List;
-import java.util.Map;
-
-import io.reactivex.Observable;
-import okhttp3.MultipartBody;
-import okhttp3.RequestBody;
-import retrofit2.adapter.rxjava2.Result;
-import retrofit2.http.FieldMap;
-import retrofit2.http.FormUrlEncoded;
-import retrofit2.http.GET;
-import retrofit2.http.Multipart;
-import retrofit2.http.POST;
-import retrofit2.http.Part;
-import retrofit2.http.PartMap;
-import retrofit2.http.QueryMap;
-
-/**
- * Created by xiansong on 2018/3/22.
- */
-
-public interface ApiServiceOpen {
-
-    /**
-     * @param maps appId	应用ID
-     *             plat	    i=IOS客户端，a=Android客户端
-     *             id	  	主题ID
-     *             page	    页号
-     *             pageSize	每页显示的条数
-     *             sign	    签名
-     * @return
-     */
-
-    @GET("open/api2/commentServices/services/commentForChat/readAll")
-    Observable<Result<BaseInfo<FriendListData>>> readAllComment(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 删除朋友圈评论
-     *
-     * @param maps appId	应用ID
-     *             plat	    i=IOS客户端，a=Android客户端
-     *             id	  	主题ID
-     *             page	    页号
-     *             pageSize	每页显示的条数
-     *             sign	    签名
-     * @return
-     */
-
-    @POST("open/api2/commentServices/services/commentForChat/delete")
-    Observable<Result<BaseInfo>> delete(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 读取点赞列表
-     *
-     * @param maps
-     * @return
-     */
-    @POST("open/api2/support/loadSupport")
-    Observable<Result<BaseInfo<FriendListData>>> loadSupport(@QueryMap() Map<String, String> maps);
-
-
-    /**
-     * 读取点赞列表
-     *
-     * @param maps
-     * @return
-     */
-    @POST("open/api2/support/readAll")
-    Observable<Result<BaseInfo<FriendListData>>> readAllLike(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 短视频入库点播云接口for app
-     * 创建短视频信息进行存储
-     *
-     * @param maps md5	string	true	MD5
-     *             appId	string	true	APPID
-     *             videoKey	string	true	短视频相对路径（支持金山云存储）
-     *             name	string	false	短视频名称
-     *             description	string	false	短视频的信息描述
-     *             isHorizontalScreen	int	true	屏幕方向，0：垂直即竖屏 ／1：水平即横屏 ，默认为1
-     *             userId	string	false	短视频的信息用户标识
-     *             callBackUrl	string	false	短视频信息回调地址
-     *             platform_id	string	true	APP bundleID 或者是包名，平台鉴权使用
-     *             extensions	string	false	扩展字段，格式
-     *             timestamp	int	true	精确到秒，当前Unix时间戳，请保证请求服务器时间正确
-     *             sign	String	true	签名规则
-     * @return
-     */
-
-    @POST("open/api2/vod_epg/svInputMamForAPP")
-    Observable<Result<BaseInfo<VideoUploadResult>>> svInputMamForAPP(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 获取点播评论列表
-     */
-    @POST("open/api2/commentServices/services/commentForChat/loadComment")
-    Observable<Result<BaseInfo<FriendListData>>> releaseVideoPath(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 获取pgc评论列表，此接口不能对某人回复的
-     */
-    @GET("open/api2/commentServices/services/commentForHdBySpId/loadComment")
-    Observable<Result<BaseInfo<CommentListData>>> getAllComments(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 评论点播节目
-     *
-     * @param map
-     * @return
-     */
-    @POST("open/api2/commentServices/services/commentForChat/insert")
-    Observable<Result<BaseInfo<FriendCommentState>>> sendVideoComment(@QueryMap Map<String, String> map);
-
-    /**
-     * 删除评论
-     *
-     * @param map
-     * @return
-     */
-    @POST("open/api2/commentServices/services/commentForChat/delete")
-    Observable<Result<BaseInfo>> deleteVideoComment(@QueryMap Map<String, String> map);
-
-    /**
-     * 读取点赞列表
-     *
-     * @param maps
-     * @return
-     */
-    @POST("open/api2/user/readUserById")
-    Observable<Result<BaseInfo<DataEntity>>> readUserById(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 上传鉴权
-     *
-     * @param maps
-     * @return
-     */
-    @POST("open/api2/vod_epg/getUploadAuthForApp")
-    Observable<Result<BaseInfo<UploadAuthData>>> getUploadAuthForApp(@QueryMap Map<String, String> maps);
-
-    /**
-     * 获取存储信息
-     *
-     * @param map
-     * @return
-     */
-    @POST("open/api2/storage/getStorageInfo")
-    Observable<Result<BaseInfo<List<StorageInfoData>>>> getStorageInfo(@QueryMap Map<String, String> map);
-
-    /**
-     * 获取直播活动播放信息
-     *
-     * @param map activityId	string	true	由开发者通过API创建接口或者在直播云管理端创建，保证唯一性
-     */
-    @FormUrlEncoded
-    @POST("open/api2/live_epg/getLiveActivityPlayInfo4App")
-    Observable<Result<BaseInfo<LiveActivityPlayInfo>>> getLiveActivityPlayInfo(@FieldMap Map<String, String> map);
-
-    /**
-     * 互动云获取一条节目的评论列表
-     *
-     * @param map
-     * @return
-     */
-    @POST("open/api2/commentServices/commentForHdBySpId/readAllComment")
-    Observable<Result<BaseInfo<InteractiveReadAllCommentData>>> interactiveReadAllComment(@QueryMap Map<String, String> map);
-
-    /**
-     * 评论一条节目
-     *
-     * @param map
-     * @return
-     */
-    @POST("open/api2/commentServices/commentForHdBySpId/insertComment")
-    Observable<Result<BaseInfo<FriendCommentState>>> insertComment(@QueryMap Map<String, String> map);
-
-    /**
-     * 顶踩一条节目 0：踩    1：顶
-     *
-     * @param map
-     * @return
-     */
-    @POST("open/api2/ctServices/supportForHd/support")
-    Observable<Result<BaseInfo>> support(@QueryMap Map<String, String> map);
-
-
-    /**
-     * 快捷登录前发送验证码
-     *
-     * @param map
-     * @return
-     */
-    @POST("open/api2/user/sendVerifyCode")
-    Observable<Result<BaseInfo>> sendVerifyCodeBefQuickLogin(@QueryMap Map<String, String> map);
-
-    /**
-     * 快捷登录
-     *
-     * @param map
-     * @return
-     */
-    @POST("open/api2/user/loginInQuickly")
-    Observable<Result<BaseInfo<UserData>>> quickLogin(@QueryMap Map<String, String> map);
-
-    /**
-     * 登录
-     *
-     * @param map
-     * @return
-     */
-    @POST("open/api2/user/loginIn")
-    Observable<Result<BaseInfo<UserData>>> login(@QueryMap Map<String, String> map);
-
-    /**
-     * 查询用户信息
-     *
-     * @param map
-     * @return
-     */
-    @POST("open/api2/user/readUserById")
-    Observable<Result<BaseInfo<UserData>>> queryUserInfo(@QueryMap Map<String, String> map);
-
-    /**
-     * 更新用户附加信息
-     *
-     * @param map
-     * @return
-     */
-    @POST("open/api2/user/updateUserExtInfo")
-    Observable<Result<BaseInfo>> updateUserExtInfo(@QueryMap Map<String, String> map);
-
-    /**
-     * 修改用户单项信息
-     *
-     * @param map
-     * @return
-     */
-    @POST("open/api2/user/updateUserById")
-    Observable<Result<BaseInfo>> modifyUserInfo(@QueryMap Map<String, String> map);
-
-
-    /**
-     * 注册或修改手机号前发手机验证码
-     *
-     * @param map
-     * @return
-     */
-    @POST("open/api2/user/sendVerifyCodeForUnRegistered")
-    Observable<Result<BaseInfo>> sendVerifyCodeForUnRegistered(@QueryMap Map<String, String> map);
-
-    /**
-     * 更新手机号
-     *
-     * @param map
-     * @return
-     */
-    @POST("open/api2/user/updateMobileById")
-    Observable<Result<BaseInfo>> updateMobile(@QueryMap Map<String, String> map);
-
-    /**
-     * 注册
-     *
-     * @param map
-     * @return
-     */
-    @POST("open/api2/user/register")
-    Observable<Result<BaseInfo<UserData>>> register(@QueryMap Map<String, String> map);
-
-
-    /**
-     * 获取access_token
-     *
-     * @param map
-     * @return
-     */
-    @POST("open/api2/token")
-    Observable<Result<BaseInfo<TokenData>>> accessToken(@QueryMap Map<String, String> map);
-
-    /**
-     * 上传头像
-     *
-     * @param map
-     * @param params
-     * @return
-     */
-    @Multipart
-    @POST("open/api2/user/updateUserFaceById")
-    Observable<Result<BaseInfo<FaceData>>> updateUserFace(@PartMap Map<String, RequestBody> map,
-                                                          @Part List<MultipartBody.Part> params);
-
-    /**
-     * 获取点播云视频的码率
-     *
-     * @param map
-     * @return
-     */
-    @GET("open/api2/vod_epg/getRates")
-    Observable<Result<BaseInfo<PlayerVodRates>>> getRates(@QueryMap Map<String, String> map);
-}
-package com.cnlive.strike.data.network.api;
-
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.GetOrderByStatusData;
-import com.cnlive.strike.data.network.model.OrderInfoData;
-
-import java.util.List;
-import java.util.Map;
-
-import io.reactivex.Observable;
-import okhttp3.MultipartBody;
-import okhttp3.RequestBody;
-import retrofit2.adapter.rxjava2.Result;
-import retrofit2.http.FieldMap;
-import retrofit2.http.FormUrlEncoded;
-import retrofit2.http.Multipart;
-import retrofit2.http.POST;
-import retrofit2.http.Part;
-import retrofit2.http.PartMap;
-import retrofit2.http.QueryMap;
-
-/**
- * Created by gujun on 2018/2/6.
- */
-
-public interface ApiServiceOrder {
-
-    /**
-     * 获取订单信息(更新)
-     *
-     * @param maps
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("Daren/order/getOrderItem.action")
-    Observable<Result<BaseInfo<OrderInfoData>>> getOrderItem(@FieldMap Map<String, String> maps);
-
-    /**
-     * 生成订单
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/order/createOrder.action")
-    Observable<Result<BaseInfo<OrderInfoData>>> createOrder(@QueryMap Map<String, String> maps);
-
-    /**
-     * 修改订单
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/order/modifyOrder.action")
-    Observable<Result<BaseInfo<OrderInfoData>>> modifyOrder(@QueryMap Map<String, String> maps);
-
-    /**
-     * 确认订单
-     *
-     * @param maps
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("Daren/order/submitOrder.action")
-    Observable<Result<BaseInfo<OrderInfoData>>> confirmOrder(@FieldMap Map<String, String> maps);
-
-    /**
-     * 取消订单
-     *
-     * @param maps
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("Daren/order/cancelOrder.action")
-    Observable<Result<BaseInfo<OrderInfoData>>> cancelOrder(@FieldMap Map<String, String> maps);
-
-    /**
-     * 订单有误操作
-     *
-     * @param maps
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("Daren/order/correctOrder.action")
-    Observable<Result<BaseInfo<OrderInfoData>>> correctOrder(@FieldMap Map<String, String> maps);
-
-    /**
-     * 根据状态查询订单列表
-     *
-     * @param maps
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("Daren/order/getOrdersByStatus.action")
-    Observable<Result<BaseInfo<GetOrderByStatusData>>> getOrdersByStatus(@FieldMap Map<String, String> maps);
-
-    /**
-     * 申请退款
-     */
-    @POST("Daren/order/applyRefund.action")
-    @Multipart
-    Observable<Result<BaseInfo>> applyRefund(@PartMap Map<String, RequestBody> maps,
-                                             @Part List<MultipartBody.Part> params);
-
-    /**
-     * 申请退款(不含图片)
-     */
-    @POST("Daren/order/applyRefund.action")
-    @Multipart
-    Observable<Result<BaseInfo>> applyRefund(@PartMap() Map<String, RequestBody> maps);
-
-    /**
-     * 确认收货
-     *
-     * @param maps
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("Daren/order/confirmRecv.action")
-    Observable<Result<BaseInfo<Object>>> confirmRecv(@FieldMap Map<String, String> maps);
-
-    /**
-     * 删除订单
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/order/deleteOrder.action")
-    Observable<Result<BaseInfo<Object>>> deleteOrder(@QueryMap() Map<String, String> maps);
-
-}
-package com.cnlive.strike.data.network.api;
-
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.CheckQrUrlInfo;
-import com.cnlive.strike.data.network.model.CottonCandyInfo;
-import com.cnlive.strike.data.network.model.CreateQrInfo;
-import com.cnlive.strike.data.network.model.DarenInfoModel;
-import com.cnlive.strike.data.network.model.QrActivityInfo;
-import com.cnlive.strike.data.network.model.QrOrderInfo;
-import com.cnlive.strike.data.network.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;
-import retrofit2.http.QueryMap;
-
-public interface ApiServiceQrcode {
-    /**
-     * 获取生成二维码的数据
-     * @param map
-     * @return
-     * appId
-     * sid
-     * type	生成或充值二维码 生成:gen 重置:reset
-     */
-    @POST("Daren/qrcode/genOrResetQrCode.action")
-    Observable<Result<BaseInfo<CreateQrInfo>>> getQrContent(@QueryMap() Map<String, String> map);
-
-
-    @POST("Daren/qrcode/checkQrCode.action")
-    Observable<Result<BaseInfo<CreateQrInfo>>> checkQr(@QueryMap() Map<String, String> map);
-
-    /**
-     * 获取达人信息
-     *
-     * @param param
-     * @return
-     */
-    @POST("Daren/member/getDarenById.action")
-    Observable<Result<BaseInfo<DarenInfoModel>>> getDarenBySid(@QueryMap Map<String, String> param);
-
-    /**
-     * 获取达人信息
-     *
-     * @param param
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("Daren/order/addOrder.action")
-    Observable<Result<BaseInfo<QrOrderInfo>>> getQrOrder(@FieldMap Map<String, String> param);
-    /**
-     * 扫码签到(临时)
-     *
-     * @param param
-     * @return
-     */
-    @POST("Daren/sign/checkSignInfo.action")
-    Observable<Result<BaseInfo<QrSignInfo>>> checkSignInfo(@QueryMap Map<String, String> param);
-
-    /**
-     * 扫码活动(临时)
-     * @param param
-     * @return
-     */
-    @POST("Daren/sign/checkQrActivity.action")
-    Observable<Result<BaseInfo<QrActivityInfo>>> checkQrActivity(@QueryMap Map<String, String> param);
-
-    /**
-     * 校验二维码数据
-     * @param param
-     * @return
-     */
-    @POST("Daren/qrcode/checkQrCodeUrl.action")
-    Observable<Result<BaseInfo<CheckQrUrlInfo>>> checkQrUrl(@QueryMap Map<String, String> param);
-
-
-    /**
-     * 生成棉花糖订单信息
-     * @param param
-     * @return
-     */
-
-    @POST("Daren/order/addOrderMHT.action")
-    Observable<Result<BaseInfo<CottonCandyInfo>>> getCottonCandy(@QueryMap Map<String, String> param);
-
-}
-package com.cnlive.strike.data.network.api;
-
-
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.QuickShortMessageData;
-
-import java.util.ArrayList;
-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;
-import retrofit2.http.QueryMap;
-
-/**
- * 达人快捷短语有关的接口
- */
-public interface ApiServiceReply {
-
-    /**
-     * 更新快捷短语
-     *
-     * @param maps
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("Daren/reply/updateQuickReply.action")
-    Observable<Result<BaseInfo<Object>>> updateQuickReply(@FieldMap Map<String, String> maps);
-
-    /**
-     * 读取快捷短语列表
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/reply/readQuickReply.action")
-    Observable<Result<BaseInfo<ArrayList<QuickShortMessageData>>>> readQuickReply(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 添加一条快捷短语
-     *
-     * @param maps
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("Daren/reply/addQuickReply.action")
-    Observable<Result<BaseInfo<Object>>> addQuickReply(@FieldMap Map<String, String> maps);
-
-    /**
-     * 删除某一条快捷短语
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/reply/deleteQuickReply.action")
-    Observable<Result<BaseInfo<Object>>> deleteQuickReply(@QueryMap() Map<String, String> maps);
-
-}
-
-package com.cnlive.strike.data.network.api;
-
-import com.cnlive.strike.data.network.model.BaseInfo;
-
-import java.util.Map;
-
-import io.reactivex.Observable;
-import retrofit2.adapter.rxjava2.Result;
-import retrofit2.http.POST;
-import retrofit2.http.QueryMap;
-
-/**
- * Created by Lynn on 2018/6/7.
- */
-
-public interface ApiServiceSms {
-
-
-    /**
-     * 发送验证码（修改支付密码）
-     */
-    @POST("Daren/sms/sendSMS.action")
-    Observable<Result<BaseInfo>> sendSms(@QueryMap Map<String, String> map);
-
-    /**
-     * 验证验证码（修改支付密码）
-     *
-     * @param map
-     * @return
-     */
-    @POST("Daren/sms/checkVerifyCode.action")
-    Observable<Result<BaseInfo>> checkVerifyCode(@QueryMap Map<String, String> map);
-}
-package com.cnlive.strike.data.network.api;
-
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.CollectionData;
-
-import java.util.Map;
-
-import io.reactivex.Observable;
-import retrofit2.adapter.rxjava2.Result;
-import retrofit2.http.POST;
-import retrofit2.http.QueryMap;
-
-public interface ApiServiceStock {
-
-    /**
-     * 收藏接口
-     *
-     * @return
-     */
-    @POST("Daren/stock/collection.action")
-    Observable<Result<BaseInfo>> collection(@QueryMap() Map<String, String> map);
-
-
-    /**
-     * 获取收藏的 列表
-     *
-     * @param map
-     * @return
-     */
-    @POST("Daren/stock/getCollectionList.action")
-    Observable<Result<BaseInfo<CollectionData>>> getCollection(@QueryMap() Map<String, String> map);
-
-    /**
-     * 取消收藏
-     *
-     * @param map
-     * @return
-     */
-    @POST("Daren/stock/deleteCollection.action")
-    Observable<Result<BaseInfo<BaseInfo>>> cancleCollection(@QueryMap() Map<String, String> map);
-
-
-}
-package com.cnlive.strike.data.network.api;
-
-
-import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.GetDarenHomeData;
-import com.cnlive.strike.data.network.model.GetDarensData;
-import com.cnlive.strike.data.network.model.GroupNotificationListData;
-import com.cnlive.strike.data.network.model.SearchDarenData;
-import com.cnlive.strike.data.network.model.SysNumberSubsData;
-import com.cnlive.strike.data.network.model.SystemNotificationListData;
-
-import java.util.List;
-import java.util.Map;
-
-import io.reactivex.Observable;
-import retrofit2.adapter.rxjava2.Result;
-import retrofit2.http.FieldMap;
-import retrofit2.http.FormUrlEncoded;
-import retrofit2.http.Headers;
-import retrofit2.http.POST;
-import retrofit2.http.QueryMap;
-
-/**
- * 达人有关的接口
- */
-public interface ApiServiceSub {
-
-    /**
-     * 获取达人号列表接口
-     *
-     * @param maps
-     * @return
-     */
-    @Headers("cache:2")
-    @POST("Daren/sub/getDarenSubs.action")
-    Observable<Result<BaseInfo<List<SysNumberSubsData>>>> getDarenSubs(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 获取生活号列表接口
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/sub/getLifeSubs.action")
-    Observable<Result<BaseInfo<List<SysNumberSubsData>>>> getLifeSubs(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 获取关注列表接口
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/sub/getDarens.action")
-    Observable<Result<BaseInfo<GetDarensData>>> getDarens(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 获取未关注列表接口
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/classify/getUnFansOrDarenBean.action")
-    Observable<Result<BaseInfo<GetDarensData>>> getUnFollowDarens(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 获取关注列表接口(分类页面)
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/classify/getDarenList.action")
-    Observable<Result<BaseInfo<GetDarensData>>> getDarenList(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 分类页面--搜索
-     *
-     * @param maps
-     * @return
-     */
-    @FormUrlEncoded
-    @POST("Daren/search/searchDaren.action")
-    Observable<Result<BaseInfo<List<SearchDarenData>>>> searchDaren(@FieldMap() Map<String, String> maps);
-
-    @Headers("cache:5")
-    @POST("Daren/sub/getFans.action")
-    Observable<Result<BaseInfo<GetDarensData>>> getFans(@QueryMap() Map<String, String> map);
-
-    @Headers("cache:5")
-    @POST("Daren/sub/getDarenHome.action")
-    Observable<Result<BaseInfo<GetDarenHomeData>>> getDarenHome(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 获取系统通知列表或订单通知列表
-     *
-     * @param maps
-     * @return
-     */
-    @POST("Daren/sub/getLifeHome.action")
-    Observable<Result<BaseInfo<SystemNotificationListData>>> getLifeSystemHome(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 关注
-     *
-     * @param map appId     应用Id
-     *            sid       用户Id
-     *            darenIds  达人Id，多个用逗号分隔
-     * @return
-     */
-    @POST("Daren/sub/addDarenSub.action")
-    Observable<Result<BaseInfo>> addDaren(@QueryMap() Map<String, String> map);
-
-
-    /**
-     * 取消关注
-     *
-     * @param map appId     应用Id
-     *            sid       用户Id
-     *            darenIds  达人Id，多个用逗号分隔
-     * @return
-     */
-    @POST("Daren/sub/cancelDarenSub.action")
-    Observable<Result<BaseInfo>> cancelDaren(@QueryMap() Map<String, String> map);
-
-    @POST("Daren/sub/deleteFriend.action")
-    Observable<Result<BaseInfo>> deleteFriend(@QueryMap() Map<String, String> maps);
-
-    /**
-     * 从达人号列表删除某达人
-     *
-     * @return
-     */
-    @POST("Daren/sub/deleteDarenSubs.action")
-    Observable<Result<BaseInfo>> deleteDarenSubs(@QueryMap() Map<String, String> map);
-
-    /**
-     * 删除生活号列表中的订单通知和系统通知的item
-     *
-     * @return
-     */
-    @POST("Daren/sub/deleteLifeSubs.action")
-    Observable<Result<BaseInfo>> deleteLifeSubs(@QueryMap() Map<String, String> map);
-
-    /**
-     * 获取通知号的列表数据
-     *
-     * @return
-     */
-    @POST("Daren/sub/getNoticeSubs.action")
-    Observable<Result<BaseInfo<GroupNotificationListData>>> getNoticeSubs(@QueryMap() Map<String, String> map);
-
-    /**
-     * 从群组通知列表删除某条通知
-     *
-     * @return
-     */
-    @POST("Daren/sub/deleteNotice.action")
-    Observable<Result<BaseInfo>> deleteNotice(@QueryMap() Map<String, String> map);
-
-}
-
-package com.cnlive.strike.data.network.model;
-
-import java.util.List;
-
-/**
- * 作者: 吴奎庆
- * <p>
- * 时间: 2018/5/29
- * <p>
- * 简介:
- */
-
-public class ActivityRecordDetailsInfo {
-
-
-    /**
-     * createTime : 2018-05-29 13:42:15
-     * description :
-     * endTime : 2018-05-29 15:40:00
-     * fundsId : 68f31cc1e5ec4dd793297facd72358af
-     * groupId : @TGS#1CEBXTHFD
-     * ownerMsg : {"image":"http://cnlive-yweb.ks3-cn-beijing.ksyun.com/images/headImg/2018/0504/1525422551146_small.jpg","nickName":"牛道健","userId":"10505015"}
-     * groupMembers : [{"payTime":"","type":false,"user":{"image":"http://cnlive-yweb.ks3-cn-beijing.ksyun.com/images/headImg/2018/0513/1526178128533_small.jpg","nickName":"张旭","userId":"10499533"}},{"payTime":"","type":false,"user":{"image":"http://cnlive-yweb.ks3-cn-beijing.ksyun.com/images/headImg/2018/0417/1523951343993_small.jpg","nickName":"写bug的程序猿","userId":"10458139"}},{"payTime":"","type":false,"user":{"image":"http://cnlive-yweb.ks3-cn-beijing.ksyun.com/images/headImg/2018/0504/1525422551146_small.jpg","nickName":"牛道健","userId":"10505015"}},{"payTime":"","type":false,"user":{"image":"http://cnlive-yweb.ks3-cn-beijing.ksyun.com/images/headImg/2018/0511/1526003358652_small.jpg","nickName":"牛道健","userId":"10504908"}}]
-     * payList : [{"payTime":"","type":false,"user":{"image":"http://cnlive-yweb.ks3-cn-beijing.ksyun.com/images/headImg/2018/0513/1526178128533_small.jpg","nickName":"张旭","userId":"10499533"}}]
-     * price : 0.1
-     * type : 1
-     */
-
-    private String createTime;
-
-    public String getTotalPrice() {
-        return totalPrice;
-    }
-
-    public void setTotalPrice(String totalPrice) {
-        this.totalPrice = totalPrice;
-    }
-
-    private String totalPrice;
-    private String description;
-    private String endTime;
-    private String fundsId;
-    private String groupId;
-    private OwnerMsgBean ownerMsg;
-    private double price;
-    private int type;
-    private List<GroupMembersBean> groupMembers;
-    private List<GroupMembersBean> payList;
-
-    public String getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-
-    public String getFundsId() {
-        return fundsId;
-    }
-
-    public void setFundsId(String fundsId) {
-        this.fundsId = fundsId;
-    }
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    public OwnerMsgBean getOwnerMsg() {
-        return ownerMsg;
-    }
-
-    public void setOwnerMsg(OwnerMsgBean ownerMsg) {
-        this.ownerMsg = ownerMsg;
-    }
-
-    public double getPrice() {
-        return price;
-    }
-
-    public void setPrice(double price) {
-        this.price = price;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public List<GroupMembersBean> getGroupMembers() {
-        return groupMembers;
-    }
-
-    public void setGroupMembers(List<GroupMembersBean> groupMembers) {
-        this.groupMembers = groupMembers;
-    }
-
-    public List<GroupMembersBean> getPayList() {
-        return payList;
-    }
-
-    public void setPayList(List<GroupMembersBean> payList) {
-        this.payList = payList;
-    }
-
-    public static class OwnerMsgBean {
-        /**
-         * image : http://cnlive-yweb.ks3-cn-beijing.ksyun.com/images/headImg/2018/0504/1525422551146_small.jpg
-         * nickName : 牛道健
-         * userId : 10505015
-         */
-
-        private String image;
-        private String nickName;
-        private String userId;
-
-        public String getImage() {
-            return image;
-        }
-
-        public void setImage(String image) {
-            this.image = image;
-        }
-
-        public String getNickName() {
-            return nickName;
-        }
-
-        public void setNickName(String nickName) {
-            this.nickName = nickName;
-        }
-
-        public String getUserId() {
-            return userId;
-        }
-
-        public void setUserId(String userId) {
-            this.userId = userId;
-        }
-    }
-
-    public static class GroupMembersBean {
-        /**
-         * payTime :
-         * type : false
-         * user : {"image":"http://cnlive-yweb.ks3-cn-beijing.ksyun.com/images/headImg/2018/0513/1526178128533_small.jpg","nickName":"张旭","userId":"10499533"}
-         */
-
-        private String payTime;
-        private boolean type;
-        private UserBean user;
-
-        public String getPayTime() {
-            return payTime;
-        }
-
-        public void setPayTime(String payTime) {
-            this.payTime = payTime;
-        }
-
-        public boolean isType() {
-            return type;
-        }
-
-        public void setType(boolean type) {
-            this.type = type;
-        }
-
-        public UserBean getUser() {
-            return user;
-        }
-
-        public void setUser(UserBean user) {
-            this.user = user;
-        }
-
-        public static class UserBean {
-            /**
-             * image : http://cnlive-yweb.ks3-cn-beijing.ksyun.com/images/headImg/2018/0513/1526178128533_small.jpg
-             * nickName : 张旭
-             * userId : 10499533
-             */
-
-            private String image;
-            private String nickName;
-            private String userId;
-
-            public String getImage() {
-                return image;
-            }
-
-            public void setImage(String image) {
-                this.image = image;
-            }
-
-            public String getNickName() {
-                return nickName;
-            }
-
-            public void setNickName(String nickName) {
-                this.nickName = nickName;
-            }
-
-            public String getUserId() {
-                return userId;
-            }
-
-            public void setUserId(String userId) {
-                this.userId = userId;
-            }
-        }
-    }
-
-}
-package com.cnlive.strike.data.network.model;
-
-import java.io.Serializable;
-
-public class AddIntegration implements Serializable {
-
-
-    public static class DataBean {
-        /**
-         * status : false
-         * score : 100
-         */
-
-        private boolean status;
-        private String score;
-        private String desc;
-        private String descEnd;
-
-        public String getDescEnd() {
-            return descEnd;
-        }
-
-        public void setDescEnd(String descEnd) {
-            this.descEnd = descEnd;
-        }
-
-        public String getDesc() {
-            return desc;
-        }
-
-        public void setDesc(String desc) {
-            this.desc = desc;
-        }
-
-
-        public boolean isStatus() {
-            return status;
-        }
-
-        public void setStatus(boolean status) {
-            this.status = status;
-        }
-
-        public String getScore() {
-            return score;
-        }
-
-        public void setScore(String score) {
-            this.score = score;
-        }
-    }
-}
-package com.cnlive.strike.data.network.model;
-
-/**
- * 创建：wukuiqing
- * <p>
- * 时间：2018/4/2
- * <p>
- * 描述：
- */
-
-public class AppVersionInfo {
-
-
-
-    /**
-     * deviceType : IOS
-     * msg : 达人端1.0
-     * createTime : 2018-04-02 00:00:00
-     * id : aaaaa
-     * type : B
-     * version : 1.0
-     * strongUpdate
-     */
-
-    public String deviceType;
-    public String msg;
-    public String createTime;
-    public String id;
-    public String type;
-    public String version;
-    public String versionCode;
-    public String downLoadUrl;
-    public boolean forceUpdating;
-
-    public boolean isForceUpdating() {
-        return forceUpdating;
-    }
-
-    public void setForceUpdating(boolean forceUpdating) {
-        this.forceUpdating = forceUpdating;
-    }
-
-    public String getVersionCode() {
-        return versionCode;
-    }
-
-    public void setVersionCode(String versionCode) {
-        this.versionCode = versionCode;
-    }
-
-    public String getDownLoadUrl() {
-        return downLoadUrl;
-    }
-
-    public void setDownLoadUrl(String downLoadUrl) {
-        this.downLoadUrl = downLoadUrl;
-    }
-
-    public String getDeviceType() {
-        return deviceType;
-    }
-
-    public void setDeviceType(String deviceType) {
-        this.deviceType = deviceType;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public String getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-}
-package com.cnlive.strike.data.network.model;
-
-/**
- * 作者: 吴奎庆
- * <p>
- * 时间: 2019/2/22
- * <p>
- * 简介:
- */
-public class AudioAlbumDetailsInfo {
-
-    /**
-     * albumId : 67
-     * albumImg : http://ffyl.ys1.cnliveimg.com/223/img/2018/1119/181119100131652_957.png@base@tag=imgScale&q=20
-     * albumName : 音频第一个专辑2
-     * desc : 123123
-     * actor : 123
-     * time : 1551061851000
-     * sp : {"spName":null,"spId":60,"spIcon":null,"desc":null,"subscriptions":null,"subscribe":false}
-     * episodeNow : 3
-     * subscriptions : null
-     * subscribe : false
-     * episodeLast : null
-     */
-
-    private int albumId;
-    private String albumImg;
-    private String albumName;
-    private String desc;
-    private String actor;
-    private long time;
-    private SpBean sp;
-    private int episodeNow;
-    private String subscriptions;
-
-    public String getContentIdLast() {
-        return contentIdLast;
-    }
-
-    public void setContentIdLast(String contentIdLast) {
-        this.contentIdLast = contentIdLast;
-    }
-
-    private String contentIdLast;
-    private boolean subscribe;
-    private int episodeLast;
-
-    public int getAlbumId() {
-        return albumId;
-    }
-
-    public void setAlbumId(int albumId) {
-        this.albumId = albumId;
-    }
-
-    public String getAlbumImg() {
-        return albumImg;
-    }
-
-    public void setAlbumImg(String albumImg) {
-        this.albumImg = albumImg;
-    }
-
-    public String getAlbumName() {
-        return albumName;
-    }
-
-    public void setAlbumName(String albumName) {
-        this.albumName = albumName;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-
-    public String getActor() {
-        return actor;
-    }
-
-    public void setActor(String actor) {
-        this.actor = actor;
-    }
-
-    public long getTime() {
-        return time;
-    }
-
-    public void setTime(long time) {
-        this.time = time;
-    }
-
-    public SpBean getSp() {
-        return sp;
-    }
-
-    public void setSp(SpBean sp) {
-        this.sp = sp;
-    }
-
-    public int getEpisodeNow() {
-        return episodeNow;
-    }
-
-    public void setEpisodeNow(int episodeNow) {
-        this.episodeNow = episodeNow;
-    }
-
-    public String getSubscriptions() {
-        return subscriptions;
-    }
-
-    public void setSubscriptions(String subscriptions) {
-        this.subscriptions = subscriptions;
-    }
-
-    public boolean isSubscribe() {
-        return subscribe;
-    }
-
-    public void setSubscribe(boolean subscribe) {
-        this.subscribe = subscribe;
-    }
-
-    public int getEpisodeLast() {
-        return episodeLast;
-    }
-
-    public void setEpisodeLast(int episodeLast) {
-        this.episodeLast = episodeLast;
-    }
-
-    public static class SpBean {
-        /**
-         * spName : null
-         * spId : 60
-         * spIcon : null
-         * desc : null
-         * subscriptions : null
-         * subscribe : false
-         */
-
-        private Object spName;
-        private int spId;
-        private Object spIcon;
-        private Object desc;
-        private Object subscriptions;
-        private boolean subscribe;
-
-        public Object getSpName() {
-            return spName;
-        }
-
-        public void setSpName(Object spName) {
-            this.spName = spName;
-        }
-
-        public int getSpId() {
-            return spId;
-        }
-
-        public void setSpId(int spId) {
-            this.spId = spId;
-        }
-
-        public Object getSpIcon() {
-            return spIcon;
-        }
-
-        public void setSpIcon(Object spIcon) {
-            this.spIcon = spIcon;
-        }
-
-        public Object getDesc() {
-            return desc;
-        }
-
-        public void setDesc(Object desc) {
-            this.desc = desc;
-        }
-
-        public Object getSubscriptions() {
-            return subscriptions;
-        }
-
-        public void setSubscriptions(Object subscriptions) {
-            this.subscriptions = subscriptions;
-        }
-
-        public boolean isSubscribe() {
-            return subscribe;
-        }
-
-        public void setSubscribe(boolean subscribe) {
-            this.subscribe = subscribe;
-        }
-    }
-}
-package com.cnlive.strike.data.network.model;
-
-import java.io.Serializable;
-
-/**
- * 作者: 吴奎庆
- * <p>
- * 时间: 2019/2/22
- * <p>
- * 简介:
- */
-public class AudioChapterInfo implements Serializable {
-
-    /**
-     * title : 20181030aaa
-     * modelId : 5
-     * time : 1550567051000
-     * img : null
-     * viewCounts : 66666
-     * schedule : null
-     * activityId : 604_42d8ee17506445c792dba348c1e794c1
-     * contentId : 25675
-     * duration : 146
-     */
-
-    private String title;
-    private String albumId;
-    private String albumName;
-    private String actor;
-    private int modelId;
-    private long time;
-    private String img;
-    private int counts;
-    private double viewCounts;
-    private double schedule;
-    private String activityId;
-    private int contentId;
-    private long duration;
-    private int comments;
-    private String shareUrl;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getAlbumId() {
-        return albumId;
-    }
-
-    public void setAlbumId(String albumId) {
-        this.albumId = albumId;
-    }
-
-    public String getAlbumName() {
-        return albumName;
-    }
-
-    public void setAlbumName(String albumName) {
-        this.albumName = albumName;
-    }
-
-    public String getActor() {
-        return actor;
-    }
-
-    public void setActor(String actor) {
-        this.actor = actor;
-    }
-
-    public int getModelId() {
-        return modelId;
-    }
-
-    public void setModelId(int modelId) {
-        this.modelId = modelId;
-    }
-
-    public long getTime() {
-        return time;
-    }
-
-    public void setTime(long time) {
-        this.time = time;
-    }
-
-    public String getImg() {
-        return img;
-    }
-
-    public void setImg(String img) {
-        this.img = img;
-    }
-
-    public int getCounts() {
-        return counts;
-    }
-
-    public void setCounts(int counts) {
-        this.counts = counts;
-    }
-
-    public double getViewCounts() {
-        return viewCounts;
-    }
-
-    public void setViewCounts(double viewCounts) {
-        this.viewCounts = viewCounts;
-    }
-
-    public double getSchedule() {
-        return schedule;
-    }
-
-    public void setSchedule(double schedule) {
-        this.schedule = schedule;
-    }
-
-    public String getActivityId() {
-        return activityId;
-    }
-
-    public void setActivityId(String activityId) {
-        this.activityId = activityId;
-    }
-
-    public int getContentId() {
-        return contentId;
-    }
-
-    public void setContentId(int contentId) {
-        this.contentId = contentId;
-    }
-
-    public long getDuration() {
-        return duration;
-    }
-
-    public void setDuration(long duration) {
-        this.duration = duration;
-    }
-
-    public int getComments() {
-        return comments;
-    }
-
-    public void setComments(int comments) {
-        this.comments = comments;
-    }
-
-    public String getShareUrl() {
-        return shareUrl;
-    }
-
-    public void setShareUrl(String shareUrl) {
-        this.shareUrl = shareUrl;
-    }
-
-    @Override
-    public boolean equals( Object obj) {
-        if(obj instanceof AudioChapterInfo){
-            return ((AudioChapterInfo)obj).getActivityId().equals(activityId);
-        }
-        return super.equals(obj);
-    }
-}
-package com.cnlive.strike.data.network.model;
-
-/**
- * 作者: 吴奎庆
- * <p>
- * 时间: 2019/2/26
- * <p>
- * 简介:
- */
-public class AudioHistoryInfo {
-
-    /**
-     * id : 262
-     * contentId : 25685
-     * activeId : 60_7f14a5821e8246339ccdb7f17ec1c291
-     * title : 20181030
-     * time : 1551110400000
-     * counts : null
-     * sid : 10504050
-     * albumId : 65
-     * albumName : audio-test1
-     * albumImg : http://ffyl.ys1.cnliveimg.com/223/img/2018/1119/181119100131652_957.png@base@tag=imgScale&q=20
-     * schedule : 0
-     * recent : true
-     */
-
-    private int id;
-    private String contentId;
-    private String activeId;
-    private String title;
-    private long time;
-    private int counts;
-    private String sid;
-    private int albumId;
-    private String albumName;
-    private String albumImg;
-    private float schedule;
-    private boolean recent;
-    private  String channelName;
-    private  String shareUrl;
-    private  String actor;
-
-    public String getChannelName() {
-        return channelName;
-    }
-
-    public void setChannelName(String channelName) {
-        this.channelName = channelName;
-    }
-
-    public String getShareUrl() {
-        return shareUrl;
-    }
-
-    public void setShareUrl(String shareUrl) {
-        this.shareUrl = shareUrl;
-    }
-
-    public String getActor() {
-        return actor;
-    }
-
-    public void setActor(String actor) {
-        this.actor = actor;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getContentId() {
-        return contentId;
-    }
-
-    public void setContentId(String contentId) {
-        this.contentId = contentId;
-    }
-
-    public String getActiveId() {
-        return activeId;
-    }
-
-    public void setActiveId(String activeId) {
-        this.activeId = activeId;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public long getTime() {
-        return time;
-    }
-
-    public void setTime(long time) {
-        this.time = time;
-    }
-
-    public int getCounts() {
-        return counts;
-    }
-
-    public void setCounts(int counts) {
-        this.counts = counts;
-    }
-
-    public String getSid() {
-        return sid;
-    }
-
-    public void setSid(String sid) {
-        this.sid = sid;
-    }
-
-    public int getAlbumId() {
-        return albumId;
-    }
-
-    public void setAlbumId(int albumId) {
-        this.albumId = albumId;
-    }
-
-    public String getAlbumName() {
-        return albumName;
-    }
-
-    public void setAlbumName(String albumName) {
-        this.albumName = albumName;
-    }
-
-    public String getAlbumImg() {
-        return albumImg;
-    }
-
-    public void setAlbumImg(String albumImg) {
-        this.albumImg = albumImg;
-    }
-
-    public float getSchedule() {
-        return schedule;
-    }
-
-    public void setSchedule(float schedule) {
-        this.schedule = schedule;
-    }
-
-    public boolean isRecent() {
-        return recent;
-    }
-
-    public void setRecent(boolean recent) {
-        this.recent = recent;
-    }
-}