调整项目目录结构、删除无用依赖库、删除 Platform 业务代码、修改 Platform 模块网络请求框架

app/src/main/AndroidManifest.xml

@@ -12,7 +12,7 @@
 
 
     <application
-            android:name="com.yidianling.ydlcommon.core.base.BaseApplication"
+            android:name="com.yidianling.ydlcommon.base.BaseApplication"
             android:allowBackup="false"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"

app/src/main/java/com/ydl/component/MainActivity.kt

@@ -3,7 +3,7 @@ package com.ydl.component
 import com.alibaba.android.arouter.launcher.ARouter
 import com.ydl.component.mvp.DemoContract
 import com.ydl.component.mvp.DemoPresenter
-import com.yidianling.ydlcommon.core.mvp.lce.BaseLceActivity
+import com.yidianling.ydlcommon.mvp.lce.BaseLceActivity
 import kotlinx.android.synthetic.main.activity_main.*
 
 /**

app/src/main/java/com/ydl/component/api/DemoService.kt

@@ -2,8 +2,8 @@ package com.ydl.component.api
 
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
-import com.yidianling.ydlcommon.core.base.config.YDL_DOMAIN
-import com.yidianling.ydlcommon.core.base.config.YDL_DOMAIN_JAVA
+import com.yidianling.ydlcommon.base.config.YDL_DOMAIN
+import com.yidianling.ydlcommon.base.config.YDL_DOMAIN_JAVA
 import io.reactivex.Observable
 import retrofit2.http.GET
 import retrofit2.http.Headers

app/src/main/java/com/ydl/component/base/DemoAppLifecycles.java

@@ -3,7 +3,7 @@ package com.ydl.component.base;
 
 import android.app.Application;
 import android.content.Context;
-import com.yidianling.ydlcommon.core.base.delegate.IAppLifecycles;
+import com.yidianling.ydlcommon.base.delegate.IAppLifecycles;
 import org.jetbrains.annotations.NotNull;
 
 /**

app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java

@@ -3,9 +3,9 @@ package com.ydl.component.base;
 
 import android.content.Context;
 import com.ydl.component.BuildConfig;
-import com.yidianling.ydlcommon.core.base.config.IConfigModule;
-import com.yidianling.ydlcommon.core.base.delegate.IAppLifecycles;
-import com.yidianling.ydlcommon.core.base.config.GlobalConfig;
+import com.yidianling.ydlcommon.base.config.IConfigModule;
+import com.yidianling.ydlcommon.base.delegate.IAppLifecycles;
+import com.yidianling.ydlcommon.base.config.GlobalConfig;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;

app/src/main/java/com/ydl/component/mvp/DemoContract.kt

@@ -2,9 +2,9 @@ package com.ydl.component.mvp
 
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
-import com.yidianling.ydlcommon.core.mvp.base.IModel
-import com.yidianling.ydlcommon.core.mvp.base.IPresenter
-import com.yidianling.ydlcommon.core.mvp.lce.ILceView
+import com.yidianling.ydlcommon.mvp.base.IModel
+import com.yidianling.ydlcommon.mvp.base.IPresenter
+import com.yidianling.ydlcommon.mvp.lce.ILceView
 import io.reactivex.Observable
 
 /**

app/src/main/java/com/ydl/component/mvp/DemoModel.kt

@@ -5,7 +5,7 @@ import android.arch.lifecycle.OnLifecycleEvent
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.ydl.component.api.DemoService
-import com.yidianling.ydlcommon.core.mvp.base.BaseModel
+import com.yidianling.ydlcommon.mvp.base.BaseModel
 import com.ydl.ydlnet.YDLHttpUtils
 import io.reactivex.Observable
 

app/src/main/java/com/ydl/component/mvp/DemoPresenter.kt

@@ -2,8 +2,8 @@ package com.ydl.component.mvp
 
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
-import com.yidianling.ydlcommon.core.mvp.base.BasePresenter
-import com.yidianling.ydlcommon.core.utils.RxLifecycleUtils
+import com.yidianling.ydlcommon.mvp.base.BasePresenter
+import com.yidianling.ydlcommon.utils.RxLifecycleUtils
 import com.ydl.ydlnet.builder.interceptor.YDLTransformer
 import com.ydl.ydlnet.client.observer.CommonObserver
 

app/src/main/res/layout/activity_main.xml

@@ -78,7 +78,7 @@
 
     </LinearLayout>
 
-    <com.yidianling.ydlcommon.core.mvp.lce.view.YDLStateView
+    <com.yidianling.ydlcommon.mvp.lce.view.YDLStateView
             android:id="@+id/lce_state_view"
             android:layout_width="match_parent"
             android:layout_height="300dp"/>

config.gradle

@@ -148,6 +148,7 @@ ext {
             "umeng-analytics"              : 'com.umeng.sdk:analytics:7.5.1',
             "umeng-share-core"             : 'com.umeng.sdk:share-core:6.9.1',
             "umeng-share-qq"               : 'com.umeng.sdk:share-qq:6.9.1.1',
+            "umeng-share-wechat"           : 'com.umeng.sdk:share-wechat:6.9.1',
             "umeng-shareboard"             : 'com.umeng.sdk:shareboard-widget:6.9.1',
             "umeng-debug"                  : 'com.umeng.sdk:debug:1.0.0',
             "tablayout"                    : 'com.flyco.tablayout:FlycoTabLayout_Lib:2.1.2@aar',

ydl-net/src/main/java/com/ydl/ydlnet/builder/interceptor/log/DefaultFormatPrinter.java

@@ -157,13 +157,13 @@ public class DefaultFormatPrinter {
         }
     };
 
-    private static final String[] ARMS = new String[]{"-A-", "-R-", "-M-", "-S-"};
+    private static final String[] YDLS = new String[]{"-Y-", "-D-", "-L-", "-S-"};
 
     private static String computeKey() {
         if (last.get() >= 4) {
             last.set(0);
         }
-        String s = ARMS[last.get()];
+        String s = YDLS[last.get()];
         last.set(last.get() + 1);
         return s;
     }

ydl-platform/src/main/AndroidManifest.xml

@@ -11,27 +11,22 @@
 
     <application>
         <activity
-            android:name=".custom.h5.NewH5Activity"
+            android:name="com.yidianling.ydlcommon.h5.NewH5Activity"
             android:screenOrientation="portrait"
             android:theme="@style/NoTitleTheme"/>
         <activity
-            android:name=".custom.pay.PayActivity"
+            android:name="com.yidianling.ydlcommon.actions.pay.PayActivity"
             android:screenOrientation="portrait" />
-        <!--支付跳转中间页（目前只有测评入口使用）-->
-        <activity
-            android:name=".custom.pay.redpacket.jump.JumpPayActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Transparent" />
 
         <activity
-            android:name="com.yidianling.ydlcommon.custom.actions.imagepicker.ImagePickerActivity"
+            android:name="com.yidianling.ydlcommon.actions.imagepicker.ImagePickerActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
 
-        <service android:name="com.yidianling.ydlcommon.custom.actions.player.service.HMusicPlayService"
+        <service android:name="com.yidianling.ydlcommon.actions.player.service.HMusicPlayService"
             android:enabled="true"/>
 
-        <receiver android:name="com.yidianling.ydlcommon.custom.actions.player.notifycation.MusicPlayerReceiver"
+        <receiver android:name="com.yidianling.ydlcommon.actions.player.notifycation.MusicPlayerReceiver"
             android:enabled="true"
             android:exported="false">
             <intent-filter>
@@ -42,7 +37,7 @@
             </intent-filter>
         </receiver>
         <!--监听系统下载完成的广播-->
-        <receiver android:name=".custom.utils.receiver.DownloadReceiver">
+        <receiver android:name="com.yidianling.ydlcommon.utils.receiver.DownloadReceiver">
             <intent-filter>
                 <action android:name="DownloadManager.ACTION_DOWNLOAD_COMPLETE"/>
                 <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/crash/ClientTransaction.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/crash/ClientTransaction.java

-package com.yidianling.ydlcommon.custom.crash;
+package com.yidianling.ydlcommon.actions.crash;
 
 import android.os.IBinder;
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/crash/Cockroach.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/crash/Cockroach.java

-package com.yidianling.ydlcommon.custom.crash;
+package com.yidianling.ydlcommon.actions.crash;
 
 import android.content.Context;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import com.yidianling.ydlcommon.custom.crash.compat.*;
+import com.yidianling.ydlcommon.actions.crash.compat.*;
 import me.weishu.reflection.Reflection;
 
 import java.lang.reflect.Field;

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/crash/ExceptionHandler.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/crash/ExceptionHandler.java

-package com.yidianling.ydlcommon.custom.crash;
+package com.yidianling.ydlcommon.actions.crash;
 
 /**
  * Created by wanjian on 2018/5/29.

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/crash/compat/ActivityKillerV15_V20.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/crash/compat/ActivityKillerV15_V20.java

-package com.yidianling.ydlcommon.custom.crash.compat;
+package com.yidianling.ydlcommon.actions.crash.compat;
 
 import android.app.Activity;
 import android.content.Intent;

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/crash/compat/ActivityKillerV21_V23.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/crash/compat/ActivityKillerV21_V23.java

-package com.yidianling.ydlcommon.custom.crash.compat;
+package com.yidianling.ydlcommon.actions.crash.compat;
 
 import android.app.Activity;
 import android.content.Intent;

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/crash/compat/ActivityKillerV24_V25.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/crash/compat/ActivityKillerV24_V25.java

-package com.yidianling.ydlcommon.custom.crash.compat;
+package com.yidianling.ydlcommon.actions.crash.compat;
 
 import android.app.Activity;
 import android.content.Intent;

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/crash/compat/ActivityKillerV26.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/crash/compat/ActivityKillerV26.java

-package com.yidianling.ydlcommon.custom.crash.compat;
+package com.yidianling.ydlcommon.actions.crash.compat;
 
 import android.app.Activity;
 import android.app.ActivityManager;

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/crash/compat/ActivityKillerV28.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/crash/compat/ActivityKillerV28.java

-package com.yidianling.ydlcommon.custom.crash.compat;
+package com.yidianling.ydlcommon.actions.crash.compat;
 
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -6,7 +6,7 @@ import android.content.Intent;
 import android.os.IBinder;
 import android.os.Message;
 
-import com.yidianling.ydlcommon.custom.crash.ClientTransaction;
+import com.yidianling.ydlcommon.actions.crash.ClientTransaction;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/crash/compat/IActivityKiller.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/crash/compat/IActivityKiller.java

-package com.yidianling.ydlcommon.custom.crash.compat;
+package com.yidianling.ydlcommon.actions.crash.compat;
 
 import android.os.Message;
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/imagepicker/ImagePickerActivity.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/imagepicker/ImagePickerActivity.kt

-package com.yidianling.ydlcommon.custom.actions.imagepicker
+package com.yidianling.ydlcommon.actions.imagepicker
 
 import android.app.Activity
 import android.content.Intent
 import com.lzy.imagepicker.ImagePicker
 import com.lzy.imagepicker.bean.ImageItem
 import com.lzy.imagepicker.ui.ImageGridActivity
-import com.yidianling.ydlcommon.core.base.BaseActivity
-import com.yidianling.ydlcommon.custom.utils.remind.ToastHelper
+import com.yidianling.ydlcommon.base.BaseActivity
+import com.yidianling.ydlcommon.utils.remind.ToastHelper
 
 
 /**

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/imagepicker/ImagePickerFragment.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/imagepicker/ImagePickerFragment.kt

-package com.yidianling.ydlcommon.custom.actions.imagepicker
+package com.yidianling.ydlcommon.actions.imagepicker
 
 import android.content.Intent
 import android.os.Bundle
@@ -6,8 +6,8 @@ import android.support.v7.app.AppCompatActivity
 import com.lzy.imagepicker.ImagePicker
 import com.lzy.imagepicker.bean.ImageItem
 import com.lzy.imagepicker.ui.ImageGridActivity
-import com.yidianling.ydlcommon.core.base.BaseFragment
-import com.yidianling.ydlcommon.custom.utils.remind.ToastHelper
+import com.yidianling.ydlcommon.base.BaseFragment
+import com.yidianling.ydlcommon.utils.remind.ToastHelper
 
 /**
  * author : Zhangwenchao

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/imagepicker/PickerCallback.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/imagepicker/PickerCallback.kt

-package com.yidianling.ydlcommon.custom.actions.imagepicker
+package com.yidianling.ydlcommon.actions.imagepicker
 
 import com.lzy.imagepicker.bean.ImageItem
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/imagepicker/YdlImageLoader.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/imagepicker/YdlImageLoader.java

-package com.yidianling.ydlcommon.custom.actions.imagepicker;
+package com.yidianling.ydlcommon.actions.imagepicker;
 
 import android.app.Activity;
 import android.net.Uri;

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/imagepicker/YdlImagePicker.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/imagepicker/YdlImagePicker.kt

-package com.yidianling.ydlcommon.custom.actions.imagepicker
+package com.yidianling.ydlcommon.actions.imagepicker
 
 import android.support.v7.app.AppCompatActivity
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/AliInfo.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/AliInfo.kt

-package com.yidianling.ydlcommon.custom.pay
+package com.yidianling.ydlcommon.actions.pay
 
 data class AliInfo(val alipayPartner: String,
                    val alipayKey: String,

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/AliPayBean.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/AliPayBean.kt

-package com.yidianling.ydlcommon.custom.pay
+package com.yidianling.ydlcommon.actions.pay
 
 /**
  * author : Zhangwenchao

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/Base64.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/Base64.java

-package com.yidianling.ydlcommon.custom.pay;
+package com.yidianling.ydlcommon.actions.pay;
 
  public class Base64 {
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/PayActivity.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/PayActivity.kt

-package com.yidianling.ydlcommon.custom.pay
+package com.yidianling.ydlcommon.actions.pay
 
 import android.app.Activity
 import android.content.Intent
@@ -12,20 +12,20 @@ import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import com.yidianling.ydlcommon.R
-import com.yidianling.ydlcommon.core.base.BaseActivity
-import com.yidianling.ydlcommon.custom.data.PlatformDataManager
-import com.yidianling.ydlcommon.custom.http.RxUtils
-import com.yidianling.ydlcommon.custom.http.ThrowableConsumer
-import com.yidianling.ydlcommon.custom.http.params.*
-import com.yidianling.ydlcommon.custom.http.response.TestAddOrderBean
-import com.yidianling.ydlcommon.custom.utils.log.LogHelper
-import com.yidianling.ydlcommon.custom.pay.PayParams.CREATOR.INLET_NORMAL
-import com.yidianling.ydlcommon.custom.pay.PayParams.CREATOR.INLET_TEST
-import com.yidianling.ydlcommon.custom.pay.redpacket.RedPacketBean
-import com.yidianling.ydlcommon.custom.pay.redpacket.RedPacketPayBean
-import com.yidianling.ydlcommon.custom.pay.redpacket.RedPacketPopWindow
-import com.yidianling.ydlcommon.custom.utils.remind.ToastHelper
-import com.yidianling.ydlcommon.custom.router.YdlCommonRouterManager
+import com.yidianling.ydlcommon.base.BaseActivity
+import com.yidianling.ydlcommon.data.PlatformDataManager
+import com.yidianling.ydlcommon.data.http.RxUtils
+import com.yidianling.ydlcommon.data.http.ThrowableConsumer
+import com.yidianling.ydlcommon.data.http.params.*
+import com.yidianling.ydlcommon.data.http.response.TestAddOrderBean
+import com.yidianling.ydlcommon.utils.log.LogHelper
+import com.yidianling.ydlcommon.actions.pay.PayParams.CREATOR.INLET_NORMAL
+import com.yidianling.ydlcommon.actions.pay.PayParams.CREATOR.INLET_TEST
+import com.yidianling.ydlcommon.actions.pay.redpacket.RedPacketBean
+import com.yidianling.ydlcommon.actions.pay.redpacket.RedPacketPayBean
+import com.yidianling.ydlcommon.actions.pay.redpacket.RedPacketPopWindow
+import com.yidianling.ydlcommon.utils.remind.ToastHelper
+import com.yidianling.ydlcommon.router.YdlCommonRouterManager
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.functions.Consumer

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/PayParams.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/PayParams.kt

-package com.yidianling.ydlcommon.custom.pay
+package com.yidianling.ydlcommon.actions.pay
 
 import android.os.Parcel
 import android.os.Parcelable

ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/PayResult.java

+package com.yidianling.ydlcommon.actions.pay;
import java.util.Map;
import android.text.TextUtils;
public class PayResult {
	private String resultStatus;
	private String result;
	private String memo;

	public PayResult(Map<String, String> rawResult) {
		if (rawResult == null) {
			return;
		}

		for (String key : rawResult.keySet()) {
			if (TextUtils.equals(key, "resultStatus")) {
				resultStatus = rawResult.get(key);
			} else if (TextUtils.equals(key, "result")) {
				result = rawResult.get(key);
			} else if (TextUtils.equals(key, "memo")) {
				memo = rawResult.get(key);
			}
		}
	}

	@Override
	public String toString() {
		return "resultStatus={" + resultStatus + "};memo={" + memo
				+ "};result={" + result + "}";
	}

	/**
	 * @return the resultStatus
	 */
	public String getResultStatus() {
		return resultStatus;
	}

	/**
	 * @return the memo
	 */
	public String getMemo() {
		return memo;
	}

	/**
	 * @return the result
	 */
	public String getResult() {
		return result;
	}}
\ No newline at end of file

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/PayStatus.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/PayStatus.kt

-package com.yidianling.ydlcommon.custom.pay
+package com.yidianling.ydlcommon.actions.pay
 
 import android.support.annotation.Keep
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/PayType.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/PayType.kt

-package com.yidianling.ydlcommon.custom.pay
+package com.yidianling.ydlcommon.actions.pay
 
 /**
  * 支付类型

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/RxPay.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/RxPay.kt

-package com.yidianling.ydlcommon.custom.pay
+package com.yidianling.ydlcommon.actions.pay
 
 import android.app.Activity
 import android.content.Context
@@ -6,9 +6,9 @@ import com.alipay.sdk.app.PayTask
 import com.tencent.mm.opensdk.constants.Build
 import com.tencent.mm.opensdk.modelpay.PayReq
 import com.tencent.mm.opensdk.openapi.WXAPIFactory
-import com.yidianling.ydlcommon.core.base.BaseApplication
-import com.yidianling.ydlcommon.custom.http.CustomThrowable
-import com.yidianling.ydlcommon.custom.http.response.WXPay
+import com.yidianling.ydlcommon.base.BaseApplication
+import com.yidianling.ydlcommon.data.http.CustomThrowable
+import com.yidianling.ydlcommon.data.http.response.WXPay
 import de.greenrobot.event.EventBus
 import io.reactivex.Emitter
 import io.reactivex.Observable
@@ -55,7 +55,7 @@ object RxPay {
         return Observable.create<PayStatus> {
             val alipay = PayTask(activity)
             val result = alipay.payV2(aliSign, true)
-            val payResult = com.yidianling.ydlcommon.custom.pay.PayResult(result)
+            val payResult = com.yidianling.ydlcommon.actions.pay.PayResult(result)
             when {
                 "9000" == payResult.resultStatus -> it.onNext(PayStatus(true))
                 else -> it.onError(CustomThrowable(payResult.memo))

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/WXPayEvent.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/WXPayEvent.kt

-package com.yidianling.ydlcommon.custom.pay
+package com.yidianling.ydlcommon.actions.pay
 
 /**
  * @author : Zhangwenchao

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/YdlWXAPIFactory.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/YdlWXAPIFactory.kt

-package com.yidianling.ydlcommon.custom.pay
+package com.yidianling.ydlcommon.actions.pay
 
 import com.tencent.mm.opensdk.openapi.IWXAPI
 import com.tencent.mm.opensdk.openapi.WXAPIFactory
-import com.yidianling.ydlcommon.core.base.BaseApplication
+import com.yidianling.ydlcommon.base.BaseApplication
 
 
 /**

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/model/CouponBean.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/model/CouponBean.java

-package com.yidianling.ydlcommon.custom.pay.model;
+package com.yidianling.ydlcommon.actions.pay.model;
 
 /**
  * @author jiucheng

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/model/OrderChangeCouponBean.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/model/OrderChangeCouponBean.java

-package com.yidianling.ydlcommon.custom.pay.model;
+package com.yidianling.ydlcommon.actions.pay.model;
 
 /**
  * @author jiucheng

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/model/OrderDataBean.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/model/OrderDataBean.kt

-package com.yidianling.ydlcommon.custom.pay.model
+package com.yidianling.ydlcommon.actions.pay.model
 
 import com.google.gson.annotations.SerializedName
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/model/SubmitOrderResponse.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/model/SubmitOrderResponse.kt

-package com.yidianling.ydlcommon.custom.pay.model
+package com.yidianling.ydlcommon.actions.pay.model
 
 /**
  * 提交订单-响应类

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/payDialog/ConfidePayParams.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/payDialog/ConfidePayParams.kt

-package com.yidianling.ydlcommon.custom.pay.payDialog
-
-import java.math.BigDecimal
+package com.yidianling.ydlcommon.actions.pay.payDialog
 
 /**
  * 倾诉支付参数

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/payDialog/PayDialog.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/payDialog/PayDialog.kt

-package com.yidianling.ydlcommon.custom.pay.payDialog
+package com.yidianling.ydlcommon.actions.pay.payDialog
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -8,15 +8,15 @@ import android.os.Bundle
 import android.support.v7.app.AlertDialog
 import android.view.*
 import com.yidianling.ydlcommon.R
-import com.yidianling.ydlcommon.custom.YdlBuryPointUtil
-import com.yidianling.ydlcommon.custom.data.PlatformDataManager
-import com.yidianling.ydlcommon.custom.http.RxUtils
-import com.yidianling.ydlcommon.custom.http.params.PayParam
-import com.yidianling.ydlcommon.custom.pay.PayStatus
-import com.yidianling.ydlcommon.custom.pay.RxPay
-import com.yidianling.ydlcommon.custom.utils.StringUtils
-import com.yidianling.ydlcommon.custom.utils.log.LogHelper
-import com.yidianling.ydlcommon.custom.utils.remind.ToastHelper
+import com.yidianling.ydlcommon.utils.YdlBuryPointUtil
+import com.yidianling.ydlcommon.data.PlatformDataManager
+import com.yidianling.ydlcommon.data.http.RxUtils
+import com.yidianling.ydlcommon.data.http.params.PayParam
+import com.yidianling.ydlcommon.actions.pay.PayStatus
+import com.yidianling.ydlcommon.actions.pay.RxPay
+import com.yidianling.ydlcommon.utils.StringUtils
+import com.yidianling.ydlcommon.utils.log.LogHelper
+import com.yidianling.ydlcommon.utils.remind.ToastHelper
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
@@ -52,7 +52,7 @@ class PayDialog : Dialog{
 
     private var activity : Activity by Delegates.notNull()
 
-    constructor(context: com.yidianling.ydlcommon.custom.h5.NewH5Activity) : super(context){
+    constructor(context: com.yidianling.ydlcommon.h5.NewH5Activity) : super(context){
         this.activity = context
     }
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/redpacket/RedPacketBean.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/redpacket/RedPacketBean.kt

-package com.yidianling.ydlcommon.custom.pay.redpacket
+package com.yidianling.ydlcommon.actions.pay.redpacket
 
 import android.os.Parcel
 import android.os.Parcelable

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/redpacket/RedPacketParam.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/redpacket/RedPacketParam.kt

-package com.yidianling.ydlcommon.custom.pay.redpacket
+package com.yidianling.ydlcommon.actions.pay.redpacket
 
 /**
  * @author yuanWai

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/redpacket/RedPacketPayBean.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/redpacket/RedPacketPayBean.kt

-package com.yidianling.ydlcommon.custom.pay.redpacket
+package com.yidianling.ydlcommon.actions.pay.redpacket
 
 import android.os.Parcel
 import android.os.Parcelable
-import com.yidianling.ydlcommon.custom.pay.PayParams
+import com.yidianling.ydlcommon.actions.pay.PayParams
 
 /**
  * @author yuanWai

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/redpacket/RedPacketPopWindow.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/redpacket/RedPacketPopWindow.kt

-package com.yidianling.ydlcommon.custom.pay.redpacket
+package com.yidianling.ydlcommon.actions.pay.redpacket
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -12,7 +12,6 @@ import android.widget.RelativeLayout
 import com.yidianling.common.tools.RxImageTool
 import com.yidianling.common.view.popupwindow.BasePopupWindow
 import com.yidianling.ydlcommon.R
-import com.yidianling.ydlcommon.custom.utils.Utils
 
 @Suppress("DEPRECATION")
 /**
@@ -48,7 +47,7 @@ class RedPacketPopWindow : BasePopupWindow {
         super.initPopupwindow()
         mView = LayoutInflater.from(mContext).inflate(R.layout.redpacket_pop_layout, null, false)
         popupWindow!!.width = ViewGroup.LayoutParams.MATCH_PARENT
-        popupWindow!!.height = (com.yidianling.ydlcommon.custom.utils.Utils.getScreenHeight(mContext) * 0.66).toInt()
+        popupWindow!!.height = (com.yidianling.ydlcommon.utils.Utils.getScreenHeight(mContext) * 0.66).toInt()
 
         popupWindow!!.setBackgroundDrawable(BitmapDrawable())
         popupWindow!!.setOnDismissListener(this)

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/pay/redpacket/RedPacketView.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/pay/redpacket/RedPacketView.kt

-package com.yidianling.ydlcommon.custom.pay.redpacket
+package com.yidianling.ydlcommon.actions.pay.redpacket
 
 import android.annotation.SuppressLint
 import android.content.Context

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/player/Config.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/player/Config.kt

-package com.yidianling.ydlcommon.custom.actions.player
+package com.yidianling.ydlcommon.actions.player
 
 /**
  * 配置文件

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/player/MusicInfoBean.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/player/MusicInfoBean.kt

-package com.yidianling.ydlcommon.custom.actions.player
+package com.yidianling.ydlcommon.actions.player
 
 /**
  * 音乐详情

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/player/MusicPlayerHelper.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/player/MusicPlayerHelper.kt

-package com.yidianling.ydlcommon.custom.actions.player
+package com.yidianling.ydlcommon.actions.player
 
 import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
 import android.os.Bundle
-import com.yidianling.ydlcommon.custom.actions.player.player.NotifyClickListener
-import com.yidianling.ydlcommon.custom.actions.player.service.HMusicPlayService
+import com.yidianling.ydlcommon.actions.player.player.NotifyClickListener
+import com.yidianling.ydlcommon.actions.player.service.HMusicPlayService
 
 /**
  * 音频播放器辅助类

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/player/YDLMusicHelper.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/player/YDLMusicHelper.kt

-package com.yidianling.ydlcommon.custom.actions.player
+package com.yidianling.ydlcommon.actions.player
 
 import android.content.Context
 import android.content.Intent

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/player/YDLMusicPlayer.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/player/YDLMusicPlayer.kt

-package com.yidianling.ydlcommon.custom.actions.player
+package com.yidianling.ydlcommon.actions.player
 
 import android.content.ComponentName
 import android.content.ServiceConnection
 import android.os.IBinder
 import android.text.TextUtils
-import com.yidianling.ydlcommon.core.base.BaseApplication
-import com.yidianling.ydlcommon.custom.actions.player.player.PlayStatusListener
-import com.yidianling.ydlcommon.custom.actions.player.service.HMusicPlayService
-import com.yidianling.ydlcommon.custom.utils.AppUtils
+import com.yidianling.ydlcommon.base.BaseApplication
+import com.yidianling.ydlcommon.actions.player.player.PlayStatusListener
+import com.yidianling.ydlcommon.actions.player.service.HMusicPlayService
+import com.yidianling.ydlcommon.utils.AppUtils
 import java.util.concurrent.CopyOnWriteArraySet
 
 class YDLMusicPlayer {

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/player/notifycation/MusicPlayerReceiver.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/player/notifycation/MusicPlayerReceiver.kt

-package com.yidianling.ydlcommon.custom.actions.player.notifycation
+package com.yidianling.ydlcommon.actions.player.notifycation
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.yidianling.ydlcommon.custom.actions.player.MusicPlayerHelper
-import com.yidianling.ydlcommon.custom.actions.player.service.HMusicPlayService
 import android.os.Build
+import com.yidianling.ydlcommon.actions.player.MusicPlayerHelper
+import com.yidianling.ydlcommon.actions.player.service.HMusicPlayService
 import java.lang.reflect.Method
 
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/player/notifycation/NotificationHelper.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/player/notifycation/NotificationHelper.kt

-package com.yidianling.ydlcommon.custom.actions.player.notifycation
+package com.yidianling.ydlcommon.actions.player.notifycation
 
 import android.annotation.SuppressLint
 import android.app.Notification

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/player/player/HPlayStatusListener.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/player/player/HPlayStatusListener.kt

-package com.yidianling.ydlcommon.custom.actions.player.player
+package com.yidianling.ydlcommon.actions.player.player
 
-import com.yidianling.ydlcommon.custom.actions.player.MusicInfoBean
+import com.yidianling.ydlcommon.actions.player.MusicInfoBean
 
 
 /**

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/player/player/NotifyClickListener.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/player/player/NotifyClickListener.kt

-package com.yidianling.ydlcommon.custom.actions.player.player
+package com.yidianling.ydlcommon.actions.player.player
 
 /**
  * 通知栏操作监听器

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/player/player/PlayStatusListener.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/player/player/PlayStatusListener.kt

-package com.yidianling.ydlcommon.custom.actions.player.player
+package com.yidianling.ydlcommon.actions.player.player
 
 /**
  * 播放状态回调

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/player/service/HMusicPlayService.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/player/service/HMusicPlayService.kt

-package com.yidianling.ydlcommon.custom.actions.player.service
+package com.yidianling.ydlcommon.actions.player.service
 
 import android.app.Notification
 import android.app.NotificationManager
@@ -28,12 +28,12 @@ import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory
 import com.google.android.exoplayer2.util.Util
 import com.yidianling.common.tools.LogUtil
 import com.yidianling.ydlcommon.R
-import com.yidianling.ydlcommon.custom.actions.player.MusicInfoBean
-import com.yidianling.ydlcommon.custom.actions.player.YDLMusicHelper
-import com.yidianling.ydlcommon.custom.actions.player.notifycation.NotificationHelper
-import com.yidianling.ydlcommon.custom.actions.player.player.PlayStatusListener
-import com.yidianling.ydlcommon.custom.actions.player.util.LogH
-import com.yidianling.ydlcommon.custom.actions.player.util.UtilH
+import com.yidianling.ydlcommon.actions.player.MusicInfoBean
+import com.yidianling.ydlcommon.actions.player.YDLMusicHelper
+import com.yidianling.ydlcommon.actions.player.notifycation.NotificationHelper
+import com.yidianling.ydlcommon.actions.player.player.PlayStatusListener
+import com.yidianling.ydlcommon.actions.player.util.LogH
+import com.yidianling.ydlcommon.actions.player.util.UtilH
 import java.util.*
 import kotlin.collections.ArrayList
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/player/util/LogH.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/player/util/LogH.kt

-package com.yidianling.ydlcommon.custom.actions.player.util
+package com.yidianling.ydlcommon.actions.player.util
 
 import android.util.Log
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/player/util/UtilH.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/player/util/UtilH.kt

-package com.yidianling.ydlcommon.custom.actions.player.util
+package com.yidianling.ydlcommon.actions.player.util
 
 import android.content.Context
 import android.text.TextUtils
-import com.yidianling.ydlcommon.custom.actions.player.Config
+import com.yidianling.ydlcommon.actions.player.Config
 
 /**
  * 工具类

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/player/view/HPlayView.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/player/view/HPlayView.kt

-package com.yidianling.ydlcommon.custom.actions.player.view
+package com.yidianling.ydlcommon.actions.player.view
 
 import android.app.Activity
 import android.os.Handler
@@ -7,12 +7,12 @@ import android.widget.RelativeLayout
 import android.widget.SeekBar
 import com.bumptech.glide.Glide
 import com.yidianling.ydlcommon.R
-import com.yidianling.ydlcommon.custom.actions.player.MusicInfoBean
-import com.yidianling.ydlcommon.custom.actions.player.YDLMusicHelper
-import com.yidianling.ydlcommon.custom.actions.player.YDLMusicPlayer
-import com.yidianling.ydlcommon.custom.actions.player.player.HPlayStatusListener
-import com.yidianling.ydlcommon.custom.actions.player.player.PlayStatusListener
-import com.yidianling.ydlcommon.custom.actions.player.service.HMusicPlayService
+import com.yidianling.ydlcommon.actions.player.MusicInfoBean
+import com.yidianling.ydlcommon.actions.player.YDLMusicHelper
+import com.yidianling.ydlcommon.actions.player.YDLMusicPlayer
+import com.yidianling.ydlcommon.actions.player.player.HPlayStatusListener
+import com.yidianling.ydlcommon.actions.player.player.PlayStatusListener
+import com.yidianling.ydlcommon.actions.player.service.HMusicPlayService
 import kotlinx.android.synthetic.main.play_music_view.view.*
 
 /**

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/actions/share/ShareUtils.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/actions/share/ShareUtils.kt

-package com.yidianling.ydlcommon.custom.actions.share
+package com.yidianling.ydlcommon.actions.share
 
 import android.app.Activity
 import android.text.TextUtils
@@ -10,8 +10,8 @@ import com.umeng.socialize.media.UMWeb
 import com.umeng.socialize.shareboard.ShareBoardConfig
 import com.yidianling.common.tools.LogUtil
 import com.yidianling.common.tools.ToastUtil
-import com.yidianling.ydlcommon.custom.view.dialog.CustomShareDialog
-import com.yidianling.ydlcommon.custom.utils.remind.ToastHelper
+import com.yidianling.ydlcommon.view.dialog.CustomShareDialog
+import com.yidianling.ydlcommon.utils.remind.ToastHelper
 import com.umeng.socialize.media.UMMin
 
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/adapter/BaseRecyclerAdapter.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/adapter/BaseRecyclerAdapter.java

-package com.yidianling.ydlcommon.custom.adapter;
+package com.yidianling.ydlcommon.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import com.yidianling.ydlcommon.custom.view.BaseViewHolder;
+import com.yidianling.ydlcommon.view.BaseViewHolder;
 
 import java.util.List;
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/adapter/CommonAdapter.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/adapter/CommonAdapter.java

-package com.yidianling.ydlcommon.custom.adapter;
+package com.yidianling.ydlcommon.adapter;
 
 import android.widget.BaseAdapter;
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/adapter/CommonRecyclerAdapter.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/adapter/CommonRecyclerAdapter.kt

-package com.yidianling.ydlcommon.custom.adapter
+package com.yidianling.ydlcommon.adapter
 
 import android.support.v7.widget.GridLayoutManager
 import android.support.v7.widget.LinearLayoutManager
@@ -166,21 +166,21 @@ class CommonRecyclerAdapter<T>(recyclerView: RecyclerView?, resLayout: Int) : Re
     }
 
     override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        if (viewType == HEAD) return com.yidianling.ydlcommon.custom.view.BaseViewHolder(
+        if (viewType == HEAD) return com.yidianling.ydlcommon.view.BaseViewHolder(
             headView
         )
-        if (viewType == FOOT) return com.yidianling.ydlcommon.custom.view.BaseViewHolder(
+        if (viewType == FOOT) return com.yidianling.ydlcommon.view.BaseViewHolder(
             footView
         )
         val view = LayoutInflater.from(viewGroup.context).inflate(layout, null)
-        return com.yidianling.ydlcommon.custom.view.BaseViewHolder(view)
+        return com.yidianling.ydlcommon.view.BaseViewHolder(view)
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         if (getItemViewType(position) == HEAD) return
         if (getItemViewType(position) == FOOT) return
         //绑定数据
-        callback?.bindDatabindData(holder as com.yidianling.ydlcommon.custom.view.BaseViewHolder,datas[position-headViewCount],position-headViewCount)
+        callback?.bindDatabindData(holder as com.yidianling.ydlcommon.view.BaseViewHolder,datas[position-headViewCount],position-headViewCount)
     }
 
     companion object {
@@ -191,7 +191,7 @@ class CommonRecyclerAdapter<T>(recyclerView: RecyclerView?, resLayout: Int) : Re
 
     interface BindDataCallback<T>{
         //绑定数据回调  需要子类设置此回调
-        fun bindDatabindData(holder : com.yidianling.ydlcommon.custom.view.BaseViewHolder, t : T, position: Int)
+        fun bindDatabindData(holder : com.yidianling.ydlcommon.view.BaseViewHolder, t : T, position: Int)
     }
     //加载更多监听
     interface OnLoadMoreLIstener{

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/adapter/DialogListAdapter.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/adapter/DialogListAdapter.java

-package com.yidianling.ydlcommon.custom.adapter;
+package com.yidianling.ydlcommon.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/adapter/FragmentWithTabPagerAdapter.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/adapter/FragmentWithTabPagerAdapter.java

-package com.yidianling.ydlcommon.custom.adapter;
+package com.yidianling.ydlcommon.adapter;
 
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/adapter/MyBaseAdapter.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/adapter/MyBaseAdapter.java

-package com.yidianling.ydlcommon.custom.adapter;
+package com.yidianling.ydlcommon.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/adapter/section/Section.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/adapter/section/Section.java

-package com.yidianling.ydlcommon.custom.adapter.section;
+package com.yidianling.ydlcommon.adapter.section;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/adapter/section/SectionAdapter.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/adapter/section/SectionAdapter.java

-package com.yidianling.ydlcommon.custom.adapter.section;
+package com.yidianling.ydlcommon.adapter.section;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/app/YdlRepository.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/app/YdlRepository.kt

-package com.yidianling.ydlcommon.custom.app
+package com.yidianling.ydlcommon.app
 
 import android.annotation.SuppressLint
 import android.app.Application
@@ -7,8 +7,8 @@ import com.lzy.imagepicker.ImagePicker
 import com.lzy.imagepicker.view.CropImageView
 import com.squareup.leakcanary.LeakCanary
 import com.yidianling.common.tools.RxTool
-import com.yidianling.ydlcommon.custom.utils.BuryPointUtils
-import com.yidianling.ydlcommon.custom.utils.log.LogHelper
+import com.yidianling.ydlcommon.utils.BuryPointUtils
+import com.yidianling.ydlcommon.utils.log.LogHelper
 
 
 /**
@@ -50,7 +50,7 @@ object YdlRepository {
 
     private fun initImagePicker() {
         val imagePicker = ImagePicker.getInstance()
-        imagePicker.imageLoader = com.yidianling.ydlcommon.custom.actions.imagepicker.YdlImageLoader()   //设置图片加载器
+        imagePicker.imageLoader = com.yidianling.ydlcommon.actions.imagepicker.YdlImageLoader()   //设置图片加载器
         imagePicker.isEdit = true   //设置图片是否可编辑
         imagePicker.isShowCamera = true  //显示拍照按钮
         imagePicker.isCrop = true        //允许裁剪（单选才有效）

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/BaseActivity.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/BaseActivity.kt

-package com.yidianling.ydlcommon.core.base
+package com.yidianling.ydlcommon.base
 
 import android.app.Activity
 import android.content.res.Resources
@@ -8,11 +8,11 @@ import android.support.v7.app.AppCompatActivity
 import android.util.Log
 import android.view.View
 import com.trello.rxlifecycle2.android.ActivityEvent
-import com.yidianling.ydlcommon.core.base.lifecycle.IActivityLifecycleable
-import com.yidianling.ydlcommon.core.bean.StatusBarOptions
-import com.yidianling.ydlcommon.core.utils.ActivityManager
-import com.yidianling.ydlcommon.core.utils.AndroidSystemHelper
-import com.yidianling.ydlcommon.core.utils.StatusBarUtils
+import com.yidianling.ydlcommon.base.lifecycle.IActivityLifecycleable
+import com.yidianling.ydlcommon.bean.StatusBarOptions
+import com.yidianling.ydlcommon.utils.ActivityManager
+import com.yidianling.ydlcommon.utils.AndroidSystemHelper
+import com.yidianling.ydlcommon.utils.StatusBarUtils
 import io.reactivex.subjects.BehaviorSubject
 import io.reactivex.subjects.Subject
 import kotlin.properties.Delegates
@@ -88,7 +88,8 @@ abstract class BaseActivity : AppCompatActivity(),IActivityLifecycleable {
     }
 
     open fun initStatusViewOptions(isAddStatusView:Boolean,statusBarDarkMode:Boolean,statusColor:String){
-        statusBarOption = StatusBarOptions(isAddStatusView,statusBarDarkMode,statusColor)
+        statusBarOption =
+            StatusBarOptions(isAddStatusView, statusBarDarkMode, statusColor)
     }
 
     open fun initStatusViewOptions(){

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/BaseApplication.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/BaseApplication.kt

-package com.yidianling.ydlcommon.core.base
+package com.yidianling.ydlcommon.base
 
 import android.app.Application
 import android.content.Context
 import android.support.multidex.MultiDex
-import com.yidianling.ydlcommon.core.base.delegate.AppDelegate
-import com.yidianling.ydlcommon.core.base.delegate.IAppLifecycles
-import com.yidianling.ydlcommon.core.utils.YDLPreconditions
-import com.yidianling.ydlcommon.core.base.config.GlobalConfig
-import com.yidianling.ydlcommon.core.base.config.IApp
+import com.yidianling.ydlcommon.base.config.GlobalConfig
+import com.yidianling.ydlcommon.base.config.IApp
+import com.yidianling.ydlcommon.base.delegate.AppDelegate
+import com.yidianling.ydlcommon.base.delegate.IAppLifecycles
+import com.yidianling.ydlcommon.utils.YDLPreconditions
 
 /**
  * Created by haorui on 2019-08-21 .

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/BaseFragment.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/BaseFragment.kt

-package com.yidianling.ydlcommon.core.base
+package com.yidianling.ydlcommon.base
 
 import android.os.Bundle
 import android.support.annotation.LayoutRes
@@ -7,9 +7,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.trello.rxlifecycle2.android.FragmentEvent
-import com.yidianling.ydlcommon.core.base.lifecycle.IFragmentLifecycleable
-import com.yidianling.ydlcommon.core.bean.StatusBarOptions
-import com.yidianling.ydlcommon.core.utils.StatusBarUtils
+import com.yidianling.ydlcommon.base.lifecycle.IFragmentLifecycleable
+import com.yidianling.ydlcommon.bean.StatusBarOptions
+import com.yidianling.ydlcommon.utils.StatusBarUtils
 import io.reactivex.subjects.BehaviorSubject
 import io.reactivex.subjects.Subject
 
@@ -127,7 +127,8 @@ abstract class BaseFragment : Fragment() ,IFragmentLifecycleable{
     }
 
     open fun initStatusViewOptions(isAddStatusView:Boolean,statusBarDarkMode:Boolean,statusColor:String){
-        statusBarOption = StatusBarOptions(isAddStatusView,statusBarDarkMode,statusColor)
+        statusBarOption =
+            StatusBarOptions(isAddStatusView, statusBarDarkMode, statusColor)
     }
 
     override fun onDestroyView() {

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/BaseMvpActivity.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/BaseMvpActivity.kt

-package com.yidianling.ydlcommon.core.base
+package com.yidianling.ydlcommon.base
 
 import android.os.Bundle
-import com.yidianling.ydlcommon.core.mvp.base.IPresenter
-import com.yidianling.ydlcommon.core.mvp.base.IView
-import com.yidianling.ydlcommon.core.mvp.delegate.MvpActivityDelegateImpl
-import com.yidianling.ydlcommon.core.mvp.delegate.MvpDelegateCallback
+import com.yidianling.ydlcommon.mvp.base.IPresenter
+import com.yidianling.ydlcommon.mvp.base.IView
+import com.yidianling.ydlcommon.mvp.delegate.MvpActivityDelegateImpl
+import com.yidianling.ydlcommon.mvp.delegate.MvpDelegateCallback
 
 /**
  * Created by haorui on 2019-08-14.

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/BaseMvpDialogFragment.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/BaseMvpDialogFragment.kt

-package com.yidianling.ydlcommon.core.base
+package com.yidianling.ydlcommon.base
 
 import android.os.Bundle
 import android.support.v4.app.DialogFragment
 import android.view.View
-import com.yidianling.ydlcommon.core.mvp.base.IPresenter
-import com.yidianling.ydlcommon.core.mvp.base.IView
-import com.yidianling.ydlcommon.core.mvp.delegate.MvpDelegateCallback
-import com.yidianling.ydlcommon.core.mvp.delegate.MvpFragmentDelegateImpl
+import com.yidianling.ydlcommon.mvp.base.IPresenter
+import com.yidianling.ydlcommon.mvp.base.IView
+import com.yidianling.ydlcommon.mvp.delegate.MvpDelegateCallback
+import com.yidianling.ydlcommon.mvp.delegate.MvpFragmentDelegateImpl
 
 
 /**

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/BaseMvpFragment.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/BaseMvpFragment.kt

-package com.yidianling.ydlcommon.core.base
+package com.yidianling.ydlcommon.base
 
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.view.View
-import com.yidianling.ydlcommon.core.mvp.base.IPresenter
-import com.yidianling.ydlcommon.core.mvp.base.IView
-import com.yidianling.ydlcommon.core.mvp.delegate.MvpDelegateCallback
-import com.yidianling.ydlcommon.core.mvp.delegate.MvpFragmentDelegateImpl
+import com.yidianling.ydlcommon.mvp.base.IPresenter
+import com.yidianling.ydlcommon.mvp.base.IView
+import com.yidianling.ydlcommon.mvp.delegate.MvpDelegateCallback
+import com.yidianling.ydlcommon.mvp.delegate.MvpFragmentDelegateImpl
 
 /**
  * Created by haorui on 2019-08-14.

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/config/AppConfig.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/config/AppConfig.kt

-package com.yidianling.ydlcommon.core.base.config
+package com.yidianling.ydlcommon.base.config
 
 /**
  * Created by haorui on 2019-08-30 .

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/config/GlobalConfig.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/config/GlobalConfig.kt

-package com.yidianling.ydlcommon.core.base.config
+package com.yidianling.ydlcommon.base.config
 
 import android.content.Context
-import com.yidianling.ydlcommon.core.utils.YDLPreconditions
+import com.yidianling.ydlcommon.utils.YDLPreconditions
 import com.ydl.ydlnet.YDLHttpUtils
 import okhttp3.OkHttpClient
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/config/HttpConfig.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/config/HttpConfig.kt

-package com.yidianling.ydlcommon.core.base.config
+package com.yidianling.ydlcommon.base.config
 
 import android.content.Context
 import android.text.TextUtils
 import com.facebook.stetho.okhttp3.StethoInterceptor
-import com.yidianling.ydlcommon.core.base.BaseApplication
+import com.yidianling.ydlcommon.base.BaseApplication
 import com.ydl.ydlnet.builder.config.OkHttpConfig
 import com.yidianling.common.tools.RxAppTool
 import com.yidianling.common.tools.RxDeviceTool
 import com.yidianling.ydlcommon.BuildConfig
-import com.yidianling.ydlcommon.custom.constant.YDLConstants
-import com.yidianling.ydlcommon.custom.data.PlatformDataManager
-import com.yidianling.ydlcommon.custom.http.EncryptUtils
-import com.yidianling.ydlcommon.custom.router.YdlCommonRouterManager
-import com.yidianling.ydlcommon.custom.utils.YDLCacheUtils
+import com.yidianling.ydlcommon.constant.YDLConstants
+import com.yidianling.ydlcommon.data.PlatformDataManager
+import com.yidianling.ydlcommon.data.http.EncryptUtils
+import com.yidianling.ydlcommon.router.YdlCommonRouterManager
+import com.yidianling.ydlcommon.utils.YDLCacheUtils
 import okhttp3.FormBody
 import okhttp3.Interceptor
 import okhttp3.MultipartBody

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/config/IApp.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/config/IApp.kt

-package com.yidianling.ydlcommon.core.base.config
+package com.yidianling.ydlcommon.base.config
 
 /**
  * Created by haorui on 2019-08-29 .

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/config/IConfigModule.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/config/IConfigModule.kt

-package com.yidianling.ydlcommon.core.base.config
+package com.yidianling.ydlcommon.base.config
 
-import android.app.Application
 import android.content.Context
-import com.yidianling.ydlcommon.core.base.delegate.IAppLifecycles
-import com.yidianling.ydlcommon.core.base.config.GlobalConfig
+import com.yidianling.ydlcommon.base.delegate.IAppLifecycles
 
 /**
  * Created by haorui on 2019-08-22 .

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/config/YDLConstants.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/config/YDLConstants.kt

-package com.yidianling.ydlcommon.core.base.config
+package com.yidianling.ydlcommon.base.config
 
 import android.support.annotation.StringDef
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/delegate/ActivityDelegate.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/delegate/ActivityDelegate.kt

 
-package com.yidianling.ydlcommon.core.base.delegate
+package com.yidianling.ydlcommon.base.delegate
 
 import android.app.Activity
 import android.app.Application
 import android.os.Bundle
 import android.support.v4.app.FragmentActivity
 import com.trello.rxlifecycle2.android.ActivityEvent
-import com.yidianling.ydlcommon.core.base.lifecycle.IActivityLifecycleable
+import com.yidianling.ydlcommon.base.lifecycle.IActivityLifecycleable
 import io.reactivex.subjects.Subject
 
 /**

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/delegate/AppDelegate.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/delegate/AppDelegate.kt

-package com.yidianling.ydlcommon.core.base.delegate
+package com.yidianling.ydlcommon.base.delegate
 
 import android.app.Application
 import android.content.Context
-import com.yidianling.ydlcommon.core.base.config.IConfigModule
-import com.yidianling.ydlcommon.core.utils.ManifestParser
-import com.yidianling.ydlcommon.core.base.config.GlobalConfig
-import com.yidianling.ydlcommon.core.base.config.IApp
-import com.yidianling.ydlcommon.custom.app.YdlRepository
+import com.yidianling.ydlcommon.base.config.IConfigModule
+import com.yidianling.ydlcommon.utils.ManifestParser
+import com.yidianling.ydlcommon.base.config.GlobalConfig
+import com.yidianling.ydlcommon.base.config.IApp
+import com.yidianling.ydlcommon.app.YdlRepository
 import java.util.*
 
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/delegate/FragmentDelegate.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/delegate/FragmentDelegate.kt

 
-package com.yidianling.ydlcommon.core.base.delegate
+package com.yidianling.ydlcommon.base.delegate
 
 import android.content.Context
 import android.os.Bundle
@@ -7,7 +7,7 @@ import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentManager
 import android.view.View
 import com.trello.rxlifecycle2.android.FragmentEvent
-import com.yidianling.ydlcommon.core.base.lifecycle.IFragmentLifecycleable
+import com.yidianling.ydlcommon.base.lifecycle.IFragmentLifecycleable
 import io.reactivex.subjects.Subject
 
 /**

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/delegate/IAppLifecycles.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/delegate/IAppLifecycles.kt

 
-package com.yidianling.ydlcommon.core.base.delegate
+package com.yidianling.ydlcommon.base.delegate
 
 import android.app.Application
 import android.content.Context

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/lifecycle/IActivityLifecycleable.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/lifecycle/IActivityLifecycleable.kt

 
-package com.yidianling.ydlcommon.core.base.lifecycle
+package com.yidianling.ydlcommon.base.lifecycle
 
 import com.trello.rxlifecycle2.android.ActivityEvent
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/lifecycle/IFragmentLifecycleable.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/lifecycle/IFragmentLifecycleable.kt

 
-package com.yidianling.ydlcommon.core.base.lifecycle
+package com.yidianling.ydlcommon.base.lifecycle
 
 import com.trello.rxlifecycle2.android.FragmentEvent
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/base/lifecycle/ILifecycleable.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/base/lifecycle/ILifecycleable.kt

 
-package com.yidianling.ydlcommon.core.base.lifecycle
+package com.yidianling.ydlcommon.base.lifecycle
 
 import io.reactivex.subjects.Subject
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/GlobalInfo.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/bean/GlobalInfo.java

-package com.yidianling.ydlcommon.custom;
+package com.yidianling.ydlcommon.bean;
 
 import java.io.Serializable;
 import java.util.List;

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/bean/MustUP.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/bean/MustUP.java

-package com.yidianling.ydlcommon.custom.bean;
+package com.yidianling.ydlcommon.bean;
 
 public class MustUP {
         public VersionData version;

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/bean/ShareData.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/bean/ShareData.kt

-package com.yidianling.ydlcommon.custom.bean
+package com.yidianling.ydlcommon.bean
 
 import com.google.gson.annotations.SerializedName
 import java.io.Serializable

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/bean/StatusBarOptions.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/bean/StatusBarOptions.kt

-package com.yidianling.ydlcommon.core.bean
+package com.yidianling.ydlcommon.bean
 
 /**
  * Created by haorui on 2019-08-15.

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/bean/VersionData.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/bean/VersionData.java

-package com.yidianling.ydlcommon.custom.bean;
+package com.yidianling.ydlcommon.bean;
 
 import java.io.Serializable;
 

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/constant/FinalString.java → ydl-platform/src/main/java/com/yidianling/ydlcommon/constant/FinalString.java

-package com.yidianling.ydlcommon.custom.constant;
+package com.yidianling.ydlcommon.constant;
 
 /**
  * 一些常量字符串

ydl-platform/src/main/java/com/yidianling/ydlcommon/custom/constant/YDLConstants.kt → ydl-platform/src/main/java/com/yidianling/ydlcommon/constant/YDLConstants.kt

-package com.yidianling.ydlcommon.custom.constant
-
-import com.yidianling.ydlcommon.BuildConfig
+package com.yidianling.ydlcommon.constant
 
 /**
  * 常量类

ydl-platform/src/main/java/com/yidianling/ydlcommon/core/utils/permission/Permission.kt

-package com.yidianling.ydlcommon.core.utils.permission
-
-import io.reactivex.Observable
-
-open class Permission {
-    open val name: String
-    open val granted: Boolean
-    open var shouldShowRequestPermissionRationale: Boolean
-
-    @JvmOverloads
-    constructor(name: String, granted: Boolean, shouldShowRequestPermissionRationale: Boolean = false) {
-        this.name = name
-        this.granted = granted
-        this.shouldShowRequestPermissionRationale = shouldShowRequestPermissionRationale
-    }
-
-    constructor(permissions: List<Permission>) {
-        name = combineName(permissions)
-        granted = combineGranted(permissions)!!
-        shouldShowRequestPermissionRationale = combineShouldShowRequestPermissionRationale(permissions)!!
-    }
-
-    override fun equals(o: Any?): Boolean {
-        if (this === o) return true
-        if (o == null || javaClass != o.javaClass) return false
-
-        val that = o as Permission?
-
-        if (granted != that!!.granted) return false
-        return if (shouldShowRequestPermissionRationale != that.shouldShowRequestPermissionRationale) false else name == that.name
-    }
-
-    override fun hashCode(): Int {
-        var result = name.hashCode()
-        result = 31 * result + if (granted) 1 else 0
-        result = 31 * result + if (shouldShowRequestPermissionRationale) 1 else 0
-        return result
-    }
-
-    override fun toString(): String {
-        return "Permission{" +
-                "name='" + name + '\''.toString() +
-                ", granted=" + granted +
-                ", shouldShowRequestPermissionRationale=" + shouldShowRequestPermissionRationale +
-                '}'.toString()
-    }
-
-    private fun combineName(permissions: List<Permission>): String {
-        return Observable.fromIterable(permissions)
-            .map { permission -> permission.name }.collectInto(StringBuilder(), { s, s2 ->
-                if (s.length == 0) {
-                    s.append(s2)
-                } else {
-                    s.append(", ").append(s2)
-                }
-            }).blockingGet().toString()
-    }
-
-    private fun combineGranted(permissions: List<Permission>): Boolean? {
-        return Observable.fromIterable(permissions)
-            .all { permission -> permission.granted }.blockingGet()
-    }
-
-    private fun combineShouldShowRequestPermissionRationale(permissions: List<Permission>): Boolean? {
-        return Observable.fromIterable(permissions)
-            .any { permission -> permission.shouldShowRequestPermissionRationale }.blockingGet()
-    }
-}