瀏覽代碼

编译通过

allen 4 年之前
父節點
當前提交
361cff8bc4
共有 100 個文件被更改,包括 364 次插入525 次删除
  1. 2 2
      app/proguard-rules.pro
  2. 1 1
      app/src/main/AndroidManifest.xml
  3. 0 7
      app/src/main/code/com/enation/app/javashop/WBShareActivity.kt
  4. 0 26
      app/src/main/code/com/enation/app/javashop/activity/SchemeActivity.kt
  5. 0 101
      app/src/main/code/com/enation/app/javashop/application/Application.kt
  6. 1 1
      common/src/main/code/com/wdkl/ncs/android/lib/core/framework/InstallResourceHelper.kt
  7. 2 2
      common/src/main/code/com/wdkl/ncs/android/lib/core/framework/UnInstallResourceHelper.kt
  8. 1 1
      common/src/main/code/com/wdkl/ncs/android/lib/utils/JsonTranforHelper.kt
  9. 1 1
      common/src/main/code/com/wdkl/ncs/android/lib/utils/SmartHideViewHelper.kt
  10. 2 2
      extra/src/main/code/com/wdkl/ncs/android/component/extra/activity/ScanActivity.kt
  11. 1 1
      extra/src/main/code/com/wdkl/ncs/android/component/extra/di/ExtraComponent.kt
  12. 1 1
      extra/src/main/code/com/wdkl/ncs/android/component/extra/launch/ExtraLaunch.kt
  13. 1 1
      home/build.gradle
  14. 2 2
      home/src/androidTest/java/com/enation/javashop/android/component/home/ExampleInstrumentedTest.java
  15. 1 1
      home/src/main/AndroidManifest.xml
  16. 1 1
      home/src/main/ApkBuildDir/AndroidManifest.xml
  17. 0 23
      home/src/main/code/com/enation/javashop/android/component/home/di/HomeComponent.kt
  18. 10 10
      home/src/main/code/com/enation/javashop/android/component/home/activity/HomeActivity.kt
  19. 5 5
      home/src/main/code/com/enation/javashop/android/component/home/adapter/ChildCategoryAdapter.kt
  20. 5 5
      home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorBannerAdapter.kt
  21. 5 5
      home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorCornerBannerAdapter.kt
  22. 7 7
      home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorFiveImageAdapter.kt
  23. 7 7
      home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorFourImageAdapter.kt
  24. 8 8
      home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorLeftOneRightTwoAdapter.kt
  25. 7 7
      home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorLeftRightAdapter.kt
  26. 8 8
      home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorMenuAdapter.kt
  27. 7 7
      home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorRightOneLeftTwoAdapter.kt
  28. 5 5
      home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorSecKillAdapter.kt
  29. 6 6
      home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorSingleImageAdapter.kt
  30. 7 7
      home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorTextAdapter.kt
  31. 7 7
      home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorThreeImageAdapter.kt
  32. 7 7
      home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorTitleAdapter.kt
  33. 4 4
      home/src/main/code/com/enation/javashop/android/component/home/adapter/ParentCategoryAdapter.kt
  34. 4 4
      home/src/main/code/com/enation/javashop/android/component/home/agreement/FloorActionAgreement.kt
  35. 2 2
      home/src/main/code/com/enation/javashop/android/component/home/binding/HomeFragmentBindHelper.kt
  36. 23 0
      home/src/main/code/com/wdkl/ncs/android/component/home/di/HomeComponent.kt
  37. 14 14
      home/src/main/code/com/enation/javashop/android/component/home/fragment/CategoryFragment.kt
  38. 13 13
      home/src/main/code/com/enation/javashop/android/component/home/fragment/HomeFragment.kt
  39. 5 5
      home/src/main/code/com/enation/javashop/android/component/home/launch/HomeLaunch.kt
  40. 1 1
      home/src/main/res/layout/categroy_child_item.xml
  41. 1 1
      home/src/main/res/layout/categroy_left_item.xml
  42. 1 1
      home/src/main/res/layout/home_frag_lay.xml
  43. 1 1
      home/src/test/java/com/enation/javashop/android/component/home/ExampleUnitTest.java
  44. 2 2
      middleware/src/androidTest/java/com/enation/javashop/android/middleware/ExampleInstrumentedTest.java
  45. 1 1
      middleware/src/main/AndroidManifest.xml
  46. 0 9
      middleware/src/main/code/com/enation/javashop/android/middleware/event/LoginEvent.kt
  47. 0 15
      middleware/src/main/code/com/enation/javashop/android/middleware/event/LogoutEvent.kt
  48. 0 7
      middleware/src/main/code/com/enation/javashop/android/middleware/model/ConnectLoginModel.kt
  49. 0 9
      middleware/src/main/code/com/enation/javashop/android/middleware/model/ReceiptContentViewModel.kt
  50. 0 11
      middleware/src/main/code/com/enation/javashop/android/middleware/model/SingleIntViewModel.kt
  51. 3 3
      middleware/src/main/code/com/enation/javashop/android/middleware/api/AdApi.kt
  52. 2 2
      middleware/src/main/code/com/enation/javashop/android/middleware/api/AfterSaleApi.kt
  53. 3 3
      middleware/src/main/code/com/enation/javashop/android/middleware/api/ApiManager.kt
  54. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/api/BaseApi.kt
  55. 3 3
      middleware/src/main/code/com/enation/javashop/android/middleware/api/CartApi.kt
  56. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/api/CategoryApi.kt
  57. 2 2
      middleware/src/main/code/com/enation/javashop/android/middleware/api/ExtraApi.kt
  58. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/api/GoodsApi.kt
  59. 3 3
      middleware/src/main/code/com/enation/javashop/android/middleware/api/MemberApi.kt
  60. 3 3
      middleware/src/main/code/com/enation/javashop/android/middleware/api/MemberState.kt
  61. 3 3
      middleware/src/main/code/com/enation/javashop/android/middleware/api/NetFectory.kt
  62. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/api/OrderApi.kt
  63. 2 2
      middleware/src/main/code/com/enation/javashop/android/middleware/api/PassportApi.kt
  64. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/api/PaymentApi.kt
  65. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/api/PromotionApi.kt
  66. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/api/ShopApi.kt
  67. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/api/TradeApi.kt
  68. 5 5
      middleware/src/main/code/com/enation/javashop/android/middleware/api/UrlManager.kt
  69. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/aspect/LockClick.java
  70. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/aspect/LockClickAspect.java
  71. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/bind/DataBindingAction.kt
  72. 4 4
      middleware/src/main/code/com/enation/javashop/android/middleware/bind/DataBindingHelper.kt
  73. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/bind/ViewAttrModel.kt
  74. 2 2
      middleware/src/main/code/com/enation/javashop/android/middleware/cache/HsitoryCache.kt
  75. 3 3
      middleware/src/main/code/com/enation/javashop/android/middleware/config/JavaShopConfigCenter.kt
  76. 14 14
      middleware/src/main/code/com/enation/javashop/android/middleware/di/ApiProvides.kt
  77. 14 14
      middleware/src/main/code/com/enation/javashop/android/middleware/di/ApplicationComponent.kt
  78. 2 2
      middleware/src/main/code/com/enation/javashop/android/middleware/di/DaggerManager.kt
  79. 4 4
      middleware/src/main/code/com/enation/javashop/android/middleware/di/MiddlewareDaggerComponent.kt
  80. 15 15
      middleware/src/main/code/com/enation/javashop/android/middleware/di/PresenterComponent.kt
  81. 18 18
      middleware/src/main/code/com/enation/javashop/android/middleware/enum/GlobalState.kt
  82. 2 2
      middleware/src/main/code/com/enation/javashop/android/middleware/enum/Promotion.kt
  83. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/event/AddressListDataChange.kt
  84. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/event/CartDataChange.kt
  85. 9 0
      middleware/src/main/code/com/wdkl/ncs/android/middleware/event/LoginEvent.kt
  86. 15 0
      middleware/src/main/code/com/wdkl/ncs/android/middleware/event/LogoutEvent.kt
  87. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/event/OrderCreateDataChange.kt
  88. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/event/OrderDetailDataChange.kt
  89. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/event/OrderListDataChange.kt
  90. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/event/PayEvent.kt
  91. 2 2
      middleware/src/main/code/com/enation/javashop/android/middleware/event/ShopCategorySelectEvent.kt
  92. 4 4
      middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/cart/CartFragmentContract.kt
  93. 1 1
      middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/extra/ScanContract.kt
  94. 3 3
      middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/goods/GoodsActivityContract.kt
  95. 4 4
      middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/goods/GoodsCommentContract.kt
  96. 3 3
      middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/goods/GoodsInfoContract.kt
  97. 2 2
      middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/goods/GoodsIntroduceContract.kt
  98. 4 4
      middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/goods/GoodsSearchContract.kt
  99. 2 2
      middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/goods/SearchContract.kt
  100. 0 0
      middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/home/CategoryFragmentContract.kt

+ 2 - 2
app/proguard-rules.pro

@@ -174,14 +174,14 @@
 
 #-----------处理实体类---------------
 # 在开发的时候我们可以将所有的实体类放在一个包内,这样我们写一次混淆就行了。
--keep class com.enation.javashop.android.middleware.model.**{ *; }
+-keep class com.wdkl.ncs.android.middleware.model.**{ *; }
 
 -keep class com.enation.app.javashop.**{ *; }
 
 -keep class com.enation.app.javashop.**{ *; }
 
 -keep class com.enation.javashop.android.component.member.adapterPostCommentGoodsAdapter
--keep class com.enation.javashop.android.component.shop.adapter.ShopAllGoodsAdapter
+-keep class com.wdkl.ncs.android.component.shop.adapter.ShopAllGoodsAdapter
 -keep class com.enation.javashop.android.component.member.adapter.CouponAdapter
 -keep class com.enation.javashop.android.component.order.adapter.OrderItemAdapter
 

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -43,7 +43,7 @@
             android:name="UMENG_MESSAGE_SECRET"
             android:value="53d15319bc4f06721db8dd3e4813c7df">
         </meta-data>
-        <activity android:name="com.enation.javashop.android.component.welcome.activity.WelcomeActivity"
+        <activity android:name="com.wdkl.ncs.android.component.welcome.activity.WelcomeActivity"
             >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

+ 0 - 7
app/src/main/code/com/enation/app/javashop/WBShareActivity.kt

@@ -1,7 +0,0 @@
-package com.enation.app.javashop
-
-import com.umeng.socialize.media.WBShareCallBackActivity
-
-
-class WBShareActivity : WBShareCallBackActivity() {
-}

+ 0 - 26
app/src/main/code/com/enation/app/javashop/activity/SchemeActivity.kt

@@ -1,26 +0,0 @@
-package com.enation.app.javashop.activity
-
-import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import com.enation.javashop.android.jrouter.JRouter
-import com.enation.javashop.android.jrouter.logic.datainfo.Postcard
-import com.enation.javashop.android.jrouter.logic.listener.NavListener
-import java.lang.ref.PhantomReference
-import java.lang.ref.ReferenceQueue
-
-/**
- * Created by LDD on 2017/9/10.
- */
-class SchemeActivity:AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val uri = intent.data
-        JRouter.prepare().create(uri).seek(this,object:NavListener(){
-            override fun onArrival(postcard: Postcard?) {
-                finish()
-            }
-        })
-    }
-
-}

+ 0 - 101
app/src/main/code/com/enation/app/javashop/application/Application.kt

@@ -1,101 +0,0 @@
-package com.enation.app.javashop.application
-
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.content.Context
-import android.graphics.Color
-import android.os.Build
-import android.provider.Settings
-import android.support.v4.app.NotificationCompat
-import android.util.Log
-import android.widget.RemoteViews
-import com.enation.app.javashop.R
-import com.enation.javashop.android.jrouter.JRouter
-import com.enation.javashop.android.lib.base.BaseApplication
-import com.enation.javashop.android.lib.utils.errorLog
-import com.enation.javashop.android.middleware.api.MemberState.Companion.manager
-import com.enation.javashop.android.middleware.config.JavaShopConfigCenter
-import com.enation.javashop.connectview.UmengConfig
-import com.enation.javashop.net.engine.config.NetEngineConfig
-import com.enation.javashop.net.engine.plugin.exception.RestfulExceptionInterceptor
-import com.enation.javashop.utils.base.config.BaseConfig
-import com.enation.javashop.utils.base.tool.CommonTool
-import com.google.gson.Gson
-import com.squareup.leakcanary.LeakCanary
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.functions.Function4
-import io.reactivex.schedulers.Schedulers
-
-/**
- * @author LDD
- * @Date   2018/1/11 下午12:48
- * @From   com.enation.javashop.android.application
- * @Note   应用Application
- */
-class Application : BaseApplication() {
-
-
-    /**
-     * @author LDD
-     * @From   Application
-     * @Date   2018/1/11 下午12:50
-     * @Note   应用启动时调用
-     */
-    override fun onCreate() {
-        super.onCreate()
-        initRouter()
-        initFrame()
-        initLeaks()
-    }
-
-    /**
-     * @author  LDD
-     * @From    Application
-     * @Date   2018/1/11 下午12:50
-     * @Note   初始化路由
-     * @return rx观察者
-     */
-    private fun initRouter() {
-        JRouter.init(this)
-        JRouter.openDebug()
-        JRouter.openLog()
-        JRouter.prepare().create("/welcome/launch").seek()
-        JRouter.prepare().create("/home/launch").seek()
-        JRouter.prepare().create("/setting/launch").seek()
-        JRouter.prepare().create("/shop/launch").seek()
-        JRouter.prepare().create("/extra/launch").seek()
-    }
-
-    /**
-     * @author  LDD
-     * @From    Application
-     * @Date   2018/1/11 下午12:50
-     * @Note   初始化内存检测器
-     * @return rx观察者
-     */
-    private fun initLeaks() {
-//        if (JavaShopConfigCenter.INSTANCE.APP_DEV) {
-//            LeakCanary.install(this)
-//        }
-    }
-
-    /**
-     * @author  LDD
-     * @From    Application
-     * @Date   2018/1/11 下午12:50
-     * @Note   初始化内部框架
-     * @return rx观察者
-     */
-    private fun initFrame() {
-        if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.LOLLIPOP) {
-            BaseConfig.getInstance().addActivity("WelcomeActivity", "HomeActivity")
-        } else {
-            BaseConfig.getInstance().closeScrollBack()
-        }
-        NetEngineConfig.init(baseContext)
-                .openLogger()
-                .addNetInterceptor(RestfulExceptionInterceptor())
-    }
-}

+ 1 - 1
common/src/main/code/com/wdkl/ncs/android/lib/core/framework/InstallResourceHelper.kt

@@ -6,7 +6,7 @@ import android.content.Context
 /**
  * @author LDD
  * @Date   2018/1/17 上午10:15
- * @From   com.enation.javashop.android.middleware.resource
+ * @From   com.wdkl.ncs.android.middleware.resource
  * @Note   加载已安装资源
  */
 class InstallResourceHelper {

+ 2 - 2
common/src/main/code/com/wdkl/ncs/android/lib/core/framework/UnInstallResourceHelper.kt

@@ -5,7 +5,7 @@ import android.content.Context
 /**
  * @author LDD
  * @Date   2018/1/17 上午10:26
- * @From   com.enation.javashop.android.middleware.resource
+ * @From   com.wdkl.ncs.android.middleware.resource
  * @Note   加载未安装apk的资源文件
  */
 class UnInstallResourceHelper {
@@ -27,7 +27,7 @@ class UnInstallResourceHelper {
     /**
      * @author LDD
      * @Date   2018/1/17 上午10:23
-     * @From   com.enation.javashop.android.middleware.resource
+     * @From   com.wdkl.ncs.android.middleware.resource
      * @Note   伴生对象
      */
     companion object {

+ 1 - 1
common/src/main/code/com/wdkl/ncs/android/lib/utils/JsonTranforHelper.kt

@@ -6,7 +6,7 @@ import com.google.gson.Gson
 /**
  * @author LDD
  * @Date   2018/5/8 上午11:51
- * @From   com.enation.javashop.android.middleware.router
+ * @From   com.wdkl.ncs.android.middleware.router
  * @Note   Json转换辅助类
  */
 object JsonTranforHelper {

+ 1 - 1
common/src/main/code/com/wdkl/ncs/android/lib/utils/SmartHideViewHelper.kt

@@ -8,7 +8,7 @@ import com.scwang.smartrefresh.layout.listener.OnMultiPurposeListener
 
 /**
  * @author LDD
- * @From   com.enation.javashop.android.component.home.utils
+ * @From   com.wdkl.ncs.android.component.home.utils
  * @Date   2018/1/30 下午3:06
  * @Note   首页上滑topbar变幻辅助类
  */

+ 2 - 2
extra/src/main/code/com/wdkl/ncs/android/component/extra/activity/ScanActivity.kt

@@ -13,8 +13,8 @@ import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.wdkl.ncs.android.lib.base.BaseActivity
 import com.wdkl.ncs.android.lib.base.GalleryActivity
 import com.wdkl.ncs.android.lib.utils.*
-import com.enation.javashop.android.middleware.logic.contract.extra.ScanContract
-import com.enation.javashop.android.middleware.logic.presenter.extra.ScanPresenter
+import com.wdkl.ncs.android.middleware.logic.contract.extra.ScanContract
+import com.wdkl.ncs.android.middleware.logic.presenter.extra.ScanPresenter
 import com.enation.javashop.net.engine.model.NetState
 import com.enation.javashop.photoutils.model.TResult
 import com.enation.javashop.photoutils.uitl.RxGetPhotoUtils

+ 1 - 1
extra/src/main/code/com/wdkl/ncs/android/component/extra/di/ExtraComponent.kt

@@ -1,7 +1,7 @@
 package com.wdkl.ncs.android.component.extra.di
 
 import com.wdkl.ncs.android.component.extra.activity.ScanActivity
-import com.enation.javashop.android.middleware.di.ApplicationComponent
+import com.wdkl.ncs.android.middleware.di.ApplicationComponent
 import dagger.Component
 
 /**

+ 1 - 1
extra/src/main/code/com/wdkl/ncs/android/component/extra/launch/ExtraLaunch.kt

@@ -4,7 +4,7 @@ import com.wdkl.ncs.android.component.extra.di.DaggerExtraComponent
 import com.wdkl.ncs.android.component.extra.di.ExtraComponent
 import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.wdkl.ncs.android.lib.base.BaseLaunch
-import com.enation.javashop.android.middleware.di.DaggerManager
+import com.wdkl.ncs.android.middleware.di.DaggerManager
 
 /**
  *  扩展模块 启动入口

+ 1 - 1
home/build.gradle

@@ -23,7 +23,7 @@ android {
 
     defaultConfig {
         if (componentTag){
-            applicationId "com.enation.javashop.android.component.home"
+            applicationId "com.wdkl.ncs.android.component.home"
             multiDexEnabled true
         }
         minSdkVersion min_sdk_version

+ 2 - 2
home/src/androidTest/java/com/enation/javashop/android/component/home/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.component.home;
+package com.wdkl.ncs.android.component.home;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.enation.javashop.android.component.home.test", appContext.getPackageName());
+        assertEquals("com.wdkl.ncs.android.component.home.test", appContext.getPackageName());
     }
 }

+ 1 - 1
home/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 
-          package="com.enation.javashop.android.component.home"
+          package="com.wdkl.ncs.android.component.home"
 >
 
     <application android:allowBackup="true"

+ 1 - 1
home/src/main/ApkBuildDir/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 
-          package="com.enation.javashop.android.component.home"
+          package="com.wdkl.ncs.android.component.home"
 >
     <uses-permission android:name="android.permission.INTERNET"/>
 

+ 0 - 23
home/src/main/code/com/enation/javashop/android/component/home/di/HomeComponent.kt

@@ -1,23 +0,0 @@
-package com.enation.javashop.android.component.home.di
-
-import com.enation.javashop.android.component.home.activity.HomeActivity
-import com.enation.javashop.android.component.home.fragment.CategoryFragment
-import com.enation.javashop.android.component.home.fragment.HomeFragment
-import com.enation.javashop.android.middleware.di.ApplicationComponent
-import dagger.Component
-
-/**
- * @author LDD
- * @Date   2018/1/22 下午2:43
- * @From   com.enation.javashop.android.component.home.di
- * @Note   依赖注入入口
- */
-@Component(dependencies = arrayOf(ApplicationComponent::class))
-interface HomeComponent {
-
-    fun inject(activity: HomeActivity)
-
-    fun inject(activity: HomeFragment)
-
-    fun inject(activity: CategoryFragment)
-}

+ 10 - 10
home/src/main/code/com/enation/javashop/android/component/home/activity/HomeActivity.kt

@@ -1,18 +1,18 @@
-package com.enation.javashop.android.component.home.activity
+package com.wdkl.ncs.android.component.home.activity
 
 import android.graphics.Color
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.databinding.HomeActLayBinding
-import com.enation.javashop.android.component.home.fragment.CategoryFragment
-import com.enation.javashop.android.component.home.fragment.HomeFragment
-import com.enation.javashop.android.component.home.launch.HomeLaunch
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.databinding.HomeActLayBinding
+import com.wdkl.ncs.android.component.home.fragment.CategoryFragment
+import com.wdkl.ncs.android.component.home.fragment.HomeFragment
+import com.wdkl.ncs.android.component.home.launch.HomeLaunch
 import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.wdkl.ncs.android.lib.base.BaseActivity
 import com.wdkl.ncs.android.lib.utils.*
 import com.wdkl.ncs.android.lib.vo.filter
-import com.enation.javashop.android.middleware.logic.contract.home.HomeActivityContract
-import com.enation.javashop.android.middleware.logic.presenter.home.HomeActivityPresenter
-import com.enation.javashop.android.middleware.model.MemberViewModel
+import com.wdkl.ncs.android.middleware.logic.contract.home.HomeActivityContract
+import com.wdkl.ncs.android.middleware.logic.presenter.home.HomeActivityPresenter
+import com.wdkl.ncs.android.middleware.model.MemberViewModel
 import com.enation.javashop.android.widget.navigationview.NavigationModel
 import com.enation.javashop.net.engine.model.NetState
 import kotlinx.android.synthetic.main.home_act_lay.*
@@ -20,7 +20,7 @@ import kotlinx.android.synthetic.main.home_act_lay.*
 /**
  * @author  LDD
  * @Date   2018/1/16 下午1:35
- * @From   com.enation.javashop.android.component.home.activity
+ * @From   com.wdkl.ncs.android.component.home.activity
  * @Note   首页Activity
  */
 @Router(path = "/home/main")

+ 5 - 5
home/src/main/code/com/enation/javashop/android/component/home/adapter/ChildCategoryAdapter.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.component.home.adapter
+package com.wdkl.ncs.android.component.home.adapter
 
 import android.databinding.DataBindingUtil
 import android.view.LayoutInflater
@@ -6,18 +6,18 @@ import android.view.View
 import android.view.ViewGroup
 import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.VirtualLayoutManager
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.databinding.CategroyChildItemBinding
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.databinding.CategroyChildItemBinding
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.lib.utils.getColorCompatible
-import com.enation.javashop.android.middleware.model.ChildCategoryViewModel
+import com.wdkl.ncs.android.middleware.model.ChildCategoryViewModel
 import com.enation.javashop.utils.base.tool.ScreenTool
 
 /**
  * @author LDD
  * @Date   2018/1/30 下午2:54
- * @From   com.enation.javashop.android.component.home.adapter
+ * @From   com.wdkl.ncs.android.component.home.adapter
  * @Note   三级分类适配器
  */
 class ChildCategoryAdapter constructor(private val mLayoutHelper: LayoutHelper, var data: List<ChildCategoryViewModel>) : BaseDelegateAdapter<BaseRecyclerViewHolder<CategroyChildItemBinding>, ChildCategoryViewModel>() {

+ 5 - 5
home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorBannerAdapter.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.component.home.adapter
+package com.wdkl.ncs.android.component.home.adapter
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -10,16 +10,16 @@ import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.agreement.FloorActionAgreement
-import com.enation.javashop.android.component.home.databinding.FloorItemBannerLayBinding
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.agreement.FloorActionAgreement
+import com.wdkl.ncs.android.component.home.databinding.FloorItemBannerLayBinding
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.base.BaseControl
 import com.wdkl.ncs.android.lib.base.LIFE_CYCLE_PAUSE
 import com.wdkl.ncs.android.lib.base.LIFE_CYCLE_RESUME
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.lib.utils.then
-import com.enation.javashop.android.middleware.model.BannerModel
+import com.wdkl.ncs.android.middleware.model.BannerModel
 import com.enation.javashop.utils.base.tool.ScreenTool
 import com.zhouwei.mzbanner.holder.MZViewHolder
 import java.lang.ref.WeakReference

+ 5 - 5
home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorCornerBannerAdapter.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.component.home.adapter
+package com.wdkl.ncs.android.component.home.adapter
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -10,9 +10,9 @@ import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.agreement.FloorActionAgreement
-import com.enation.javashop.android.component.home.databinding.FloorCornerItemBannerLayBinding
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.agreement.FloorActionAgreement
+import com.wdkl.ncs.android.component.home.databinding.FloorCornerItemBannerLayBinding
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.base.BaseControl
 import com.wdkl.ncs.android.lib.base.LIFE_CYCLE_PAUSE
@@ -20,7 +20,7 @@ import com.wdkl.ncs.android.lib.base.LIFE_CYCLE_RESUME
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.lib.utils.dpToPx
 import com.wdkl.ncs.android.lib.utils.then
-import com.enation.javashop.android.middleware.model.BannerModel
+import com.wdkl.ncs.android.middleware.model.BannerModel
 import com.enation.javashop.utils.base.tool.ScreenTool
 import com.zhouwei.mzbanner.holder.MZViewHolder
 import java.lang.ref.WeakReference

+ 7 - 7
home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorFiveImageAdapter.kt

@@ -1,19 +1,19 @@
-package com.enation.javashop.android.component.home.adapter
+package com.wdkl.ncs.android.component.home.adapter
 
 import android.view.ViewGroup
 import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.agreement.FloorActionAgreement
-import com.enation.javashop.android.component.home.databinding.FloorItemFiveImageLayBinding
-import com.enation.javashop.android.component.home.databinding.FloorItemSingleImageLayBinding
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.agreement.FloorActionAgreement
+import com.wdkl.ncs.android.component.home.databinding.FloorItemFiveImageLayBinding
+import com.wdkl.ncs.android.component.home.databinding.FloorItemSingleImageLayBinding
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.lib.utils.dpToPx
 import com.wdkl.ncs.android.lib.utils.then
-import com.enation.javashop.android.middleware.model.FloorItem
-import com.enation.javashop.android.middleware.model.FloorViewModel
+import com.wdkl.ncs.android.middleware.model.FloorItem
+import com.wdkl.ncs.android.middleware.model.FloorViewModel
 import com.enation.javashop.imagepluin.utils.GlideUtils
 import com.enation.javashop.utils.base.tool.ScreenTool
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation

+ 7 - 7
home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorFourImageAdapter.kt

@@ -1,19 +1,19 @@
-package com.enation.javashop.android.component.home.adapter
+package com.wdkl.ncs.android.component.home.adapter
 
 import android.view.ViewGroup
 import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.agreement.FloorActionAgreement
-import com.enation.javashop.android.component.home.databinding.FloorItemFourImageLayBinding
-import com.enation.javashop.android.component.home.databinding.FloorItemSingleImageLayBinding
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.agreement.FloorActionAgreement
+import com.wdkl.ncs.android.component.home.databinding.FloorItemFourImageLayBinding
+import com.wdkl.ncs.android.component.home.databinding.FloorItemSingleImageLayBinding
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.lib.utils.dpToPx
 import com.wdkl.ncs.android.lib.utils.then
-import com.enation.javashop.android.middleware.model.FloorItem
-import com.enation.javashop.android.middleware.model.FloorViewModel
+import com.wdkl.ncs.android.middleware.model.FloorItem
+import com.wdkl.ncs.android.middleware.model.FloorViewModel
 import com.enation.javashop.imagepluin.utils.GlideUtils
 import com.enation.javashop.utils.base.tool.ScreenTool
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation

+ 8 - 8
home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorLeftOneRightTwoAdapter.kt

@@ -1,20 +1,20 @@
-package com.enation.javashop.android.component.home.adapter
+package com.wdkl.ncs.android.component.home.adapter
 
 import android.view.ViewGroup
 import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.agreement.FloorActionAgreement
-import com.enation.javashop.android.component.home.databinding.FloorItemLoneRtwoImageLayBinding
-import com.enation.javashop.android.component.home.databinding.FloorItemSingleImageLayBinding
-import com.enation.javashop.android.component.home.databinding.FloorItemThreeImageLayBinding
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.agreement.FloorActionAgreement
+import com.wdkl.ncs.android.component.home.databinding.FloorItemLoneRtwoImageLayBinding
+import com.wdkl.ncs.android.component.home.databinding.FloorItemSingleImageLayBinding
+import com.wdkl.ncs.android.component.home.databinding.FloorItemThreeImageLayBinding
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.lib.utils.dpToPx
 import com.wdkl.ncs.android.lib.utils.then
-import com.enation.javashop.android.middleware.model.FloorItem
-import com.enation.javashop.android.middleware.model.FloorViewModel
+import com.wdkl.ncs.android.middleware.model.FloorItem
+import com.wdkl.ncs.android.middleware.model.FloorViewModel
 import com.enation.javashop.imagepluin.utils.GlideUtils
 import com.enation.javashop.utils.base.tool.ScreenTool
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation

+ 7 - 7
home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorLeftRightAdapter.kt

@@ -1,19 +1,19 @@
-package com.enation.javashop.android.component.home.adapter
+package com.wdkl.ncs.android.component.home.adapter
 
 import android.view.ViewGroup
 import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.agreement.FloorActionAgreement
-import com.enation.javashop.android.component.home.databinding.FloorItemLeftRightLayBinding
-import com.enation.javashop.android.component.home.databinding.FloorItemSingleImageLayBinding
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.agreement.FloorActionAgreement
+import com.wdkl.ncs.android.component.home.databinding.FloorItemLeftRightLayBinding
+import com.wdkl.ncs.android.component.home.databinding.FloorItemSingleImageLayBinding
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.lib.utils.dpToPx
 import com.wdkl.ncs.android.lib.utils.then
-import com.enation.javashop.android.middleware.model.FloorItem
-import com.enation.javashop.android.middleware.model.FloorViewModel
+import com.wdkl.ncs.android.middleware.model.FloorItem
+import com.wdkl.ncs.android.middleware.model.FloorViewModel
 import com.enation.javashop.imagepluin.utils.GlideUtils
 import com.enation.javashop.utils.base.tool.ScreenTool
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation

+ 8 - 8
home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorMenuAdapter.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.component.home.adapter
+package com.wdkl.ncs.android.component.home.adapter
 
 import android.content.Context
 import android.graphics.Color
@@ -12,17 +12,17 @@ import android.widget.TextView
 import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.agreement.FloorActionAgreement
-import com.enation.javashop.android.component.home.databinding.FloorItemMenuLayBinding
-import com.enation.javashop.android.component.home.databinding.FloorItemSingleImageLayBinding
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.agreement.FloorActionAgreement
+import com.wdkl.ncs.android.component.home.databinding.FloorItemMenuLayBinding
+import com.wdkl.ncs.android.component.home.databinding.FloorItemSingleImageLayBinding
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.lib.utils.dpToPx
 import com.wdkl.ncs.android.lib.utils.then
-import com.enation.javashop.android.middleware.model.FloorItem
-import com.enation.javashop.android.middleware.model.FloorMenuModel
-import com.enation.javashop.android.middleware.model.FloorViewModel
+import com.wdkl.ncs.android.middleware.model.FloorItem
+import com.wdkl.ncs.android.middleware.model.FloorMenuModel
+import com.wdkl.ncs.android.middleware.model.FloorViewModel
 import com.enation.javashop.imagepluin.utils.GlideUtils
 import com.enation.javashop.utils.base.tool.ScreenTool
 

+ 7 - 7
home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorRightOneLeftTwoAdapter.kt

@@ -1,19 +1,19 @@
-package com.enation.javashop.android.component.home.adapter
+package com.wdkl.ncs.android.component.home.adapter
 
 import android.view.ViewGroup
 import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.agreement.FloorActionAgreement
-import com.enation.javashop.android.component.home.databinding.FloorItemLtwoRoneImageLayBinding
-import com.enation.javashop.android.component.home.databinding.FloorItemSingleImageLayBinding
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.agreement.FloorActionAgreement
+import com.wdkl.ncs.android.component.home.databinding.FloorItemLtwoRoneImageLayBinding
+import com.wdkl.ncs.android.component.home.databinding.FloorItemSingleImageLayBinding
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.lib.utils.dpToPx
 import com.wdkl.ncs.android.lib.utils.then
-import com.enation.javashop.android.middleware.model.FloorItem
-import com.enation.javashop.android.middleware.model.FloorViewModel
+import com.wdkl.ncs.android.middleware.model.FloorItem
+import com.wdkl.ncs.android.middleware.model.FloorViewModel
 import com.enation.javashop.imagepluin.utils.GlideUtils
 import com.enation.javashop.utils.base.tool.ScreenTool
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation

+ 5 - 5
home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorSecKillAdapter.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.component.home.adapter
+package com.wdkl.ncs.android.component.home.adapter
 
 import android.support.v7.widget.RecyclerView
 import android.text.SpannableStringBuilder
@@ -9,14 +9,14 @@ import android.view.ViewGroup
 import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.databinding.FloorItemSeckillLayBinding
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.databinding.FloorItemSeckillLayBinding
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.base.LIFE_CYCLE_DESTORY
 import com.wdkl.ncs.android.lib.utils.*
-import com.enation.javashop.android.middleware.model.GoodsItemViewModel
-import com.enation.javashop.android.middleware.model.SecKillListViewModel
+import com.wdkl.ncs.android.middleware.model.GoodsItemViewModel
+import com.wdkl.ncs.android.middleware.model.SecKillListViewModel
 import com.enation.javashop.utils.base.tool.BaseToolActivity
 import com.enation.javashop.utils.base.tool.ScreenTool
 import java.lang.ref.WeakReference

+ 6 - 6
home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorSingleImageAdapter.kt

@@ -1,18 +1,18 @@
-package com.enation.javashop.android.component.home.adapter
+package com.wdkl.ncs.android.component.home.adapter
 
 import android.view.ViewGroup
 import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.agreement.FloorActionAgreement
-import com.enation.javashop.android.component.home.databinding.FloorItemSingleImageLayBinding
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.agreement.FloorActionAgreement
+import com.wdkl.ncs.android.component.home.databinding.FloorItemSingleImageLayBinding
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.lib.utils.dpToPx
 import com.wdkl.ncs.android.lib.utils.then
-import com.enation.javashop.android.middleware.model.FloorItem
-import com.enation.javashop.android.middleware.model.FloorViewModel
+import com.wdkl.ncs.android.middleware.model.FloorItem
+import com.wdkl.ncs.android.middleware.model.FloorViewModel
 import com.enation.javashop.imagepluin.utils.GlideUtils
 import com.enation.javashop.utils.base.tool.ScreenTool
 

+ 7 - 7
home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorTextAdapter.kt

@@ -1,18 +1,18 @@
-package com.enation.javashop.android.component.home.adapter
+package com.wdkl.ncs.android.component.home.adapter
 
 import android.view.ViewGroup
 import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.agreement.FloorActionAgreement
-import com.enation.javashop.android.component.home.databinding.FloorItemSingleImageLayBinding
-import com.enation.javashop.android.component.home.databinding.FloorItemTextLayBinding
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.agreement.FloorActionAgreement
+import com.wdkl.ncs.android.component.home.databinding.FloorItemSingleImageLayBinding
+import com.wdkl.ncs.android.component.home.databinding.FloorItemTextLayBinding
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.lib.utils.then
-import com.enation.javashop.android.middleware.model.FloorItem
-import com.enation.javashop.android.middleware.model.FloorViewModel
+import com.wdkl.ncs.android.middleware.model.FloorItem
+import com.wdkl.ncs.android.middleware.model.FloorViewModel
 import com.enation.javashop.imagepluin.utils.GlideUtils
 import com.enation.javashop.utils.base.tool.ScreenTool
 

+ 7 - 7
home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorThreeImageAdapter.kt

@@ -1,19 +1,19 @@
-package com.enation.javashop.android.component.home.adapter
+package com.wdkl.ncs.android.component.home.adapter
 
 import android.view.ViewGroup
 import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.agreement.FloorActionAgreement
-import com.enation.javashop.android.component.home.databinding.FloorItemSingleImageLayBinding
-import com.enation.javashop.android.component.home.databinding.FloorItemThreeImageLayBinding
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.agreement.FloorActionAgreement
+import com.wdkl.ncs.android.component.home.databinding.FloorItemSingleImageLayBinding
+import com.wdkl.ncs.android.component.home.databinding.FloorItemThreeImageLayBinding
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.lib.utils.dpToPx
 import com.wdkl.ncs.android.lib.utils.then
-import com.enation.javashop.android.middleware.model.FloorItem
-import com.enation.javashop.android.middleware.model.FloorViewModel
+import com.wdkl.ncs.android.middleware.model.FloorItem
+import com.wdkl.ncs.android.middleware.model.FloorViewModel
 import com.enation.javashop.imagepluin.utils.GlideUtils
 import com.enation.javashop.utils.base.tool.ScreenTool
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation

+ 7 - 7
home/src/main/code/com/enation/javashop/android/component/home/adapter/FloorTitleAdapter.kt

@@ -1,19 +1,19 @@
-package com.enation.javashop.android.component.home.adapter
+package com.wdkl.ncs.android.component.home.adapter
 
 import android.view.ViewGroup
 import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.agreement.FloorActionAgreement
-import com.enation.javashop.android.component.home.databinding.FloorItemSingleImageLayBinding
-import com.enation.javashop.android.component.home.databinding.FloorItemTitleLayBinding
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.agreement.FloorActionAgreement
+import com.wdkl.ncs.android.component.home.databinding.FloorItemSingleImageLayBinding
+import com.wdkl.ncs.android.component.home.databinding.FloorItemTitleLayBinding
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.lib.utils.dpToPx
 import com.wdkl.ncs.android.lib.utils.then
-import com.enation.javashop.android.middleware.model.FloorItem
-import com.enation.javashop.android.middleware.model.FloorViewModel
+import com.wdkl.ncs.android.middleware.model.FloorItem
+import com.wdkl.ncs.android.middleware.model.FloorViewModel
 import com.enation.javashop.imagepluin.utils.GlideUtils
 import com.enation.javashop.utils.base.tool.ScreenTool
 

+ 4 - 4
home/src/main/code/com/enation/javashop/android/component/home/adapter/ParentCategoryAdapter.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.component.home.adapter
+package com.wdkl.ncs.android.component.home.adapter
 
 import android.databinding.DataBindingUtil
 import android.view.LayoutInflater
@@ -6,8 +6,8 @@ import android.view.ViewGroup
 import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.databinding.CategoryParentItemBinding
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.databinding.CategoryParentItemBinding
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.enation.javashop.utils.base.tool.ScreenTool
@@ -15,7 +15,7 @@ import com.enation.javashop.utils.base.tool.ScreenTool
 /**
  * @author LDD
  * @Date   2018/1/30 下午2:50
- * @From   com.enation.javashop.android.component.home.adapter
+ * @From   com.wdkl.ncs.android.component.home.adapter
  * @Note   二级分类适配器
  */
 class ParentCategoryAdapter(val name : String) : BaseDelegateAdapter<BaseRecyclerViewHolder<CategoryParentItemBinding>,String>() {

+ 4 - 4
home/src/main/code/com/enation/javashop/android/component/home/agreement/FloorActionAgreement.kt

@@ -1,10 +1,10 @@
-package com.enation.javashop.android.component.home.agreement
+package com.wdkl.ncs.android.component.home.agreement
 
 import android.view.MenuItem
 import android.view.View
-import com.enation.javashop.android.middleware.model.BannerModel
-import com.enation.javashop.android.middleware.model.FloorItem
-import com.enation.javashop.android.middleware.model.FloorMenuModel
+import com.wdkl.ncs.android.middleware.model.BannerModel
+import com.wdkl.ncs.android.middleware.model.FloorItem
+import com.wdkl.ncs.android.middleware.model.FloorMenuModel
 
 /**
  * Created by LDD on 2018/10/16.

+ 2 - 2
home/src/main/code/com/enation/javashop/android/component/home/binding/HomeFragmentBindHelper.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.component.home.binding
+package com.wdkl.ncs.android.component.home.binding
 
 import android.databinding.BindingAdapter
 import android.databinding.ObservableField
@@ -6,7 +6,7 @@ import android.support.constraint.ConstraintLayout
 
 /**
  * @author LDD
- * @From   com.enation.javashop.android.component.home.binding
+ * @From   com.wdkl.ncs.android.component.home.binding
  * @Date   2018/1/30 下午3:03
  * @Note   首页UIVM
  */

+ 23 - 0
home/src/main/code/com/wdkl/ncs/android/component/home/di/HomeComponent.kt

@@ -0,0 +1,23 @@
+package com.wdkl.ncs.android.component.home.di
+
+import com.wdkl.ncs.android.component.home.activity.HomeActivity
+import com.wdkl.ncs.android.component.home.fragment.CategoryFragment
+import com.wdkl.ncs.android.component.home.fragment.HomeFragment
+import com.wdkl.ncs.android.middleware.di.ApplicationComponent
+import dagger.Component
+
+/**
+ * @author LDD
+ * @Date   2018/1/22 下午2:43
+ * @From   com.wdkl.ncs.android.component.home.di
+ * @Note   依赖注入入口
+ */
+@Component(dependencies = arrayOf(ApplicationComponent::class))
+interface HomeComponent {
+
+    fun inject(activity: HomeActivity)
+
+    fun inject(activity: HomeFragment)
+
+    fun inject(activity: CategoryFragment)
+}

+ 14 - 14
home/src/main/code/com/enation/javashop/android/component/home/fragment/CategoryFragment.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.component.home.fragment
+package com.wdkl.ncs.android.component.home.fragment
 
 import android.support.constraint.ConstraintLayout
 import android.support.v7.widget.RecyclerView
@@ -10,23 +10,23 @@ import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.alibaba.android.vlayout.layout.GridLayoutHelper
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.activity.HomeActivity
-import com.enation.javashop.android.component.home.adapter.ChildCategoryAdapter
-import com.enation.javashop.android.component.home.adapter.ParentCategoryAdapter
-import com.enation.javashop.android.component.home.databinding.CategoryFragLayBinding
-import com.enation.javashop.android.component.home.databinding.CategroyLeftItemBinding
-import com.enation.javashop.android.component.home.launch.HomeLaunch
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.activity.HomeActivity
+import com.wdkl.ncs.android.component.home.adapter.ChildCategoryAdapter
+import com.wdkl.ncs.android.component.home.adapter.ParentCategoryAdapter
+import com.wdkl.ncs.android.component.home.databinding.CategoryFragLayBinding
+import com.wdkl.ncs.android.component.home.databinding.CategroyLeftItemBinding
+import com.wdkl.ncs.android.component.home.launch.HomeLaunch
 import com.wdkl.ncs.android.lib.adapter.ListViewBaseAdapter
 import com.wdkl.ncs.android.lib.adapter.VlayoutHolderAdapter
 import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.utils.*
 import com.wdkl.ncs.android.lib.vo.filter
-import com.enation.javashop.android.middleware.logic.contract.home.CategoryFragmentContract
-import com.enation.javashop.android.middleware.logic.presenter.home.CategoryFragmentPresenter
-import com.enation.javashop.android.middleware.model.ChildCategoryShell
-import com.enation.javashop.android.middleware.model.ChildCategoryViewModel
-import com.enation.javashop.android.middleware.model.ParentCategoryViewModel
+import com.wdkl.ncs.android.middleware.logic.contract.home.CategoryFragmentContract
+import com.wdkl.ncs.android.middleware.logic.presenter.home.CategoryFragmentPresenter
+import com.wdkl.ncs.android.middleware.model.ChildCategoryShell
+import com.wdkl.ncs.android.middleware.model.ChildCategoryViewModel
+import com.wdkl.ncs.android.middleware.model.ParentCategoryViewModel
 import com.enation.javashop.net.engine.model.NetState
 import com.enation.javashop.utils.base.tool.ScreenTool
 import kotlinx.android.synthetic.main.category_frag_lay.*
@@ -35,7 +35,7 @@ import kotlin.collections.ArrayList
 /**
  * @author LDD
  * @Date   2018/1/22 下午12:38
- * @From   com.enation.javashop.android.component.home.fragment
+ * @From   com.wdkl.ncs.android.component.home.fragment
  * @Note   分类Fragment
  */
 class CategoryFragment :BaseFragment<CategoryFragmentPresenter,CategoryFragLayBinding>(),CategoryFragmentContract.View {

+ 13 - 13
home/src/main/code/com/enation/javashop/android/component/home/fragment/HomeFragment.kt

@@ -1,25 +1,25 @@
-package com.enation.javashop.android.component.home.fragment
+package com.wdkl.ncs.android.component.home.fragment
 
 import android.support.constraint.ConstraintLayout
 import android.support.v7.widget.RecyclerView
 import android.view.View
 import com.alibaba.android.vlayout.DelegateAdapter
 import com.alibaba.android.vlayout.VirtualLayoutManager
-import com.enation.javashop.android.component.home.R
-import com.enation.javashop.android.component.home.activity.HomeActivity
-import com.enation.javashop.android.component.home.adapter.*
-import com.enation.javashop.android.component.home.agreement.FloorActionAgreement
-import com.enation.javashop.android.component.home.binding.HomeFragmentBindHelper
-import com.enation.javashop.android.component.home.databinding.HomeFragLayBinding
-import com.enation.javashop.android.component.home.launch.HomeLaunch
+import com.wdkl.ncs.android.component.home.R
+import com.wdkl.ncs.android.component.home.activity.HomeActivity
+import com.wdkl.ncs.android.component.home.adapter.*
+import com.wdkl.ncs.android.component.home.agreement.FloorActionAgreement
+import com.wdkl.ncs.android.component.home.binding.HomeFragmentBindHelper
+import com.wdkl.ncs.android.component.home.databinding.HomeFragLayBinding
+import com.wdkl.ncs.android.component.home.launch.HomeLaunch
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
 import com.wdkl.ncs.android.lib.adapter.VlayoutItemType
 import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.utils.*
 import com.wdkl.ncs.android.lib.vo.filter
-import com.enation.javashop.android.middleware.logic.contract.home.HomeFragmentContract
-import com.enation.javashop.android.middleware.logic.presenter.home.HomeFragmentPresenter
-import com.enation.javashop.android.middleware.model.*
+import com.wdkl.ncs.android.middleware.logic.contract.home.HomeFragmentContract
+import com.wdkl.ncs.android.middleware.logic.presenter.home.HomeFragmentPresenter
+import com.wdkl.ncs.android.middleware.model.*
 import com.enation.javashop.net.engine.model.NetState
 import com.enation.javashop.utils.base.tool.ScreenTool
 import com.google.gson.Gson
@@ -30,7 +30,7 @@ import java.util.logging.Handler
 /**
  * @author LDD
  * @Date   2018/1/19 下午5:27
- * @From   com.enation.javashop.android.component.home.fragment
+ * @From   com.wdkl.ncs.android.component.home.fragment
  * @Note   主页Fragment
  */
 class HomeFragment : BaseFragment<HomeFragmentPresenter,HomeFragLayBinding>(),HomeFragmentContract.View ,FloorActionAgreement{
@@ -66,7 +66,7 @@ class HomeFragment : BaseFragment<HomeFragmentPresenter,HomeFragLayBinding>(),Ho
     /**
      * @author LDD
      * @Date   2018/1/19 下午5:29
-     * @From   com.enation.javashop.android.component.home.fragment.HomeFragment
+     * @From   com.wdkl.ncs.android.component.home.fragment.HomeFragment
      * @Note   databindingViewModel
      */
     private var bindHelper = HomeFragmentBindHelper()

+ 5 - 5
home/src/main/code/com/enation/javashop/android/component/home/launch/HomeLaunch.kt

@@ -1,15 +1,15 @@
-package com.enation.javashop.android.component.home.launch
+package com.wdkl.ncs.android.component.home.launch
 
-import com.enation.javashop.android.component.home.di.DaggerHomeComponent
-import com.enation.javashop.android.component.home.di.HomeComponent
+import com.wdkl.ncs.android.component.home.di.DaggerHomeComponent
+import com.wdkl.ncs.android.component.home.di.HomeComponent
 import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.wdkl.ncs.android.lib.base.BaseLaunch
-import com.enation.javashop.android.middleware.di.DaggerManager
+import com.wdkl.ncs.android.middleware.di.DaggerManager
 
 /**
  * @author LDD
  * @Date   2018/1/22 下午2:44
- * @From   com.enation.javashop.android.component.home.launch
+ * @From   com.wdkl.ncs.android.component.home.launch
  * @Note   home模块启动类 代替Application 在壳工程Application中反射调用
  */
 @Router(path = "/home/launch")

+ 1 - 1
home/src/main/res/layout/categroy_child_item.xml

@@ -3,7 +3,7 @@
     <data>
         <variable
             name="data"
-            type="com.enation.javashop.android.middleware.model.ChildCategoryViewModel"/>
+            type="com.wdkl.ncs.android.middleware.model.ChildCategoryViewModel"/>
     </data>
 <android.support.constraint.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"

+ 1 - 1
home/src/main/res/layout/categroy_left_item.xml

@@ -3,7 +3,7 @@
     <data>
         <variable
             name="itemData"
-            type="com.enation.javashop.android.middleware.model.ParentCategoryViewModel"/>
+            type="com.wdkl.ncs.android.middleware.model.ParentCategoryViewModel"/>
     </data>
 <android.support.constraint.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"

+ 1 - 1
home/src/main/res/layout/home_frag_lay.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
     <data>
-        <variable name="homeData" type="com.enation.javashop.android.component.home.binding.HomeFragmentBindHelper"/>
+        <variable name="homeData" type="com.wdkl.ncs.android.component.home.binding.HomeFragmentBindHelper"/>
     </data>
 <android.support.constraint.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"

+ 1 - 1
home/src/test/java/com/enation/javashop/android/component/home/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.component.home;
+package com.wdkl.ncs.android.component.home;
 
 import org.junit.Test;
 

+ 2 - 2
middleware/src/androidTest/java/com/enation/javashop/android/middleware/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware;
+package com.wdkl.ncs.android.middleware;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.enation.javashop.android.middleware.test", appContext.getPackageName());
+        assertEquals("com.wdkl.ncs.android.middleware.test", appContext.getPackageName());
     }
 }

+ 1 - 1
middleware/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.enation.javashop.android.middleware"/>
+          package="com.wdkl.ncs.android.middleware"/>

+ 0 - 9
middleware/src/main/code/com/enation/javashop/android/middleware/event/LoginEvent.kt

@@ -1,9 +0,0 @@
-package com.enation.javashop.android.middleware.event
-
-/**
- * @author LDD
- * @Date   2018/8/13 下午6:18
- * @From   com.enation.javashop.android.middleware.event
- * @Note   登录事件
- */
-class LoginEvent

+ 0 - 15
middleware/src/main/code/com/enation/javashop/android/middleware/event/LogoutEvent.kt

@@ -1,15 +0,0 @@
-package com.enation.javashop.android.middleware.event
-
-import com.enation.javashop.android.middleware.api.MemberState
-
-/**
- * @author LDD
- * @Date   2018/8/13 下午6:18
- * @From   com.enation.javashop.android.middleware.event
- * @Note   登出事件
- */
-class LogoutEvent{
-    constructor(){
-        MemberState.manager.clearMember()
-    }
-}

+ 0 - 7
middleware/src/main/code/com/enation/javashop/android/middleware/model/ConnectLoginModel.kt

@@ -1,7 +0,0 @@
-package com.enation.javashop.android.middleware.model
-
-/**
- * Created by LDD on 2018/11/9.
- */
-data class ConnectLoginModel(var type :String,
-                             var unionId :String)

+ 0 - 9
middleware/src/main/code/com/enation/javashop/android/middleware/model/ReceiptContentViewModel.kt

@@ -1,9 +0,0 @@
-package com.enation.javashop.android.middleware.model
-
-/**
- * @author LDD
- * @Date   2018/5/23 下午6:31
- * @From   com.enation.javashop.android.middleware.model
- * @Note   发票内容ViewModel
- */
-class ReceiptContentViewModel(val id :Int, val name :String)

+ 0 - 11
middleware/src/main/code/com/enation/javashop/android/middleware/model/SingleIntViewModel.kt

@@ -1,11 +0,0 @@
-package com.enation.javashop.android.middleware.model
-
-import android.databinding.ObservableField
-
-/**
- * @author LDD
- * @Date   2018/5/17 上午9:37
- * @From   com.enation.javashop.android.middleware.model
- * @Note   单个IntVM
- */
-data class SingleIntViewModel(val state :ObservableField<Int>)

+ 3 - 3
middleware/src/main/code/com/enation/javashop/android/middleware/api/AdApi.kt

@@ -1,13 +1,13 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
-import com.enation.javashop.android.middleware.model.AdViewModel
+import com.wdkl.ncs.android.middleware.model.AdViewModel
 import io.reactivex.Observable
 import retrofit2.http.*
 
 /**
  * @author LDD
  * @Date   2018/1/16 下午12:16
- * @From   com.enation.javashop.android.middleware.api
+ * @From   com.wdkl.ncs.android.middleware.api
  * @Note   广告API
  */
 interface AdApi {

+ 2 - 2
middleware/src/main/code/com/enation/javashop/android/middleware/api/AfterSaleApi.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
 import io.reactivex.Observable
 import okhttp3.ResponseBody
@@ -7,7 +7,7 @@ import retrofit2.http.*
 /**
  * @author LDD
  * @Date   2018/8/15 上午10:30
- * @From   com.enation.javashop.android.middleware.api
+ * @From   com.wdkl.ncs.android.middleware.api
  * @Note   售后相关API
  */
 interface AfterSaleApi  {

+ 3 - 3
middleware/src/main/code/com/enation/javashop/android/middleware/api/ApiManager.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
 import android.annotation.SuppressLint
 import com.wdkl.ncs.android.lib.base.BaseApplication
@@ -32,7 +32,7 @@ object ApiManager {
         val PAGE_SIZE = 10
 
         /**
-         * @Name  com.enation.javashop.android.middleware.api.ApiManager.EXTRA_API
+         * @Name  com.wdkl.ncs.android.middleware.api.ApiManager.EXTRA_API
          * @Type  ExtraApi
          * @Note  其他API
          */
@@ -40,7 +40,7 @@ object ApiManager {
 
 
         /**
-         * @Name  com.enation.javashop.android.middleware.api.ApiManager.BASE_URL
+         * @Name  com.wdkl.ncs.android.middleware.api.ApiManager.BASE_URL
          * @Type  BaseApi
          * @Note  基础API
          */

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/api/BaseApi.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
 import com.wdkl.ncs.android.lib.utils.UUID
 import io.reactivex.Observable

+ 3 - 3
middleware/src/main/code/com/enation/javashop/android/middleware/api/CartApi.kt

@@ -1,6 +1,6 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
-import com.enation.javashop.android.middleware.model.GoodsViewModel
+import com.wdkl.ncs.android.middleware.model.GoodsViewModel
 import io.reactivex.Observable
 import okhttp3.ResponseBody
 import retrofit2.http.*
@@ -8,7 +8,7 @@ import retrofit2.http.*
 /**
  * @author LDD
  * @Date   2018/2/9 下午12:06
- * @From   com.enation.javashop.android.middleware.api
+ * @From   com.wdkl.ncs.android.middleware.api
  * @Note   购物车Api
  */
 interface CartApi {

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/api/CategoryApi.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
 import io.reactivex.Observable
 import okhttp3.ResponseBody

+ 2 - 2
middleware/src/main/code/com/enation/javashop/android/middleware/api/ExtraApi.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
 import io.reactivex.Observable
 import okhttp3.ResponseBody
@@ -9,7 +9,7 @@ import retrofit2.http.Query
 /**
  * @author LDD
  * @Date   2018/8/16 下午3:03
- * @From   com.enation.javashop.android.middleware.api
+ * @From   com.wdkl.ncs.android.middleware.api
  * @Note   额外API
  */
 interface ExtraApi {

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/api/GoodsApi.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
 import io.reactivex.Observable
 import okhttp3.ResponseBody

+ 3 - 3
middleware/src/main/code/com/enation/javashop/android/middleware/api/MemberApi.kt

@@ -1,6 +1,6 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
-import com.enation.javashop.android.middleware.model.PostCommentModel
+import com.wdkl.ncs.android.middleware.model.PostCommentModel
 import io.reactivex.Observable
 import okhttp3.ResponseBody
 import retrofit2.adapter.rxjava2.Result
@@ -9,7 +9,7 @@ import retrofit2.http.*
 /**
  * @author LDD
  * @Date   2018/1/16 下午12:10
- * @From   com.enation.javashop.android.middleware.api
+ * @From   com.wdkl.ncs.android.middleware.api
  * @Note   会员Api
  */
 interface MemberApi {

+ 3 - 3
middleware/src/main/code/com/enation/javashop/android/middleware/api/MemberState.kt

@@ -1,6 +1,6 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
-import com.enation.javashop.android.middleware.model.MemberViewModel
+import com.wdkl.ncs.android.middleware.model.MemberViewModel
 
 /**
  *  会员状态管理器
@@ -10,7 +10,7 @@ class MemberState {
     companion object {
 
         /**
-         * @Name  com.enation.javashop.android.middleware.api.MemberManager.Companion.instance
+         * @Name  com.wdkl.ncs.android.middleware.api.MemberManager.Companion.instance
          * @Type  MemberManager
          * @Note  单例
          */

+ 3 - 3
middleware/src/main/code/com/enation/javashop/android/middleware/api/NetFectory.kt

@@ -1,10 +1,10 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
 import android.content.Context
 import android.util.Log
 import com.wdkl.ncs.android.lib.utils.*
-import com.enation.javashop.android.middleware.config.JavaShopConfigCenter
-import com.enation.javashop.android.middleware.event.LogoutEvent
+import com.wdkl.ncs.android.middleware.config.JavaShopConfigCenter
+import com.wdkl.ncs.android.middleware.event.LogoutEvent
 import com.enation.javashop.net.engine.plugin.cookies.PersistentCookieJar
 import com.enation.javashop.net.engine.plugin.cookies.cache.SetCookieCache
 import com.enation.javashop.net.engine.plugin.cookies.persistence.SharedPrefsCookiePersistor

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/api/OrderApi.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
 import io.reactivex.Observable
 import okhttp3.ResponseBody

+ 2 - 2
middleware/src/main/code/com/enation/javashop/android/middleware/api/PassportApi.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
 import com.wdkl.ncs.android.lib.utils.UUID
 import io.reactivex.Observable
@@ -11,7 +11,7 @@ import retrofit2.http.*
 /**
  * @author LDD
  * @Date   2018/8/13 上午11:00
- * @From   com.enation.javashop.android.middleware.api
+ * @From   com.wdkl.ncs.android.middleware.api
  * @Note   护照
  */
 interface PassportApi {

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/api/PaymentApi.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
 import io.reactivex.Observable
 import okhttp3.ResponseBody

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/api/PromotionApi.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
 import io.reactivex.Observable
 import okhttp3.ResponseBody

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/api/ShopApi.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
 import io.reactivex.Observable
 import okhttp3.ResponseBody

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/api/TradeApi.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
 import io.reactivex.Observable
 import okhttp3.ResponseBody

+ 5 - 5
middleware/src/main/code/com/enation/javashop/android/middleware/api/UrlManager.kt

@@ -1,11 +1,11 @@
-package com.enation.javashop.android.middleware.api
+package com.wdkl.ncs.android.middleware.api
 
-import com.enation.javashop.android.middleware.config.JavaShopConfigCenter
+import com.wdkl.ncs.android.middleware.config.JavaShopConfigCenter
 
 /**
  * @author LDD
  * @Date   2018/8/21 下午4:38
- * @From   com.enation.javashop.android.middleware.api
+ * @From   com.wdkl.ncs.android.middleware.api
  * @Note   Url控制器接口
  */
 interface UrlManager {
@@ -48,7 +48,7 @@ interface UrlManager {
 /**
  * @author LDD
  * @Date   2018/8/21 下午4:38
- * @From   com.enation.javashop.android.middleware.api
+ * @From   com.wdkl.ncs.android.middleware.api
  * @Note   开发模式Url控制器
  */
 private class DevUrlManager : UrlManager{
@@ -68,7 +68,7 @@ private class DevUrlManager : UrlManager{
 /**
  * @author LDD
  * @Date   2018/8/21 下午4:38
- * @From   com.enation.javashop.android.middleware.api
+ * @From   com.wdkl.ncs.android.middleware.api
  * @Note   生产模式Url控制器
  */
 private class ProUrlManager : UrlManager{

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/aspect/LockClick.java

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.aspect;
+package com.wdkl.ncs.android.middleware.aspect;
 
 import com.enation.javashop.android.jrouter.JRouter;
 import com.enation.javashop.android.jrouter.external.annotation.Router;

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/aspect/LockClickAspect.java

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.aspect;
+package com.wdkl.ncs.android.middleware.aspect;
 
 import com.wdkl.ncs.android.lib.utils.ExtendMethodsKt;
 import org.aspectj.lang.ProceedingJoinPoint;

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/bind/DataBindingAction.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.bind
+package com.wdkl.ncs.android.middleware.bind
 
 object DataBindingAction {
 

+ 4 - 4
middleware/src/main/code/com/enation/javashop/android/middleware/bind/DataBindingHelper.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.bind
+package com.wdkl.ncs.android.middleware.bind
 
 import android.databinding.BindingAdapter
 import android.graphics.Color
@@ -16,9 +16,9 @@ import android.widget.TextView
 import com.enation.javashop.android.jrouter.JRouter
 import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.utils.*
-import com.enation.javashop.android.middleware.R
-import com.enation.javashop.android.middleware.api.MemberState
-import com.enation.javashop.android.middleware.model.GoodsItemViewModel
+import com.wdkl.ncs.android.middleware.R
+import com.wdkl.ncs.android.middleware.api.MemberState
+import com.wdkl.ncs.android.middleware.model.GoodsItemViewModel
 import com.enation.javashop.utils.base.tool.BaseToolActivity
 import com.enation.javashop.utils.base.tool.ScreenTool
 

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/bind/ViewAttrModel.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.bind
+package com.wdkl.ncs.android.middleware.bind
 
 /**
  * Created by LDD on 2018/4/8.

+ 2 - 2
middleware/src/main/code/com/enation/javashop/android/middleware/cache/HsitoryCache.kt

@@ -1,7 +1,7 @@
-package com.enation.javashop.android.middleware.cache
+package com.wdkl.ncs.android.middleware.cache
 
 import com.wdkl.ncs.android.lib.base.BaseApplication
-import com.enation.javashop.android.middleware.model.HistoryModel
+import com.wdkl.ncs.android.middleware.model.HistoryModel
 import com.enation.javashop.utils.base.cache.ACache
 import com.google.gson.Gson
 

+ 3 - 3
middleware/src/main/code/com/enation/javashop/android/middleware/config/JavaShopConfigCenter.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.config
+package com.wdkl.ncs.android.middleware.config
 
 import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.utils.AppTool
@@ -10,7 +10,7 @@ import org.json.JSONObject
 /**
  * @author LDD
  * @Date   2018/5/18 上午11:15
- * @From   com.enation.javashop.android.middleware.config
+ * @From   com.wdkl.ncs.android.middleware.config
  * @Note   JavaShop配置中心
  */
 class JavaShopConfigCenter {
@@ -101,7 +101,7 @@ class JavaShopConfigCenter {
     companion object {
 
         /**
-         * @Name  com.enation.javashop.android.middleware.config.JavaShopConfigCenter.Companion.INSTANCE
+         * @Name  com.wdkl.ncs.android.middleware.config.JavaShopConfigCenter.Companion.INSTANCE
          * @Type  JavaShopConfigCenter
          * @Note  配置中心单例
          */

+ 14 - 14
middleware/src/main/code/com/enation/javashop/android/middleware/di/ApiProvides.kt

@@ -1,6 +1,6 @@
-package com.enation.javashop.android.middleware.di
+package com.wdkl.ncs.android.middleware.di
 
-import com.enation.javashop.android.middleware.api.*
+import com.wdkl.ncs.android.middleware.api.*
 import com.enation.javashop.net.engine.core.NetEngineFactory
 import dagger.Module
 import dagger.Provides
@@ -16,7 +16,7 @@ class ApiProvides {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   额外ApI
      * @return 额外API
@@ -28,7 +28,7 @@ class ApiProvides {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   售后ApI
      * @return 售后API
@@ -40,7 +40,7 @@ class ApiProvides {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   购物车ApI
      * @return 购物车API
@@ -52,7 +52,7 @@ class ApiProvides {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   分类ApI
      * @return 分类API
@@ -64,7 +64,7 @@ class ApiProvides {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   商品ApI
      * @return 商品API
@@ -76,7 +76,7 @@ class ApiProvides {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   会员ApI
      * @return 会员API
@@ -88,7 +88,7 @@ class ApiProvides {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   订单ApI
      * @return 订单API
@@ -100,7 +100,7 @@ class ApiProvides {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   支付ApI
      * @return 支付API
@@ -112,7 +112,7 @@ class ApiProvides {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   促销ApI
      * @return 促销API
@@ -124,7 +124,7 @@ class ApiProvides {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   店铺ApI
      * @return 店铺API
@@ -136,7 +136,7 @@ class ApiProvides {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   交易ApI
      * @return 交易API
@@ -148,7 +148,7 @@ class ApiProvides {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   广告ApI
      * @return 广告ApI

+ 14 - 14
middleware/src/main/code/com/enation/javashop/android/middleware/di/ApplicationComponent.kt

@@ -1,6 +1,6 @@
-package com.enation.javashop.android.middleware.di
+package com.wdkl.ncs.android.middleware.di
 
-import com.enation.javashop.android.middleware.api.*
+import com.wdkl.ncs.android.middleware.api.*
 import com.umeng.socialize.media.Base
 import dagger.Component
 
@@ -15,7 +15,7 @@ interface ApplicationComponent {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   额外Api
      * @return 额外API
@@ -24,7 +24,7 @@ interface ApplicationComponent {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   售后ApI
      * @return 售后API
@@ -33,7 +33,7 @@ interface ApplicationComponent {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   购物车ApI
      * @return 购物车API
@@ -42,7 +42,7 @@ interface ApplicationComponent {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   分类ApI
      * @return 分类API
@@ -51,7 +51,7 @@ interface ApplicationComponent {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   商品ApI
      * @return 商品API
@@ -60,7 +60,7 @@ interface ApplicationComponent {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   会员ApI
      * @return 会员API
@@ -69,7 +69,7 @@ interface ApplicationComponent {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   订单ApI
      * @return 订单API
@@ -78,7 +78,7 @@ interface ApplicationComponent {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   支付ApI
      * @return 支付API
@@ -87,7 +87,7 @@ interface ApplicationComponent {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   促销ApI
      * @return 促销API
@@ -96,7 +96,7 @@ interface ApplicationComponent {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   店铺ApI
      * @return 店铺API
@@ -105,7 +105,7 @@ interface ApplicationComponent {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   交易ApI
      * @return 交易API
@@ -114,7 +114,7 @@ interface ApplicationComponent {
 
     /**
      * @author  LDD
-     * @From   com.enation.javashop.android.middleware.di
+     * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
      * @Note   广告ApI
      * @return 广告ApI

+ 2 - 2
middleware/src/main/code/com/enation/javashop/android/middleware/di/DaggerManager.kt

@@ -1,9 +1,9 @@
-package com.enation.javashop.android.middleware.di
+package com.wdkl.ncs.android.middleware.di
 
 /**
  * @author LDD
  * @Date   2018/1/15 下午2:48
- * @From   com.enation.javashop.android.middleware.di
+ * @From   com.wdkl.ncs.android.middleware.di
  * @Note   提供
  */
 object DaggerManager {

+ 4 - 4
middleware/src/main/code/com/enation/javashop/android/middleware/di/MiddlewareDaggerComponent.kt

@@ -1,16 +1,16 @@
-package com.enation.javashop.android.middleware.di
+package com.wdkl.ncs.android.middleware.di
 
 /**
  * @author LDD
  * @Date   2018/1/19 下午6:22
- * @From   com.enation.javashop.android.middleware.di
+ * @From   com.wdkl.ncs.android.middleware.di
  * @Note   中间件 依赖注入模块管理类
  */
 object MiddlewareDaggerComponent {
 
     /**
-     * @Name  com.enation.javashop.android.middleware.di.MiddlewareDaggerComponent.component
-     * @Type  com.enation.javashop.android.middleware.di.PresenterComponent
+     * @Name  com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent.component
+     * @Type  com.wdkl.ncs.android.middleware.di.PresenterComponent
      * @Note  逻辑控制器依赖注入模块
      */
     val component :PresenterComponent by lazy { DaggerPresenterComponent.builder().applicationComponent(DaggerManager.APPLICATION_COMPONENT).build() }

+ 15 - 15
middleware/src/main/code/com/enation/javashop/android/middleware/di/PresenterComponent.kt

@@ -1,24 +1,24 @@
-package com.enation.javashop.android.middleware.di
-
-import com.enation.javashop.android.middleware.logic.presenter.cart.CartFragmentPresenter
-import com.enation.javashop.android.middleware.logic.presenter.extra.ScanPresenter
-import com.enation.javashop.android.middleware.logic.presenter.goods.*
-import com.enation.javashop.android.middleware.logic.presenter.home.CategoryFragmentPresenter
-import com.enation.javashop.android.middleware.logic.presenter.home.HomeActivityPresenter
-import com.enation.javashop.android.middleware.logic.presenter.home.HomeFragmentPresenter
-import com.enation.javashop.android.middleware.logic.presenter.member.*
-import com.enation.javashop.android.middleware.logic.presenter.order.*
-import com.enation.javashop.android.middleware.logic.presenter.promotion.*
-import com.enation.javashop.android.middleware.logic.presenter.setting.SettingActivityPresenter
-import com.enation.javashop.android.middleware.logic.presenter.shop.*
-import com.enation.javashop.android.middleware.logic.presenter.welcome.WelcomePresenter
+package com.wdkl.ncs.android.middleware.di
+
+import com.wdkl.ncs.android.middleware.logic.presenter.cart.CartFragmentPresenter
+import com.wdkl.ncs.android.middleware.logic.presenter.extra.ScanPresenter
+import com.wdkl.ncs.android.middleware.logic.presenter.goods.*
+import com.wdkl.ncs.android.middleware.logic.presenter.home.CategoryFragmentPresenter
+import com.wdkl.ncs.android.middleware.logic.presenter.home.HomeActivityPresenter
+import com.wdkl.ncs.android.middleware.logic.presenter.home.HomeFragmentPresenter
+import com.wdkl.ncs.android.middleware.logic.presenter.member.*
+import com.wdkl.ncs.android.middleware.logic.presenter.order.*
+import com.wdkl.ncs.android.middleware.logic.presenter.promotion.*
+import com.wdkl.ncs.android.middleware.logic.presenter.setting.SettingActivityPresenter
+import com.wdkl.ncs.android.middleware.logic.presenter.shop.*
+import com.wdkl.ncs.android.middleware.logic.presenter.welcome.WelcomePresenter
 import dagger.Component
 
 
 /**
  * @author LDD
  * @Date   2018/1/19 下午6:20
- * @From   com.enation.javashop.android.middleware.di
+ * @From   com.wdkl.ncs.android.middleware.di
  * @Note   逻辑控制者依赖注入模块
  */
 @Component(dependencies = arrayOf(ApplicationComponent::class))

+ 18 - 18
middleware/src/main/code/com/enation/javashop/android/middleware/enum/GlobalState.kt

@@ -1,24 +1,24 @@
-package com.enation.javashop.android.middleware.enum
+package com.wdkl.ncs.android.middleware.enum
 
 
 object GlobalState{
 
     /**
-     * @Name  com.enation.javashop.android.middleware.enum.GlobalState.REGISTER
+     * @Name  com.wdkl.ncs.android.middleware.enum.GlobalState.REGISTER
      * @Type  Int
      * @Note  注册
      */
     const val REGISTER_USER = 1
 
     /**
-     * @Name  com.enation.javashop.android.middleware.enum.GlobalState.BIND
+     * @Name  com.wdkl.ncs.android.middleware.enum.GlobalState.BIND
      * @Type  Int
      * @Note  绑定手机号
      */
     const val BIND_PHONE = 2
 
     /**
-     * @Name  com.enation.javashop.android.middleware.enum.GlobalState.FIND
+     * @Name  com.wdkl.ncs.android.middleware.enum.GlobalState.FIND
      * @Type  Int
      * @Note  找回密码
      */
@@ -26,14 +26,14 @@ object GlobalState{
 
 
     /**
-     * @Name  com.enation.javashop.android.middleware.enum.GlobalState.EDIT_PASSWORD
+     * @Name  com.wdkl.ncs.android.middleware.enum.GlobalState.EDIT_PASSWORD
      * @Type  Int
      * @Note  修改密码
      */
     const val EDIT_PASSWORD = 4
 
     /**
-     * @Name  com.enation.javashop.android.middleware.enum.GlobalState.BIND
+     * @Name  com.wdkl.ncs.android.middleware.enum.GlobalState.BIND
      * @Type  Int
      * @Note  更换手机号
      */
@@ -41,84 +41,84 @@ object GlobalState{
 
 
     /**
-     * @Name  com.enation.javashop.android.middleware.enum.GlobalState.DYNAMIC_LOGIN
+     * @Name  com.wdkl.ncs.android.middleware.enum.GlobalState.DYNAMIC_LOGIN
      * @Type  Int
      * @Note  动态登录
      */
     const val VALIDATE_MOBILE = -1
 
     /**
-     * @Name  com.enation.javashop.android.middleware.enum.GlobalState.DYNAMIC_LOGIN
+     * @Name  com.wdkl.ncs.android.middleware.enum.GlobalState.DYNAMIC_LOGIN
      * @Type  Int
      * @Note  动态登录
      */
     const val DYNAMIC_LOGIN = 6
 
     /**
-     * @Name  com.enation.javashop.android.middleware.enum.GlobalState.LOGIN
+     * @Name  com.wdkl.ncs.android.middleware.enum.GlobalState.LOGIN
      * @Type  Int
      * @Note  普通登录
      */
     const val LOGIN = 7
 
     /**
-     * @Name  com.enation.javashop.android.middleware.enum.GlobalState.ORDER_CREATE_PAYSHIP
+     * @Name  com.wdkl.ncs.android.middleware.enum.GlobalState.ORDER_CREATE_PAYSHIP
      * @Type  String
      * @Note  支付配送
      */
     const val ORDER_CREATE_PAYSHIP = 8
 
     /**
-     * @Name  com.enation.javashop.android.middleware.enum.GlobalState.ORDER_CREATE_ADDRESS
+     * @Name  com.wdkl.ncs.android.middleware.enum.GlobalState.ORDER_CREATE_ADDRESS
      * @Type  String
      * @Note  地址
      */
     const val ORDER_CREATE_ADDRESS = 9
 
     /**
-     * @Name  com.enation.javashop.android.middleware.enum.GlobalState.ORDER_CREATE_RECEIPT
+     * @Name  com.wdkl.ncs.android.middleware.enum.GlobalState.ORDER_CREATE_RECEIPT
      * @Type  String
      * @Note  发票
      */
     const val ORDER_CREATE_RECEIPT = 10
 
     /**
-     * @Name  com.enation.javashop.android.middleware.enum.GlobalState.ORDER_CREATE_RECEIPT
+     * @Name  com.wdkl.ncs.android.middleware.enum.GlobalState.ORDER_CREATE_RECEIPT
      * @Type  String
      * @Note  优惠券
      */
     const val ORDER_CREATE_COUPON = 11
 
     /**
-     * @Name  com.enation.javashop.android.middleware.enum.GlobalState.PAY_ONLINE
+     * @Name  com.wdkl.ncs.android.middleware.enum.GlobalState.PAY_ONLINE
      * @Type  String
      * @Note  在线支付
      */
     const val PAY_ONLINE = 12
 
     /**
-     * @Name  com.enation.javashop.android.middleware.enum.GlobalState.PAY_COD
+     * @Name  com.wdkl.ncs.android.middleware.enum.GlobalState.PAY_COD
      * @Type  String
      * @Note  货到付款
      */
     const val PAY_COD = 13
 
     /**
-     * @Name  com.enation.javashop.android.middleware.enum.GlobalState.SHIP_EVERYTIME
+     * @Name  com.wdkl.ncs.android.middleware.enum.GlobalState.SHIP_EVERYTIME
      * @Type  String
      * @Note  任何时间送货
      */
     const val SHIP_EVERYTIME = 14
 
     /**
-     * @Name  com.enation.javashop.android.middleware.enum.GlobalState.SHIP_WORKTIME
+     * @Name  com.wdkl.ncs.android.middleware.enum.GlobalState.SHIP_WORKTIME
      * @Type  String
      * @Note  仅工作日送货
      */
     const val SHIP_WORKTIME = 15
 
     /**
-     * @Name  com.enation.javashop.android.middleware.enum.GlobalState.SHIP_RESTTIME
+     * @Name  com.wdkl.ncs.android.middleware.enum.GlobalState.SHIP_RESTTIME
      * @Type  String
      * @Note  仅休息日送货
      */

+ 2 - 2
middleware/src/main/code/com/enation/javashop/android/middleware/enum/Promotion.kt

@@ -1,8 +1,8 @@
-package com.enation.javashop.android.middleware.enum
+package com.wdkl.ncs.android.middleware.enum
 
 /**
  * @author LDD
- * @From   com.enation.javashop.android.middleware.enum
+ * @From   com.wdkl.ncs.android.middleware.enum
  * @Date   2018/2/2 下午1:38
  * @Note   促销活动类型
  */

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/event/AddressListDataChange.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.event
+package com.wdkl.ncs.android.middleware.event
 
 /**
  * Created by LDD on 2018/10/29.

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/event/CartDataChange.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.event
+package com.wdkl.ncs.android.middleware.event
 
 /**
  * Created by LDD on 2018/10/22.

+ 9 - 0
middleware/src/main/code/com/wdkl/ncs/android/middleware/event/LoginEvent.kt

@@ -0,0 +1,9 @@
+package com.wdkl.ncs.android.middleware.event
+
+/**
+ * @author LDD
+ * @Date   2018/8/13 下午6:18
+ * @From   com.wdkl.ncs.android.middleware.event
+ * @Note   登录事件
+ */
+class LoginEvent

+ 15 - 0
middleware/src/main/code/com/wdkl/ncs/android/middleware/event/LogoutEvent.kt

@@ -0,0 +1,15 @@
+package com.wdkl.ncs.android.middleware.event
+
+import com.wdkl.ncs.android.middleware.api.MemberState
+
+/**
+ * @author LDD
+ * @Date   2018/8/13 下午6:18
+ * @From   com.wdkl.ncs.android.middleware.event
+ * @Note   登出事件
+ */
+class LogoutEvent{
+    constructor(){
+        MemberState.manager.clearMember()
+    }
+}

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/event/OrderCreateDataChange.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.event
+package com.wdkl.ncs.android.middleware.event
 
 /**
  * Created by LDD on 2018/10/11.

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/event/OrderDetailDataChange.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.event
+package com.wdkl.ncs.android.middleware.event
 
 /**
  * Created by LDD on 2018/10/13.

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/event/OrderListDataChange.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.event
+package com.wdkl.ncs.android.middleware.event
 
 /**
  * Created by LDD on 2018/10/24.

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/event/PayEvent.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.event
+package com.wdkl.ncs.android.middleware.event
 
 /**
  * Created by LDD on 2018/10/24.

+ 2 - 2
middleware/src/main/code/com/enation/javashop/android/middleware/event/ShopCategorySelectEvent.kt

@@ -1,9 +1,9 @@
-package com.enation.javashop.android.middleware.event
+package com.wdkl.ncs.android.middleware.event
 
 /**
  * @author LDD
  * @Date   2018/4/11 下午4:38
- * @From   com.enation.javashop.android.middleware.event
+ * @From   com.wdkl.ncs.android.middleware.event
  * @Note   店铺分类选中事件
  */
 data class ShopCategorySelectEvent(var category :String ,var name :String)

+ 4 - 4
middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/cart/CartFragmentContract.kt

@@ -1,13 +1,13 @@
-package com.enation.javashop.android.middleware.logic.contract.cart
+package com.wdkl.ncs.android.middleware.logic.contract.cart
 
 import com.wdkl.ncs.android.lib.base.BaseContract
-import com.enation.javashop.android.middleware.model.CouponViewModel
-import com.enation.javashop.android.middleware.model.MemberViewModel
+import com.wdkl.ncs.android.middleware.model.CouponViewModel
+import com.wdkl.ncs.android.middleware.model.MemberViewModel
 
 /**
  * @author LDD
  * @Date   2018/2/9 上午10:38
- * @From   com.enation.javashop.android.middleware.logic.contract.cart
+ * @From   com.wdkl.ncs.android.middleware.logic.contract.cart
  * @Note   购物车接口控制
  */
 interface CartFragmentContract {

+ 1 - 1
middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/extra/ScanContract.kt

@@ -1,4 +1,4 @@
-package com.enation.javashop.android.middleware.logic.contract.extra
+package com.wdkl.ncs.android.middleware.logic.contract.extra
 
 import com.wdkl.ncs.android.lib.base.BaseContract
 

+ 3 - 3
middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/goods/GoodsActivityContract.kt

@@ -1,14 +1,14 @@
-package com.enation.javashop.android.middleware.logic.contract.goods
+package com.wdkl.ncs.android.middleware.logic.contract.goods
 
 import android.app.Activity
 import android.graphics.Bitmap
 import com.wdkl.ncs.android.lib.base.BaseContract
-import com.enation.javashop.android.middleware.model.GoodsViewModel
+import com.wdkl.ncs.android.middleware.model.GoodsViewModel
 
 /**
  * @author LDD
  * @Date   2018/3/23 上午11:26
- * @From   com.enation.javashop.android.middleware.logic.contract.goods
+ * @From   com.wdkl.ncs.android.middleware.logic.contract.goods
  * @Note   商品Activity接口控制器
  */
 interface GoodsActivityContract {

+ 4 - 4
middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/goods/GoodsCommentContract.kt

@@ -1,12 +1,12 @@
-package com.enation.javashop.android.middleware.logic.contract.goods
+package com.wdkl.ncs.android.middleware.logic.contract.goods
 
 import com.wdkl.ncs.android.lib.base.BaseContract
-import com.enation.javashop.android.middleware.model.CommentNumViewModel
-import com.enation.javashop.android.middleware.model.GoodsCommentViewModel
+import com.wdkl.ncs.android.middleware.model.CommentNumViewModel
+import com.wdkl.ncs.android.middleware.model.GoodsCommentViewModel
 
 /**
  * @author LDD
- * @From   com.enation.javashop.android.middleware.logic.contract.goods
+ * @From   com.wdkl.ncs.android.middleware.logic.contract.goods
  * @Date   2018/3/30 下午2:09
  * @Note   商品评论接口控制器
  */

+ 3 - 3
middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/goods/GoodsInfoContract.kt

@@ -1,13 +1,13 @@
-package com.enation.javashop.android.middleware.logic.contract.goods
+package com.wdkl.ncs.android.middleware.logic.contract.goods
 
 import com.alibaba.android.vlayout.DelegateAdapter
 import com.wdkl.ncs.android.lib.base.BaseContract
-import com.enation.javashop.android.middleware.model.*
+import com.wdkl.ncs.android.middleware.model.*
 
 /**
  * @author LDD
  * @Date   2018/3/27 上午11:01
- * @From   com.enation.javashop.android.middleware.logic.contract.goods
+ * @From   com.wdkl.ncs.android.middleware.logic.contract.goods
  * @Note   商品详细页面接口控制器
  */
 interface GoodsInfoContract {

+ 2 - 2
middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/goods/GoodsIntroduceContract.kt

@@ -1,11 +1,11 @@
-package com.enation.javashop.android.middleware.logic.contract.goods
+package com.wdkl.ncs.android.middleware.logic.contract.goods
 
 import com.wdkl.ncs.android.lib.base.BaseContract
 
 /**
  * @author LDD
  * @Date   2018/3/30 上午10:04
- * @From   com.enation.javashop.android.middleware.logic.contract.goods
+ * @From   com.wdkl.ncs.android.middleware.logic.contract.goods
  * @Note   商品介绍页面接口控制器
  */
 interface GoodsIntroduceContract {

+ 4 - 4
middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/goods/GoodsSearchContract.kt

@@ -1,13 +1,13 @@
-package com.enation.javashop.android.middleware.logic.contract.goods
+package com.wdkl.ncs.android.middleware.logic.contract.goods
 
 import com.wdkl.ncs.android.lib.base.BaseContract
-import com.enation.javashop.android.middleware.model.GoodsFilterViewModel
-import com.enation.javashop.android.middleware.model.GoodsItemViewModel
+import com.wdkl.ncs.android.middleware.model.GoodsFilterViewModel
+import com.wdkl.ncs.android.middleware.model.GoodsItemViewModel
 
 /**
  * @author LDD
  * @Date   2018/3/9 上午11:36
- * @From   com.enation.javashop.android.middleware.logic.contract.goods
+ * @From   com.wdkl.ncs.android.middleware.logic.contract.goods
  * @Note   商品搜索页面接口控制器
  */
 interface GoodsSearchContract {

+ 2 - 2
middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/goods/SearchContract.kt

@@ -1,7 +1,7 @@
-package com.enation.javashop.android.middleware.logic.contract.goods
+package com.wdkl.ncs.android.middleware.logic.contract.goods
 
 import com.wdkl.ncs.android.lib.base.BaseContract
-import com.enation.javashop.android.middleware.model.HistoryModel
+import com.wdkl.ncs.android.middleware.model.HistoryModel
 
 
 /**

+ 0 - 0
middleware/src/main/code/com/enation/javashop/android/middleware/logic/contract/home/CategoryFragmentContract.kt


Some files were not shown because too many files changed in this diff