Update

RMA/.idea/misc.xml

@@ -19,6 +19,10 @@
         <entry key="..\:/Repo/MyGogs/Muchinfo/MTP2.0_RMA/RMA/chart/src/main/res/drawable/load_corners_submit_p.xml" value="0.4083333333333333" />
         <entry key="..\:/Repo/MyGogs/Muchinfo/MTP2.0_RMA/RMA/chart/src/main/res/drawable/load_corners_submit_un.xml" value="0.4083333333333333" />
         <entry key="..\:/Repo/MyGogs/Muchinfo/MTP2.0_RMA/RMA/chart/src/main/res/layout/chart_attorn.xml" value="0.3921875" />
+        <entry key="app/src/main/res/drawable/rma_item_normal_bg.xml" value="0.3671875" />
+        <entry key="app/src/main/res/layout/activity_chart.xml" value="0.35104166666666664" />
+        <entry key="app/src/main/res/layout/chart_info_layout.xml" value="0.35104166666666664" />
+        <entry key="app/src/main/res/layout/item_fresco.xml" value="0.35104166666666664" />
       </map>
     </option>
   </component>

RMA/app/build.gradle

@@ -130,7 +130,6 @@ android {
 }
 
 dependencies {
-
     implementation 'androidx.core:core-ktx:1.2.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.android.material:material:1.1.0'

RMA/app/src/main/AndroidManifest.xml

@@ -523,6 +523,10 @@
 
         <activity android:name=".view.base.home.commodity.modify.AddMiddleGoodsNameActivity"/>
 
+        <activity android:name=".view.base.home.xhcp.XhcpPreSaleDetailActivity"/>
+
+        <activity android:name=".view.base.home.xhcp.XhcpPreSaleActivity"/>
+
     </application>
 
 </manifest>

RMA/app/src/main/java/cn/muchinfo/rma/business/warehouse/WarehouseManager.kt

@@ -1238,5 +1238,32 @@ class WarehouseManager {
         )
     }
 
+    /**
+     * 查询新品发布
+     * @param params Map<String, String>
+     * @param responseBack Function3<[@kotlin.ParameterName] Boolean, [@kotlin.ParameterName] List<BusinessData>?, [@kotlin.ParameterName] Error?, Unit>
+     */
+    fun queryWrPreSaleInfo(
+        params: Map<String, String>,
+        responseBack: (isSuccess: Boolean, respData: List<WrPreSaleInfoData>?, error: Error?) -> Unit
+    ) {
+        MyOkHttpUtils().query(
+            URL = SPUtils.getInstance()
+                .getString(Constant.goCommonSearchUrl) + "/WrTrade2/QueryWrPreSaleInfo",
+            params = params,
+            type = "1",
+            callback = object : ResponseCallback<BaseResult<List<WrPreSaleInfoData>>>() {
+                override fun onResponse(
+                    response: BaseResult<List<WrPreSaleInfoData>>?,
+                    id: Int
+                ) {
+                    responseBack(true, response?.data, null)
+                }
 
+                override fun onError(call: Call?, e: Exception?, id: Int) {
+                    responseBack(false, null, Error(e?.message))
+                }
+            }
+        )
+    }
 }

RMA/app/src/main/java/cn/muchinfo/rma/global/MTPEnums.java

@@ -28,6 +28,8 @@ public class MTPEnums {
 
     public final static int TRADEMODE_TRADESTOCKS = 29;  //港股交易模式
 
+    public final static int TRADEMODE_CDYS = 47; // 廣陈优品-仓单预售 新品发售
+
     /**
      * 期权类型
      */

RMA/app/src/main/java/cn/muchinfo/rma/view/MainActivity.kt

@@ -10,6 +10,7 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.GlobalDataCollection
+import cn.muchinfo.rma.global.MTPEnums
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.easyNavigationBar
 import cn.muchinfo.rma.view.base.BaseActivity
@@ -21,6 +22,7 @@ import cn.muchinfo.rma.view.base.hnstmain.HnstMainFragment
 import cn.muchinfo.rma.view.base.home.NewHomeFragment
 import cn.muchinfo.rma.view.base.home.tjmd.TjmdHomeFragment
 import cn.muchinfo.rma.view.base.home.xhcp.XhcpHomeFragment
+import cn.muchinfo.rma.view.base.home.xhcp.XhcpNewGoodsFragment
 import cn.muchinfo.rma.view.base.home.yrdz.YrdzHomeFragment
 import cn.muchinfo.rma.view.base.main.SeaKingMainFragment
 import cn.muchinfo.rma.view.base.platinumtreasure.PlatinumTreasureFragment
@@ -133,6 +135,11 @@ class MainActivity : BaseActivity<MainViewModel>() {
         YrdzDdjyFragment()
     }
 
+    /** 新会陈皮 新品发售 **/
+    private val xhcpNewGoodsFragment by lazy {
+        XhcpNewGoodsFragment()
+    }
+
     /** 华南顺通 我的 **/
     var hnstMainFragment: HnstMainFragment? = null
 
@@ -279,7 +286,15 @@ class MainActivity : BaseActivity<MainViewModel>() {
         if (SPUtils.getInstance().getString(Constant.oem) == "xhcp"){
             val tjmdMarketList = GlobalDataCollection.instance?.getTjmdShowMarketSectionList()
             tjmdMarketList?.forEach {
-
+                it.mlist?.forEach { item ->
+                    if (item.trademode?.toInt() == MTPEnums.TRADEMODE_CDYS) {
+                        // 新品发售
+                        newFragments.add(xhcpNewGoodsFragment)
+                        newTabText.add(it.marketsectionname ?: "")
+                        newNormalIcon.add(R.mipmap.qhj_sphg_tab_normal)
+                        newSelectIcon.add(R.mipmap.qhj_sphg_tab_select)
+                    }
+                }
             }
         }
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/app/Constant.kt

@@ -41,7 +41,7 @@ object Constant {
 //    const val baseurl = "http://218.17.158.45:21001/cfg?key=test_139"// 邓工139外网环境 2100000003/123456
 //    const val baseurl = "http://192.168.31.176:8080/cfg?key=test_176" // 邓工 新会陈皮
 //    const val baseurl = "http://192.168.31.139:8080/cfg?key=test_139" // 麦顿
-    const val baseurl = "http://218.17.158.45:15203/cfg?key=test_176" // 邓工 新会陈皮 176外网
+    const val baseurl = "http://192.168.31.176/cfg?key=test_176" // 邓工 新会陈皮 176外网
 
     /**
      * 用sp存储基础url的key

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/xhcp/XhcpHomeFragment.kt

@@ -266,6 +266,10 @@ class XhcpHomeFragment : BaseFragment<XhcpHomeViewModel>(){
 
                             itemView()
 
+//                            view {
+//                                background = resources.getDrawable(R.color.rma_hint_line_color_eee)
+//                            }.lparams(matchParent, autoSize(20))
+
                             // 推广图片
                             viewModel.imageList.bindOptional(context) {
                                 it?.forEachIndexed { index, bannerData ->
@@ -273,18 +277,12 @@ class XhcpHomeFragment : BaseFragment<XhcpHomeViewModel>(){
                                         if (bannerData.imagepath != null && bannerData.imagepath.isNotEmpty()) {
                                             showImage(SPUtils.getInstance().getString(Constant.uploadUrl).replace("/upload","") + bannerData.imagepath.substring(1))
                                         }
-                                    }.lparams(autoSize(72), autoSize(72)) {
-                                        gravity = Gravity.CENTER_HORIZONTAL
-                                    }
+                                    }.lparams(autoSize(360), autoSize(260))
                                 }
                             }
 
                             itemView()
 
-                            view {
-                                background = resources.getDrawable(R.color.rma_hint_line_color_eee)
-                            }.lparams(matchParent, autoSize(20))
-
                             tabSegment {
                                 segment = this
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/xhcp/XhcpNewGoodsFragment.kt

@@ -0,0 +1,219 @@
+package cn.muchinfo.rma.view.base.home.xhcp
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.cardview.widget.CardView
+import androidx.lifecycle.MutableLiveData
+import androidx.recyclerview.widget.StaggeredGridLayoutManager
+import cn.bingoogolapple.bgabanner.BGABanner
+import cn.muchinfo.rma.R
+import cn.muchinfo.rma.global.GlobalDataCollection
+import cn.muchinfo.rma.global.data.BannerData
+import cn.muchinfo.rma.global.data.SiteColumnDetailData
+import cn.muchinfo.rma.global.data.WrPreSaleInfoData
+import cn.muchinfo.rma.global.data.account.loginQeruy.GoodsInfo
+import cn.muchinfo.rma.lifecycle.bindOptional
+import cn.muchinfo.rma.lifecycle.getAppCompatActivity
+import cn.muchinfo.rma.view.MyApplication
+import cn.muchinfo.rma.view.autoWidget.*
+import cn.muchinfo.rma.view.base.BaseFragment
+import cn.muchinfo.rma.view.base.WebActivity
+import cn.muchinfo.rma.view.base.app.Constant
+import cn.muchinfo.rma.view.base.future.trade.itemView
+import cn.muchinfo.rma.view.base.home.tjmd.TjmdHomeSonViewHolder
+import cn.muchinfo.rma.view.base.home.xhcp.viewholder.XhcpNewGoodsViewHolder
+import com.blankj.utilcode.util.ActivityUtils
+import com.blankj.utilcode.util.SPUtils
+import com.facebook.drawee.view.SimpleDraweeView
+import mtp.polymer.com.autowidget.adapter.BaseAdapter
+import org.jetbrains.anko.*
+import org.jetbrains.anko.support.v4.UI
+
+/**
+ * 新会陈皮 新品发售
+ */
+class XhcpNewGoodsFragment: BaseFragment<XhcpNewGoodsViewModel>() {
+    companion object {
+        fun newInstance() = XhcpNewGoodsFragment()
+    }
+
+    // 下拉刷新
+    private lateinit var swipeToLayout: SwipeToLoadLayout
+    private lateinit var statusLayout: StatusLayout
+
+    // 新品发售抢购中和发售历史列表 adapter
+    private val newGoodsAdapter: BaseAdapter<WrPreSaleInfoData, XhcpNewGoodsViewHolder> =
+        BaseAdapter { _, _ ->
+            XhcpNewGoodsViewHolder(
+                this.getAppCompatActivity(),
+                viewModel
+            )
+        }
+    private val newGoodsHistoryAdapter: BaseAdapter<WrPreSaleInfoData, XhcpNewGoodsViewHolder> =
+        BaseAdapter { _, _ ->
+            XhcpNewGoodsViewHolder(
+                this.getAppCompatActivity(),
+                viewModel
+            )
+        }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        return UI {
+            // 查询新品发售信息
+            viewModel.queryWrPreSaleInfo()
+
+            verticalLayout {
+                // 标题栏
+                linearLayout {
+                    background = resources.getDrawable(R.color.main_title_bg_color)
+                    verticalLayout {
+                        gravity = Gravity.CENTER
+                        textView {
+                            text = "新品发售"
+                            textColorInt = R.color.white
+                            textSizeAuto = 36
+                        }.lparams(wrapContent, wrapContent) {
+                            gravity = Gravity.CENTER_HORIZONTAL
+                        }
+                    }.lparams(autoSize(620), autoSize(90)) {
+                        marginStart = autoSize(140)
+                    }
+                }.lparams(matchParent, autoSize(120))
+
+                background = resources.getDrawable(R.color.white)
+                // 新品发布信息-未开始
+                inflateLayout<BGABanner>(R.layout.banner) {
+                    viewModel.wrPreSaleInfoNotStartedList.bindOptional(context) {
+                        setData(
+                            R.layout.item_fresco,
+                            it,
+                            null
+                        )
+                    }
+                    setDelegate { _, _, model, _ ->
+                        val data = model as BannerData
+                        val intent = Intent()
+                        intent.putExtra("url",data.url)
+                        intent.putExtra("title",data.title)
+                        intent.setClass(context, WebActivity::class.java)
+                        ActivityUtils.startActivity(intent)
+                    }
+
+                    setAdapter(object : BGABanner.Adapter<CardView, WrPreSaleInfoData> {
+                        override fun fillBannerItem(
+                            banner: BGABanner?,
+                            itemView: CardView?,
+                            model: WrPreSaleInfoData?,
+                            position: Int
+                        ) {
+                            val simpleDraweeView: SimpleDraweeView =
+                                itemView!!.findViewById(R.id.sdv_item_fresco_content)
+                            simpleDraweeView.setImageURI(
+                                Uri.parse(if (SPUtils.getInstance().getString(Constant.uploadUrl).contains("upload")){
+                                    SPUtils.getInstance().getString(Constant.uploadUrl).replace("/upload","") + model?.bannerpicurl?.substring(1)
+                                }else{
+                                    SPUtils.getInstance().getString(Constant.uploadUrl) + model?.bannerpicurl?.substring(1)
+                                }))
+                        }
+                    })
+                }.lparams(matchParent, autoSize(400))
+
+                // 页面内容
+                statusLayout(contentBlock = {
+                    statusLayout = this
+                    setRetryAction {
+
+                    }
+                    swipeToLoadLayout {
+                        swipeToLayout = this
+                        setEnableRefresh(true)
+                        setEnableLoadMore(false)
+                        setOnRefreshListener {
+
+                        }
+                        setEnableScrollContentWhenLoaded(false)
+                        setEnableLoadMoreWhenContentNotFull(false)
+
+                        relativeLayout {
+                            background = resources.getDrawable(R.color.white, null)
+                            nestedScrollView {
+                                verticalLayout {
+                                    // 正在抢购
+                                    linearLayout {
+                                        imageView {
+                                            imageResource = R.mipmap.qianggoumiaosha
+                                        }.lparams(wrapContent, wrapContent) {
+                                            leftMargin = autoSize(15)
+                                        }
+
+                                        textView {
+                                            text = "正在抢购"
+                                            textColorInt = R.color.black
+                                        }.lparams(wrapContent, wrapContent) {
+                                            marginStart = autoSize(10)
+                                        }
+                                    }.lparams(matchParent, wrapContent) {
+                                        topMargin = autoSize(10)
+                                    }
+                                    recyclerView {
+                                        background = resources.getDrawable(R.color.white, null)
+                                        val staggeredGridLayoutManager = StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL)
+                                        layoutManager = staggeredGridLayoutManager
+                                        adapter = newGoodsAdapter
+                                    }.lparams(matchParent, wrapContent) {
+                                        topMargin = autoSize(10)
+                                    }
+                                    viewModel.wrPreSaleInfoList.bindOptional(context){
+                                        newGoodsAdapter.setNewData(it)
+                                    }
+
+                                    // 发售历史
+                                    linearLayout {
+                                        imageView {
+                                            imageResource = R.mipmap.qingjiashenqing
+                                        }.lparams(wrapContent, wrapContent) {
+                                            leftMargin = autoSize(15)
+                                        }
+
+                                        textView {
+                                            text = "发售历史"
+                                            textColorInt = R.color.black
+                                        }.lparams(wrapContent, wrapContent) {
+                                            marginStart = autoSize(10)
+                                        }
+                                    }.lparams(matchParent, wrapContent) {
+                                        topMargin = autoSize(10)
+                                    }
+                                    recyclerView {
+                                        background = resources.getDrawable(R.color.white, null)
+                                        val staggeredGridLayoutManager = StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL)
+                                        layoutManager = staggeredGridLayoutManager
+                                        adapter = newGoodsHistoryAdapter
+                                    }.lparams(matchParent, wrapContent) {
+                                        topMargin = autoSize(10)
+                                    }
+                                    viewModel.wrPreSaleInfoHistoryList.bindOptional(context){
+                                        newGoodsHistoryAdapter.setNewData(it)
+                                    }
+                                }
+                            }.lparams(matchParent, matchParent)
+                        }
+                    }
+                }, emptyBlock = {
+                    emptyView(hint = resources.getString(R.string.now_no_data))
+                }).lparams(matchParent, matchParent)
+            }
+        }.view
+    }
+}

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/xhcp/XhcpNewGoodsViewModel.kt

@@ -0,0 +1,59 @@
+package cn.muchinfo.rma.view.base.home.xhcp
+
+import androidx.lifecycle.MutableLiveData
+import cn.muchinfo.rma.global.GlobalDataCollection
+import cn.muchinfo.rma.global.MTPEnums
+import cn.muchinfo.rma.global.data.WrPreSaleInfoData
+import cn.muchinfo.rma.view.MyApplication
+import cn.muchinfo.rma.view.base.BaseViewModel
+
+class XhcpNewGoodsViewModel: BaseViewModel() {
+
+    /**
+     * 新品发布信息-未开始
+     */
+    val wrPreSaleInfoNotStartedList: MutableLiveData<List<WrPreSaleInfoData>> = MutableLiveData()
+
+    /**
+     * 新品发布信息-抢购中
+     */
+    val wrPreSaleInfoList: MutableLiveData<List<WrPreSaleInfoData>> = MutableLiveData()
+
+    /**
+     * 新品发布信息-发售历史
+     */
+    val wrPreSaleInfoHistoryList: MutableLiveData<List<WrPreSaleInfoData>> = MutableLiveData()
+
+    /**
+     * 查询新品发布
+     */
+    fun queryWrPreSaleInfo(){
+        val params = mutableMapOf<String,String>().apply {
+            // 新品发售市场ID
+            put("marketid", GlobalDataCollection.instance?.getMaketidByTrademode(MTPEnums.TRADEMODE_CDYS).toString())
+            put("presalestatus", "1,2,3,4")
+        }
+        MyApplication.getInstance()?.warehouseManager?.queryWrPreSaleInfo(params = params){ isSuccess, respData, error ->
+            if (isSuccess){
+                // 未开始
+                val notStartedList = ArrayList<WrPreSaleInfoData>()
+                // 抢购中
+                val list = ArrayList<WrPreSaleInfoData>()
+                // 发售历史
+                val historyList = ArrayList<WrPreSaleInfoData>()
+                respData?.forEach {
+                    if (it.presalestatus == "1") {
+                        notStartedList.add(it)
+                    } else if (it.presalestatus == "2") {
+                        list.add(it)
+                    } else if (it.presalestatus?.toInt() ?: 0 > 2) {
+                        historyList.add(it)
+                    }
+                }
+                wrPreSaleInfoNotStartedList.postValue(notStartedList)
+                wrPreSaleInfoList.postValue(list)
+                wrPreSaleInfoHistoryList.postValue(historyList)
+            }
+        }
+    }
+}

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/xhcp/XhcpPreSaleActivity.kt

@@ -0,0 +1,217 @@
+package cn.muchinfo.rma.view.base.home.xhcp
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.Gravity
+import android.widget.ImageView
+import cn.muchinfo.rma.R
+import cn.muchinfo.rma.global.data.WrPreSaleInfoData
+import cn.muchinfo.rma.global.toShowTime
+import cn.muchinfo.rma.global.toShowTime3
+import cn.muchinfo.rma.global.toTimeData
+import cn.muchinfo.rma.view.autoWidget.*
+import cn.muchinfo.rma.view.base.BaseActivity
+import cn.muchinfo.rma.view.base.BaseViewModel
+import cn.muchinfo.rma.view.base.app.Constant
+import cn.muchinfo.rma.view.base.future.trade.itemView
+import cn.muchinfo.rma.view.base.home.contract.emptyView
+import com.blankj.utilcode.util.SPUtils
+import org.jetbrains.anko.*
+
+/**
+ * 新品发售商品详情（抢购中）
+ * @property data WrPreSaleInfoData
+ */
+class XhcpPreSaleActivity: BaseActivity<BaseViewModel>() {
+    private val data by lazy {
+        intent.getParcelableExtra<WrPreSaleInfoData>("data") as WrPreSaleInfoData
+    }
+
+    @SuppressLint("RtlHardcoded")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        verticalLayout {
+            topBar {
+                // 返回
+                commonLeftButton()
+                commonTitle {
+                    text = "商品详情"
+                }
+            }
+
+            scrollView {
+                verticalLayout {
+                    // ********** 商品信息 **********
+                    // 商品banner
+                    imageView {
+                        showImage(SPUtils.getInstance().getString(Constant.uploadUrl).
+                                            replace("/upload","") +
+                                            data.bannerpicurl?.substring(1))
+                    }.lparams(matchParent, autoSize(400))
+
+                    // 商品名称
+                    textView {
+                        textColorInt = R.color.rma_black_33
+                        textSizeAuto = 40
+                        text = data.wrstandardname
+                    }.lparams(wrapContent, wrapContent) {
+                        leftMargin = autoSize(20)
+                        topMargin = autoSize(10)
+                    }
+
+                    linearLayout {
+                        linearLayout {
+                            textView {
+                                textColorInt = R.color.rma_zhushi_text_color
+                                textSizeAuto = 31
+                                text = "发行价"
+                            }.lparams(autoSize(0), wrapContent, 1F)
+                            textView {
+                                textColorInt = R.color.rma_black_33
+                                textSizeAuto = 31
+                                text = data.unitprice
+                                gravity = Gravity.RIGHT
+                            }.lparams(autoSize(0), wrapContent, 1F)
+                        }.lparams(matchParent, wrapContent, 1F) {
+                            topMargin = autoSize(10)
+                            leftMargin = autoSize(20)
+                            rightMargin = autoSize(30)
+                        }
+                        linearLayout {
+                            textView {
+                                textColorInt = R.color.rma_zhushi_text_color
+                                textSizeAuto = 31
+                                text = "发行总量"
+                            }.lparams(autoSize(0), wrapContent, 1F)
+                            textView {
+                                textColorInt = R.color.rma_black_33
+                                textSizeAuto = 31
+                                text = data.presaleqty
+                                gravity = Gravity.RIGHT
+                            }.lparams(autoSize(0), wrapContent, 1F)
+                        }.lparams(matchParent, wrapContent, 1F) {
+                            topMargin = autoSize(10)
+                            leftMargin = autoSize(30)
+                            rightMargin = autoSize(20)
+                        }
+                    }
+                    linearLayout {
+                        linearLayout {
+                            textView {
+                                textColorInt = R.color.rma_zhushi_text_color
+                                textSizeAuto = 31
+                                text = "开始时间"
+                            }.lparams(autoSize(0), wrapContent, 1F)
+                            textView {
+                                textColorInt = R.color.rma_black_33
+                                textSizeAuto = 31
+                                text = data.startdate?.toShowTime3() ?: "--"
+                                gravity = Gravity.RIGHT
+                            }.lparams(autoSize(0), wrapContent, 1F)
+                        }.lparams(matchParent, wrapContent, 1F) {
+                            topMargin = autoSize(10)
+                            leftMargin = autoSize(20)
+                            rightMargin = autoSize(30)
+                        }
+                        linearLayout {
+                            textView {
+                                textColorInt = R.color.rma_zhushi_text_color
+                                textSizeAuto = 31
+                                text = "结束时间"
+                            }.lparams(autoSize(0), wrapContent, 1F)
+                            textView {
+                                textColorInt = R.color.rma_black_33
+                                textSizeAuto = 31
+                                text = data.enddate?.toShowTime3() ?: "--"
+                                gravity = Gravity.RIGHT
+                            }.lparams(autoSize(0), wrapContent, 1F)
+                        }.lparams(matchParent, wrapContent, 1F) {
+                            topMargin = autoSize(10)
+                            leftMargin = autoSize(30)
+                            rightMargin = autoSize(20)
+                        }
+                    }
+                    linearLayout {
+                        linearLayout {
+                            textView {
+                                textColorInt = R.color.rma_zhushi_text_color
+                                textSizeAuto = 31
+                                text = "仓库"
+                            }.lparams(autoSize(0), wrapContent, 1F)
+                            textView {
+                                textColorInt = R.color.rma_black_33
+                                textSizeAuto = 31
+                                text = data.warehousename
+                                gravity = Gravity.RIGHT
+                            }.lparams(autoSize(0), wrapContent, 1F)
+                        }.lparams(matchParent, wrapContent, 1F) {
+                            topMargin = autoSize(10)
+                            leftMargin = autoSize(20)
+                            rightMargin = autoSize(30)
+                        }
+                        linearLayout {
+
+                        }.lparams(matchParent, wrapContent, 1F) {
+                            topMargin = autoSize(10)
+                            leftMargin = autoSize(30)
+                            rightMargin = autoSize(20)
+                        }
+                    }
+
+                    view { }.lparams(0, autoSize(10), 1f)
+                    itemView()
+
+                    // ********** 交互相关 **********
+                    relativeLayout {
+                        button {
+                            gravity = Gravity.CENTER
+                            text = "我要认购"
+                            textSizeAuto = 36
+                            textColorInt = R.color.white
+                            backgroundDrawable =
+                                createRoundRectDrawable("#2794FF", 10)
+                        }.lparams(autoSize(320), autoSize(100)) {
+                            gravity = Gravity.CENTER
+                        }
+                    }.lparams(matchParent, autoSize(200))
+
+                    // ********** 商品详情 **********
+                    linearLayout {
+                        view {
+                            background = resources.getDrawable(R.color.pickerview_bgColor_overlay, null)
+                        }.lparams(autoSize(0), autoSize(1), 1F) {
+                            gravity = Gravity.CENTER
+                            leftMargin = autoSize(100)
+                        }
+                        textView {
+                            textColorInt = R.color.rma_black_33
+                            textSizeAuto = 31
+                            text = "商品详情"
+                            gravity = Gravity.CENTER
+                        }.lparams(autoSize(200), wrapContent, 1F) {
+                            gravity = Gravity.CENTER
+                        }
+                        view {
+                            background = resources.getDrawable(R.color.pickerview_bgColor_overlay, null)
+                        }.lparams(autoSize(0), autoSize(1), 1F) {
+                            gravity = Gravity.CENTER
+                            rightMargin = autoSize(100)
+                        }
+                    }.lparams(matchParent, autoSize(40))
+                    scrollView {
+                        imageView {
+                            showImage(SPUtils.getInstance().getString(Constant.uploadUrl).
+                                                replace("/upload","") +
+                                                data.pictureurls?.substring(1))
+                            scaleType = ImageView.ScaleType.FIT_XY
+                            adjustViewBounds = true
+                        }.lparams(matchParent, wrapContent) {
+                            topMargin = autoSize(15)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/xhcp/XhcpPreSaleDetailActivity.kt

@@ -0,0 +1,49 @@
+package cn.muchinfo.rma.view.base.home.xhcp
+
+import android.os.Bundle
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ImageView
+import cn.muchinfo.rma.global.data.WrPreSaleInfoData
+import cn.muchinfo.rma.view.autoWidget.*
+import cn.muchinfo.rma.view.base.BaseActivity
+import cn.muchinfo.rma.view.base.BaseViewModel
+import cn.muchinfo.rma.view.base.app.Constant
+import com.blankj.utilcode.util.SPUtils
+import org.jetbrains.anko.*
+
+/**
+ * 新品发售商品详情（未开始、发售历史）
+ * @property data WrPreSaleInfoData
+ */
+class XhcpPreSaleDetailActivity: BaseActivity<BaseViewModel>() {
+
+    private val data by lazy {
+        intent.getParcelableExtra<WrPreSaleInfoData>("data") as WrPreSaleInfoData
+    }
+
+    lateinit var iv: ImageView
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        verticalLayout {
+            topBar {
+                // 返回
+                commonLeftButton()
+                commonTitle {
+                    text = "商品详情"
+                }
+            }
+
+            scrollView {
+                imageView {
+                    iv = this
+                    showImage(SPUtils.getInstance().getString(Constant.uploadUrl).replace("/upload","") + data.pictureurls?.substring(1))
+                    scaleType = ImageView.ScaleType.FIT_XY
+                    adjustViewBounds = true
+                }.lparams(matchParent, wrapContent)
+            }
+        }
+    }
+}

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/xhcp/viewholder/XhcpNewGoodsViewHolder.kt

@@ -0,0 +1,104 @@
+package cn.muchinfo.rma.view.base.home.xhcp.viewholder
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.view.WindowManager
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.RecyclerView
+import cn.muchinfo.rma.R
+import cn.muchinfo.rma.global.data.WrPreSaleInfoData
+import cn.muchinfo.rma.lifecycle.bindOptional
+import cn.muchinfo.rma.view.autoWidget.*
+import cn.muchinfo.rma.view.base.app.Constant
+import cn.muchinfo.rma.view.base.home.xhcp.XhcpNewGoodsViewModel
+import cn.muchinfo.rma.view.base.home.xhcp.XhcpPreSaleActivity
+import cn.muchinfo.rma.view.base.home.xhcp.XhcpPreSaleDetailActivity
+import com.afollestad.materialdialogs.utils.MDUtil.getWidthAndHeight
+import com.blankj.utilcode.util.ActivityUtils
+import com.blankj.utilcode.util.SPUtils
+import mtp.polymer.com.autowidget.adapter.BaseViewHolder
+import org.jetbrains.anko.*
+
+/**
+ * 新品发售ViewHolder
+ * @property activity AppCompatActivity
+ * @property viewModel XhcpNewGoodsViewModel
+ * @property itemSize IntArray
+ * @property recyclview RecyclerView
+ * @constructor
+ */
+class XhcpNewGoodsViewHolder(private val activity : AppCompatActivity, private val viewModel: XhcpNewGoodsViewModel): BaseViewHolder<WrPreSaleInfoData>(activity) {
+    override val itemSize: IntArray = intArrayOf(matchParent, wrapContent)
+
+    lateinit var recyclview : RecyclerView
+
+    @SuppressLint("SetTextI18n")
+    override fun _FrameLayout.createContentView() {
+        // 屏幕大小
+        val size = (context.getSystemService(Context.WINDOW_SERVICE) as WindowManager).getWidthAndHeight()
+        val imageWidth = size.first/2 - 20
+
+        verticalLayout {
+            background = resources.getDrawable(R.color.segtabment_bg_color, null)
+
+            onThrottleFirstClick {
+                val intent = Intent()
+                intent.putExtra("data",data.value)
+                if (data.value?.presalestatus == "2") {
+                    // 抢购中
+                    intent.setClass(context, XhcpPreSaleActivity::class.java)
+                } else {
+                    // 未发售、发售历史
+                    intent.setClass(context, XhcpPreSaleDetailActivity::class.java)
+                }
+
+                ActivityUtils.startActivity(intent)
+            }
+
+            // 商品图片
+            imageView {
+                data.bindOptional(context) {
+                    showImage(SPUtils.getInstance().getString(Constant.uploadUrl).replace("/upload","") + it?.thumurls?.substring(1))
+                }
+            }.lparams(autoSize(imageWidth), autoSize(450)) {
+                leftMargin = autoSize(15)
+            }
+
+            // 商品名称
+            textView {
+                data.bindOptional(context) {
+                    text = it?.wrstandardname
+                }
+                textSizeAuto = 32
+                textColorInt = R.color.black
+            }.lparams(matchParent, wrapContent) {
+                topMargin = autoSize(10)
+                leftMargin = autoSize(20)
+            }
+
+            // 卖价
+            linearLayout {
+                textView {
+                    background = resources.getDrawable(R.color.qmui_config_color_50_blue, null)
+                    text = "卖价"
+                    textSizeAuto = 32
+                    textColorInt = R.color.white
+                }.lparams(wrapContent, wrapContent)
+                textView {
+                    data.bindOptional(context) {
+                        text = "￥ " + it?.unitprice
+                    }
+                    textSizeAuto = 32
+                    textColorInt = R.color.qmui_config_color_red
+                }.lparams(wrapContent, wrapContent) {
+                    leftMargin = autoSize(20)
+                }
+            }.lparams(matchParent, wrapContent) {
+                topMargin = autoSize(10)
+                leftMargin = autoSize(20)
+                bottomMargin = autoSize(20)
+            }
+        }.lparams(matchParent, wrapContent)
+    }
+}