删除无关文件，build通过

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/AdApi.kt

@@ -1,25 +0,0 @@
-package com.wdkl.ncs.android.middleware.api
-
-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.wdkl.ncs.android.middleware.api
- * @Note   广告API
- */
-interface AdApi {
-
-    /**
-     * @author LDD
-     * @From   AdApi
-     * @Date   2018/1/16 下午12:16
-     * @Note   获取广告
-     * @return 广告列表
-     */
-    @GET("TestMode")
-    fun getAd(): Observable<ArrayList<AdViewModel>>
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/ApiManager.kt

@@ -31,13 +31,6 @@ object ApiManager {
         /** 全局分页条数 */
         val PAGE_SIZE = 10
 
-        /**
-         * @Name  com.wdkl.ncs.android.middleware.api.ApiManager.EXTRA_API
-         * @Type  ExtraApi
-         * @Note  其他API
-         */
-        val EXTRA_API :ExtraApi by lazy { apiFactory.createService(ExtraApi::class.java, urlManager.device_url) }
-
 
         /**
          * @Name  com.wdkl.ncs.android.middleware.api.ApiManager.BASE_URL
@@ -54,74 +47,12 @@ object ApiManager {
         val API_AFTERSALE : AfterSaleApi by lazy { apiFactory.createService(AfterSaleApi::class.java, urlManager.device_url) }
 
         /**
-         * @Name  com.wdkl.ncs.android.lib.api.ApiManager.Companion.API_CART
-         * @Type  CartApi
-         * @Note  购物车API
-         */
-        val API_CART: CartApi by lazy { apiFactory.createService(CartApi::class.java, urlManager.device_url) }
-
-        /**
-         * @Name  com.wdkl.ncs.android.lib.api.ApiManager.Companion.API_CATEGORY
-         * @Type  CategoryApi
-         * @Note  分类API
-         */
-        val API_CATEGORY: CategoryApi by lazy { apiFactory.createService(CategoryApi::class.java, urlManager.device_url) }
-
-        /**
-         * @Name  com.wdkl.ncs.android.lib.api.ApiManager.Companion.API_GOODS
-         * @Type  GoodsApi
-         * @Note  商品API
-         */
-        val API_GOODS: GoodsApi by lazy { apiFactory.createService(GoodsApi::class.java, urlManager.device_url) }
-
-        /**
          * @Name  com.wdkl.ncs.android.lib.api.ApiManager.Companion.API_MEMBER
          * @Type  MemberApi
          * @Note  会员API
          */
         val API_MEMBER: MemberApi by lazy { apiFactory.createService(MemberApi::class.java, urlManager.device_url) }
 
-        /**
-         * @Name  com.wdkl.ncs.android.lib.api.ApiManager.Companion.API_ORDER
-         * @Type  OrderApi
-         * @Note  订单API
-         */
-        val API_ORDER: OrderApi by lazy { apiFactory.createService(OrderApi::class.java, urlManager.device_url) }
-
-        /**
-         * @Name  com.wdkl.ncs.android.lib.api.ApiManager.Companion.API_PAYMENT
-         * @Type  PaymentApi
-         * @Note  支付API
-         */
-        val API_PAYMENT: PaymentApi by lazy { apiFactory.createService(PaymentApi::class.java, urlManager.device_url) }
-
-        /**
-         * @Name  com.wdkl.ncs.android.lib.api.ApiManager.Companion.API_PROMOTION
-         * @Type  PromotionApi
-         * @Note  促销API
-         */
-        val API_PROMOTION: PromotionApi by lazy { apiFactory.createService(PromotionApi::class.java, urlManager.device_url) }
-
-        /**
-         * @Name  com.wdkl.ncs.android.lib.api.ApiManager.Companion.API_SHOP
-         * @Type  ShopApi
-         * @Note  店铺API
-         */
-        val API_SHOP: ShopApi by lazy { apiFactory.createService(ShopApi::class.java, urlManager.device_url) }
-
-        /**
-         * @Name  com.wdkl.ncs.android.lib.api.ApiManager.Companion.API_TRADE
-         * @Type  TradeApi
-         * @Note  交易API
-         */
-        val API_TRADE: TradeApi by lazy { apiFactory.createService(TradeApi::class.java, urlManager.device_url) }
-
-        /**
-         * @Name  API_AD
-         * @Type  AdApi
-         * @Note  广告API
-         */
-        val API_AD: AdApi by lazy { apiFactory.createService(AdApi::class.java, urlManager.device_url) }
 
         /**
          * @Name  PASSPORT_API
@@ -131,10 +62,6 @@ object ApiManager {
         val PASSPORT_API :PassportApi by lazy { apiFactory.createService(PassportApi::class.java, urlManager.device_url) }
 
 //   =========================================   以下是护士手表相关的  ==========================================================
-        /**
-         * 测试api
-         */
-        val API_HELLO :HelloApi by lazy { apiFactory.createService(HelloApi::class.java, urlManager.device_url)}
 
 
         /**

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/CartApi.kt

@@ -1,109 +0,0 @@
-package com.wdkl.ncs.android.middleware.api
-
-import com.wdkl.ncs.android.middleware.model.GoodsViewModel
-import io.reactivex.Observable
-import okhttp3.ResponseBody
-import retrofit2.http.*
-
-/**
- * @author LDD
- * @Date   2018/2/9 下午12:06
- * @From   com.wdkl.ncs.android.middleware.api
- * @Note   购物车Api
- */
-interface CartApi {
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   设置全部商为选中或不选中
-     * @param   checked    是否选中
-     */
-    @POST("trade/carts/checked")
-    fun setAllCheck(@Query("checked") checked :Int):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   更新购物车中的多个产品
-     * @param   skuId    产品id数组
-     * @param   checked    是否选中
-     * @param   num    产品数量
-     */
-    @POST("trade/carts/sku/{sku_id}")
-    fun updateItemState(@Path("sku_id") skuId :String, @Query("checked") checked :Int?, @Query("num") num :Int?):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   批量设置某商家的商品为选中或不选中
-     * @param   sellerId    卖家id
-     * @param   checked    是否选中
-     */
-    @POST("trade/carts/seller/{seller_id}")
-    fun updateSellerGoods(@Path("seller_id") sellerId :Int,@Query("checked") checked :Int):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   向购物车中添加一个产品
-     * @param   skuId    产品ID
-     * @param   num    此产品的购买数量
-     * @param   activityId    默认参与的活动id
-     */
-    @POST("trade/carts")
-    fun add(@Query("sku_id") skuId :Int,@Query("num") num :Int ,@Query(value = "activity_id") id : Int?):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   获取购物车列表
-     * @param   showType    显示方式
-     */
-    @GET("trade/carts/{show_type}")
-    fun getCartData(@Path("show_type") showType :String):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   清空购物车
-     */
-    @DELETE("trade/carts")
-    fun cleanCart():Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   删除购物车中的一个或多个产品
-     * @param   skuIds    产品id，多个产品可以用英文逗号：(,) 隔开
-     */
-    @DELETE("trade/carts/{sku_ids}/sku")
-    fun delete(@Path("sku_ids") skuIds :String):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   立即购买
-     * @param   skuId    产品ID
-     * @param   num    此产品的购买数量
-     * @param   activityId    默认参与的活动id
-     */
-    @POST("trade/carts/buy")
-    fun buy(@Query("sku_id") skuId :Int,@Query("num") num :Int ,@Query(value = "activity_id") id : Int?):Observable<ResponseBody>
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/CategoryApi.kt

@@ -1,25 +0,0 @@
-package com.wdkl.ncs.android.middleware.api
-
-import io.reactivex.Observable
-import okhttp3.ResponseBody
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-/**
- * Created by LDD on 2018/1/11.
- */
-interface CategoryApi{
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:43:03
-     * @Note   首页等商品分类数据
-     * @param   parentId    分类id，顶级为0
-     */
-    @GET("goods/categories/{parent_id}/children")
-    fun getCat(@Path("parent_id") parentId :Int): Observable<ResponseBody>
-
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/ExtraApi.kt

@@ -1,42 +0,0 @@
-package com.wdkl.ncs.android.middleware.api
-
-import io.reactivex.Observable
-import okhttp3.ResponseBody
-import retrofit2.http.GET
-import retrofit2.http.Path
-import retrofit2.http.Query
-
-/**
- * @author LDD
- * @Date   2018/8/16 下午3:03
- * @From   com.wdkl.ncs.android.middleware.api
- * @Note   额外API
- */
-interface ExtraApi {
-
-    /**
-     * @author LDD
-     * @From   ExtraApi
-     * @Date   2018/8/16 下午3:05
-     * @Note   获取关键字
-     * @param  num 获取数量
-     */
-    @GET("pages/hot-keywords")
-    fun getKeyword(@Query("num") num :Int) :Observable<ResponseBody>
-
-    @GET("focus-pictures")
-    fun getBanner(@Query("client_type") type : String = "WAP"):Observable<ResponseBody>
-
-    @GET("pages/site-navigations")
-    fun getMenu(@Query("client_type") type : String = "MOBILE"):Observable<ResponseBody>
-
-    /**
-     * @author LDD
-     * @From   ExtraApi
-     * @Date   2018/8/16 下午3:08
-     * @Note   获取楼层数据
-     * @param  clientType
-     */
-    @GET("pages/{client_type}/{page_type}")
-    fun getFloor(@Path("client_type") clientType :String = "WAP", @Path("page_type") pageType :String = "INDEX") :Observable<ResponseBody>
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/GoodsApi.kt

@@ -1,178 +0,0 @@
-package com.wdkl.ncs.android.middleware.api
-
-import io.reactivex.Observable
-import okhttp3.ResponseBody
-import retrofit2.adapter.rxjava2.Result
-import retrofit2.http.GET
-import retrofit2.http.Path
-import retrofit2.http.Query
-import retrofit2.http.QueryMap
-
-/**
- * Created by LDD on 2018/1/11.
- */
-interface GoodsApi {
-
-    /** ============================== 商品相关API   =============================== */
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:43:03
-     * @Note   浏览商品的详情,静态部分使用
-     * @param   goodsId    分类id，顶级为0
-     */
-    @GET("goods/{goods_id}")
-    fun getGoodsDetail(@Path("goods_id") goodsId :Int):Observable<ResponseBody>
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:14:05
-     * @Note   查询会员是否收藏商品
-     * @param   id    商品id
-     */
-    @GET("members/collection/goods/{id}")
-    fun getCollectionState(@Path("id") id :Int):Observable<Result<ResponseBody>>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:43:03
-     * @Note   查询某商品的咨询
-     * @param   pageNo    页码
-     * @param   pageSize    每页显示数量
-     * @param   goodsId    商品ID
-     */
-    @GET("goods/{goods_id}/asks")
-    fun getAsksList (@Path("goods_id") goodsId :Int,@Query("page_no") pageNo :Int,
-                 @Query("page_size") pageSize :Int):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:43:03
-     * @Note   获取sku信息，商品详情页动态部分
-     * @param   goodsId    分类id，顶级为0
-     */
-    @GET("goods/{goods_id}/skus")
-    fun getGoodsSku(@Path("goods_id") goodsId :Int):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:43:03
-     * @Note   查询某商品的评论
-     * @param   grade    好中差评
-     * @param   haveImage    是否有图
-     * @param   pageNo    页码
-     * @param   pageSize    每页显示数量
-     * @param   goodsId    商品ID
-     */
-    @GET("members/comments/goods/{goods_id}")
-    fun listComment(@Path("goods_id") goodsId :Int,@Query("grade") grade :String?,
-                    @Query("have_image") haveImage :Boolean? , @Query("page_no") pageNo :Int,
-                    @Query("page_size") pageSize :Int):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:43:03
-     * @Note   记录浏览器商品次数
-     * @param   goodsId    商品ID
-     */
-    @GET("goods/{goods_id}/visit")
-    fun visitGoods(@Path("goods_id") goodsId :Int):Observable<ResponseBody>
-
-    /** ============================== 商品检索相关API  =============================== */
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:43:03
-     * @Note   查询商品选择器
-     * @param   pageNo    页码
-     * @param   pageSize    每页数量
-     * @param   keyword    关键字
-     * @param   category    分类
-     * @param   brand    品牌
-     * @param   price    价格
-     * @param   sort    排序:关键字_排序
-     * @param   prop    属性:参数名_参数值@参数名_参数值
-     * @param   sellerId    卖家id，搜索店铺商品的时候使用
-     */
-//    @GET("goods/search/selector")
-//    fun searchGoodsSelector(@Query("page_no") pageNo :Int,@Query("page_size") pageSize :Int,
-//                            @Query("keyword") keyword :String,@Query("category") category :Int,
-//                            @Query("brand") brand :Int,@Query("price") price :String,@Query("sort") sort :String,
-//                            @Query("prop") prop :String,@Query("seller_id") sellerId :Int):Observable<ResponseBody>
-
-    @GET("goods/search/selector")
-    fun searchGoodsSelector(@Query("page_no") pageNo :Int,@Query("page_size") pageSize :Int = ApiManager.PAGE_SIZE,
-                            @QueryMap() map : HashMap<String,Any>):Observable<ResponseBody>
-
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:43:03
-     * @Note   查询商品列表
-     * @param   pageNo    页码
-     * @param   pageSize    每页数量
-     * @param   keyword    关键字
-     * @param   category    分类
-     * @param   brand    品牌
-     * @param   price    价格
-     * @param   sort    排序:关键字_排序
-     * @param   prop    属性:参数名_参数值@参数名_参数值
-     * @param   sellerId    卖家id，搜索店铺商品的时候使用
-     */
-//    @GET("goods/search")
-//    fun searchGoodsList(@Query("page_no") pageNo :Int,@Query("page_size") pageSize :Int = ApiManager.PAGE_SIZE,
-//                        @Query("keyword") keyword :String? = null,
-//                        @Query("sort") sort :String? = null,@Query("prop") prop :String? = null,
-//                        @Query("category") category :Int? = null,@Query("price") price :String? = null,
-//                        @Query("brand") brand :Int? = null, @Query("seller_id") sellerId :Int? = null):Observable<ResponseBody>
-    @GET("goods/search")
-    fun searchGoodsList(@Query("page_no") pageNo :Int,@Query("page_size") pageSize :Int = ApiManager.PAGE_SIZE,
-                        @QueryMap() map : HashMap<String,Any>):Observable<ResponseBody>
-    /** ============================== 标签商品相关API  =============================== */
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:43:03
-     * @Note   查询标签商品列表
-     * @param   sellerId    卖家id
-     * @param   mark    hot热卖 new新品 recommend推荐
-     * @param   num    查询数量
-     */
-    @GET("goods/tags/{mark}/goods")
-    fun getTagGoodsList(@Path("mark") mark :String, @Query("seller_id") sellerId :Int,
-                    @Query("num") num :Int):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:43:03
-     * @Note   查询商品销量
-     * @param   goodsId    商品id
-     */
-    @GET("goods/tags/count")
-    fun getGoodsBuyCount(@Query("goods_id") goodsId :String): Observable<ResponseBody>
-
-    /**
-     * 查询店铺商品数量
-     * @param shopId 店铺id
-     */
-    @GET("goods/tags/{shopId}/goods-num")
-    fun getGoodsNumForShop(@Path("shopId") shopId :Int):Observable<ResponseBody>
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/HelloApi.kt

@@ -1,12 +0,0 @@
-package com.wdkl.ncs.android.middleware.api
-
-import io.reactivex.Observable
-import okhttp3.ResponseBody
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface HelloApi{
-
-    @GET("goods/categories/{parent_id}/children")
-    fun getCategories(@Path("parent_id") parentId:Int): Observable<ResponseBody>
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/MemberApi.kt

@@ -1,6 +1,5 @@
 package com.wdkl.ncs.android.middleware.api
 
-import com.wdkl.ncs.android.middleware.model.PostCommentModel
 import io.reactivex.Observable
 import okhttp3.ResponseBody
 import retrofit2.adapter.rxjava2.Result
@@ -226,15 +225,6 @@ interface MemberApi {
 
     /** ============================== 评论相关API =============================== */
 
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:14:05
-     * @Note   提交评论
-     * @param   comment    comment
-     */
-    @POST("members/comments")
-    fun addComment(@Body comment : PostCommentModel):Observable<ResponseBody>
 
 
     /**

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/MemberState.kt

@@ -1,7 +1,5 @@
 package com.wdkl.ncs.android.middleware.api
 
-import com.wdkl.ncs.android.middleware.model.MemberViewModel
-
 /**
  *  会员状态管理器
  */
@@ -18,52 +16,4 @@ class MemberState {
 
     }
 
-    /**
-     * @Name  member
-     * @Type  MemberViewModel
-     * @Note  会员信息
-     */
-    private var member : MemberViewModel? = null
-
-    /**
-     * @author LDD
-     * @From   MemberManager
-     * @Date   2018/8/13 下午5:23
-     * @Note   更新会员信息
-     * @param  member 会员信息
-     */
-    fun updateMember(member :MemberViewModel){
-        this.member = member
-    }
-
-    /**
-     * @author LDD
-     * @From   MemberManager
-     * @Date   2018/8/13 下午5:24
-     * @Note   清空会员信息
-     */
-    fun clearMember(){
-        this.member = null
-    }
-
-    /**
-     * @author LDD
-     * @From   MemberState
-     * @Date   2018/8/13 下午5:31
-     * @Note   获取会员信息
-     */
-    fun info() : MemberViewModel? {
-        return member
-    }
-
-    /**
-     * @author LDD
-     * @From   MemberManager
-     * @Date   2018/8/13 下午5:24
-     * @Note   获取登录状态
-     */
-    fun getLoginState() : Boolean {
-        return member != null
-    }
-
 }

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/OrderApi.kt

@@ -1,107 +0,0 @@
-package com.wdkl.ncs.android.middleware.api
-
-import io.reactivex.Observable
-import okhttp3.ResponseBody
-import retrofit2.adapter.rxjava2.Result
-import retrofit2.http.GET
-import retrofit2.http.POST
-import retrofit2.http.Path
-import retrofit2.http.Query
-
-/**
- * Created by LDD on 2018/1/11.
- */
-interface OrderApi {
-
-    /** ============================== 物流查询接口  =============================== */
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   查询物流详细
-     * @param   id    物流公司id
-     * @param   num    快递单号
-     */
-    @GET("express")
-    fun express(@Query("id") id :Int, @Query("num") num :String): Observable<Result<ResponseBody>>
-
-
-    /** ============================== 会员订单API  =============================== */
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   查询单个订单明细
-     * @param   orderSn    订单编号
-     */
-    @GET("trade/orders/{order_sn}")
-    fun getOrderDetail(@Path("order_sn") orderSn :String):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   根据交易编号或者订单编号查询收银台数据
-     * @param   tradeSn    交易编号
-     * @param   orderSn    订单编号
-     */
-    @GET("trade/orders/cashier")
-    fun getCashier(@Query("trade_sn") tradeSn :String,@Query("order_sn") orderSn :String):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   根据交易编号查询订单列表
-     * @param   tradeSn    交易编号
-     */
-    @GET("trade/orders/{trade_sn}/list")
-    fun getOrderListByTradeSn(@Path("trade_sn") tradeSn :String):Observable<ResponseBody>
-
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   确认收货
-     * @param   orderSn    订单编号
-     */
-    @POST("trade/orders/{order_sn}/rog")
-    fun rog(@Path("order_sn") orderSn :String):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   查询会员订单列表
-     * @param   goodsName    商品名称关键字
-     * @param   orderStatus    订单状态
-     * @param   pageNo    页数
-     * @param   pageSize    条数
-     */
-    @GET("trade/orders")
-    fun getOrderList(@Query("order_status") orderStatus :String,
-                     @Query("page_no") pageNo :Int,
-                     @Query("page_size") pageSize :Int = ApiManager.PAGE_SIZE):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   取消订单
-     * @param   orderSn    订单编号
-     * @param   reason    取消原因
-     */
-    @POST("trade/orders/{order_sn}/cancel")
-    fun cancel(@Path("order_sn") orderSn :String,@Query("reason") reason :String):Observable<ResponseBody>
-
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/PaymentApi.kt

@@ -1,44 +0,0 @@
-package com.wdkl.ncs.android.middleware.api
-
-import io.reactivex.Observable
-import okhttp3.ResponseBody
-import retrofit2.http.GET
-import retrofit2.http.Path
-import retrofit2.http.Query
-
-/**
- * Created by LDD on 2018/1/11.
- */
-interface PaymentApi {
-    /** ============================== 订单支付API  =============================== */
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 16:22:48
-     * @Note   查询支持的支付方式
-     * @param   clientType    调用客户端PC,WAP,NATIVE,REACT
-     */
-    @GET("order/pay/{client_type}")
-    fun getPayList(@Path("client_type") clientType :String): Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 16:22:48
-     * @Note   对一个交易发起支付
-     * @param   paymentPluginId    支付插件id
-     * @param   payMode    支付模式，正常normal， 二维码 ar,枚举类型PaymentPatternEnum
-     * @param   clientType    调用客户端PC,WAP,NATIVE,REACT
-     * @param   sn    要支付的交易sn
-     * @param   tradeType    交易类型
-     */
-    @GET("order/pay/app/{trade_type}/{sn}")
-    fun payTrade(@Path("sn") sn :String, @Path("trade_type") tradeType :String, @Query("payment_plugin_id") paymentPluginId :String, @Query("pay_mode") payMode :String, @Query("client_type") clientType :String):Observable<ResponseBody>
-
-
-
-    /** ============================== 订单支付API  =============================== */
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/PromotionApi.kt

@@ -1,150 +0,0 @@
-package com.wdkl.ncs.android.middleware.api
-
-import io.reactivex.Observable
-import okhttp3.ResponseBody
-import retrofit2.http.*
-
-/**
- * Created by LDD on 2018/1/11.
- */
-interface PromotionApi {
-
-
-    /** ============================== 优惠券相关API  =============================== */
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 16:07:24
-     * @Note   查询商家优惠券列表
-     * @param   sellerId    商家ID
-     */
-    @GET("promotions/coupons")
-    fun getSellerCoupon(@Query("seller_id") sellerId :Int):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 16:07:24
-     * @Note   查询所有优惠券
-     * @param   pageNo    页码
-     * @param   pageSize    条数
-     * @param   sellerId    商家ID
-     */
-    @GET("promotions/coupons/all")
-    fun getAllCoupon(@Query("page_no") pageNo :Int,@Query("page_size") pageSize :Int = ApiManager.PAGE_SIZE):Observable<ResponseBody>
-
-
-    /** ============================== 积分商品相关API  =============================== */
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 16:07:24
-     * @Note   查询积分分类集合
-     */
-    @GET("promotions/exchange/cats")
-    fun getExchangeCats():Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 16:07:24
-     * @Note   查询积分商品
-     * @param   catId    积分分类id
-     * @param   pageNo    页码
-     * @param   pageSize    条数
-     */
-    @GET("promotions/exchange/goods")
-    fun getExchangeGoods(@QueryMap map :HashMap<String,Any>):Observable<ResponseBody>
-
-
-
-    /** ============================== 团购相关API  =============================== */
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 16:07:24
-     * @Note   查询团购活动的信息
-     * @param   activeId    团购活动主键
-     */
-    @GET("promotions/group-buy/active")
-    fun getGroupBuy(@Query("active_id") activeId :Int):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 16:07:24
-     * @Note   查询团购商品
-     * @param   catId    团购分类id
-     * @param   pageNo    页码
-     * @param   pageSize    条数
-     */
-    @GET("promotions/group-buy/goods")
-    fun getGroupBuyGoods(@QueryMap map :HashMap<String,Any>):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 16:07:24
-     * @Note   查询团购分类的所有标签
-     */
-    @GET("promotions/group-buy/cats")
-    fun getGroupBuyCat():Observable<ResponseBody>
-
-
-    /** ============================== 促销活动相关API  =============================== */
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 16:07:24
-     * @Note   根据商品读取参与的所有活动
-     * @param   goodsId    商品ID
-     */
-    @GET("promotions/{goods_id}")
-    fun getPromotion(@Path("goods_id") goodsId :Int):Observable<ResponseBody>
-
-
-    /** ============================== 限时抢购相关API  =============================== */
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 16:07:24
-     * @Note   根据参数读取限时抢购的商品列表
-     * @param   rangeTime    时刻
-     * @param   pageNo    页码
-     * @param   pageSize    条数
-     */
-    @GET("promotions/seckill/goods-list")
-    fun getSeckillGoods(@Query("range_time") rangeTime :Int,@Query("page_no") pageNo :Int,@Query("page_size") pageSize :Int):Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 16:07:24
-     * @Note   读取秒杀时刻
-     */
-    @GET("promotions/seckill/time-line")
-    fun getSeckillTimeLine(): Observable<ResponseBody>
-
-
-    @POST("trade/promotion")
-    fun changeActivity(@Query("seller_id") sellerId: Int,
-                       @Query("sku_id") skuId :Int,
-                       @Query("activity_id") actId :Int,
-                       @Query("promotion_type") promotionType :String): Observable<ResponseBody>
-
-    @DELETE("trade/promotion")
-    fun deleteActivity(@Query("seller_id") sellerId: Int,
-                       @Query("sku_id") skuId :Int): Observable<ResponseBody>
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/ShopApi.kt

@@ -1,82 +0,0 @@
-package com.wdkl.ncs.android.middleware.api
-
-import io.reactivex.Observable
-import okhttp3.ResponseBody
-import retrofit2.http.GET
-import retrofit2.http.Path
-import retrofit2.http.Query
-
-/**
- * Created by LDD on 2018/1/11.
- */
-interface ShopApi {
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:14:05
-     * @Note   查看会员是否收藏店铺
-     * @param   id    要检索的收藏店铺id
-     */
-    @GET("members/collection/shop/{id}")
-    fun getIsCollectionShop(@Path("id") id :Int): Observable<ResponseBody>
-
-
-
-    /** ============================== 店铺分组相关API  =============================== */
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 16:14:35
-     * @Note   查询店铺分组列表
-     * @param   shopId    店铺id
-     */
-    @GET("shops/cats/{shop_id}")
-    fun getShopCats(@Path("shop_id") shopId :Int):Observable<ResponseBody>
-
-
-    /** ============================== 店铺相关API  =============================== */
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 16:14:35
-     * @Note   查询店铺列表
-     * @param   pageNo    页码
-     * @param   pageSize    分页数
-     * @param   name    店铺名称
-     * @param   order    按好评率排序
-     */
-    @GET("shops/list")
-    fun getShopList(@Query("page_no") pageNo :Int,@Query("page_size") pageSize :Int,@Query("name") name :String):Observable<ResponseBody>
-
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 16:14:35
-     * @Note   获取店铺信息(未登录状态)
-     * @param   shopId    店铺id
-     */
-    @GET("shops/{shop_id}")
-    fun getShop(@Path("shop_id") shopId :Int):Observable<ResponseBody>
-
-
-
-
-    /** ============================== 店铺幻灯片相关API  =============================== */
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 16:14:35
-     * @Note   查询店铺幻灯片列表
-     * @param   shopId    店铺id
-     */
-    @GET("shops/sildes/{shop_id}")
-    fun getSildes(@Path("shop_id") shopId :Int):Observable<ResponseBody>
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/TradeApi.kt

@@ -1,75 +0,0 @@
-package com.wdkl.ncs.android.middleware.api
-
-import io.reactivex.Observable
-import okhttp3.ResponseBody
-import retrofit2.http.*
-
-/**
- * Created by LDD on 2018/1/11.
- */
-interface TradeApi {
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   获取结算参数
-     */
-    @GET("trade/checkout-params")
-    fun getParam(): Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   创建交易
-     */
-    @POST("trade/create")
-    fun create(@Query("client")client :String = "APP"): Observable<ResponseBody>
-
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:44:40
-     * @Note   使用优惠券
-     * @param   sellerId    店铺ID
-     * @param   mcId    优惠券ID
-     */
-    @POST("trade/promotion/{seller_id}/seller/{mc_id}/coupon")
-    fun useCoupon(@Path("seller_id") sellerId :Int, @Path("mc_id") mcId :Int): Observable<ResponseBody>
-
-    /**
-     * @author Snow
-     * @From   MemberApi
-     * @Date   2018-08-14 15:14:05
-     * @Note   结算页—读取可用的优惠券列表
-     * @param   sellerIds    商家ID集合
-     */
-    @GET("members/coupon/{seller_ids}")
-    fun getCouponListbyUsed(@Path("seller_ids") sellerIds :String):Observable<ResponseBody>
-
-
-    @POST("trade/checkout-params/address-id/{id}")
-    fun setAddress(@Path("id") id :Int):Observable<ResponseBody>
-
-    @POST("trade/checkout-params/payment-type")
-    fun setPaymentType(@Query("payment_type") payment_type :String):Observable<ResponseBody>
-
-    @POST("trade/checkout-params/receipt")
-    fun setReceipt(@Query("type") receiptType :String,
-                   @Query("receipt_title") receiptTitle :String,
-                   @Query("receipt_content") receiptContent :String,
-                   @Query("tax_no") dutyInvoice :String):Observable<ResponseBody>
-
-    @DELETE("trade/checkout-params/receipt")
-    fun deleteReceipt():Observable<ResponseBody>
-
-    @POST("trade/checkout-params/receive-time")
-    fun setTime(@Query("receive_time") time :String):Observable<ResponseBody>
-
-    @POST("trade/checkout-params/remark")
-    fun setRemark(@Query("remark") remark : String ):Observable<ResponseBody>
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/bind/DataBindingHelper.kt

@@ -18,7 +18,6 @@ import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.utils.*
 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
 
@@ -157,56 +156,6 @@ object DataBindingHelper {
         }
     }
 
-    @BindingAdapter(value = ["bind:price_with_shop_home"], requireAll = true)
-    @JvmStatic
-    fun setPriceWithShopName(view: TextView, data: GoodsItemViewModel) {
-        val textHeight = ScreenTool.getScreenWidth(BaseApplication.appContext) / 2 * 1.25 / 13
-        view.text = SpannableStringBuilder("￥${data.goodsPrice}起 ￥${data.orginPrice}起").then { self ->
-            self.setSpan(AbsoluteSizeSpan((textHeight * 0.5).toInt()), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-            self.setSpan(AbsoluteSizeSpan((textHeight).toInt()), 1, "￥${data.goodsPrice}".length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-            self.setSpan(AbsoluteSizeSpan((textHeight * 0.5).toInt()), "￥${data.goodsPrice}".length, "￥${data.goodsPrice}".length + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-            self.setSpan(AbsoluteSizeSpan((textHeight * 0.5).toInt()), "￥${data.goodsPrice}起".length + 1, "￥${data.goodsPrice}起 ￥${data.orginPrice}起".length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-            self.setSpan(ForegroundColorSpan(Color.parseColor("#888888")), "￥${data.goodsPrice}起".length + 1, "￥${data.goodsPrice}起 ￥${data.orginPrice}起".length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-            self.setSpan(StrikethroughSpan(), "￥${data.goodsPrice}起".length + 1, "￥${data.goodsPrice}起 ￥${data.orginPrice}起".length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-            self.setSpan(ForegroundColorSpan(Color.parseColor(data.priceColor)), 0, "￥${data.goodsPrice}起".length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-        }
-    }
-
-    @BindingAdapter(value = ["bind:to_order"], requireAll = true)
-    @JvmStatic
-    fun toOrder(view: View, state: Int) {
-        view.setOnClickListener(OnClickListenerAntiViolence(event = {
-            toOrderImpl(view,state)
-        }))
-    }
-
-
-    @BindingAdapter(value = ["bind:text_num_count_percent"],requireAll = true)
-    @JvmStatic
-    fun textNumCountPercent(view :TextView ,text :ObserableString){
-        view.text = "${text.get().length}/500"
-    }
-
-    /**
-     * @author LDD
-     * @From   DataBindingHelper
-     * @Date   2018/4/16 下午5:05
-     * @Note   跳转订单实现方法
-     * @param  state 列表
-     * @param  view  视图
-     */
-    fun toOrderImpl(view: View, state: Int) {
-        Do.prepare().doOnBack { call ->
-            if (MemberState.manager.getLoginState()){
-                JRouter.prepare().create("/order/list").withInt("state",state).withTransition(R.anim.push_left_in, R.anim.push_left_out).seek(view.context)
-            }else{
-                JRouter.prepare().create("/member/login/main").withTransition(R.anim.push_left_in, R.anim.push_left_out).seek(view.context)
-            }
-            call.invoke()
-        }.execute()
-    }
-
-
     @JvmStatic
     fun createOrderGoodsNumText(goodsNum :Int):String{
         return "共${goodsNum}件商品 实付款："

middleware/src/main/code/com/wdkl/ncs/android/middleware/cache/HsitoryCache.kt

@@ -1,7 +1,6 @@
 package com.wdkl.ncs.android.middleware.cache
 
 import com.wdkl.ncs.android.lib.base.BaseApplication
-import com.wdkl.ncs.android.middleware.model.HistoryModel
 import com.enation.javashop.utils.base.cache.ACache
 import com.google.gson.Gson
 
@@ -16,59 +15,59 @@ class HsitoryCache() {
 
     private val HISTORY_CACHE_KEY = "HISTORY_CACHE_KEY"
 
-    fun add(item :HistoryModel){
-        var json :String? = cache.getAsString(HISTORY_CACHE_KEY)
-        if (json == null){
-            val data = HistoryDisk(arrayListOf(item))
-            val newJson = jsonFormat.toJson(data)
-            cache.put(HISTORY_CACHE_KEY,newJson)
-        }else{
-            var data = jsonFormat.fromJson(json,HistoryDisk::class.java)
-            var deleteItems = ArrayList<HistoryModel>()
-            data.data.forEach { child ->
-                if (item.text == child.text){
-                    deleteItems.add(child)
-                }
-            }
-            data.data.removeAll(deleteItems)
-            data.data.add(0,item)
-            val newJson = jsonFormat.toJson(data)
-            cache.put(HISTORY_CACHE_KEY,newJson)
-        }
-    }
+//    fun add(item :HistoryModel){
+//        var json :String? = cache.getAsString(HISTORY_CACHE_KEY)
+//        if (json == null){
+//            val data = HistoryDisk(arrayListOf(item))
+//            val newJson = jsonFormat.toJson(data)
+//            cache.put(HISTORY_CACHE_KEY,newJson)
+//        }else{
+//            var data = jsonFormat.fromJson(json,HistoryDisk::class.java)
+//            var deleteItems = ArrayList<HistoryModel>()
+//            data.data.forEach { child ->
+//                if (item.text == child.text){
+//                    deleteItems.add(child)
+//                }
+//            }
+//            data.data.removeAll(deleteItems)
+//            data.data.add(0,item)
+//            val newJson = jsonFormat.toJson(data)
+//            cache.put(HISTORY_CACHE_KEY,newJson)
+//        }
+//    }
 
     fun clear(){
         cache.remove(HISTORY_CACHE_KEY)
     }
 
-    fun get():ArrayList<HistoryModel>{
-        var data = ArrayList<HistoryModel>()
-        var json :String? = cache.getAsString(HISTORY_CACHE_KEY)
-        if (json != null){
-            var history = jsonFormat.fromJson(json,HistoryDisk::class.java)
-            data = history.data
-        }
-        return  data
-    }
-
-    fun delete(item :HistoryModel){
-        var json :String? = cache.getAsString(HISTORY_CACHE_KEY)
-        if (json != null){
-            var data = jsonFormat.fromJson(json,HistoryDisk::class.java)
-            var deleteItems = ArrayList<HistoryModel>()
-            data.data.forEach { child ->
-                if (item.text == child.text){
-                    deleteItems.add(child)
-                }
-            }
-            data.data.removeAll(deleteItems)
-            val newJson = jsonFormat.toJson(data)
-            cache.put(HISTORY_CACHE_KEY,newJson)
-        }
-    }
+//    fun get():ArrayList<HistoryModel>{
+//        var data = ArrayList<HistoryModel>()
+//        var json :String? = cache.getAsString(HISTORY_CACHE_KEY)
+//        if (json != null){
+//            var history = jsonFormat.fromJson(json,HistoryDisk::class.java)
+//            data = history.data
+//        }
+//        return  data
+//    }
+//
+//    fun delete(item :HistoryModel){
+//        var json :String? = cache.getAsString(HISTORY_CACHE_KEY)
+//        if (json != null){
+//            var data = jsonFormat.fromJson(json,HistoryDisk::class.java)
+//            var deleteItems = ArrayList<HistoryModel>()
+//            data.data.forEach { child ->
+//                if (item.text == child.text){
+//                    deleteItems.add(child)
+//                }
+//            }
+//            data.data.removeAll(deleteItems)
+//            val newJson = jsonFormat.toJson(data)
+//            cache.put(HISTORY_CACHE_KEY,newJson)
+//        }
+//    }
 
 
 
 }
 
-class HistoryDisk(var data :ArrayList<HistoryModel>)
+//class HistoryDisk(var data :ArrayList<HistoryModel>)

middleware/src/main/code/com/wdkl/ncs/android/middleware/di/ApiProvides.kt

@@ -17,18 +17,6 @@ class ApiProvides {
      * @author  LDD
      * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
-     * @Note   额外ApI
-     * @return 额外API
-     */
-    @Provides
-    fun provideExtraApi(): ExtraApi{
-        return ApiManager.EXTRA_API
-    }
-
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
      * @Note   售后ApI
      * @return 售后API
      */
@@ -37,41 +25,6 @@ class ApiProvides {
         return ApiManager.API_AFTERSALE
     }
 
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   购物车ApI
-     * @return 购物车API
-     */
-    @Provides
-    fun provideCartApi(): CartApi{
-        return ApiManager.API_CART
-    }
-
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   分类ApI
-     * @return 分类API
-     */
-    @Provides
-    fun provideCategoryApi(): CategoryApi{
-        return ApiManager.API_CATEGORY
-    }
-
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   商品ApI
-     * @return 商品API
-     */
-    @Provides
-    fun provideGoodsApi(): GoodsApi{
-        return ApiManager.API_GOODS
-    }
 
     /**
      * @author  LDD
@@ -86,78 +39,6 @@ class ApiProvides {
     }
 
     /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   订单ApI
-     * @return 订单API
-     */
-    @Provides
-    fun provideOrderApi(): OrderApi{
-        return ApiManager.API_ORDER
-    }
-
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   支付ApI
-     * @return 支付API
-     */
-    @Provides
-    fun providePaymentApi(): PaymentApi{
-        return ApiManager.API_PAYMENT
-    }
-
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   促销ApI
-     * @return 促销API
-     */
-    @Provides
-    fun providePromotionApi(): PromotionApi{
-        return ApiManager.API_PROMOTION
-    }
-
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   店铺ApI
-     * @return 店铺API
-     */
-    @Provides
-    fun provideShopApi(): ShopApi{
-        return ApiManager.API_SHOP
-    }
-
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   交易ApI
-     * @return 交易API
-     */
-    @Provides
-    fun provideTradeApi(): TradeApi{
-        return ApiManager.API_TRADE
-    }
-
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   广告ApI
-     * @return 广告ApI
-     */
-    @Provides
-    fun provideAdApi():AdApi{
-        return ApiManager.API_AD
-    }
-
-    /**
      * @author LDD
      * @From   ApplicationComponent
      * @Date   2018/8/10 下午12:59
@@ -181,13 +62,6 @@ class ApiProvides {
 
 
     //======================================= 以下护士手表相关 =====================================
-    /**
-     * 测试api
-     */
-    @Provides
-    fun provideHelloApi():HelloApi{
-        return ApiManager.API_HELLO
-    }
 
     /**
      * @author LDD

middleware/src/main/code/com/wdkl/ncs/android/middleware/di/ApplicationComponent.kt

@@ -16,47 +16,10 @@ interface ApplicationComponent {
      * @author  LDD
      * @From   com.wdkl.ncs.android.middleware.di
      * @Data   2017/12/26 上午7:30
-     * @Note   额外Api
-     * @return 额外API
-     */
-    fun provideExtraApi(): ExtraApi
-
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
      * @Note   售后ApI
      * @return 售后API
      */
     fun provideAfterSaleApi(): AfterSaleApi
-
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   购物车ApI
-     * @return 购物车API
-     */
-    fun provideCartApi(): CartApi
-
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   分类ApI
-     * @return 分类API
-     */
-    fun provideCategoryApi():CategoryApi
-
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   商品ApI
-     * @return 商品API
-     */
-    fun provideGoodsApi():GoodsApi
-
     /**
      * @author  LDD
      * @From   com.wdkl.ncs.android.middleware.di
@@ -67,60 +30,6 @@ interface ApplicationComponent {
     fun provideMemberApi():MemberApi
 
     /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   订单ApI
-     * @return 订单API
-     */
-    fun provideOrderApi():OrderApi
-
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   支付ApI
-     * @return 支付API
-     */
-    fun providePaymentApi():PaymentApi
-
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   促销ApI
-     * @return 促销API
-     */
-    fun providePromotionApi():PromotionApi
-
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   店铺ApI
-     * @return 店铺API
-     */
-    fun provideShopApi():ShopApi
-
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   交易ApI
-     * @return 交易API
-     */
-    fun provideTradeApi():TradeApi
-
-    /**
-     * @author  LDD
-     * @From   com.wdkl.ncs.android.middleware.di
-     * @Data   2017/12/26 上午7:30
-     * @Note   广告ApI
-     * @return 广告ApI
-     */
-    fun provideAdApi():AdApi
-
-    /**
      * @author LDD
      * @From   ApplicationComponent
      * @Date   2018/8/10 下午12:59
@@ -139,10 +48,6 @@ interface ApplicationComponent {
 
 
     //======================================= 以下护士手表相关 ====================================
-    /**
-     * 测试api
-     */
-    fun provideHelloApi(): HelloApi
 
     /**
     用户列表api

middleware/src/main/code/com/wdkl/ncs/android/middleware/di/PresenterComponent.kt

@@ -1,12 +1,6 @@
 package com.wdkl.ncs.android.middleware.di
 
-import com.wdkl.ncs.android.middleware.logic.presenter.extra.ScanPresenter
-import com.wdkl.ncs.android.middleware.logic.presenter.hello.HelloActivityPresenter
-import com.wdkl.ncs.android.middleware.logic.presenter.hello.HelloListActivityPresenter
 import com.wdkl.ncs.android.middleware.logic.presenter.home.*
-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
 
 
@@ -18,34 +12,8 @@ import dagger.Component
  */
 @Component(dependencies = arrayOf(ApplicationComponent::class))
 interface PresenterComponent {
-
-    fun inject(presenter: WelcomePresenter)
-
-    fun inject(presenter: SettingActivityPresenter)
-
-    fun inject(presenter: ShopActivityPersenter)
-
     fun inject(presenter: AppUpdatePresenter)
 
-    fun inject(presenter: ShopAllPersenter)
-
-    fun inject(presenter: ShopHomePresenter)
-
-    fun inject(presenter: ShopTagPresenter)
-
-    fun inject(presenter: ShopListPersenter)
-
-    fun inject(presenter: ShopCategoryActivityPresenter)
-
-    fun inject(presenter: ShopInfoPresenter)
-
-    fun inject(presenter: ScanPresenter)
-
-    fun inject(presenter: HelloActivityPresenter)
-
-    fun inject(presenter: HelloListActivityPresenter)
-
-
     //手表相关的
     fun inject(presenter: HomeActivityPresenter)
 

middleware/src/main/code/com/wdkl/ncs/android/middleware/event/LogoutEvent.kt

@@ -10,6 +10,6 @@ import com.wdkl.ncs.android.middleware.api.MemberState
  */
 class LogoutEvent{
     constructor(){
-        MemberState.manager.clearMember()
+//        MemberState.manager.clearMember()
     }
 }

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/extra/ScanContract.kt

@@ -1,18 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.contract.extra
-
-import com.wdkl.ncs.android.lib.base.BaseContract
-
-/**
- * Created by LDD on 2018/11/5.
- */
-interface ScanContract {
-
-    interface View :BaseContract.BaseView{
-
-    }
-
-    interface Presenter :BaseContract.BasePresenter{
-
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/hello/HelloActivityContract.kt

@@ -1,13 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.contract.hello
-
-import com.wdkl.ncs.android.lib.base.BaseContract
-import com.wdkl.ncs.android.middleware.model.ChildCategoryShell
-
-interface HelloActivityContract{
-    interface View :BaseContract.BaseView{
-        fun showData(categoryList: ArrayList<ChildCategoryShell>)
-    }
-    interface Presenter :BaseContract.BasePresenter{
-        fun loadData(parentId:Int)
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/hello/HelloListActivityContract.kt

@@ -1,15 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.contract.hello
-
-import com.wdkl.ncs.android.lib.base.BaseContract
-import com.wdkl.ncs.android.middleware.model.ChildCategoryShell
-import com.wdkl.ncs.android.middleware.model.JavaShopItem
-import com.wdkl.ncs.android.middleware.model.ShopItem
-
-interface HelloListActivityContract{
-    interface View : BaseContract.BaseView{
-        fun render(data: ArrayList<JavaShopItem>)
-    }
-    interface Presenter : BaseContract.BasePresenter{
-        fun loadData(keyWord :String ,page : Int)
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/setting/SettingActivityContract.kt

@@ -1,87 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.contract.setting
-
-import android.content.Context
-import com.wdkl.ncs.android.lib.base.BaseContract
-import com.wdkl.ncs.android.middleware.model.MemberViewModel
-
-/**
- * @author LDD
- * @Date   2018/3/6 下午3:52
- * @From   com.wdkl.ncs.android.middleware.logic.contract.setting
- * @Note   设置页面接口控制
- */
-interface SettingActivityContract {
-
-
-    /**
-     * @author LDD
-     * @Date   2018/2/24 下午4:51
-     * @From   SettingActivityContract
-     * @Note   视图接口
-     */
-    interface View : BaseContract.BaseView {
-
-        /**
-         * @author LDD
-         * @From   View
-         * @Date   2018/3/9 上午9:34
-         * @Note   展示用户信息
-         * @param  member 用户信息数据
-         */
-        fun renderInfo(member:MemberViewModel)
-
-        /**
-         * @author LDD
-         * @From   View
-         * @Date   2018/8/13 下午9:12
-         * @Note   退出登录
-         */
-        fun logout()
-
-
-        fun renderCacheSize(size :String)
-    }
-
-    /**
-     * @author LDD
-     * @Date   2018/2/24 下午4:51
-     * @From   SettingActivityContract
-     * @Note   逻辑层接口
-     */
-    interface Presenter : BaseContract.BasePresenter {
-
-        /**
-         * @author LDD
-         * @From   Presenter
-         * @Date   2018/3/9 上午9:34
-         * @Note   加载用户信息
-         */
-        fun loadMemberInfo()
-
-        /**
-         * @author LDD
-         * @From   Presenter
-         * @Date   2018/3/9 上午9:34
-         * @Note   App分享
-         */
-        fun appShare()
-
-        fun getCacheSize(context: Context)
-
-        /**
-         * @author LDD
-         * @From   Presenter
-         * @Date   2018/3/9 上午9:35
-         * @Note   清除缓存
-         */
-        fun clearChche(context : Context)
-
-        /**
-         * @author LDD
-         * @From   Presenter
-         * @Date   2018/8/13 下午8:52
-         * @Note   退出登录
-         */
-        fun logout(uid :String)
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/shop/ShopActivityContract.kt

@@ -1,64 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.contract.shop
-
-import android.app.Activity
-import com.wdkl.ncs.android.lib.base.BaseContract
-import com.wdkl.ncs.android.middleware.model.ShopViewModel
-
-/**
- * @author LDD
- * @Date   2018/4/8 下午3:21
- * @From   com.wdkl.ncs.android.middleware.logic.contract.shop
- * @Note   店铺页面接口控制器
- */
-interface ShopActivityContract {
-
-    /**
-     * @author LDD
-     * @Date   2018/4/8 下午3:26
-     * @From   ShopActivityContract
-     * @Note   视图
-     */
-    interface View :BaseContract.BaseView{
-
-        /**
-         * @author LDD
-         * @From   View
-         * @Date   2018/4/9 下午5:18
-         * @Note   初始化店铺信息
-         * @param  shop 店铺信息
-         */
-        fun initShop(shop :ShopViewModel)
-    }
-
-    /**
-     * @author LDD
-     * @Date   2018/4/8 下午3:26
-     * @From   ShopActivityContract
-     * @Note   视图控制器
-     */
-    interface Presenter:BaseContract.BasePresenter{
-
-        /**
-         * @author LDD
-         * @From   Presenter
-         * @Date   2018/4/9 下午5:19
-         * @Note   加载店铺信息
-         * @param  storeId 店铺ID
-         */
-        fun loadShopInfo(shopId : Int)
-
-        /**
-         * @author LDD
-         * @From   Presenter
-         * @Date   2018/4/9 下午5:19
-         * @Note   关注店铺
-         * @param  shopId 店铺ID
-         * @param  isCollect 是否关注
-         */
-        fun collectShop(shopId :Int ,isCollect :Boolean)
-
-
-        fun share(activity: Activity, url: String, image: String, title: String, description: String)
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/shop/ShopAllContract.kt

@@ -1,53 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.contract.shop
-
-import com.wdkl.ncs.android.lib.base.BaseContract
-import com.wdkl.ncs.android.middleware.model.GoodsItemViewModel
-
-/**
- * @author LDD
- * @Date   2018/4/9 下午5:26
- * @From   com.wdkl.ncs.android.middleware.logic.contract.shop
- * @Note   店铺全部商品页面接口
- */
-interface ShopAllContract {
-
-    /**
-     * @author LDD
-     * @Date   2018/4/9 下午5:26
-     * @From   ShopAllContract
-     * @Note   视图接口
-     */
-    interface View :BaseContract.BaseView{
-
-        /**
-         * @author LDD
-         * @From   View
-         * @Date   2018/4/9 下午5:27
-         * @Note   初始化商品列表
-         * @param  data 商品数据
-         */
-        fun initGoods(data :List<GoodsItemViewModel>)
-
-    }
-
-    /**
-     * @author LDD
-     * @Date   2018/4/9 下午5:26
-     * @From   ShopAllContract
-     * @Note   逻辑接口
-     */
-    interface Presenter : BaseContract.BasePresenter{
-
-        /**
-         * @author LDD
-         * @From   Presenter
-         * @Date   2018/4/9 下午5:27
-         * @Note   加载店铺内商品
-         * @param  filter 筛选数据
-         * @param  page   分页查询
-         */
-        fun loadGoods(filter :HashMap<String,Any> , page :Int)
-
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/shop/ShopCategoryActivityContract.kt

@@ -1,52 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.contract.shop
-
-import com.wdkl.ncs.android.lib.base.BaseContract
-import com.wdkl.ncs.android.middleware.model.ShopCategoryViewModel
-
-/**
- * @author LDD
- * @Date   2018/4/12 上午9:00
- * @From   com.wdkl.ncs.android.middleware.logic.contract.shop
- * @Note   店铺种类接口控制
- */
-interface ShopCategoryActivityContract {
-
-    /**
-     * @author LDD
-     * @Date   2018/4/12 上午9:01
-     * @From   ShopCategoryActivityContract
-     * @Note   视图接口
-     */
-    interface View :BaseContract.BaseView {
-
-        /**
-         * @author LDD
-         * @From   View
-         * @Date   2018/4/12 上午9:08
-         * @Note   初始化分类
-         * @param  data 数据
-         */
-        fun initCategory(data :ArrayList<ShopCategoryViewModel>)
-
-    }
-
-    /**
-     * @author LDD
-     * @Date   2018/4/12 上午9:02
-     * @From   ShopCategoryActivityContract
-     * @Note   逻辑接口
-     */
-    interface Presenter :BaseContract.BasePresenter{
-
-        /**
-         * @author LDD
-         * @From   Presenter
-         * @Date   2018/4/12 上午9:08
-         * @Note   加载分类数据
-         * @param  shopId     店铺ID
-         */
-        fun loadCategory(shopId :Int)
-
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/shop/ShopHomeContract.kt

@@ -1,69 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.contract.shop
-
-import com.wdkl.ncs.android.lib.base.BaseContract
-import com.wdkl.ncs.android.middleware.model.CouponViewModel
-import com.wdkl.ncs.android.middleware.model.ShopFirstViewModel
-
-/**
- * @author LDD
- * @Date   2018/4/9 下午5:06
- * @From   com.wdkl.ncs.android.middleware.logic.contract.shop
- * @Note   商品首页接口控制器
- */
-interface ShopHomeContract {
-
-    /**
-     * @author LDD
-     * @Date   2018/4/9 下午5:06
-     * @From   ShopHomeContract
-     * @Note   视图接口
-     */
-    interface View :BaseContract.BaseView{
-        
-        /**
-         * @author LDD
-         * @From   View
-         * @Date   2018/4/9 下午5:21
-         * @Note   初始化首页数据
-         * @param  data 数据
-         */
-        fun initFirstData(data :ShopFirstViewModel)
-
-        /**
-         * @author LDD
-         * @From   View
-         * @Date   2018/4/9 下午5:21
-         * @Note   初始化优惠券
-         * @param  data 优惠券数据
-         */
-        fun initCoupon(data :List<CouponViewModel>)
-    }
-
-    /**
-     * @author LDD
-     * @Date   2018/4/9 下午5:07
-     * @From   ShopHomeContract
-     * @Note   逻辑接口
-     */
-    interface Presenter :BaseContract.BasePresenter{
-
-        /**
-         * @author LDD
-         * @From   Presenter
-         * @Date   2018/4/9 下午5:22
-         * @Note   加载首页数据
-         * @param  shopId 店铺ID
-         */
-        fun loadFirstData(shopId : Int)
-
-        /**
-         * @author LDD
-         * @From   Presenter
-         * @Date   2018/4/9 下午5:23
-         * @Note   加载优惠券数据
-         * @param  shopId 店铺ID
-         */
-        fun loadCoupon(shopId :Int)
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/shop/ShopInfoActivityContract.kt

@@ -1,85 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.contract.shop
-
-import android.app.Activity
-import android.graphics.Bitmap
-import com.wdkl.ncs.android.lib.base.BaseContract
-import com.wdkl.ncs.android.middleware.model.ShopViewModel
-
-/**
- * @author LDD
- * @Date   2018/4/13 下午4:40
- * @From   com.wdkl.ncs.android.middleware.logic.contract.shop
- * @Note   店铺信息页面接口控制器
- */
-interface ShopInfoActivityContract {
-
-    /**
-     * @author LDD
-     * @Date   2018/4/13 下午4:40
-     * @From   ShopInfoActivityContract
-     * @Note   视图控制器
-     */
-    interface View :BaseContract.BaseView{
-
-        /**
-         * @author LDD
-         * @From   View
-         * @Date   2018/4/13 下午4:44
-         * @Note   初始化店铺数据
-         * @param  data 店铺数据
-         */
-        fun initShopInfo(data :ShopViewModel)
-
-        /**
-         * @author LDD
-         * @From   View
-         * @Date   2018/4/13 下午4:44
-         * @Note   显示店铺二维码
-         * @param  bitmap 二维码图片
-         */
-        fun showQrCode(bitmap: Bitmap)
-
-    }
-
-    /**
-     * @author LDD
-     * @Date   2018/4/13 下午4:40
-     * @From   ShopInfoActivityContract
-     * @Note   逻辑控制器
-     */
-    interface Presenter :BaseContract.BasePresenter{
-
-        /**
-         * @author LDD
-         * @From   Presenter
-         * @Date   2018/4/13 下午4:44
-         * @Note   加载店铺信息
-         * @param  shopId 店铺ID
-         */
-        fun loadShopInfo(shopId :Int)
-
-        /**
-         * @author LDD
-         * @From   Presenter
-         * @Date   2018/4/13 下午4:45
-         * @Note   构建店铺二维码
-         * @param  shopId 店铺Id
-         */
-        fun buildQrCode(shopId :Int)
-
-        /**
-         * @author LDD
-         * @From   Presenter
-         * @Date   2018/4/9 下午5:19
-         * @Note   关注店铺
-         * @param  shopId 店铺ID
-         * @param  isCollect 是否关注
-         */
-        fun collectShop(shopId :Int ,isCollect :Boolean)
-
-
-        fun share(activity: Activity, url: String, image: String, title: String, description: String)
-
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/shop/ShopListContract.kt

@@ -1,22 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.contract.shop
-
-import com.wdkl.ncs.android.lib.base.BaseContract
-import com.wdkl.ncs.android.middleware.model.ShopItem
-import com.wdkl.ncs.android.middleware.model.ShopViewModel
-
-
-interface ShopListContract {
-
-    interface View :BaseContract.BaseView{
-
-        fun render(data :ArrayList<ShopItem>)
-
-    }
-
-    interface Presenter :BaseContract.BasePresenter{
-
-        fun loadData(keyWord :String ,page : Int)
-
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/shop/ShopTagContract.kt

@@ -1,51 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.contract.shop
-
-import com.wdkl.ncs.android.lib.base.BaseContract
-import com.wdkl.ncs.android.middleware.model.GoodsItemViewModel
-
-/**
- * @author LDD
- * @Date   2018/4/9 下午5:28
- * @From   com.wdkl.ncs.android.middleware.logic.contract.shop
- * @Note   店铺标签商品页面接口控制
- */
-interface ShopTagContract {
-
-    /**
-     * @author LDD
-     * @Date   2018/4/9 下午5:29
-     * @From   ShopTagContract
-     * @Note   视图借口
-     */
-    interface View :BaseContract.BaseView{
-
-        /**
-         * @author LDD
-         * @From   View
-         * @Date   2018/4/9 下午5:31
-         * @Note   初始化商品数据
-         * @param  data 商品数据
-         */
-        fun initGoods(data :List<GoodsItemViewModel>)
-    }
-    
-    /**
-     * @author LDD
-     * @Date   2018/4/9 下午5:29
-     * @From   ShopTagContract
-     * @Note   逻辑接口
-     */
-    interface Presenter :BaseContract.BasePresenter{
-
-        /**
-         * @author LDD
-         * @From    Presenter
-         * @Date   2018/4/9 下午5:31
-         * @Note   加载商品数据
-         * @param  tag 标签
-         * @param  shopId 店铺Id
-         */
-        fun loadGoods(tag :String , shopId :Int)
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/welcome/WelcomeContract.kt

@@ -1,55 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.contract.welcome
-
-import com.wdkl.ncs.android.lib.base.BaseContract
-import com.wdkl.ncs.android.middleware.model.AdViewModel
-
-/**
- * @author  LDD
- * @Date   2018/1/9 下午2:04
- * @From   com.wdkl.ncs.android.lib.logic.contract.welcome
- * @Note   欢迎页面 MVP接口
- */
-interface WelcomeContract {
-
-    /**
-     * @author  LDD
-     * @Data   2018/1/9 下午2:05
-     * @From   WelcomeContract
-     * @Note   欢迎页面基础View接口
-     */
-    interface View : BaseContract.BaseView{
-        /**
-         * @author  LDD
-         * @From    View
-         * @Date   2018/1/9 下午2:07
-         * @Note   跳转到主页面
-         */
-        fun toHome()
-
-        /**
-         * @author  LDD
-         * @From    View
-         * @Date   2018/1/9 下午2:08
-         * @Note   跳转广告页面
-         * @param  data  广告数据
-         */
-        fun showAd(data: ArrayList<AdViewModel>)
-    }
-
-    /**
-     * @author  LDD
-     * @Date   2018/1/9 下午2:09
-     * @From   WelcomeContract
-     * @Note   欢迎页面Presenter接口
-     */
-    interface Presenter : BaseContract.BasePresenter{
-
-        /**
-         * @author  LDD
-         * @From    Presenter
-         * @Date   2018/1/9 下午2:40
-         * @Note   加载广告
-         */
-        fun loadAd()
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/extra/ScanPresenter.kt

@@ -1,17 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.presenter.extra
-
-import com.wdkl.ncs.android.lib.base.RxPresenter
-import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
-import com.wdkl.ncs.android.middleware.logic.contract.extra.ScanContract
-import javax.inject.Inject
-
-/**
- * Created by LDD on 2018/11/5.
- */
-class ScanPresenter  @Inject constructor() : RxPresenter<ScanContract.View>(),ScanContract.Presenter {
-
-
-    override fun bindDagger() {
-        MiddlewareDaggerComponent.component.inject(this)
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/hello/HelloActivityPresenter.kt

@@ -1,64 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.presenter.hello
-
-import com.enation.javashop.net.engine.plugin.connection.ConnectionQuality
-import com.enation.javashop.net.engine.plugin.exception.ExceptionHandle
-import com.enation.javashop.net.engine.utils.ThreadFromUtils
-import com.wdkl.ncs.android.lib.base.RxPresenter
-import com.wdkl.ncs.android.lib.utils.ConnectionObserver
-import com.wdkl.ncs.android.lib.utils.getJsonString
-import com.wdkl.ncs.android.lib.utils.more
-import com.wdkl.ncs.android.middleware.api.HelloApi
-import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
-import com.wdkl.ncs.android.middleware.logic.contract.hello.HelloActivityContract
-import com.wdkl.ncs.android.middleware.model.ChildCategoryShell
-import io.reactivex.disposables.Disposable
-import org.json.JSONArray
-import javax.inject.Inject
-
-class HelloActivityPresenter @Inject constructor() :RxPresenter<HelloActivityContract.View>(),HelloActivityContract.Presenter{
-    override fun bindDagger() {
-        MiddlewareDaggerComponent.component.inject(this)
-    }
-
-    @Inject
-    protected lateinit var helloApi: HelloApi
-
-    private val observer = object : ConnectionObserver<ArrayList<*>>() {
-        override fun onStartWithConnection() {
-            providerView().start()
-        }
-
-        override fun onNextWithConnection(result: ArrayList<*>, connectionQuality: ConnectionQuality) {
-            providerView().complete()
-            result.getOrNull(0)?.more { data ->
-                providerView().showData(result as ArrayList<ChildCategoryShell>)
-            }
-        }
-
-        override fun onErrorWithConnection(error: ExceptionHandle.ResponeThrowable, connectionQuality: ConnectionQuality) {
-            providerView().onError(error.customMessage)
-        }
-
-        override fun attachSubscribe(var1: Disposable) {
-            addDisposable(var1)
-        }
-    }
-
-    override fun loadData(parentId: Int) {
-        helloApi.getCategories(parentId).map { response->
-            var jsonResult = response.getJsonString()
-            /**初始化Result数据*/
-            val result = ArrayList<Any>()
-
-            if (jsonResult != ""){
-                val jsonArray = JSONArray(jsonResult)
-                for (i in 0..(jsonArray.length() - 1)){
-                    val item = ChildCategoryShell.map(jsonArray.getJSONObject(i))
-                    result.add(item)
-                }
-            }
-
-            return@map result
-        }.compose(ThreadFromUtils.defaultSchedulers()).subscribe(observer)
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/setting/SettingActivityPresenter.kt

@@ -1,146 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.presenter.setting
-
-import android.content.Context
-import com.wdkl.ncs.android.lib.base.RxPresenter
-import com.wdkl.ncs.android.lib.utils.AppTool
-import com.wdkl.ncs.android.lib.utils.ConnectionObserver
-import com.wdkl.ncs.android.lib.utils.joinManager
-import com.wdkl.ncs.android.lib.utils.then
-import com.wdkl.ncs.android.middleware.api.MemberApi
-import com.wdkl.ncs.android.middleware.api.TokenManager
-import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
-import com.wdkl.ncs.android.middleware.logic.contract.setting.SettingActivityContract
-import com.wdkl.ncs.android.middleware.model.MemberViewModel
-import com.enation.javashop.imagepluin.utils.ClearUtils
-import com.enation.javashop.imagepluin.utils.GlideUtils
-import com.enation.javashop.net.engine.plugin.connection.ConnectionQuality
-import com.enation.javashop.net.engine.plugin.exception.ExceptionHandle
-import com.enation.javashop.net.engine.utils.ThreadFromUtils
-import io.reactivex.Observable
-import io.reactivex.disposables.Disposable
-import okhttp3.ResponseBody
-import java.io.File
-import java.util.*
-import javax.inject.Inject
-
-/**
- * @author LDD
- * @Date   2018/3/9 上午9:36
- * @From   com.wdkl.ncs.android.middleware.logic.presenter.setting
- * @Note   设置页面逻辑控制器
- */
-open class SettingActivityPresenter @Inject constructor() : RxPresenter<SettingActivityContract.View>(), SettingActivityContract.Presenter {
-
-    /**
-     * @Name  memberApi
-     * @Type  MemberApi
-     * @Note  Api
-     */
-    @Inject
-    protected lateinit var memberApi: MemberApi
-
-    /**
-     * @Name  observer
-     * @Type  ConnectionObserver
-     * @Note  监听者
-     */
-    private val observer  = object : ConnectionObserver<Any>(){
-
-        override fun onStartWithConnection() {
-            providerView().start()
-        }
-
-        override fun onNextWithConnection(result: Any, connectionQuality: ConnectionQuality) {
-            when(result){
-                is ResponseBody ->{
-                    providerView().logout()
-                }
-
-                is MemberViewModel ->{
-                    providerView().renderInfo(result)
-                }
-            }
-        }
-
-        override fun onErrorWithConnection(error: ExceptionHandle.ResponeThrowable, connectionQuality: ConnectionQuality) {
-            providerView().onError(error.customMessage)
-        }
-
-        override fun attachSubscribe(var1: Disposable) {
-            addDisposable(var1)
-        }
-    }
-
-    /**
-     * @author LDD
-     * @From   SettingActivityPresenter
-     * @Date   2018/3/9 上午9:37
-     * @Note   加载用户信息
-     */
-    override fun loadMemberInfo() {
-        memberApi.memberInfo()
-                .map { return@map MemberViewModel.map(it) }
-                .compose(ThreadFromUtils.defaultSchedulers())
-                .subscribe(observer)
-    }
-
-    /**
-     * @author LDD
-     * @From   SettingActivityPresenter
-     * @Date   2018/3/9 上午9:38
-     * @Note   分享应用
-     */
-    override fun appShare() {
-
-    }
-
-    /**
-     * @author LDD
-     * @From   SettingActivityPresenter
-     * @Date   2018/3/9 上午9:38
-     * @Note   清除缓存
-     */
-    override fun clearChche(context :Context) {
-        Observable.create<String> {
-            ClearUtils.getInstance().clearImageDiskCache(context)
-            it.onNext("0KB")
-        }.compose(ThreadFromUtils.defaultSchedulers())
-                .subscribe {
-                    providerView().renderCacheSize(it)
-                }.joinManager(this)
-    }
-
-    override fun getCacheSize(context: Context) {
-        Observable.create<String> {
-            it.onNext(ClearUtils.getFormatSize(ClearUtils.getInstance().getFolderSize(File(context.externalCacheDir!!.path,"Glide")).toDouble()))
-        }.compose(ThreadFromUtils.defaultSchedulers())
-                .subscribe {
-                    providerView().renderCacheSize(it)
-                }.joinManager(this)
-    }
-
-    /**
-     * @author LDD
-     * @From   Presenter
-     * @Date   2018/8/13 下午8:52
-     * @Note   退出登录
-     */
-    override fun logout(uid :String) {
-        memberApi.logout(uid)
-                 .compose(ThreadFromUtils.defaultSchedulers())
-                 .subscribe(observer)
-    }
-
-    /**
-     * @author LDD
-     * @From   SettingActivityPresenter
-     * @Date   2018/3/9 上午9:39
-     * @Note   绑定Dagger
-     */
-    override fun bindDagger() {
-        MiddlewareDaggerComponent.component.inject(this)
-    }
-
-
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/shop/ShopActivityPersenter.kt

@@ -1,154 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.presenter.shop
-
-import android.app.Activity
-import com.wdkl.ncs.android.lib.base.RxPresenter
-import com.wdkl.ncs.android.lib.utils.*
-import com.wdkl.ncs.android.middleware.api.GoodsApi
-import com.wdkl.ncs.android.middleware.api.MemberApi
-import com.wdkl.ncs.android.middleware.api.ShopApi
-import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
-import com.wdkl.ncs.android.middleware.logic.contract.shop.ShopActivityContract
-import com.wdkl.ncs.android.middleware.model.ShopViewModel
-import com.enation.javashop.connectview.logic.UmengShare
-import com.enation.javashop.net.engine.plugin.connection.ConnectionQuality
-import com.enation.javashop.net.engine.plugin.exception.ExceptionHandle
-import com.enation.javashop.net.engine.utils.ThreadFromUtils
-import io.reactivex.Observable
-import io.reactivex.disposables.Disposable
-import okhttp3.ResponseBody
-import io.reactivex.functions.Function3
-import org.json.JSONObject
-import javax.inject.Inject
-
-/**
- * @author LDD
- * @Date   2018/4/8 下午3:55
- * @From   com.wdkl.ncs.android.middleware.logic.presenter.shop
- * @Note   店铺页面逻辑控制器
- */
-class ShopActivityPersenter @Inject constructor() : RxPresenter<ShopActivityContract.View>(), ShopActivityContract.Presenter {
-
-    /**
-     * @Name  shopApi
-     * @Type  ShopApi
-     * @Note  店铺Api
-     */
-    @Inject
-    protected lateinit var shopApi: ShopApi
-
-    @Inject
-    protected lateinit var goodsApi : GoodsApi
-
-    @Inject
-    protected lateinit var memberApi: MemberApi
-
-    private val observer = object: ConnectionObserver<Any>(){
-        override fun onStartWithConnection() {
-            providerView().start()
-        }
-
-        override fun onNextWithConnection(data: Any, connectionQuality: ConnectionQuality) {
-            when (data) {
-                is ShopViewModel -> {
-                    providerView().initShop(data as ShopViewModel)
-                    providerView().complete()
-                }
-                is String ->{
-                    providerView().complete(data)
-                }
-
-            }
-        }
-
-        override fun onErrorWithConnection(error: ExceptionHandle.ResponeThrowable, connectionQuality: ConnectionQuality) {
-            providerView().onError(error.customMessage)
-        }
-
-        override fun attachSubscribe(var1: Disposable) {
-            addDisposable(var1)
-        }
-    }
-
-    /**
-     * @author LDD
-     * @From   ShopActivityPersenter
-     * @Date   2018/4/8 下午3:58
-     * @Note   绑定Dagger
-     */
-    override fun bindDagger() {
-        MiddlewareDaggerComponent.component.inject(this)
-    }
-
-    /**
-     * @author LDD
-     * @From    ShopActivityPersenter
-     * @Date   2018/4/8 下午4:01
-     * @Note   加载店铺信息
-     * @param  storeId 店铺ID
-     */
-    override fun loadShopInfo(storeId: Int) {
-        val shop = shopApi.getShop(storeId)
-        var collect = shopApi.getIsCollectionShop(storeId).onErrorReturn { t-> ResponseBody.create(null, "{\"message\":false}") }
-        val goodsNum = goodsApi.getGoodsNumForShop(storeId)
-
-        Observable.zip(shop, goodsNum, collect, Function3<ResponseBody, ResponseBody, ResponseBody, ShopViewModel>{
-            shopResponse, goodsNumResponse, collectResponse ->
-
-            var shopJsonObject = JSONObject(shopResponse.getJsonString())
-            val shopViewModel = ShopViewModel.map(shopJsonObject)
-
-            val numJsonObject = JSONObject(goodsNumResponse.getJsonString())
-            shopViewModel.hotNum = numJsonObject.optInt("hot_num")
-            shopViewModel.new_Num = numJsonObject.optInt("new_num")
-            shopViewModel.recommendNum = numJsonObject.optInt("recommend_num")
-
-            if(collectResponse != null){
-                var collectJsonObject = JSONObject(collectResponse.getJsonString())
-                if(!collectJsonObject.has("code") && collectJsonObject.has("message")){
-                    shopViewModel.favorited = collectJsonObject.optBoolean("message")
-                }
-            }
-
-            shopViewModel
-        }).compose(ThreadFromUtils.defaultSchedulers()).subscribe(observer)
-    }
-
-    /**
-     * @author LDD
-     * @From   ShopActivityPersenter
-     * @Date   2018/4/8 下午4:01
-     * @Note   关注店铺
-     * @param  shopId 店铺ID
-     * @param  isCollect 是否关注
-     */
-    override fun collectShop(shopId: Int, isCollect: Boolean) {
-        if (isCollect){
-            memberApi.addCollectionShop(shopId)
-                    .map { "关注成功" }
-                    .compose(ThreadFromUtils.defaultSchedulers())
-                    .subscribe(observer)
-        }else{
-            memberApi.deleteCollectionShop(shopId)
-                    .map { "取消关注成功" }
-                    .compose(ThreadFromUtils.defaultSchedulers())
-                    .subscribe(observer)
-        }
-    }
-
-
-    override fun share(activity: Activity, url: String, image: String, title: String, description: String) {
-        providerView().start()
-        AppTool.Image.urlToBitmap(image).compose(ThreadFromUtils.defaultSchedulers()).subscribe({ image ->
-            providerView().complete()
-            UmengShare.Init(activity.weak().get())
-                    .web(url)
-                    .setWebTitle(title)
-                    .setWebImage(image)
-                    .setWebDescription(description)
-                    .webShare()
-        },{
-            providerView().onError("分享失败")
-        }).joinManager(this)
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/shop/ShopAllPersenter.kt

@@ -1,104 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.presenter.shop
-
-import com.wdkl.ncs.android.lib.base.RxPresenter
-import com.wdkl.ncs.android.lib.utils.ConnectionObserver
-import com.wdkl.ncs.android.lib.utils.getJsonString
-import com.wdkl.ncs.android.lib.utils.then
-import com.wdkl.ncs.android.middleware.api.GoodsApi
-import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
-import com.wdkl.ncs.android.middleware.enum.Promotion
-import com.wdkl.ncs.android.middleware.logic.contract.shop.ShopAllContract
-import com.wdkl.ncs.android.middleware.model.GoodsFilterViewModel
-import com.wdkl.ncs.android.middleware.model.GoodsItemViewModel
-import com.wdkl.ncs.android.middleware.model.PromotionViewModel
-import com.enation.javashop.net.engine.plugin.connection.ConnectionQuality
-import com.enation.javashop.net.engine.plugin.exception.ExceptionHandle
-import com.enation.javashop.net.engine.utils.ThreadFromUtils
-import io.reactivex.disposables.Disposable
-import org.json.JSONArray
-import org.json.JSONObject
-import javax.inject.Inject
-
-/**
- * @author LDD
- * @Date   2018/4/9 下午5:51
- * @From   com.wdkl.ncs.android.middleware.logic.presenter.shop
- * @Note   店铺全部商品
- */
-class ShopAllPersenter @Inject constructor() : RxPresenter<ShopAllContract.View>(), ShopAllContract.Presenter {
-
-
-    /**
-     * @Name  goodsApi
-     * @Type  GoodsApi
-     * @Note  店铺API
-     */
-    @Inject
-    protected lateinit var goodsApi: GoodsApi
-
-
-    private val observer = object: ConnectionObserver<Any>(){
-        override fun onStartWithConnection() {
-            providerView().start()
-        }
-
-        override fun onNextWithConnection(data: Any, connectionQuality: ConnectionQuality) {
-
-            when (data) {
-                is ArrayList<*> -> {
-                    providerView().complete()
-                    providerView().initGoods(data as ArrayList<GoodsItemViewModel>)
-                }
-            }
-        }
-
-        override fun onErrorWithConnection(error: ExceptionHandle.ResponeThrowable, connectionQuality: ConnectionQuality) {
-            providerView().onError(error.customMessage)
-        }
-
-        override fun attachSubscribe(var1: Disposable) {
-            addDisposable(var1)
-        }
-
-    }
-
-
-    /**
-     * @author LDD
-     * @From   ShopAllPersenter
-     * @Date   2018/4/24 下午3:35
-     * @Note   依赖注入
-     */
-    override fun bindDagger() {
-        MiddlewareDaggerComponent.component.inject(this)
-    }
-
-    /**
-     * @author LDD
-     * @From   ShopAllPersenter
-     * @Date   2018/4/24 下午3:36
-     * @Note   加载商品
-     * @param  filter 筛选条件
-     */
-    override fun loadGoods(filter: HashMap<String, Any>,page :Int) {
-
-
-        goodsApi.searchGoodsList(page,10,filter).map { responseBody ->
-
-            var jsonPage = JSONObject(responseBody.getJsonString())
-
-            var jsonArray = JSONArray(jsonPage.get("data").toString())
-
-            var goodsItemList = ArrayList<GoodsItemViewModel>()
-
-            for (i in 0..(jsonArray.length() - 1)) {
-                val jsonObject = jsonArray.getJSONObject(i)
-                goodsItemList.add(GoodsItemViewModel.goodssearchMap(jsonObject))
-            }
-
-            return@map goodsItemList
-
-        }.compose(ThreadFromUtils.defaultSchedulers()).subscribe(observer)
-
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/shop/ShopCategoryActivityPresenter.kt

@@ -1,113 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.presenter.shop
-
-import com.wdkl.ncs.android.lib.base.RxPresenter
-import com.wdkl.ncs.android.lib.utils.*
-import com.wdkl.ncs.android.middleware.api.CategoryApi
-import com.wdkl.ncs.android.middleware.api.ShopApi
-import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
-import com.wdkl.ncs.android.middleware.logic.contract.shop.ShopCategoryActivityContract
-import com.wdkl.ncs.android.middleware.model.ShopCategoryViewModel
-import com.enation.javashop.net.engine.plugin.connection.ConnectionQuality
-import com.enation.javashop.net.engine.plugin.exception.ExceptionHandle
-import com.enation.javashop.net.engine.utils.ThreadFromUtils
-import io.reactivex.disposables.Disposable
-import org.json.JSONArray
-import javax.inject.Inject
-
-/**
- * @author LDD
- * @Date   2018/4/12 上午9:32
- * @From   com.wdkl.ncs.android.middleware.logic.presenter.shop
- * @Note   店铺分类页面逻辑控制
- */
-class ShopCategoryActivityPresenter @Inject constructor() :RxPresenter<ShopCategoryActivityContract.View>() ,ShopCategoryActivityContract.Presenter {
-
-
-    /**
-     * @Name  categoryApi
-     * @Type  CategoryApi
-     * @Note  分类API
-     */
-    @Inject
-    protected lateinit var shopApi : ShopApi
-
-
-    private val observer = object: ConnectionObserver<Any>(){
-        override fun onStartWithConnection() {
-            providerView().start()
-        }
-
-        override fun onNextWithConnection(data: Any, connectionQuality: ConnectionQuality) {
-            when (data) {
-                is ArrayList<*> -> {
-                    providerView().initCategory(data as ArrayList<ShopCategoryViewModel>)
-                }
-            }
-        }
-
-        override fun onErrorWithConnection(error: ExceptionHandle.ResponeThrowable, connectionQuality: ConnectionQuality) {
-            providerView().onError(error.customMessage)
-        }
-
-        override fun attachSubscribe(var1: Disposable) {
-            addDisposable(var1)
-        }
-    }
-
-
-
-    /**
-     * @author LDD
-     * @From   ShopCategoryActivityPresenter
-     * @Date   2018/4/12 上午9:38
-     * @Note   依赖注入
-     */
-    override fun bindDagger() {
-        MiddlewareDaggerComponent.component.inject(this)
-    }
-
-    /**
-     * @author LDD
-     * @From   ShopCategoryActivityPresenter
-     * @Date   2018/4/12 上午9:38
-     * @Note   加载分类
-     * @param  shopId 店铺ID
-     */
-    override fun loadCategory(shopId: Int) {
-
-        shopApi.getShopCats(shopId).map { responseBody ->
-            var jsonArray = JSONArray(responseBody.getJsonString())
-
-            var jsonShopCat = ArrayList<ShopCategoryViewModel>()
-
-            for (i in 0..(jsonArray.length() - 1)){
-                val jsonObject = jsonArray.getJSONObject(i)
-                val jsonChildrenArray = JSONArray(jsonObject.get("children").toString())
-                var childrenView = ArrayList<ShopCategoryViewModel>()
-
-                //判断是否有子
-                if(jsonChildrenArray != null && jsonChildrenArray.length() > 0 ){
-
-                    for (i in 0..(jsonChildrenArray.length() - 1)){
-                        val jsonChildren = jsonChildrenArray.getJSONObject(i)
-                        childrenView.add(ShopCategoryViewModel(
-                                jsonChildren.valueInt("shop_cat_id"),
-                                jsonChildren.valueString("shop_cat_name"),
-                                null
-                        ))
-
-                    }
-
-                }
-
-                jsonShopCat.add(ShopCategoryViewModel(
-                        jsonObject.valueInt("shop_cat_id"),
-                        jsonObject.valueString("shop_cat_name"),
-                        childrenView
-                ))
-            }
-
-            return@map jsonShopCat
-        }.compose(ThreadFromUtils.defaultSchedulers()).subscribe(observer)
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/shop/ShopHomePresenter.kt

@@ -1,182 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.presenter.shop
-
-import com.wdkl.ncs.android.lib.base.RxPresenter
-import com.wdkl.ncs.android.lib.utils.*
-import com.wdkl.ncs.android.middleware.api.CartApi
-import com.wdkl.ncs.android.middleware.api.GoodsApi
-import com.wdkl.ncs.android.middleware.api.PromotionApi
-import com.wdkl.ncs.android.middleware.api.ShopApi
-import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
-import com.wdkl.ncs.android.middleware.enum.Promotion
-import com.wdkl.ncs.android.middleware.logic.contract.shop.ShopHomeContract
-import com.wdkl.ncs.android.middleware.model.*
-import com.enation.javashop.net.engine.plugin.connection.ConnectionQuality
-import com.enation.javashop.net.engine.plugin.exception.ExceptionHandle
-import com.enation.javashop.net.engine.utils.ThreadFromUtils
-import io.reactivex.disposables.Disposable
-import org.json.JSONArray
-import javax.inject.Inject
-
-/**
- * @author LDD
- * @Date   2018/4/9 下午5:54
- * @From   com.wdkl.ncs.android.lib.base.RxPresenter
- * @Note   店铺首页逻辑控制器
- */
-class ShopHomePresenter @Inject constructor() : RxPresenter<ShopHomeContract.View>(), ShopHomeContract.Presenter {
-
-
-    /**
-     * @Name  shopApi
-     * @Type  ShopApi
-     * @Note  店铺API
-     */
-    @Inject
-    protected lateinit var shopApi: ShopApi
-
-    /**
-     * @Name  goodsApi
-     * @Type  GoodsApi
-     * @Note  店铺API
-     */
-    @Inject
-    protected lateinit var goodsApi: GoodsApi
-
-
-    /**
-     * @Name  promotionApi
-     * @Type  PromotionApi
-     * @Note  店铺API
-     */
-    @Inject
-    protected lateinit var promotionApi: PromotionApi
-
-
-
-    private val observer = object: ConnectionObserver<Any>(){
-        override fun onStartWithConnection() {
-            providerView().start()
-        }
-
-        override fun onNextWithConnection(data: Any, connectionQuality: ConnectionQuality) {
-            when (data) {
-                is ShopFirstViewModel -> {
-                    providerView().initFirstData(data as ShopFirstViewModel)
-                }
-                is ArrayList<*> -> {
-                    providerView().initCoupon(data as ArrayList<CouponViewModel>)
-                }
-            }
-        }
-
-        override fun onErrorWithConnection(error: ExceptionHandle.ResponeThrowable, connectionQuality: ConnectionQuality) {
-            providerView().onError(error.customMessage)
-        }
-
-        override fun attachSubscribe(var1: Disposable) {
-            addDisposable(var1)
-        }
-
-    }
-
-
-    /**
-     * @author LDD
-     * @From   ShopFirstPresenter
-     * @Date   2018/4/9 下午5:55
-     * @Note   依赖注入
-     */
-    override fun bindDagger() {
-        MiddlewareDaggerComponent.component.inject(this)
-    }
-
-    /**
-     * @author LDD
-     * @From   ShopFirstPresenter
-     * @Date   2018/4/9 下午5:55
-     * @Note   加载首页数据
-     * @param  shopId 店铺ID
-     */
-    override fun loadFirstData(shopId: Int) {
-
-        var hot = ArrayList<GoodsItemViewModel>()
-        var new = ArrayList<GoodsItemViewModel>()
-        var recommend = ArrayList<GoodsItemViewModel>()
-
-        goodsApi.getTagGoodsList("hot",shopId,20).flatMap {
-            responseBody ->
-            var jsonArray = JSONArray(responseBody.getJsonString())
-
-            for (i in 0..(jsonArray.length() - 1)) {
-                val jsonObject = jsonArray.getJSONObject(i)
-                var item = GoodsItemViewModel.shopGoodsMap(jsonObject,shopId)
-                hot.add(item)
-            }
-
-            return@flatMap goodsApi.getTagGoodsList("new",shopId,20)
-
-        }.flatMap {
-            responseBody ->
-            var jsonArray = JSONArray(responseBody.getJsonString())
-
-            for (i in 0..(jsonArray.length() - 1)) {
-                val jsonObject = jsonArray.getJSONObject(i)
-                var item = GoodsItemViewModel.shopGoodsMap(jsonObject,shopId)
-                new.add(item)
-            }
-            return@flatMap goodsApi.getTagGoodsList("recommend",shopId,20)
-        }.map {
-
-            responseBody ->
-            var jsonArray = JSONArray(responseBody.getJsonString())
-
-            for (i in 0..(jsonArray.length() - 1)) {
-                val jsonObject = jsonArray.getJSONObject(i)
-                var item = GoodsItemViewModel.shopGoodsMap(jsonObject,shopId)
-                recommend.add(item)
-            }
-
-            return@map ShopFirstViewModel(recommend,new,hot)
-
-        }.compose(ThreadFromUtils.defaultSchedulers()).subscribe(observer)
-
-    }
-
-    /**
-     * @author LDD
-     * @From   ShopFirstPresenter
-     * @Date   2018/4/9 下午5:56
-     * @Note   加载优惠券
-     * @param  shopId  店铺ID
-     */
-    override fun loadCoupon(shopId: Int) {
-
-        promotionApi.getAllCoupon(10,10).map { responseBody ->
-
-            var jsonArray = JSONArray(responseBody.getJsonString())
-
-            var couponList = ArrayList<CouponViewModel>()
-            for (i in 0..(jsonArray.length() - 1)) {
-                val jsonObject = jsonArray.getJSONObject(i)
-                var item = CouponViewModel(
-                        jsonObject.valueDouble("coupon_price"),
-                        jsonObject.valueDouble("coupon_threshold_price"),
-                        jsonObject.valueString("seller_name"),
-                        false,
-                        false,
-                        false,
-                        jsonObject.valueInt("coupon_id"),
-                        jsonObject.valueDate("start_time")+"-"+jsonObject.valueDate("end_time"),
-                        jsonObject.valueInt("seller_id"),
-                        jsonObject.valueString("title")
-                )
-
-                couponList.add(item)
-            }
-
-            return@map couponList
-
-        }.compose(ThreadFromUtils.defaultSchedulers()).subscribe(observer)
-
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/shop/ShopInfoPresenter.kt

@@ -1,187 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.presenter.shop
-
-import android.app.Activity
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import com.wdkl.ncs.android.lib.base.BaseApplication
-import com.wdkl.ncs.android.lib.base.RxPresenter
-import com.wdkl.ncs.android.lib.utils.*
-import com.wdkl.ncs.android.middleware.R
-import com.wdkl.ncs.android.middleware.api.GoodsApi
-import com.wdkl.ncs.android.middleware.api.MemberApi
-import com.wdkl.ncs.android.middleware.api.ShopApi
-import com.wdkl.ncs.android.middleware.config.WdklNcsConfigCenter
-import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
-import com.wdkl.ncs.android.middleware.logic.contract.shop.ShopInfoActivityContract
-import com.wdkl.ncs.android.middleware.model.ShopViewModel
-import com.enation.javashop.connectview.logic.UmengShare
-import com.enation.javashop.net.engine.plugin.connection.ConnectionQuality
-import com.enation.javashop.net.engine.plugin.exception.ExceptionHandle
-import com.enation.javashop.net.engine.utils.ThreadFromUtils
-import io.reactivex.Observable
-import io.reactivex.disposables.Disposable
-import io.reactivex.functions.Function3
-import okhttp3.ResponseBody
-import org.json.JSONObject
-import javax.inject.Inject
-
-
-/**
- * @author LDD
- * @Date   2018/4/13 下午4:47
- * @From   com.wdkl.ncs.android.middleware.logic.presenter.shop
- * @Note   店铺信息逻辑控制器
- */
-class ShopInfoPresenter @Inject constructor() : RxPresenter<ShopInfoActivityContract.View>(), ShopInfoActivityContract.Presenter {
-
-
-    /**
-     * @Name  shopApi
-     * @Type  ShopApi
-     * @Note  店铺API
-     */
-    @Inject
-    protected lateinit var shopApi: ShopApi
-
-    @Inject
-    protected lateinit var goodsApi : GoodsApi
-
-    @Inject
-    protected lateinit var memberApi: MemberApi
-
-    private val observer = object: ConnectionObserver<Any>(){
-        override fun onStartWithConnection() {
-            providerView().start()
-        }
-
-        override fun onNextWithConnection(data: Any, connectionQuality: ConnectionQuality) {
-            when (data) {
-                is ShopViewModel -> {
-                    providerView().initShopInfo(data)
-                    providerView().complete()
-                }
-                is String ->{
-                    providerView().complete(data)
-                }
-            }
-        }
-
-        override fun onErrorWithConnection(error: ExceptionHandle.ResponeThrowable, connectionQuality: ConnectionQuality) {
-            providerView().onError(error.customMessage)
-        }
-
-        override fun attachSubscribe(var1: Disposable) {
-            addDisposable(var1)
-        }
-    }
-
-
-    /**
-     * @author LDD
-     * @From   ShopInfoPresenter
-     * @Date   2018/4/24 下午3:36
-     * @Note   依赖注入
-     */
-    override fun bindDagger() {
-        MiddlewareDaggerComponent.component.inject(this)
-    }
-
-    /**
-     * @author LDD
-     * @From   ShopInfoPresenter
-     * @Date   2018/4/24 下午3:37
-     * @Note   加载店铺信息
-     * @param  shopId 店铺ID
-     */
-    override fun loadShopInfo(shopId: Int) {
-        val shop = shopApi.getShop(shopId)
-        var collect = shopApi.getIsCollectionShop(shopId).onErrorReturn { t-> ResponseBody.create(null, "{\"message\":false}") }
-        val goodsNum = goodsApi.getGoodsNumForShop(shopId)
-
-        Observable.zip(shop, goodsNum, collect, Function3<ResponseBody, ResponseBody, ResponseBody, ShopViewModel>{
-            shopResponse, goodsNumResponse, collectResponse ->
-
-            var shopJsonObject = JSONObject(shopResponse.getJsonString())
-            val shopViewModel = ShopViewModel.map(shopJsonObject)
-
-            val numJsonObject = JSONObject(goodsNumResponse.getJsonString())
-            shopViewModel.hotNum = numJsonObject.optInt("hot_num")
-            shopViewModel.new_Num = numJsonObject.optInt("new_num")
-            shopViewModel.recommendNum = numJsonObject.optInt("recommend_num")
-
-            if(collectResponse != null){
-                var collectJsonObject = JSONObject(collectResponse.getJsonString())
-                if(!collectJsonObject.has("code") && collectJsonObject.has("message")){
-                    shopViewModel.favorited = collectJsonObject.optBoolean("message")
-                }
-            }
-
-            shopViewModel
-        }).compose(ThreadFromUtils.defaultSchedulers()).subscribe(observer)
-    }
-
-    /**
-     * @author LDD
-     * @From   ShopInfoPresenter
-     * @Date   2018/4/24 下午3:37
-     * @Note   构建二维码
-     * @param  shopId 店铺Id
-     */
-    override fun buildQrCode(shopId: Int) {
-        providerView().start()
-        Observable.create<Bitmap> { observableEmitter ->
-            val logo = BitmapFactory.decodeResource(BaseApplication.appContext.resources, R.mipmap.launcher)
-            val qrCode = EcodeHelper().createQRImage(WdklNcsConfigCenter.INSTANCE.WAP_SELLER_URL+"$shopId", 200, logo)
-            if (qrCode != null) {
-                observableEmitter.onNext(qrCode)
-            } else {
-                observableEmitter.onError(Throwable("创建二维码失败，请重试！"))
-            }
-        }.compose(ThreadFromUtils.defaultSchedulers())
-                .subscribe({ value ->
-                    providerView().showQrCode(value)
-                    providerView().complete()
-                }, { throwable ->
-                    providerView().onError(throwable.localizedMessage)
-                }).joinManager(this)
-    }
-
-
-    /**
-     * @author LDD
-     * @From   ShopActivityPersenter
-     * @Date   2018/4/8 下午4:01
-     * @Note   关注店铺
-     * @param  shopId 店铺ID
-     * @param  isCollect 是否关注
-     */
-    override fun collectShop(shopId: Int, isCollect: Boolean) {
-        if (isCollect){
-            memberApi.addCollectionShop(shopId)
-                    .map { "关注成功" }
-                    .compose(ThreadFromUtils.defaultSchedulers())
-                    .subscribe(observer)
-        }else{
-            memberApi.deleteCollectionShop(shopId)
-                    .map { "取消关注成功" }
-                    .compose(ThreadFromUtils.defaultSchedulers())
-                    .subscribe(observer)
-        }
-    }
-
-
-    override fun share(activity: Activity, url: String, image: String, title: String, description: String) {
-        providerView().start()
-        AppTool.Image.urlToBitmap(image).compose(ThreadFromUtils.defaultSchedulers()).subscribe({ image ->
-            providerView().complete()
-            UmengShare.Init(activity.weak().get())
-                    .web(url)
-                    .setWebTitle(title)
-                    .setWebImage(image)
-                    .setWebDescription(description)
-                    .webShare()
-        },{
-            providerView().onError("分享失败")
-        }).joinManager(this)
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/shop/ShopListPersenter.kt

@@ -1,59 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.presenter.shop
-
-import com.wdkl.ncs.android.lib.base.RxPresenter
-import com.wdkl.ncs.android.lib.utils.ConnectionObserver
-import com.wdkl.ncs.android.lib.utils.arrayObjects
-import com.wdkl.ncs.android.lib.utils.toJsonObject
-import com.wdkl.ncs.android.lib.utils.valueJsonArray
-import com.wdkl.ncs.android.middleware.api.ShopApi
-import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
-import com.wdkl.ncs.android.middleware.logic.contract.shop.ShopListContract
-import com.wdkl.ncs.android.middleware.model.ShopItem
-import com.wdkl.ncs.android.middleware.model.ShopViewModel
-import com.enation.javashop.net.engine.plugin.connection.ConnectionQuality
-import com.enation.javashop.net.engine.plugin.exception.ExceptionHandle
-import com.enation.javashop.net.engine.utils.ThreadFromUtils
-import io.reactivex.disposables.Disposable
-import javax.inject.Inject
-
-class ShopListPersenter @Inject constructor() : RxPresenter<ShopListContract.View>(), ShopListContract.Presenter {
-
-    @Inject
-    protected lateinit var shopApi: ShopApi
-
-    private val observer = object :ConnectionObserver<Any>(){
-        override fun onStartWithConnection() {
-            providerView().start()
-        }
-
-        override fun onNextWithConnection(result: Any, connectionQuality: ConnectionQuality) {
-            providerView().complete("")
-            providerView().render(result as ArrayList<ShopItem>)
-        }
-
-        override fun onErrorWithConnection(error: ExceptionHandle.ResponeThrowable, connectionQuality: ConnectionQuality) {
-            providerView().onError(error.customMessage)
-        }
-
-        override fun attachSubscribe(var1: Disposable) {
-            addDisposable(var1)
-        }
-    }
-
-    override fun loadData(keyWord: String, page: Int) {
-        shopApi.getShopList(page,10,keyWord)
-                .map {
-                    var shop = ArrayList<ShopItem>()
-                    it.toJsonObject().valueJsonArray("data").arrayObjects().forEach({ dic ->
-                        shop.add(ShopItem.map( dic))
-                })
-                    return@map shop
-                }
-                .compose(ThreadFromUtils.defaultSchedulers())
-                .subscribe(observer)
-    }
-
-    override fun bindDagger() {
-        MiddlewareDaggerComponent.component.inject(this)
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/shop/ShopTagPresenter.kt

@@ -1,104 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.presenter.shop
-
-import com.wdkl.ncs.android.lib.base.RxPresenter
-import com.wdkl.ncs.android.lib.utils.ConnectionObserver
-import com.wdkl.ncs.android.lib.utils.getJsonString
-import com.wdkl.ncs.android.middleware.api.GoodsApi
-import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
-import com.wdkl.ncs.android.middleware.logic.contract.shop.ShopTagContract
-import com.wdkl.ncs.android.middleware.model.GoodsItemViewModel
-import com.enation.javashop.net.engine.plugin.connection.ConnectionQuality
-import com.enation.javashop.net.engine.plugin.exception.ExceptionHandle
-import com.enation.javashop.net.engine.utils.ThreadFromUtils
-import io.reactivex.disposables.Disposable
-import org.json.JSONArray
-import javax.inject.Inject
-
-/**
- * @author LDD
- * @Date   2018/4/9 下午5:58
- * @From   com.wdkl.ncs.android.lib.base.RxPresenter
- * @Note   店铺标签逻辑控制器
- */
-class ShopTagPresenter @Inject constructor() : RxPresenter<ShopTagContract.View>(), ShopTagContract.Presenter {
-
-
-    /**
-     * @Name  goodsApi
-     * @Type  GoodsApi
-     * @Note  店铺API
-     */
-    @Inject
-    protected lateinit var goodsApi: GoodsApi
-
-
-    private val observer = object: ConnectionObserver<Any>(){
-        override fun onStartWithConnection() {
-            providerView().start()
-        }
-
-        override fun onNextWithConnection(data: Any, connectionQuality: ConnectionQuality) {
-            when (data) {
-                is ArrayList<*> -> {
-                    providerView().initGoods(data as ArrayList<GoodsItemViewModel>)
-                }
-
-            }
-        }
-
-        override fun onErrorWithConnection(error: ExceptionHandle.ResponeThrowable, connectionQuality: ConnectionQuality) {
-            providerView().onError(error.customMessage)
-        }
-
-        override fun attachSubscribe(var1: Disposable) {
-            addDisposable(var1)
-        }
-
-    }
-
-    /**
-     * @author LDD
-     * @From   ShopTagPresenter
-     * @Date   2018/4/9 下午5:58
-     * @Note   依赖注入
-     */
-    override fun bindDagger() {
-        MiddlewareDaggerComponent.component.inject(this)
-    }
-
-    /**
-     * @author LDD
-     * @From   ShopTagPresenter
-     * @Date   2018/4/9 下午5:59
-     * @Note   加载商品数据
-     * @param  tag 标签类型
-     * @param  shopId 店铺ID
-     */
-    override fun loadGoods(tag: String, shopId: Int) {
-        var color = "#e83437"
-        if (tag == "new"){
-            color = "#fbac42"
-        }
-        if (tag == "hot"){
-            color = "#e83437"
-        }
-        if (tag == "recommend"){
-            color = "#000000"
-        }
-
-        goodsApi.getTagGoodsList(tag,shopId,10).map { responseBody ->
-            var jsonArray = JSONArray(responseBody.getJsonString())
-
-            var goodsList = ArrayList<GoodsItemViewModel>()
-
-            for (i in 0..(jsonArray.length() - 1)) {
-                val jsonObject = jsonArray.getJSONObject(i)
-                var item = GoodsItemViewModel.shopGoodsMap(jsonObject,shopId)
-                item.priceColor = color
-                goodsList.add(item)
-            }
-
-            return@map goodsList
-        }.compose(ThreadFromUtils.defaultSchedulers()).subscribe(observer)
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/welcome/WelcomePresenter.kt

@@ -1,98 +0,0 @@
-package com.wdkl.ncs.android.middleware.logic.presenter.welcome
-
-import com.wdkl.ncs.android.lib.base.RxPresenter
-import com.wdkl.ncs.android.lib.utils.ConnectionObserver
-import com.wdkl.ncs.android.lib.utils.getEventCenter
-import com.wdkl.ncs.android.lib.utils.showMessage
-import com.wdkl.ncs.android.lib.vo.NetStateEvent
-import com.wdkl.ncs.android.middleware.api.AdApi
-import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
-import com.wdkl.ncs.android.middleware.logic.contract.welcome.WelcomeContract
-import com.wdkl.ncs.android.middleware.model.AdViewModel
-import com.enation.javashop.net.engine.model.NetState
-import com.enation.javashop.net.engine.plugin.connection.ConnectionQuality
-import com.enation.javashop.net.engine.plugin.exception.ExceptionHandle
-import com.enation.javashop.net.engine.utils.ThreadFromUtils
-import io.reactivex.disposables.Disposable
-import javax.inject.Inject
-
-/**
- * @author LDD
- * @Date   2018/1/9 下午4:17
- * @From   com.wdkl.ncs.android.lib.logic.presenter.welcome
- * @Note   欢迎页面控制器
- */
-class WelcomePresenter @Inject constructor() : RxPresenter<WelcomeContract.View>(), WelcomeContract.Presenter {
-
-
-    /**
-     * @Name  tangramApi
-     * @Type  TangramApi
-     * @Note  七巧板框架
-     */
-    @Inject
-    protected lateinit var adApi : AdApi
-
-    /**
-     * @author LDD
-     * @From   HomeFragmentPresenter
-     * @Date   2018/1/19 下午6:28
-     * @Note   依赖注入初始化
-     */
-    override fun bindDagger() {
-        MiddlewareDaggerComponent.component.inject(this)
-    }
-
-    /**
-     * @Name  welcomeObserver
-     * @Type  ConnectionObserver
-     * @Note  注册广告监听
-     */
-    private val welcomeObserver = object: ConnectionObserver<ArrayList<AdViewModel>>() {
-        override fun onStartWithConnection() {
-            providerView().start()
-        }
-
-        override fun onNextWithConnection(result: ArrayList<AdViewModel>, connectionQuality: ConnectionQuality) {
-            /**当返回值的size为0时证明没有广告直接跳转首页，有广告的话展示广告*/
-            if (result.size == 0){
-                providerView().toHome()
-            }else{
-                providerView().showAd(result)
-            }
-        }
-
-        override fun onErrorWithConnection(error: ExceptionHandle.ResponeThrowable, connectionQuality: ConnectionQuality) {
-            providerView().onError(error.customMessage)
-            providerView().toHome()
-        }
-
-        override fun attachSubscribe(p0: Disposable) {
-            /**添加至Disposable引用集合*/
-            addDisposable(p0)
-        }
-
-        override fun connectionBitsOfSecond(bits: Double) {
-            if (bits < 100){
-                showMessage("当前网络质量差")
-            }
-        }
-
-        override fun onNoneNet() {
-             getEventCenter().post(NetStateEvent(NetState.NONE))
-        }
-    }
-
-    /**
-     * @author  LDD
-     * @From    WelcomePresenter
-     * @Date   2018/1/9 下午4:25
-     * @Note   加载广告
-     */
-    override fun loadAd() {
-        adApi.getAd()
-                .compose(ThreadFromUtils.defaultSchedulers())
-                .subscribe(welcomeObserver)
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/AdViewModel.kt

@@ -1,11 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-/**
- * @author LDD
- * @Date   2018/1/16 下午12:24
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   广告Model
- */
-data class AdViewModel(var adImage : String,/**广告图片*/
-                       var adUrl   : String,/**广告URL*/
-                       var adTitle : String)/**广告标题*/

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/AfterSaleViewModel.kt

@@ -1,14 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-/**
- * @author LDD
- * @Date   2018/4/23 上午9:23
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   售后信息ViewModel
- */
-data class AfterSaleViewModel(var returnGoodsPrice :Double = 0.0,         /**单价 单个售后时使用*/
-                              var returnGoodsCount :Int = 0,            /**商品数 单个售后时使用*/
-                              var returnPoint :Int = 0,                 /**售后积分*/
-                              var returnCountMoney: Double = 0.0,            /**订单总价 整单退是使用*/
-                              var originalWay:String = "",               /**是否支持原路退回*/
-                              var returnGoodsList :ArrayList<GoodsItemViewModel> = ArrayList())   /**售后商品数据*/

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/AftersaleDetailModel.kt

@@ -1,56 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.*
-import org.json.JSONObject
-
-/**
- * Created by LDD on 2018/10/16.
- */
-class AftersaleDetailModel( var sn :String = "",
-
-                            var time :String = "",
-
-                            var state :String = "",
-
-                            var type :String = "",
-
-                            var reson :String = "",
-
-                            var des :String = "",
-
-                            var refundWay :String = "",
-
-                            var price :Double = 0.0,
-
-                            var point :Int = 0,
-
-                            var goods : ArrayList<OrderDetailGoodsViewModel> = ArrayList()) {
-
-    companion object {
-        fun map(dic :JSONObject) :AftersaleDetailModel{
-            var data = AftersaleDetailModel()
-            val refund = dic.valueJsonObject( "refund")
-            data.sn = refund.valueString( "sn")
-            data.state = refund.valueString( "refund_status_text")
-            data.type = refund.valueString( "refuse_type_text")
-            data.price = refund.valueDouble( "refund_price")
-            data.point = refund.valueInt( "refund_point")
-            data.reson = refund.valueString( "refund_reason")
-            data.refundWay = refund.valueString( "account_type_text")
-            data.time = refund.valueDate( "create_time")
-            data.des = refund.valueString( "customer_remark")
-            dic.valueJsonArray( "refund_goods").arrayObjects().forEach { goodsDic ->
-                var goodsModel = OrderDetailGoodsViewModel()
-                goodsModel.goodsName = goodsDic.valueString( "goods_name")
-                goodsModel.goodsImg = goodsDic.valueString( "goods_image")
-                goodsModel.goodsId = goodsDic.valueInt( "goods_id")
-                goodsModel.skuId = goodsDic.valueInt( "sku_id")
-                goodsModel.goodsPrice = goodsDic.valueDouble( "price")
-                goodsModel.sepc = "${goodsDic.valueInt( "return_num")}件"
-                data.goods.add(goodsModel)
-            }
-            return data
-        }
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/AftersaleListModel.kt

@@ -1,36 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.valueDouble
-import com.wdkl.ncs.android.lib.utils.valueInt
-import com.wdkl.ncs.android.lib.utils.valueString
-import org.json.JSONObject
-
-/**
- * Created by LDD on 2018/10/16.
- */
-class AftersaleListModel(var sn :String = "",
-
-                         var state :String = "",
-
-                         var type :String = "",
-
-                         var money :Double = 0.0,
-
-                         var point :Int = 0,
-
-                         var failReson :String = "") {
-
-    companion object {
-        fun map(dic :JSONObject) :AftersaleListModel{
-            var data = AftersaleListModel()
-            data.sn = dic.valueString("sn")
-            data.state = dic.valueString("refund_status_text")
-            data.type = dic.valueString("refuse_type_text")
-            data.money = dic.valueDouble( "refund_price")
-            data.point = dic.valueInt( "refund_point")
-            data.failReson = dic.valueString( "refund_fail_reason")
-            return data
-        }
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/CartGoodsItemViewModel.kt

@@ -1,115 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import android.databinding.ObservableField
-import com.wdkl.ncs.android.lib.utils.*
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @Date   2018/3/15 下午4:29
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   购物车商品ViewModel
- */
-data class CartGoodsItemViewModel(var isCheck: Boolean,      /**商品是否选择*/
-                                  var imageUrl: String,      /**商品图片URL*/
-                                  var price: Double,         /**商品介个*/
-                                  var originalPrice :Double, /**商品原价*/
-                                  var name: String,          /**商品名称*/
-                                  var spec: String,          /**商品规格*/
-                                  var maxNum: Int,           /**商品Sku最大库存*/
-                                  var currentNum: String,    /**商品当前购买数量*/
-                                  var goodsId: Int,          /**商品ID*/
-                                  var shopId: Int,           /**店铺ID*/
-                                  var skuId:Int,             /**商品skuID*/
-                                  var bottomVisible:Boolean, /**商品底部是否显示*/
-                                  var promotionList: List<SingglePromotionViewModel>?, /**促销列表*/
-                                  var groupPromotionId :Int,
-                                  var errorMessage : String) {
-
-    companion object {
-        fun map(json : JSONObject):CartGoodsItemViewModel{
-            var result = CartGoodsItemViewModel(json.valueInt("checked") == 1,
-                    json.valueString("goods_image"),
-                    json.valueDouble("purchase_price"),
-                    json.valueDouble("original_price"),
-                    json.valueString("name"),
-                    "",
-                    json.valueInt("enable_quantity"),
-                    json.valueInt("num").toString(),
-                    json.valueInt("goods_id"),
-                    json.valueInt("seller_id"),
-                    json.valueInt("sku_id"),
-                    false,
-                    null,-1,json.valueString("error_message"))
-
-            var spec  = ArrayList<Spec>()
-            json.valueJsonArray( "spec_list").arrayObjects().forEach { it ->
-
-                spec.add(Spec.map(it))
-
-            }
-            var str :String = ""
-            spec.forEach { spec ->
-                    str += ("${spec.specValue},")
-            }
-            if (str.length > 1){
-                str.removeRange(str.length-1,str.length)
-            }else{
-                str = "默认"
-            }
-            result.spec = str
-
-
-            var singgleArray = ArrayList<SingglePromotionViewModel>()
-            json.valueJsonArray("single_list").arrayObjects().forEach{ singleDic ->
-                var single = SingglePromotionViewModel(singleDic.valueInt( "activity_id"),
-                        singleDic.valueInt("is_check") == 1,
-                        singleDic.valueString("title"),
-                        singleDic.valueString("promotion_type"))
-                singgleArray.add(single)
-            }
-            if (singgleArray.count() > 0){
-                result.promotionList = singgleArray
-            }
-
-            return  result
-        }
-    }
-
-    /**
-     * @Name  checkedObservable
-     * @Type  ObservableField<Boolean>
-     * @Note  商品选择监听
-     */
-    val checkedObservable = ObservableField(isCheck)
-
-    /**
-     * @author LDD
-     * @From   CartGoodsItemViewModel
-     * @Date   2018/3/15 下午4:39
-     * @Note   促销标题
-     */
-    fun title():String{
-        var title = ""
-        promotionList?.forEach {
-            if (it.isCheck){
-                title =  it.title
-            }
-        }
-        if (title.isEmpty()){
-            title = "不参与促销活动"
-        }
-        return title
-    }
-}
-
-/**
- * @author LDD
- * @Date   2018/3/15 下午4:40
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   单品促销
- */
-data class SingglePromotionViewModel(var promotionId: Int,  /**促销ID*/
-                                     var isCheck: Boolean,  /**是否选择*/
-                                     var title: String,
-                                     var type :String)     /**促销标题*/

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/CartPromotionItemViewModel.kt

@@ -1,57 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.valueInt
-import com.wdkl.ncs.android.lib.utils.valueString
-import com.wdkl.ncs.android.middleware.enum.Promotion
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @Date   2018/3/15 下午4:42
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   购物车促销ViewModel
- */
-data class CartPromotionItemViewModel(val isFullPrice:Boolean,                      /**价格是否已满*/
-                                      val isFullDicount:Boolean,                    /**是否满折*/
-                                      val isFullMinus:Boolean,                      /**是否满减*/
-                                      val isPoint:Boolean,                          /**是否送积分*/
-                                      val isGift:Boolean,                           /**是否包含赠品*/
-                                      val isBouns:Boolean,                          /**是否赠送优惠券*/
-                                      val isFreeShip:Boolean,                       /**是否免运费*/
-                                      val shopId:Int,                               /**店铺ID*/
-                                      val promotionContent: String,                 /**促销描述*/
-                                      val promotionList:List<PromotionViewModel>,   /**促销列表*/
-                                      val difference :Double                        /**价格未满足满减时的差价*/
-                                      ){
-
-    companion object {
-
-        fun map(json :JSONObject):CartPromotionItemViewModel{
-            return  CartPromotionItemViewModel(false,
-                    json.valueInt("is_discount") == 1,
-                    json.valueInt("is_full_minus") == 1,
-                    json.valueInt("is_send_point") == 1,
-                    json.valueInt("is_send_gift") == 1,
-                    json.valueInt("is_send_bonus") == 1,
-                    json.valueInt("is_free_ship") == 1,
-                    0,
-                    json.valueString("description"),
-                    emptyList(),
-                    0.0)
-        }
-
-    }
-
-}
-
-/**
- * @author LDD
- * @Date   2018/3/15 下午4:47
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   促销ViewModel
- */
-data class PromotionViewModel(val promotionType : Promotion,       /**促销类型*/
-                              val promotionContent:String,         /**促销内容*/
-                              val promotionId:Int,                 /**促销ID*/
-                              val promotionStartTime:String,       /**促销开始时间*/
-                              val promotionEndTime:String)         /**促销结束时间*/

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/CartShopItemViewModel.kt

@@ -1,38 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import android.databinding.ObservableField
-import com.wdkl.ncs.android.lib.utils.valueInt
-import com.wdkl.ncs.android.lib.utils.valueString
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @Date   2018/3/15 下午4:49
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   购物车店铺Item
- */
-data class CartShopItemViewModel(val name:String,           /**店铺名称*/
-                                 val isSelf:Boolean,        /**是否是自营店铺*/
-                                 val hasBouns:Boolean,      /**是否有可以领取的优惠券*/
-                                 val shopId : Int,          /**店铺ID*/
-                                 val isCheck:Boolean)       /**是否选中*/ {
-
-    companion object {
-
-        fun map(json :JSONObject) : CartShopItemViewModel{
-            return CartShopItemViewModel(json.valueString("seller_name"),
-                    json.valueInt("seller_id") == 1,
-                    true,
-                    json.valueInt("seller_id"),
-                    json.valueInt("checked") == 1)
-        }
-
-    }
-
-    /**
-     * @Name  isCheckObserver
-     * @Type  ObservableField<Boolean>
-     * @Note  选中监听着
-     */
-    var isCheckObserver = ObservableField(isCheck)
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/ChildCategoryViewModel.kt

@@ -1,55 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.valueInt
-import com.wdkl.ncs.android.lib.utils.valueString
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @Date   2018/3/27 下午1:54
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   子分类
- */
-data class ChildCategoryViewModel(val catId: Int ,          /**分类ID*/
-                                  val name:String,          /**分类名称*/
-                                  val imageUrl :String)     /**分类图片*/{
-
-    companion object {
-        fun map( json :JSONObject) : ChildCategoryViewModel{
-            return ChildCategoryViewModel(json.valueInt("category_id"),
-                    json.valueString("name"),
-                    json.valueString("image"))
-
-        }
-    }
-
-}
-
-/**
- *
- * @author Snow
- * @Note   子分类可以 
- */
-data class  ChildCategoryShell(val parentName :String,                          /** 二级分类名称 */
-                               val item :ArrayList<ChildCategoryViewModel>)     /** 三级分类集合 */{
-
-    companion object {
-        fun map(json :JSONObject) : ChildCategoryShell{
-
-            val items = ArrayList<ChildCategoryViewModel>()
-
-            val jsonChildList = json.getJSONArray("children")
-
-            if (jsonChildList.length() > 0){
-                for(i in 0..(jsonChildList.length() - 1)){
-                    val itemJson = jsonChildList.getJSONObject(i)
-                    items.add(ChildCategoryViewModel.map(itemJson))
-                }
-            }
-
-            return ChildCategoryShell(json.valueString("name"),items)
-
-        }
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/CommentNumViewModel.kt

@@ -1,13 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-/**
- * @author LDD
- * @Date   2018/3/30 下午2:23
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   商品评论数ViewModel
- */
-data class CommentNumViewModel(val all :Int,        /**全部数量*/
-                               val goods:Int,       /**好评数*/
-                               val secondary :Int,  /**中评数*/
-                               val difference:Int,  /**差评数*/
-                               val image :Int)      /**图片评论数*/

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/ConnectLoginModel.kt

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

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/CouponViewModel.kt

@@ -1,39 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import android.databinding.ObservableField
-
-/**
- * @author LDD
- * @Date   2018/3/27 上午11:15
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   优惠券VM
- */
-data class CouponViewModel(val price : Double,          /**抵用的价格*/
-                           val basePrice : Double,      /**最低使用金额*/
-                           val shopName : String,       /**所属店铺*/
-                           var isReceive : Boolean,     /**是否已经领取过*/
-                           var isUseed :Boolean,        /**是否使用过*/
-                           var isDateed :Boolean,       /**是否过期*/
-                           val id : Int,                /**优惠券ID*/
-                           var useDate :String,         /**使用时间区间*/
-                           val shopId :Int ,            /**所属店铺ID*/
-                           val describe:String,         /**额外描述*/
-                           var isSelect: ObservableField<Int>  /**是否选中*/,
-                           var isGet :Boolean)  /**是否为仅领取UI*/{
-
-    constructor( price : Double,          /**抵用的价格*/
-                 basePrice : Double,      /**最低使用金额*/
-                 shopName : String,       /**所属店铺*/
-                 isReceive : Boolean,     /**是否已经领取过*/
-                 isUseed :Boolean,        /**是否使用过*/
-                 isDateed :Boolean,       /**是否过期*/
-                 id : Int,                /**优惠券ID*/
-                 useDate :String,         /**使用时间区间*/
-                 shopId :Int ,            /**所属店铺ID*/
-                 describe:String         /**额外描述*/) : this(price,basePrice,shopName,isReceive,isUseed,isDateed,id,useDate,shopId,describe,ObservableField(-1 ),false)
-
-    constructor(price: Double, basePrice: Double, shopName: String, isReceive: Boolean, isUseed: Boolean, isDateed: Boolean, id: Int, useDate: String, shopId: Int, describe: String, isGet: Boolean) : this(price,basePrice,shopName,isReceive,isUseed,isDateed,id,useDate,shopId,describe,ObservableField(-1 ),isGet)
-
-    constructor(price: Double, basePrice: Double, shopName: String, isReceive: Boolean, isUseed: Boolean, isDateed: Boolean, id: Int, useDate: String, shopId: Int, describe: String, isSelect: ObservableField<Int>) : this(price,basePrice,shopName,isReceive,isUseed,isDateed,id,useDate,shopId,describe,isSelect,false)
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/FloorViewModel.kt

@@ -1,133 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.valueInt
-import com.wdkl.ncs.android.lib.utils.valueJsonObject
-import com.wdkl.ncs.android.lib.utils.valueString
-import org.json.JSONObject
-
-
-data class FloorViewModel(val typeId : Int,
-                          val itemList :ArrayList<FloorItem>) {
-
-    fun mapBanner(): List<BannerModel> {
-        return itemList.filter {
-            return@filter  it.opt != null
-        }.map {
-            return@map BannerModel(it.getImageValue(),it.opt!!.type,it.opt!!.value)
-        }
-    }
-
-    companion object {
-
-        fun map(objc :JSONObject) :FloorViewModel{
-
-            val items = ArrayList<FloorItem>()
-
-            if (objc.has("blockList")){
-
-                val itemJsonArray = objc.getJSONArray("blockList")
-
-                for (i in 0..(itemJsonArray.length() - 1)){
-                    items.add(FloorItem.map(itemJsonArray.getJSONObject(i)))
-                }
-
-            }
-
-            return  FloorViewModel(objc.valueInt("tpl_id"),items)
-
-        }
-
-    }
-}
-
-data class FloorItem(var type :String = "",
-                     var value :Any = "",
-                     var opt :FloorOpt? = null){
-
-
-    /// 获取商品
-    ///
-    /// - Returns: 商品
-    fun getGoodsValue() : RecommendGoodsViewModel {
-        return value as RecommendGoodsViewModel
-    }
-
-    /// 获取图片
-    ///
-    /// - Returns: 图片
-    fun getImageValue() : String{
-        return value as String
-    }
-
-    companion object {
-        fun map(dic :JSONObject) :FloorItem{
-
-            var floor = FloorItem()
-
-
-            floor.type = dic.valueString( "block_type")
-            if (dic.get("block_opt") is String){
-                floor.opt = null
-            }else{
-                floor.opt = FloorOpt.map(dic.valueJsonObject("block_opt"))
-            }
-            if (dic.get("block_value") is String) {
-                floor.value = dic.valueString( "block_value")
-            } else {
-                floor.value = RecommendGoodsViewModel.map(dic.valueJsonObject( "block_value"))
-            }
-
-            return  floor
-        }
-    }
-}
-
-/// 楼层扩展数据
-data class FloorOpt(var type  :String = "" , var value :String = "") {
-
-    companion object {
-        fun map(dic :JSONObject) :FloorOpt{
-            var opt = FloorOpt()
-            opt.type = dic.valueString("opt_type")
-            opt.value = dic.valueString("opt_value")
-            return opt
-        }
-    }
-
-}
-
-data class BannerModel(var image :String = "",
-
-                       var action :String = "",
-
-                       var value :String = ""){
-
-    companion object {
-        fun map(dic :JSONObject) : BannerModel{
-            var model = BannerModel()
-            model.image = dic.valueString( "pic_url")
-            model.action = dic.valueString("operation_type")
-            model.value = dic.valueString("operation_param")
-            return model
-        }
-    }
-
-}
-
-data class FloorMenuModel(var image :String = "",
-
-                          var text :String = "",
-
-                          var action :String = ""){
-
-    companion object {
-        fun map(dic :JSONObject) : FloorMenuModel{
-            var model = FloorMenuModel()
-            model.image = dic.valueString( "image")
-            model.text = dic.valueString("navigation_name")
-            model.action = dic.valueString( "url")
-            return model
-        }
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/GoodsActionModel.kt

@@ -1,10 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-/**
- * @author Snow
- * @Date   2018/8/21 下午12:24
- * @Note   商品可进行的操作Model
- */
-class GoodsActionModel(
-        val allowApplyService :Boolean  /** 是否允许申请售后 */
-)

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/GoodsAdviceViewModel.kt

@@ -1,12 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-/**
- * @author LDD
- * @Date   2018/3/27 下午4:41
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   商品咨询
- */
-class GoodsAdviceViewModel(val problem :String,             /**问题*/
-                           val reply :String,               /**回答*/
-                           val questionTime :String,        /**提问时间*/
-                           val replyTime :String)           /**回答时间*/

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/GoodsCommentViewModel.kt

@@ -1,74 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.*
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @Date   2018/3/27 下午2:15
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   商品评论ViewModel
- */
-data class GoodsCommentViewModel(val userName:String,           /**用户姓名*/
-                                 val userFace:String,           /**用户头像*/
-                                 val commentTime:String,        /**评论时间*/
-                                 val buyTime:String,            /**购买时间*/
-                                 var images:ArrayList<String>,  /**图片集合*/
-                                 var grade :Int,                /**评分*/
-                                 val content:String,            /**评论详细*/
-                                 val reply :String?)             /**店家回复*/
-
-{
-
-    fun getStarViewNum() :Int{
-        if (grade == 3){
-          return 5
-        }
-        if (grade == 2){
-            return 3
-        }
-        if (grade == 1){
-            return 1
-        }
-        return 5
-    }
-
-    companion object {
-
-        fun map(json:JSONObject) :GoodsCommentViewModel{
-            var comment =  GoodsCommentViewModel(
-                    json.valueString("member_name"),
-                    json.valueString("member_face"),
-                    json.valueDate("create_time"),
-                    json.valueDate("create_time"),
-                    ArrayList<String>(),
-                    0,
-                    json.valueString("content"),
-                    json.valueJsonObject("reply").valueString("content")
-            )
-
-            val grade = json.valueString( "grade")
-
-            if (grade == "good"){
-                comment.grade = 3
-            }else if (grade == "neutral"){
-                comment.grade = 2
-            }else if (grade == "bad") {
-                comment.grade = 1
-            }
-
-            val imageJson = json.valueJsonArray(
-                    "images")
-
-            if (imageJson.length() > 0){
-                for (i in 0..(imageJson.length()-1)){
-                    comment.images.add(imageJson.optString(i))
-                }
-            }
-
-            return  comment
-        }
-
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/GoodsFilterViewModel.kt

@@ -1,39 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import android.databinding.ObservableField
-
-/**
- * @author LDD
- * @Date   2018/3/9 上午11:22
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   商品筛选参数
- */
-data class GoodsFilterViewModel(val filterName:String,                          /**筛选名称*/
-                                var selectedFilterValue: GoodsFilterValue?,     /**选中的筛选值*/
-                                val type :String,                               /**筛选类型*/
-                                val valueList :ArrayList<GoodsFilterValue>)     /**筛选值列表*/{
-
-    var selectedValueObser = ObservableField(selectedFilterValue)
-
-    var openFlag = ObservableField(false)
-}
-
-/**
- * @author LDD
- * @Date   2018/3/9 上午11:23
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   商品筛选参数Value
- */
-data class GoodsFilterValue(
-                            val name :String,       /**参数名*/
-                            val value :String,      /**参数值*/
-                            var selected :Boolean,  /**是否选中*/
-                            var letter:String? =null){/**首字母*/
-
-    /**
-     * @Name  selectedObservable
-     * @Type  ObservableField<Boolean>
-     * @Note  选中监听器
-     */
-    var selectedObservable =  ObservableField<Boolean>(selected)
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/GoodsGallery.kt

@@ -1,11 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-/**
- * @author LDD
- * @Date   2018/3/27 下午3:03
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   商品相册
- */
-data class GoodsGallery(val big : String ,      /**大图*/
-                        val small : String ,    /**缩略图*/
-                        val origin :String)     /**原图*/

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/GoodsItemViewModel.kt

@@ -1,154 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.valueBool
-import com.wdkl.ncs.android.lib.utils.valueDouble
-import com.wdkl.ncs.android.lib.utils.valueInt
-import com.wdkl.ncs.android.lib.utils.valueString
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @From   com.wdkl.ncs.android.middleware.model
- * @Date   2018/3/9 上午10:24
- * @Note   商品列表Item
- */
-data class GoodsItemViewModel(val goodsName : String ,                          /**商品名称*/
-                              val goodsImage :String ,                          /**商品图片*/
-                              val goodsPrice :Double ,                          /**商品价格*/
-                              val goodsId : Int,                                /**商品id*/
-                              val skuId:Int ,                                   /**商品默认skuId*/
-                              val shopId : Int,                                 /**店铺ID*/
-                              val commentNum : String,                          /**商品评论数*/
-                              val feedbackRate :String,                         /**好评率*/
-                              val promotionList :ArrayList<PromotionViewModel>, /**促销列表*/
-                              val orginPrice : Double,                          /**原价*/
-                              var priceColor:String = "#fbac42",                /**字体颜色 扩展字段*/
-                              var countNum :Int = 0,                            /**商品总库存*/
-                              var salesEnable :Boolean = false,                 /**促销是否开启*/
-                              var buyNum  :Int = 0)                             /**购买个数 订单或售后模块用到*/{
-
-    companion object {
-
-        fun afterMap(json:JSONObject):GoodsItemViewModel{
-            return GoodsItemViewModel(json.valueString("name"),
-                    json.valueString("goods_image"),
-                    json.valueDouble("purchase_price"),
-                    json.valueInt("goods_id\t"),
-                    json.valueInt("sku_id\t"),
-                    json.valueInt("seller_id"),
-                    "",
-                    "",
-                    ArrayList(),
-                    json.valueDouble("original_price"),
-                    countNum = json.valueInt("num"),
-                    buyNum = json.valueInt("num"))
-        }
-
-        fun map(goods:CartGoodsItemViewModel) : GoodsItemViewModel{
-            return  GoodsItemViewModel(goods.name,
-                    goods.imageUrl,
-                    goods.price,
-                    goods.goodsId,
-                    goods.skuId,
-                    goods.shopId,
-                    goods.currentNum+"件",
-                    "",
-                    ArrayList(),
-                    goods.originalPrice)
-        }
-
-        fun map(jsonObject :JSONObject) : GoodsItemViewModel{
-            return GoodsItemViewModel(jsonObject.valueString("goods_name"),
-                    jsonObject.valueString("goods_img"),
-                    jsonObject.valueDouble("goods_price"),
-                    jsonObject.valueInt("goods_id"),
-                    jsonObject.optInt("sku_id",0),
-                    jsonObject.valueInt("shop_id"),
-                    "",
-                    "",
-                    ArrayList(),
-                    jsonObject.valueDouble("goods_price"))
-
-        }
-
-        fun pointMap(jsonObject :JSONObject) : GoodsItemViewModel{
-            return GoodsItemViewModel(jsonObject.valueString("goods_name"),
-                    jsonObject.valueString("goods_img"),
-                    jsonObject.valueDouble("exchange_money"),
-                    jsonObject.valueInt("goods_id"),
-                    jsonObject.optInt("exchange_point",0),
-                    jsonObject.valueInt("shop_id"),
-                    "",
-                    "",
-                    ArrayList(),
-                    jsonObject.valueDouble("goods_price"))
-
-        }
-
-        fun secMap(jsonObject :JSONObject) : GoodsItemViewModel{
-            var result =  GoodsItemViewModel(jsonObject.valueString("goods_name"),
-                    jsonObject.valueString("goods_image"),
-                    jsonObject.valueDouble("seckill_price"),
-                    jsonObject.valueInt("goods_id"),
-                    jsonObject.optInt("sku_id",0),
-                    jsonObject.valueInt("shop_id"),
-                    "",
-                    "",
-                    ArrayList(),
-                    jsonObject.valueDouble("original_price"))
-            result.buyNum = jsonObject.valueInt("sold_num")
-            result.countNum = jsonObject.valueInt("sold_quantity") + result.buyNum
-            result.salesEnable = jsonObject.valueBool("is_start")
-            return result
-        }
-
-        fun groupMap(jsonObject :JSONObject) : GoodsItemViewModel{
-            return GoodsItemViewModel(jsonObject.valueString("goods_name"),
-                    jsonObject.valueString("img_url"),
-                    jsonObject.valueDouble("price"),
-                    jsonObject.valueInt("goods_id"),
-                    jsonObject.optInt("sku_id",0),
-                    jsonObject.valueInt("seller_id"),
-                    "",
-                    "",
-                    ArrayList(),
-                    jsonObject.valueDouble("original_price"),
-                    buyNum = jsonObject.valueInt("buy_num"))
-
-        }
-
-        fun goodssearchMap(jsonObject :JSONObject) : GoodsItemViewModel{
-            return GoodsItemViewModel(
-                    jsonObject.valueString("name"),
-                    jsonObject.valueString("thumbnail"),
-                    jsonObject.valueDouble("price"),
-                    jsonObject.valueInt("goods_id"),
-                    jsonObject.valueInt("sku_id"),
-                    jsonObject.valueInt("seller_id"),
-                    "",
-                    "",
-                    ArrayList(),
-                    jsonObject.valueDouble("price"))
-
-        }
-
-        fun shopGoodsMap(jsonObject :JSONObject,sellerId: Int) : GoodsItemViewModel{
-            return GoodsItemViewModel(
-                    jsonObject.valueString("goods_name"),
-                    jsonObject.valueString("thumbnail"),
-                    jsonObject.valueDouble("price"),
-                    jsonObject.valueInt("goods_id"),
-                    jsonObject.optInt("sku_id",0),
-                    sellerId,
-                    "",
-                    "",
-                    ArrayList(),
-                    jsonObject.valueDouble("price")
-            )
-
-        }
-
-
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/GoodsSpecViewModel.kt

@@ -1,11 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-/**
- * @author LDD
- * @Date   2018/3/27 下午1:55
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   商品规格
- */
-data class GoodsSpecViewModel(val defaultSkuId : Int,           /**默认Skuid*/
-                              val haveSpec : Boolean,           /**是否有规格*/
-                              val skuList : ArrayList<SkuGoods>)/**sku商品列表*/

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/GoodsViewModel.kt

@@ -1,84 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.*
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @Date   2018/3/23 下午3:13
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   商品ViewModel
- */
-data class GoodsViewModel(val name:String,              /**商品名*/
-                          val goodsId:Int,              /**商品ID*/
-                          val shopId:Int,               /**店铺ID*/
-                          val weight :Double,
-                          val skuId:Int,                /**默认SkuId*/
-                          val allStock:Int,             /**全部存库*/
-                          val skuStock:Int,             /**默认Sku库存*/
-                          val allEnableStock:Int,       /**全部剩余库存*/
-                          val skuEnableStock:Int,       /**默认Sku剩余库存*/
-                          val goodsImage:String,        /**商品默认图片*/
-                          val price :Double,            /**商品价格*/
-                          val orgPrice:Double,          /**商品原价*/
-                          var defaultSpec:String,       /**商品默认规格信息*/
-                          var commentGrade  :Double,
-                          var intro :String = "",
-                          var params :ArrayList<GoodsParamParent> = ArrayList(),
-                          var collect :Boolean = false) {
-
-    companion object {
-
-        fun map(json :JSONObject) :GoodsViewModel{
-
-            var params = ArrayList<GoodsParamParent>()
-            json.valueJsonArray( "param_list").arrayObjects().forEach { item ->
-                var paramParent = GoodsParamParent()
-                var childs = ArrayList<GoodsParamChild>()
-                paramParent.name = item.valueString( "group_name")
-                item.valueJsonArray("params").arrayObjects().forEach({ childDic ->
-                    var child = GoodsParamChild()
-                    child.name = childDic.valueString( "param_name")
-                    child.value = childDic.valueString( "param_value")
-                    childs.add(child)
-                })
-                paramParent.child = childs
-                params.add(paramParent)
-            }
-
-
-            return  GoodsViewModel(
-                    json.valueString("goods_name"),
-                    json.valueInt("goods_id"),
-                    json.valueInt("seller_id"),
-                    json.valueDouble("weight"),
-                    0,
-                    json.valueInt("quantity"),
-                    0,
-                    json.valueInt("enable_quantity"),
-                    0,
-                    json.valueString("thumbnail"),
-                    json.valueDouble("price"),
-                    json.valueDouble("price"),
-                    "默认",
-                    json.valueDouble("grade"),
-                    intro = json.valueString("intro"),
-                    params = params
-                    )
-        }
-
-    }
-
-}
-
-/// 商品规格参数 父model
-data class GoodsParamParent (
-    var name :String = "",
-    var child :ArrayList<GoodsParamChild> = ArrayList()
-)
-
-/// 商品规格参数 子model
-data class GoodsParamChild (
-    var name : String = "" ,
-    var value : String = ""
-)

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/GroupPointViewModel.kt

@@ -1,24 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.judge
-import com.wdkl.ncs.android.lib.utils.valueInt
-import com.wdkl.ncs.android.lib.utils.valueString
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @Date   2018/5/22 上午11:08
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   团购积分商城列表ViewModel
- */
-data class GroupPointViewModel(var id :Int =0,var title :String = ""){
-    companion object {
-
-        fun map(dic :JSONObject) :GroupPointViewModel{
-            val result =  GroupPointViewModel()
-            result.id = (dic.valueInt( "cat_id") == -1).judge(dic.valueInt( "category_id"),dic.valueInt( "cat_id"))
-            result.title = (dic.valueString( "cat_name") == "").judge(dic.valueString( "name"),dic.valueString( "cat_name"))
-            return  result
-        }
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/HistoryModel.kt

@@ -1,16 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-/**
- * 搜索历史模型
- */
-data class HistoryModel(val searchMode:Boolean , val text :String) {
-
-    fun getViewText() :String{
-        if (searchMode) {
-            return text
-        }else {
-            return " \"$text\" 店铺"
-        }
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/JavaShopItem.java

@@ -1,61 +0,0 @@
-package com.wdkl.ncs.android.middleware.model;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-
-public class JavaShopItem implements Serializable {
-    private String shopName;
-    private Integer shopCollect;
-    private String shopLogo;
-    private Integer shopId;
-    private Integer collectId;
-    private ArrayList<GoodsItemViewModel> goodsList;
-
-    public String getShopName() {
-        return shopName;
-    }
-
-    public void setShopName(String shopName) {
-        this.shopName = shopName;
-    }
-
-    public Integer getShopCollect() {
-        return shopCollect;
-    }
-
-    public void setShopCollect(Integer shopCollect) {
-        this.shopCollect = shopCollect;
-    }
-
-    public String getShopLogo() {
-        return shopLogo;
-    }
-
-    public void setShopLogo(String shopLogo) {
-        this.shopLogo = shopLogo;
-    }
-
-    public Integer getShopId() {
-        return shopId;
-    }
-
-    public void setShopId(Integer shopId) {
-        this.shopId = shopId;
-    }
-
-    public Integer getCollectId() {
-        return collectId;
-    }
-
-    public void setCollectId(Integer collectId) {
-        this.collectId = collectId;
-    }
-
-    public ArrayList<GoodsItemViewModel> getGoodsList() {
-        return goodsList;
-    }
-
-    public void setGoodsList(ArrayList<GoodsItemViewModel> goodsList) {
-        this.goodsList = goodsList;
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/LogisticsViewModel.kt

@@ -1,11 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-/**
- * @author LDD
- * @Date   2018/4/17 下午4:53
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   物流ViewModel
- */
-data class LogisticsViewModel(val time :String ,        /**时间*/
-                              val message :String ,     /**物流信息*/
-                              val type :Int)            /**类型*/

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/MemberAddressViewModel.kt

@@ -1,35 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import android.databinding.ObservableField
-
-/**
- * @author LDD
- * @Date   2018/4/17 下午5:22
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   会员地址信息
- */
-data class MemberAddressViewModel(var id :Int,                   /**地址ID*/
-                                  var name :String ,             /**收货人姓名*/
-                                  var phoneNum :String ,         /**手机号*/
-                                  var addressDetail :String,     /**地址详细*/
-                                  var proId :Int ,               /**省份ID*/
-                                  var proName:String,            /**省份名称*/
-                                  var cityId :Int,               /**城市ID*/
-                                  var cityName :String,          /**城市名称*/
-                                  var counId :Int,               /**城镇ID*/
-                                  var counName :String,          /**城镇名称*/
-                                  var townId :Int?,              /**乡村ID*/
-                                  var townName :String?,         /**乡村名称*/
-                                  var tag  :String?,             /**标签*/
-                                  var isDefault: Boolean = false)/**是否是默认地址*/{
-
-    val nameObser = ObservableField(name)
-
-    val addressInfoObser = ObservableField("$proName$cityName$counName$townName  $addressDetail")
-
-    val addressRegionObser =  ObservableField("$proName$cityName$counName$townName")
-
-    val phoneNumObser = ObservableField(if (phoneNum.isEmpty()){phoneNum}else{ phoneNum.replace(phoneNum.substring(3,7),"****") })
-
-    val addressDetailObser = ObservableField(addressDetail)
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/MemberViewModel.kt

@@ -1,129 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.getJsonString
-import com.wdkl.ncs.android.lib.utils.valueInt
-import com.wdkl.ncs.android.lib.utils.valueLong
-import com.wdkl.ncs.android.lib.utils.valueString
-import com.enation.javashop.utils.base.tool.CommonTool
-import okhttp3.ResponseBody
-import org.json.JSONObject
-import java.util.*
-
-/**
- * @author LDD
- * @Date   2018/1/16 下午12:24
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   用户信息Model
- * @param  username 用户名
- * @param  nikename 昵称
- * @param  buyPoint 消费积分
- * @param  levelPoint 等级积分
- * @param  face 头像
- * @param  sex 性别
- * @param  birthday 生日
- * @param  pro 省份
- * @param  proId 省份ID
- * @param  city 城市
- * @param  cityId 城市ID
- * @param  county 县级
- * @param  countyId 县级ID
- * @param  town 乡村
- * @param  townId 乡村ID
- * @param  address 详细地址
- * @param  email 电子邮件
- * @param  tel 固话
- */
-data class MemberViewModel(var username:String ,
-                           var nikename :String? ,
-                           val buyPoint :Int ,
-                           val levelPoint :Int ,
-                           var face :String ?,
-                           var sex :Int ,
-                           var birthday :Long?,
-                           var pro :String?,
-                           var proId :Int?,
-                           var city :String?,
-                           var cityId :Int?,
-                           var county :String?,
-                           var countyId :Int?,
-                           var town :String?,
-                           var townId :Int?,
-                           var address :String?,
-                           var email :String?,
-                           var mobile :String?,
-                           var tel :String?){
-
-    constructor() : this("","" , 0 , 0,"",0,0,"",0,"",0,"",0,"",0,"","","","")
-
-    fun getSexString() :String{
-        if (sex ==1) {
-            return "男"
-        } else{
-            return "女"
-        }
-    }
-
-    fun getRegionId() : Int{
-
-        if (townId != null && townId!! > 0){
-            return townId!!
-        }
-
-        if (countyId != null && countyId!! > 0){
-            return countyId!!
-        }
-
-        return 0
-
-    }
-
-    fun getBirthdayString() :String{
-        if (birthday!=null){
-            return CommonTool.toString(Date(birthday!!),null)
-        }else{
-            return ""
-        }
-    }
-
-    fun getRegion() : String{
-        return  "$pro$city$county$town"
-    }
-
-    companion object {
-
-        /**
-         * @author LDD
-         * @From   MemberViewModel
-         * @Date   2018/8/13 上午10:15
-         * @Note   解析Json
-         * @param  body 响应体
-         */
-        fun map(body :ResponseBody) : MemberViewModel{
-
-            var objc = JSONObject(body.getJsonString())
-
-            return MemberViewModel(objc.valueString("uname"),
-                    objc.valueString("nickname"),
-                    objc.valueInt("consum_point"),
-                    objc.valueInt("grade_point"),
-                    objc.valueString("face"),
-                    objc.valueInt("sex"),
-                    objc.valueLong("birthday"),
-                    objc.valueString("province"),
-                    objc.valueInt("province_id"),
-                    objc.valueString("city"),
-                    objc.valueInt("city_id"),
-                    objc.valueString("county"),
-                    objc.valueInt("county_id"),
-                    objc.valueString("town"),
-                    objc.valueInt("town_id"),
-                    objc.valueString("address"),
-                    objc.valueString("email"),
-                    objc.valueString("mobile"),
-                    objc.valueString("tel"))
-
-        }
-
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/OrderActionModel.kt

@@ -1,25 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-/**
- * @author Snow
- * @Date   2018/8/21 下午12:24
- * @Note   订单可进行的操作Model
- */
-class OrderActionModel(
-        val allowCancel :Boolean,       /** 是否允许被取消 */
-        val allowConfirm :Boolean,      /** 是否允许被确认 */
-        val allowPay :Boolean,          /** 是否允许被支付 */
-        val allowShip :Boolean,         /** 是否允许被发货 */
-        val allowRog :Boolean,          /** 是否允许被收货 */
-        val allowComment :Boolean,         /** 是否允许被评论 */
-        val allowComplete :Boolean,        /** 是否允许被完成 */
-        val allowApplyService :Boolean,    /** 是否允许申请售后 */
-        val allowServiceCancel :Boolean,    /** 是否允许取消(售后) */
-        val allowExpress :Boolean){
-        fun getCancelState():Boolean{
-                return allowServiceCancel || allowCancel
-        }
-        fun all() :Boolean{
-                return allowCancel || allowRog || allowPay || allowExpress || allowComment || getCancelState()
-        }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/OrderCreateModel.kt

@@ -1,9 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-data class OrderCreateModel(var price :OrderCreatePriceViewModel,
-                            var params :OrderCreateParamsViewModel,
-                            var goods :ArrayList<OrderShopModel>,
-                            var address :MemberAddressViewModel?,
-                            var shopId :ArrayList<Int>,
-                            var coupons :ArrayList<CouponViewModel>) {
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/OrderCreateParamsViewModel.kt

@@ -1,53 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.valueInt
-import com.wdkl.ncs.android.lib.utils.valueJsonObject
-import com.wdkl.ncs.android.lib.utils.valueString
-import com.wdkl.ncs.android.middleware.enum.GlobalState
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @Date   2018/5/23 上午8:54
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   创建订单初始数据
- */
-data class OrderCreateParamsViewModel(val addressId :Int,               /**地址Id*/
-                                       val paymentType :Int,         /**支付方式*/
-                                       val receipt  :ReceiptViewModel?,  /**发票*/
-                                       val receiveTime :Int,         /**配送时间*/
-                                       val remark     :String?)          /**留言*/{
-
-    companion object {
-
-        fun map(dic :JSONObject) :OrderCreateParamsViewModel{
-
-            var payType = GlobalState.PAY_ONLINE
-
-            if (dic.valueString("payment_type") == "COD"){
-                payType = GlobalState.PAY_COD
-            }
-
-            var shipTime = GlobalState.SHIP_EVERYTIME
-
-            if (dic.valueString("receive_time") == "仅休息日"){
-                shipTime = GlobalState.SHIP_RESTTIME
-            }
-
-            if (dic.valueString("receive_time") == "仅工作日"){
-                shipTime = GlobalState.SHIP_WORKTIME
-            }
-
-
-            return  OrderCreateParamsViewModel(dic.valueInt("address_id"),
-                    payType,
-                    if (dic.valueJsonObject("receipt").length() == 0) { ReceiptViewModel() }else{ ReceiptViewModel.map(dic.valueJsonObject( "receipt"))},
-                    shipTime,
-                    dic.valueString( "remark"))
-
-        }
-
-
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/OrderCreatePriceViewModel.kt

@@ -1,31 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import android.databinding.ObservableField
-import com.wdkl.ncs.android.lib.utils.bindingParams
-import com.wdkl.ncs.android.lib.utils.valueDouble
-import com.wdkl.ncs.android.lib.utils.valueInt
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @Date   2018/5/17 上午9:57
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   订单创建时价格详细
- */
-data class OrderCreatePriceViewModel(val goodsPrice :ObservableField<String>,
-                                     val discountPrice :ObservableField<String>,
-                                     val shipPrice :ObservableField<String>,
-                                     val pointPrice :ObservableField<String>,
-                                     val cashPrice :ObservableField<String>,
-                                     val payPrice :ObservableField<String>){
-    companion object {
-        fun map(dic :JSONObject) :OrderCreatePriceViewModel{
-            return OrderCreatePriceViewModel(ObservableField(String.format("￥%.2f",dic.valueDouble("original_price"))),
-                    ObservableField(String.format("-￥%.2f",dic.valueDouble("coupon_price"))),
-                    ObservableField(String.format("+￥%.2f",dic.valueDouble("freight_price"))),
-                    ObservableField(String.format("+%d积分",dic.valueInt("exchange_point"))),
-                    ObservableField(String.format("-￥%.2f",dic.valueDouble("cash_back"))),
-                    ObservableField(String.format("￥%.2f",dic.valueDouble("total_price"))))
-        }
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/OrderDetailViewModel.kt

@@ -1,60 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import android.databinding.ObservableField
-
-/**
- * @author LDD
- * @Date   2018/4/17 下午4:21
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   订单详细ViewModel
- */
-data class OrderDetailViewModel(var orderSn :String = "",/** 订单编号 */
-                                var orderStatus : String = "",/** 订单状态 */
-                                var lastExpressText :String = "",/** 最后的物流信息 */
-                                var lastModify :String = "",/** 最后的物流更新时间 */
-                                var consigneeName :String = "",/** 收货人姓名 */
-                                var consigneeMobile :String = "",/** 收货人手机号 */
-                                var consigneeAddress :String = "",/** 收货人地址 */
-                                var sellerId :Int = 0,/** 商家ID */
-                                var sellerName :String = "",/** 商家名称 */
-                                var createTime :String = "",/** 订单创建时间 */
-                                var payType : String = "",/** 付款方式 */
-                                var logiName :String = "",/** 配送方式 */
-                                var serviceStatus :String = "",/** 售后状态 */
-                                var goodsPrice :Double = 0.0,/** 商品价格 */
-                                var shipPrice :Double = 0.0,/** 运费 */
-                                var discountPrice :Double = 0.0,/** 商品优惠 */
-                                var pointPrice :Int = 0,
-                                var couponPrice :Double = 0.0,
-                                var needPayPrice :Double = 0.0,/** 实付款 */
-                                var logId :Int = 0,
-                                var shipNo :String = "",
-                                var payTime: String = "",
-                                var gifts : ArrayList<Gift> = ArrayList(),
-                                var coupons : ArrayList<CouponViewModel>  = ArrayList(),
-                                var receiptViewModel: ReceiptViewModel? = null,/** 发票信息 */
-                                var orderActionModel: OrderActionModel? = null,/** 订单可操作允许情况 */
-                                var goodsList: ArrayList<OrderDetailGoodsViewModel> = ArrayList())    /** 订单商品项 */{
-    fun getPayName() :String{
-        if (payType == "ONLINE"){
-            return  "在线支付"
-        }
-        if (payType == "COD"){
-            return  "货到付款"
-        }
-        return ""
-    }
-}
-
-
-data class OrderDetailGoodsViewModel(var goodsName :String = "",          /** 商品名称 */
-                                     var goodsPrice :Double = 0.0,         /** 商品成交价 */
-                                     var serviceStatus :String = "",      /** 售后状态 */
-                                     var goodsImg :String="",           /** 商品图片 */
-                                     var sepc :String="",
-                                     var goodsId :Int = 0,
-                                     var skuId :Int = 0,
-                                     var promotionTags :ArrayList<String> = ArrayList(),
-                                     var goodsActionModel: GoodsActionModel = GoodsActionModel(false)   /** 商品可操作允许情况 */
-                                     )
-

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/OrderExpressModel.kt

@@ -1,11 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-/**
- * Created by LDD on 2018/11/1.
- */
-data class OrderExpressModel(val message :String,val time :String) {
-}
-
-
-data class OrderExpressHeaderModel(val sn :String,val name :String) {
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/OrderItemViewModel.kt

@@ -1,27 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-/**
- * @author LDD
- * @Date   2018/4/16 下午4:24
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   订单列表item视图模型
- */
-data class OrderItemViewModel(val orderSn :String,                  /**订单号*/
-                              val shopName:String,                  /**店铺名称*/
-                              val shopId :Int,                      /**店铺ID*/
-                              val orginPrice:Double,                /**订单原价*/
-                              val payedPrice:Double,                /**订单实付款*/
-                              val orderStateText :String,           /**订单状态文字*/
-                              val orderState :Int,                  /**订单状态标识*/
-                              val orderAction :OrderActionModel,
-                              val goodsList:ArrayList<OrderItemGoodsViewModel>, /**订单中的商品*/
-                              val isComment :Boolean = false)       /**是否在评论中心中*/
-
-/**
- * @author LDD
- * @Date   2018/4/16 下午4:32
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   订单列表商品视图模型
- */
-data class OrderItemGoodsViewModel(val goodsName :String,   /**商品名*/
-                                   val goodsImage :String)  /**商品图片*/

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/OrderPayModel.kt

@@ -1,34 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.middleware.enum.GlobalState
-
-/**
- * Created by LDD on 2018/10/11.
- */
-data class OrderPayModel(var sn: String = "",
-
-                         var payPrice: Double = 0.0,
-
-                         var tradeType: TradeType = TradeType.Order,
-
-var payId: String = "",
-
-var client: String = "NATIVE",
-
-var paymode: String = "normal",
-
-var paymentType: Int = GlobalState.PAY_ONLINE)
-
-
-enum class TradeType {
-     Order{
-         override fun toString(): String {
-             return  "order"
-         }
-     } ,
-     Trade {
-         override fun toString(): String {
-             return  "trade"
-         }
-     }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/OrderShopModel.kt

@@ -1,12 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-/**
- * Created by LDD on 2018/12/13.
- */
-data class OrderShopModel(var cartGoods : ArrayList<CartGoodsItemViewModel>,
-                          var coupon :ArrayList<CouponViewModel>,
-                          var gift :ArrayList<Gift>,
-                          var promotionTitle :String,
-                          var shopName: String){
-    constructor() : this(ArrayList(), ArrayList(),ArrayList(),"","")
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/ParentCategoryViewModel.kt

@@ -1,28 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import android.databinding.ObservableField
-import com.wdkl.ncs.android.lib.utils.valueInt
-import com.wdkl.ncs.android.lib.utils.valueString
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @Date   2018/1/22 下午12:12
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   父分类model
- */
-data class ParentCategoryViewModel(val parentId:Int,    /**分类父ID*/
-                                   val name:String) {   /**分类名称*/
-    val selected  = ObservableField(false)
-    val bind_name = ObservableField(name)
-
-    companion object {
-
-        fun map(jsonObject :JSONObject) :ParentCategoryViewModel{
-            return ParentCategoryViewModel(jsonObject.valueInt("category_id"),
-                    jsonObject.valueString("name"))
-        }
-
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/PayMethodViewModel.kt

@@ -1,24 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.valueString
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @Date   2018/4/20 下午6:08
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   支付方式VM
- */
-data class PayMethodViewModel(var id :String ="",         /**支付方式ID*/
-                              var name :String = "")    /**支付方式名称*/
-
-{
-    companion object {
-        fun map(dic :JSONObject) :PayMethodViewModel{
-            var model = PayMethodViewModel()
-            model.id = dic.valueString( "plugin_id")
-            model.name = dic.valueString( "method_name")
-            return model
-        }
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/PayShipTimeViewModel.kt

@@ -1,11 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import android.databinding.ObservableField
-
-/**
- * @author LDD
- * @Date   2018/5/17 上午9:48
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   订单创建页面支付方式itemViewModel
- */
-data class PayShipTimeViewModel(val payName :ObservableField<String> ,val payShip :ObservableField<String>)

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/PointViewModel.kt

@@ -1,11 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-/**
- * @author LDD
- * @Date   2018/5/4 下午4:50
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   积分ViewModel
- */
-data class PointViewModel(val message:String , /**标题信息*/
-                          val time:String,     /**事件*/
-                          val point:String)    /**积分*/

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/PostCommentViewModel.kt

@@ -1,73 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.ObserableString
-
-/**
- * @author LDD
- * @Date   2018/4/26 下午2:33
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   评论页面 ViewModel
- */
-data class PostCommentViewModel(val sn :String,                                        /**店铺ID*/
-                                var desStar :Int,                                       /**描述相符*/
-                                var logisticsStar :Int,                                 /**物流相符*/
-                                var serviceStar :Int,                                   /**服务相符*/
-                                val goodsList :ArrayList<PostCommentGoodsViewModel>)    /**商品信息列表*/{
-
-    fun getPostData():PostCommentModel{
-        val goods = ArrayList<PostGoodsModel>()
-        goodsList.forEach {
-            val item = PostGoodsModel()
-            item.content = it.commentContent.get()
-            if (it.goodsStar < 3) {
-                item.grade = "bad"
-            } else if (it.goodsStar == 3 || it.goodsStar == 4) {
-                item.grade = "neutral"
-            } else {
-                item.grade = "good"
-            }
-            item.images = it.commentImages
-            item.sku_id = it.goodsSkuId
-            goods.add(item)
-        }
-        val result = PostCommentModel()
-        result.delivery_score = logisticsStar
-        result.description_score = desStar
-        result.service_score = serviceStar
-        result.order_sn = sn
-        result.comments = goods
-        return  result
-    }
-
-}
-
-data class PostCommentGoodsViewModel(val goodsImage :String,                    /**商品图片*/
-                                     var goodsStar :Int,                        /**商品评论星级*/
-                                     val goodsSkuId :Int,                       /**商品SkuId*/
-                                     var commentContent :ObserableString,                /**商品评论内容*/
-                                     val commentImages :ArrayList<String>)      /**评论图片集合*/
-
-data class PostCommentModel (
-
-    var delivery_score : Int = 5,
-
-    var description_score : Int = 5,
-
-    var order_sn :String = "",
-
-    var service_score :Int = 5,
-
-    var comments : ArrayList<PostGoodsModel> = ArrayList()
-)
-
-data class PostGoodsModel (
-
-        var content :String = "",
-
-        var grade :String = "",
-
-        var images :ArrayList<String> = ArrayList(),
-
-        var sku_id :Int = 0
-
-)

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/PromotionDetailViewModel.kt

@@ -1,263 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.*
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @Date   2018/3/27 下午1:20
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   商品详情促销ViewModel
- */
-data class PromotionDetailViewModel(
-        var minusPromotion: MinusPromotion? = null,        /**单品立减*/
-        var FullDiscountGroup :FullDiscount? = null,       /**满减组合*/
-        var halfPrice: HalfPrice? = null,                  /**第二件半价*/
-        var exchange: Exchange? = null,                    /**积分商城*/
-        var groupBuy: GroupBuy? = null,                    /**团购*/
-        var secKill: SecKill? = null)                      /**秒杀*/ {
-
-    fun inject(promotion :PromotionDetailViewModel){
-        if (promotion.exchange != null) {
-            this.exchange = promotion.exchange
-        }
-        if (promotion.FullDiscountGroup != null) {
-            this.FullDiscountGroup = promotion.FullDiscountGroup
-        }
-        if (promotion.groupBuy != null){
-            this.groupBuy = promotion.groupBuy
-        }
-        if (promotion.minusPromotion != null){
-            this.minusPromotion = promotion.minusPromotion
-        }
-        if (promotion.halfPrice != null) {
-            this.halfPrice = promotion.halfPrice
-        }
-        if (promotion.secKill != null) {
-            this.secKill = promotion.secKill
-        }
-    }
-
-    companion object {
-
-        fun map(resultObject :JSONObject) :PromotionDetailViewModel{
-
-            var parent = PromotionDetailViewModel()
-
-            val minusVO = resultObject.valueJsonObject("minus_vo")
-
-            if (minusVO.length() > 0) {
-                parent.minusPromotion = MinusPromotion(
-                        minusVO.valueString("title"),
-                        minusVO.valueDouble("single_reduction_value"),
-                        minusVO.valueDate("start_time")+"-"+minusVO.valueDate("end_time"),
-                        minusVO.valueString("description"),
-                        true
-                )
-            }
-
-            val resultFullDiscount = resultObject.valueJsonObject("full_discount_vo")
-            if (resultFullDiscount.length() > 0) {
-                val fulldiscountView = FullDiscount()
-                fulldiscountView.basePrice = resultFullDiscount.valueDouble("full_money")
-                fulldiscountView.date = resultFullDiscount.valueDate("start_time")+"-"+resultFullDiscount.valueDate("end_time")
-                fulldiscountView.title = resultFullDiscount.valueString("title")
-                fulldiscountView.descript = resultFullDiscount.valueString("description")
-                fulldiscountView.isDiscount = (resultFullDiscount.valueInt("is_discount") == 0).judge(false,true)
-                fulldiscountView.isFreeShip = (resultFullDiscount.valueInt("is_free_ship") == 0).judge(false,true)
-                fulldiscountView.isGift = (resultFullDiscount.valueInt("is_send_gift") == 0).judge(false,true)
-                fulldiscountView.isBonus = (resultFullDiscount.valueInt("is_send_bonus") == 0).judge(false,true)
-                fulldiscountView.isMinus = (resultFullDiscount.valueInt("is_full_minus") == 0).judge(false,true)
-                fulldiscountView.minusPrice = resultFullDiscount.valueDouble("minus_value")
-                fulldiscountView.discount = resultFullDiscount.valueDouble("discount_value")
-                if(fulldiscountView.isGift){
-                    var giftDO = resultFullDiscount.valueJsonObject("full_discount_gift_do")
-
-                    var gift = Gift(giftDO.valueString("gift_name"),
-                            giftDO.valueDouble("gift_price"),
-                            giftDO.valueString("gift_img"),
-                            giftDO.valueInt("gift_type")
-                    )
-                    fulldiscountView.giftValue = gift
-                }
-
-                if(fulldiscountView.isBonus){
-                    var bonusDO = resultFullDiscount.valueJsonObject("coupon_do")
-
-                    var bonusView = CouponViewModel(
-                            bonusDO.valueDouble("coupon_price"),
-                            bonusDO.valueDouble("coupon_threshold_price"),
-                            bonusDO.valueString("seller_name"),
-                            false,
-                            false,
-                            false,
-                            bonusDO.valueInt("coupon_id"),
-                            bonusDO.valueDate("start_time")+"-"+bonusDO.valueDate("end_time"),
-                            bonusDO.valueInt("seller_id"),
-                            bonusDO.valueString("title")
-                    )
-                    fulldiscountView.bonusValue = bonusView
-                }
-                parent.FullDiscountGroup = fulldiscountView
-            }
-
-            //第二件半价
-            val halfPriceVO = resultObject.valueJsonObject("half_price_vo")
-            if (halfPriceVO.length() > 0){
-                parent.halfPrice = HalfPrice(
-                        halfPriceVO.valueString("description"),
-                        false,
-                        halfPriceVO.valueDate("start_time")+"-"+halfPriceVO.valueDate("end_time"),
-                        halfPriceVO.valueString("title")
-                )
-            }
-
-
-            //积分
-            val exchangeVO = resultObject.valueJsonObject("exchange")
-
-            if (exchangeVO.length() > 0) {
-                parent.exchange = Exchange(
-                        exchangeVO.valueInt("exchange_id"),
-                        exchangeVO.valueDouble("exchange_money"),
-                        exchangeVO.valueDouble("exchange_point"),
-                        false,
-                        0,
-                        0,
-                        exchangeVO.valueDouble("goods_price")
-                )
-            }
-
-            val groupBuyVO = resultObject.valueJsonObject("groupbuy_goods_vo")
-            if (groupBuyVO.length() > 0){
-                parent.groupBuy = GroupBuy(groupBuyVO.valueInt("act_id"),
-                        groupBuyVO.valueString("gb_name"),
-                        groupBuyVO.valueDouble("price"),
-                        groupBuyVO.valueDate("start_time")+"-"+groupBuyVO.valueDate("end_time"),
-                        groupBuyVO.valueInt("goods_num"),
-                        groupBuyVO.valueDouble("original_price"),
-                        resultObject.valueLong("end_time"),
-                        true,
-                        groupBuyVO.valueInt("buy_num")
-                )
-            }
-
-            var seckillVO = resultObject.valueJsonObject("seckill_goods_vo")
-            if(seckillVO.length() > 0){
-                parent.secKill =  SecKill(resultObject.valueInt("activity_id"),
-                        "限时抢购",
-                        seckillVO.valueInt("is_start") == 1,
-                        seckillVO.valueDouble("seckill_price"),
-                        seckillVO.valueDouble("original_price"),
-                        seckillVO.valueDate("seckill_start_time"),
-                        seckillVO.valueLong("distance_start_time"),
-                        seckillVO.valueLong("distance_end_time")
-                )
-            }
-            return parent
-        }
-    }
-}
-
-
-/**
- * @author LDD
- * @Date   2018/3/27 下午1:22
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   赠品ViewModel
- */
-data class Gift(val name: String,       /**赠品名称*/
-                val price: Double,      /**赠品价格*/
-                val image: String,      /**赠品图片*/
-                val type: Int)          /**赠品类型*/
-
-/**
- * @author LDD
- * @Date   2018/3/27 下午1:24
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   单品立减
- */
-data class MinusPromotion(val title: String,        /**标题*/
-                          val minusPrice: Double,   /**立减金额*/
-                          val date: String,         /**活动日期区间*/
-                          val descript: String,     /**描述*/
-                          val disabled: Boolean)    /**是否开启*/
-
-/**
- * @author LDD
- * @Date   2018/3/27 下午1:26
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   满减组合促销
- */
-data class FullDiscount(var basePrice: Double = 0.0,          /**满减最低金额条件*/
-                        var date: String = "",               /**活动日期区间*/
-                        var title: String = "",              /**标题*/
-                        var descript: String = "",           /**描述*/
-                        var isDiscount: Boolean = false,        /**是否满折*/
-                        var isFreeShip: Boolean = false,        /**是否包邮*/
-                        var isGift: Boolean = false,            /**是否送赠品*/
-                        var isPonit: Boolean = false,           /**是否送积分*/
-                        var isBonus: Boolean = false,           /**是否送优惠券*/
-                        var isMinus: Boolean = false,           /**是否满减*/
-                        var pointValue: Int = 0,            /**赠送的积分*/
-                        var minusPrice: Double = 0.0,         /**满减金额*/
-                        var discount: Double = 0.0,           /**满折*/
-                        var giftValue:Gift? = null,             /**赠品*/
-                        var bonusValue:CouponViewModel? = null, /**优惠券*/
-                        var disabled: Boolean = false)          /**是否开启*/
-
-/**
- * @author LDD
- * @Date   2018/3/27 下午1:30
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   第二件半价
- */
-data class HalfPrice(val descript : String,     /**描述*/
-                     val disabled: Boolean,     /**是否开启*/
-                     val date:String,           /**活动日期区间*/
-                     val title: String)         /**标题*/
-
-/**
- * @author LDD
- * @Date   2018/3/27 下午1:32
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   积分换购
- */
-data class Exchange(val id :Int,
-                    val exchangeMoney:Double,       /**金额*/
-                    val exchangePoint:Double,       /**积分*/
-                    val disabled: Boolean,          /**是否开启活动*/
-                    val exchangeNum:Int,            /**总数量*/
-                    val buyNum: Int,                /**已购买数量*/
-                    val orgPrice: Double)           /**原价*/
-
-/**
- * @author LDD
- * @Date   2018/3/27 下午1:32
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   团购
- */
-data class GroupBuy(var id :Int = 0,
-                    val title:String,           /**标题*/
-                    val price:Double,           /**价格*/
-                    val date :String,           /**互动日期区间*/
-                    val groupNum:Int,           /**总库存*/
-                    val orgPrice:Double,        /**原价*/
-                    val endTime:Long,           /**结束时间*/
-                    val disabled: Boolean,      /**是否开启*/
-                    val buyNum :Int)            /**已购数量*/
-
-/**
- * @author LDD
- * @Date   2018/3/27 下午1:32
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   秒杀
- */
-data class SecKill(var id :Int = 0,
-                   val title:String,             /**标题*/
-                   val disabled:Boolean,         /**是否开启*/
-                   val seckillPrice:Double,      /**秒杀价*/
-                   val orgPrice: Double,         /**原价*/
-                   val date:String,              /**活动日期区间*/
-                   var disStartTime :Long,        /**距离开始时间*/
-                   val disEndTime: Long)         /**距离结束时间*/

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/ReceiptContentViewModel.kt

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

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/ReceiptViewModel.kt

@@ -1,31 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import android.databinding.ObservableField
-import com.wdkl.ncs.android.lib.utils.bindingParams
-import com.wdkl.ncs.android.lib.utils.judge
-import com.wdkl.ncs.android.lib.utils.valueInt
-import com.wdkl.ncs.android.lib.utils.valueString
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @Date   2018/5/17 上午10:23
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   发票ViewModel
- */
-data class ReceiptViewModel(var id :Int = 0,/**ID*/
-                            var duty_invoice :ObservableField<String> = ObservableField(""),/**纳税人税号*/
-                            var receipt_content:String = "",/**发票内容*/
-                            var receipt_title:ObservableField<String> = ObservableField(""),/**发票抬头*/
-                            var receipt_type:String = "")        /**发票类型*/
-{
-    companion object {
-        fun map(json :JSONObject) :ReceiptViewModel{
-            return  ReceiptViewModel(json.valueInt("id"),
-                    json.valueString("tax_no").bindingParams(),
-                    json.valueString("receipt_content"),
-                    json.valueString("receipt_title").bindingParams(),
-                    (json.valueInt("type") == 1).judge("country","person"))
-        }
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/RecommendGoodsViewModel.kt

@@ -1,42 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.valueDouble
-import com.wdkl.ncs.android.lib.utils.valueInt
-import com.wdkl.ncs.android.lib.utils.valueString
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @Date   2018/1/22 下午12:13
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   推荐商品model
- */
-data class RecommendGoodsViewModel(var id :Int ,        /**商品id*/
-                                   var name:String ,    /**商品名称*/
-                                   var image:String ,   /**商品图片*/
-                                   var price:Double)    /**商品价格*/
-{
-    companion object {
-        fun map(jsonObject: JSONObject) : RecommendGoodsViewModel{
-            var goods =  RecommendGoodsViewModel(jsonObject.valueInt("goods_id"),
-                    jsonObject.valueString("goods_name"),
-                    jsonObject.valueString("goods_image"),
-                    jsonObject.valueDouble("goods_price"))
-
-            if (goods.image == ""){
-                goods.image = jsonObject.valueString("thumbnail")
-            }
-            if (goods.name == ""){
-                goods.name = jsonObject.valueString("name")
-            }
-            if (goods.price == -1.0){
-                goods.price = jsonObject.valueDouble("price")
-            }
-            if (goods.id == 0){
-                goods.id = jsonObject.valueInt("goods_id")
-            }
-
-            return goods
-        }
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/RegionViewModel.kt

@@ -1,43 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.valueInt
-import com.wdkl.ncs.android.lib.utils.valueString
-import com.enation.javashop.districtselectorview.model.BaseRagionModel
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @Date   2018/5/9 上午8:59
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   地区ViewModel
- */
-data class RegionViewModel(val typeId :Int ,val name :String ,val id :Int ,val pid :Int) :BaseRagionModel {
-
-    /**
-     * @author LDD
-     * @From   RegionViewModel
-     * @Date   2018/5/9 上午9:00
-     * @Note   获取TypeId
-     * @param
-     */
-    override fun getType(): Int {
-        return typeId - 1
-    }
-
-    override fun getPickerName(): String {
-        return name
-    }
-
-    companion object {
-
-        fun map(objc :JSONObject) : RegionViewModel{
-
-            return  RegionViewModel(objc.valueInt("region_grade"),
-                    objc.valueString("local_name"),
-                    objc.valueInt("id"),
-                    objc.valueInt("parent_id"))
-
-        }
-
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/ReturnData.kt

@@ -1,41 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.ObserableString
-
-/**
- * @author LDD
- * @Date   2018/4/23 上午10:19
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   返回数据
- */
-data class ReturnData(var orderSn :String = "",              /**订单号*/
-var returnPoint :Int = 0,             /**售后积分*/
-var skuId    :Int = 0,                /**单个商品售后时的skuID*/
-var refuseType :String= "",           /**售后类型 退货/退款*/
-var refundWay :String= "",            /**退款方式*/
-var accountType :String= "",          /**账号类型*/
-var returnAccount :String= "",        /**退款账号*/
-var customerRemark :String= "",       /**买家留言*/
-var refundReason :String= "",         /**退款原因*/
-var bankName : String= "",            /**银联退款的话 银行名*/
-var bankAccountNumber:String= "",     /**银联退款的话 银行账号*/
-var bankAccountName:String= "",       /**银联退款的话 开户名*/
-var bankDepositName:String= "",       /**银联退款的话 开户行*/
-var returnNum :Int= 0)            /**单个退款时 退货个数*/
-
-data class AccountInfo(var accountType :String = "WEIXINPAY",/**账号类型*/
-                        var returnAccount :ObserableString = ObserableString(""),/**退款账号*/
-                        var bankName : ObserableString = ObserableString(""),/**银联退款的话 银行名*/
-                        var bankAccountNumber:ObserableString = ObserableString(""),/**银联退款的话 银行账号*/
-                        var bankAccountName:ObserableString = ObserableString(""),/**银联退款的话 开户名*/
-                        var bankDepositName:ObserableString = ObserableString("")){
-
-    fun reset(){
-        returnAccount.set("")
-        bankName.set("")
-        bankAccountNumber.set("")
-        bankAccountName.set("")
-        bankDepositName.set("")
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/SecKillHeaderViewModel.kt

@@ -1,11 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.ObserableString
-
-/**
- * @author LDD
- * @Date   2018/5/21 下午2:28
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   秒杀列表头部ViewModel
- */
-data class SecKillHeaderViewModel(val title :String , val type :String ,val time :Int, var hour :ObserableString = ObserableString("00") , var min :ObserableString = ObserableString("00"),var sec :ObserableString = ObserableString("00"))

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/SecKillListViewModel.kt

@@ -1,31 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.valueInt
-import com.wdkl.ncs.android.lib.utils.valueString
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @Date   2018/5/21 下午3:38
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   秒杀种类列表VM
- */
-data class SecKillListViewModel(var distanceTime :Int =0,var nextDistanceTime :Int=0 ,var text :String=""){
-
-    companion object {
-
-        fun map(dic :JSONObject) :SecKillListViewModel{
-            var model = SecKillListViewModel()
-
-            model.distanceTime = dic.valueInt( "distance_time")
-
-            model.text = dic.valueString( "time_text")
-
-            model.nextDistanceTime = dic.valueInt( "next_distance_time")
-
-            return model
-        }
-
-    }
-
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/ShopCategoryViewModel.kt

@@ -1,11 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-/**
- * @author LDD
- * @Date   2018/4/12 上午9:27
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   店铺分类VM
- */
-data class ShopCategoryViewModel (val cId :Int ,       /**分类ID*/
-                                  val cName :String ,  /**分类名称*/
-                                  val child :ArrayList<ShopCategoryViewModel>?) /**子分类*/

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/ShopFirstViewModel.kt

@@ -1,11 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-/**
- * @author LDD
- * @Date   2018/4/9 下午5:13
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   店铺首页数据模型
- */
-data class ShopFirstViewModel(val recommendGoods:ArrayList<GoodsItemViewModel>, /**推荐商品*/
-                              val newGoods :ArrayList<GoodsItemViewModel>,      /**上新*/
-                              val hotGoods :ArrayList<GoodsItemViewModel>)      /**热卖*/

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/ShopItem.kt

@@ -1,33 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.*
-import org.json.JSONObject
-
-/**
- * Created by LDD on 2018/10/15.
- */
-data class ShopItem(var shopName : String = "",
-                    var collectNum : Int = 0,
-                    var logo : String = "",
-                    var shopId :Int = -1,
-                    var collectId :Int = -1,
-                    var childGoods :ArrayList<GoodsItemViewModel> = ArrayList()) {
-
-    companion object {
-
-        fun map(json :JSONObject):ShopItem{
-            var self = ShopItem()
-            self.shopId = json.valueInt("shop_id")
-            self.collectNum = json.valueInt( "shop_collect")
-            self.shopName = json.valueString( "shop_name")
-            self.logo = json.valueString("shop_logo")
-            var goods = ArrayList<GoodsItemViewModel>()
-            json.valueJsonArray( "goods_list").arrayObjects().forEach { dic ->
-                    goods.add(GoodsItemViewModel.goodssearchMap(dic))
-            }
-            self.childGoods = goods
-            return  self
-        }
-
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/ShopViewModel.kt

@@ -1,66 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.valueDate
-import com.wdkl.ncs.android.lib.utils.valueDouble
-import com.wdkl.ncs.android.lib.utils.valueInt
-import com.wdkl.ncs.android.lib.utils.valueString
-import org.json.JSONObject
-
-/**
- * @author LDD
- * @Date   2018/3/27 下午3:15
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   店铺详情ViewModel
- */
-data class ShopViewModel(val description:String,        /**店铺描述*/
-                         var favorited:Boolean,         /**是否已关注*/
-var goodsNum:Int,              /**商品总数量*/
-var hotNum:Int,                /**热卖商品总数*/
-var new_Num:Int,               /**上新商品总数*/
-var recommendNum :Int,         /**推荐商品总数*/
-                         val banner :String,            /**banner图*/
-                         var collectNum : Int,          /**关注人数*/
-                         val credit :Double,               /**店铺总评分*/
-                         val deliveryCredit:Double,        /**物流评分*/
-                         val descCredit :Double,           /**描述评分*/
-                         val serviceCredit:Double,         /**服务态度*/
-                         val id:Int,                    /**店铺ID*/
-                         val level:Int,                 /**店铺等级*/
-                         val name:String,               /**店铺名*/
-                         var openTime :String,          /**开店时间*/
-                         var logo:String,
-                         val selfOperated:Boolean=false      /**是否平台自营**/
-)               /**店铺Logo*/{
-
-    fun collectNumString() :String{
-        return "${collectNum}人"
-    }
-
-    companion object {
-        fun map(jsonObject : JSONObject) : ShopViewModel{
-            val result = ShopViewModel(jsonObject.valueString("shop_desc"),
-                    false,
-                    jsonObject.valueInt("goods_num"),
-                    0,
-                    0,
-                    0,
-                    jsonObject.valueString("shop_logo"),
-                    jsonObject.valueInt("shop_collect"),
-                    jsonObject.valueDouble("shop_praise_rate"),
-                    jsonObject.valueDouble("shop_delivery_credit"),
-                    jsonObject.valueDouble("shop_description_credit"),
-                    jsonObject.valueDouble("shop_service_credit"),
-                    jsonObject.valueInt("shop_id"),
-                    0,
-                    jsonObject.valueString("shop_name"),
-                    jsonObject.valueDate("shop_createtime"),
-                    jsonObject.valueString("shop_logo"),
-                    jsonObject.valueInt("self_operated")==1
-                    )
-            if (result.logo == ""){
-                result.logo = jsonObject.valueString("logo")
-            }
-            return result
-        }
-    }
-}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/SingleIntViewModel.kt

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

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/SingleStringViewModel.kt

@@ -1,11 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import android.databinding.ObservableField
-
-/**
- * @author LDD
- * @Date   2018/5/17 上午9:37
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   单个StringVM
- */
-data class SingleStringViewModel(val text :ObservableField<String>)

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/SkuGoods.kt

@@ -1,178 +0,0 @@
-package com.wdkl.ncs.android.middleware.model
-
-import com.wdkl.ncs.android.lib.utils.*
-import org.json.JSONArray
-import org.json.JSONObject
-import java.util.*
-
-/**
- * @author LDD
- * @Date   2018/3/27 下午1:45
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   Sku商品列表
- */
-data class SkuGoods(var sn :String = "",
-                    var buyCount : Int = 1,             /**购买数量*/
-                    val skuId :Int,                     /**skuID*/
-                    val goodsId :Int,                   /**GoodsId*/
-                    val goodsName:String,               /**商品名称*/
-                    val stock :Int,                     /**总库存*/
-                    val enableStock:Int,                /**剩余库存*/
-                    val price:Double,                   /**价格*/
-                    val orgPrice:Double,                /**原始价格*/
-                    val weight:Double,                  /**商品重量*/
-                    val image:String,                   /**商品图片*/
-                    val shopName:String,                /**所属店铺名称*/
-                    val shopId:Int,                     /**所属店铺Id*/
-                    val specList:ArrayList<Spec>,       /**规格列表*/
-                    var identifier :String = ""){
-
-    fun getSpecString() :String {
-        var str :String = ""
-        specList.forEach { spec ->
-            str += ("${spec.specValue},")
-        }
-        if (str.length > 1){
-            str.removeRange(str.length-1,str.length)
-        }else{
-            str = "默认"
-        }
-        return  str
-    }
-    companion object {
-
-        fun mapSpec(datas :ArrayList<SkuGoods>) :ArrayList<Any>{
-            var dataSource = ArrayList<Any>()
-            if (datas.count() > 1) {
-                for (i in 0..(datas.count() - 1)){
-                for (j in 0..(datas[i].specList.count() - 1)){
-                var has = false
-                if (dataSource.count() != 0){
-                    for (k in 0..(dataSource.count() - 1)){
-                    if (dataSource[k] is Spec && (dataSource[k] as Spec).specId == datas[i].specList[j].specId &&  (dataSource[k] as Spec).specValueId == datas[i].specList[j].specValueId){
-                        if (!has){
-                            has = true
-                        }
-                    }
-                }
-                }
-                if (!has){
-                    dataSource.add(datas[i].specList[j])
-                }
-            }
-            }
-                var specSection = ArrayList<ArrayList<Spec>>()
-                for (index in 0..(dataSource.count() - 1)){
-                if (specSection.count() == 0){
-                    var spec = (dataSource[index] as Spec)
-                    spec.select = true
-                    dataSource[index] = spec
-                    specSection.add(arrayListOf(dataSource[index] as Spec))
-                }else{
-                    var has = false
-                    for (parentIndex in 0..(specSection.count() - 1)){
-                        if (specSection[parentIndex][0].specId == (dataSource[index] as Spec).specId){
-                            has = true
-                            if (!(specSection[parentIndex].contains((dataSource[index] as Spec)))){
-                                specSection[parentIndex].add((dataSource[index] as Spec))
-                            }
-                        }
-                    }
-                    if (!has){
-                        var spec = (dataSource[index] as Spec)
-                        spec.select = true
-                        dataSource[index] = spec
-                        specSection.add(arrayListOf(dataSource[index] as Spec))
-                    }
-                }
-            }
-
-                dataSource.clear()
-
-                for (parentIndex in 0..(specSection.count() - 1)){
-                for (childIndex in 0..(specSection[parentIndex].count() - 1)){
-                if (childIndex == 0){
-                    dataSource.add(specSection[parentIndex][childIndex].specName)
-                }
-                dataSource.add(specSection[parentIndex][childIndex])
-            }
-            }
-            }
-            return dataSource
-        }
-
-        fun identifier(specs :ArrayList<Spec>) : String{
-            specs.sortWith(Comparator sort@{ speca, specb ->
-                return@sort (speca.specId > specb.specId).judge(1,-1)
-            })
-            var text = ""
-            specs.forEach { item ->
-                    text += "${item.specId}-${item.specValueId}"
-            }
-            return text
-        }
-
-        fun map(jsonObject :JSONObject) :SkuGoods{
-            val specArray = ArrayList<Spec>()
-
-            //遍历规格信息
-            var specList = jsonObject.valueJsonArray("spec_list")
-            for (i in 0..(specList.length() - 1)) {
-                val specObject = specList.getJSONObject(i)
-
-                var spec = Spec(
-                        specObject.valueInt("spec_value_id"),
-                        specObject.valueInt("spec_id"),
-                        specObject.valueString("spec_name"),
-                        specObject.valueString("spec_value"),
-                        specObject.valueString("spec_image"),
-                        specObject.valueInt("spec_type")
-                )
-                specArray.add(spec)
-            }
-
-            return  SkuGoods(jsonObject.valueString("sn"),
-                    0,
-                    jsonObject.valueInt("sku_id"),
-                    jsonObject.valueInt("goods_id"),
-                    jsonObject.valueString("goods_name"),
-                    jsonObject.valueInt("quantity"),
-                    jsonObject.valueInt("enable_quantity"),
-                    jsonObject.valueDouble("price"),
-                    jsonObject.valueDouble("price"),
-                    jsonObject.valueDouble("weight"),
-                    jsonObject.valueString("thumbnail"),
-                    jsonObject.valueString("seller_name"),
-                    jsonObject.valueInt("seller_id"),
-                    specArray,SkuGoods.identifier(specArray)
-            )
-        }
-    }
-}
-
-/**
- * @author LDD
- * @Date   2018/3/27 下午1:58
- * @From   com.wdkl.ncs.android.middleware.model
- * @Note   规格信息
- */
-data class Spec(val specValueId:Int,        /**规格ID值*/
-                val specId:Int,             /**规格ID*/
-                val specName:String,        /**规格名*/
-                val specValue:String,       /**规格值名称*/
-                val specImage:String,       /**规格默认图*/
-                val specType:Int,           /**规格Type*/
-                var select :Boolean = false){
-    companion object {
-        fun map(json :JSONObject) :Spec{
-            return Spec(
-                    json.valueInt("spec_value_id"),
-                    json.valueInt("spec_id"),
-                    json.valueString("spec_name"),
-                    json.valueString("spec_value"),
-                    json.valueString("spec_image"),
-                    json.valueInt("spec_type")
-            )
-        }
-    }
-}