风险管理11月5日提交代码-liu.bolan- 云融开发

RMA/app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "cn.muchinfo.rma"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 50034
-        versionName "5.0.34"
+        versionCode 50035
+        versionName "5.0.35"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //指定room.schemaLocation生成的文件路径

RMA/app/src/main/java/cn/muchinfo/rma/global/data/SpotGroupTradeSumData.kt

@@ -13,11 +13,11 @@ import com.google.gson.annotations.SerializedName
  */
 data class SpotGroupTradeSumData(
     @SerializedName("prereckondate")
-    val prereckondate : String? = "",//上上个交易日(yyymmdd)
+    var prereckondate : String? = "",//上上个交易日(yyymmdd)
     @SerializedName("reckondate")
-    val reckondate : String? = "",//上个交易日(yyyymmdd)
+    var reckondate : String? = "",//上个交易日(yyyymmdd)
     @SerializedName("lst")
-    val lst : List<WrSpotGroupTradeSumData>? = arrayListOf()
+    var lst : List<WrSpotGroupTradeSumData>? = arrayListOf()
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
         parcel.readString(),
@@ -66,6 +66,7 @@ data class WrSpotGroupTradeSumData(
     val todayavgprice : String? = "",//上个交易日价格(前1天价格)
     @SerializedName("updown")
     val updown : String? = "",//涨跌
+    var isOnClick : Int = 0,
     @SerializedName("updownratio")
     val updownratio : String? = ""//涨幅(已格式化, 直接显示即可)
 ) : Parcelable{
@@ -78,6 +79,7 @@ data class WrSpotGroupTradeSumData(
         parcel.readString(),
         parcel.readString(),
         parcel.readString(),
+        parcel.readInt(),
         parcel.readString()
     ) {
     }
@@ -91,6 +93,7 @@ data class WrSpotGroupTradeSumData(
         parcel.writeString(reckondate)
         parcel.writeString(todayavgprice)
         parcel.writeString(updown)
+        parcel.writeInt(isOnClick)
         parcel.writeString(updownratio)
     }
 
@@ -108,4 +111,5 @@ data class WrSpotGroupTradeSumData(
         }
     }
 
+
 }

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

@@ -348,6 +348,7 @@ class MainActivity : BaseActivity<MainViewModel>() {
             background = resources.getDrawable(R.color.white)
             easyNavigationBar {
                 easyNavigationBar = this
+
                 this.defaultSetting()
                     .titleItems(newTabText.toTypedArray())
                     .normalIconItems(newNormalIcon.toIntArray())   //  Tab未选中图标集合

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

@@ -92,6 +92,7 @@ class SplashActivity : AppCompatActivity() {
                     SPUtils.getInstance().put(Constant.uploadUrl,data?.uploadUrl)
                     SPUtils.getInstance().put(Constant.openApiUrl,data?.openApiUrl)
                     SPUtils.getInstance().put(Constant.otherPayUrl,data?.otherPayUrl)
+                    SPUtils.getInstance().put(Constant.mobileOpenUrl,data?.mobileOpenUrl)
                     SPUtils.getInstance().put(Constant.oem,data?.oem)
 
                     // 外网调试环境 swagger: http://218.17.158.45:21003/swagger/index.html

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

@@ -6,7 +6,7 @@ object Constant {
     /**
      * 获取基础url的接口
      */
-//    const val baseurl = "http://103.40.249.123:38280/cfg?key=mtp_20" // 天津麦顿
+    const val baseurl = "http://103.40.249.123:38280/cfg?key=mtp_20" // 天津麦顿
 //    const val baseurl = "http://103.40.249.123:28280/cfg?key=mtp_20"//云融大宗
 //    const val baseurl = "http://103.40.249.123:8280/cfg?key=mtp_20"//千海金外盘
 //    const val baseurl = "http://103.40.249.127:28280/cfg?key=mtp_20"
@@ -18,7 +18,7 @@ object Constant {
 //    const val baseurl = "http://192.168.31.203:8080/cfg?key=test_203"//李倩云融 18611112222
 //
 //    const val baseurl = "http://192.168.31.204:8080/cfg?key=test_204"// 瑶姐 云融 190000000001 123456
-    const val baseurl = "http://192.168.31.205:8080/cfg?key=test_205"// 瑶姐 云融 190000000001 123456
+//    const val baseurl = "http://192.168.31.205:8080/cfg?key=test_205"// 瑶姐 云融 190000000001 123456
 
 //    const val baseurl = "http://192.168.31.175:8080/cfg?key=test_175" // 8888  123123
 //    const val baseurl = "http://192.168.31.223:8080/cfg?key=test_223"

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

@@ -6,6 +6,7 @@ import android.widget.LinearLayout
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.data.SiteColumnDetailData
 import cn.muchinfo.rma.global.toShowTime
+import cn.muchinfo.rma.global.toShowTime3
 import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.autoWidget.utils.HtmlUtils
 import cn.muchinfo.rma.view.base.BaseActivity
@@ -53,7 +54,7 @@ class InformationDetailsActivity : BaseActivity<HomeViewModel>(){
             }
 
             textView {
-                text = data.publishdate
+                text = data.publishdate?.toShowTime3("yyyy-MM-dd")
                 textSizeAuto = 26
                 textColorInt = R.color.rma_hint_text_color_ccc
             }.lparams(wrapContent, wrapContent){

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/yrdz/YrdzHomeFragment.kt

@@ -62,7 +62,7 @@ import org.jetbrains.anko.support.v4.viewPager
 /**
  * 云融大宗的首页
  */
-class YrdzHomeFragment : BaseFragment<YrdzHomeViewModel>(){
+class YrdzHomeFragment : BaseFragment<YrdzHomeViewModel>() {
 
     companion object {
         fun newInstance() = YrdzHomeFragment()
@@ -76,9 +76,13 @@ class YrdzHomeFragment : BaseFragment<YrdzHomeViewModel>(){
     lateinit var segment1: QMUITabSegment
     var selectedTabIndex: Int = 0
     private lateinit var viewPager: ViewPager
-    lateinit var noticeViewFlipper : ViewFlipper
+    lateinit var noticeViewFlipper: ViewFlipper
 
-    private val yrdzIndexUI : YrdzIndexUI by lazy { YrdzIndexUI(this,viewModel) }
+    //分类
+    private val classificationUI: ClassificationUI by lazy { ClassificationUI(this, viewModel) }
+
+    //指数
+    private val yrdzIndexUI: YrdzIndexUI by lazy { YrdzIndexUI(this, viewModel) }
 
     private val yrAnnouncementUI: YrAnnouncementUI by lazy {
         YrAnnouncementUI(
@@ -101,27 +105,27 @@ class YrdzHomeFragment : BaseFragment<YrdzHomeViewModel>(){
     }//消息
 
 
-
     //viewpager的适配器
-    private var pagerAdapter : PagerAdapter? = null
+    private var pagerAdapter: PagerAdapter? = null
 
     //tabSegment标题
-    private val tabsArray : ArrayList<String> = arrayListOf()
+    private val tabsArray: ArrayList<String> = arrayListOf()
 
     //暂存的页面组
-    private val uiMessageList : ArrayList<_FrameLayout> = arrayListOf()
-
+    private val uiMessageList: ArrayList<_FrameLayout> = arrayListOf()
 
 
-    fun initMessageMenuData(){
+    fun initMessageMenuData() {
         tabsArray.add("资讯")
         uiMessageList.add(yrdzInformationUI.root)
         tabsArray.add("公告")
         uiMessageList.add(yrAnnouncementUI.root)
         tabsArray.add("消息")
         uiMessageList.add(yrMessageUI.root)
-        tabsArray.add("消息")
+        tabsArray.add("指数")
         uiMessageList.add(yrdzIndexUI.root)
+        tabsArray.add("分类")
+        uiMessageList.add(classificationUI.root)
 
         pagerAdapter = object : PagerAdapter() {
 
@@ -165,7 +169,7 @@ class YrdzHomeFragment : BaseFragment<YrdzHomeViewModel>(){
             view.textSize = 12f
             view.setOnClickListener(View.OnClickListener {
                 val intent = Intent()
-                intent.putExtra("data",notice.get(i))
+                intent.putExtra("data", notice.get(i))
                 intent.setClass(context!!, MessageDetailsActivity::class.java)
                 ActivityUtils.startActivity(intent)
             })
@@ -197,7 +201,7 @@ class YrdzHomeFragment : BaseFragment<YrdzHomeViewModel>(){
                 linearLayout {
                     background = resources.getDrawable(R.color.main_title_bg_color)
                     verticalLayout {
-                       gravity = Gravity.CENTER
+                        gravity = Gravity.CENTER
                         textView {
                             text = "云融"
                             textColorInt = R.color.white
@@ -225,45 +229,25 @@ class YrdzHomeFragment : BaseFragment<YrdzHomeViewModel>(){
 
                 }.lparams(matchParent, autoSize(120))
 
-                relativeLayout {
-                    nestedScrollView{
-                        setOnScrollChangeListener(object : View.OnScrollChangeListener {
-                            override fun onScrollChange(
-                                p0: View?,
-                                p1: Int,
-                                p2: Int,
-                                p3: Int,
-                                p4: Int
-                            ) {
-                                val scrollRect = Rect()
-                                getHitRect(scrollRect)
-                                LogUtils.eTag("adakhsfkjahsfa", "x = " + p1 + "y = " + p2)
-                                if (p2 > 1000) {
-                                    segment1.visibility = View.VISIBLE
-                                } else {
-                                    segment1.visibility = View.INVISIBLE
-                                }
-                            }
-                        })
-                        verticalLayout {
-                            background = resources.getDrawable(R.color.white)
-                            inflateLayout<BGABanner>(R.layout.banner) {
-                                // TODO 目前没有banner
-                                viewModel.bannerList.bindOptional(context) {
-                                    setData(
-                                        R.layout.item_fresco,
-                                        it,
-                                        null
-                                    )
-                                }
-                                setDelegate { banner, itemView, model, position ->
-                                    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)
-                                }
+                verticalLayout {
+                    background = resources.getDrawable(R.color.white)
+                    inflateLayout<BGABanner>(R.layout.banner) {
+                        // TODO 目前没有banner
+                        viewModel.bannerList.bindOptional(context) {
+                            setData(
+                                R.layout.item_fresco,
+                                it,
+                                null
+                            )
+                        }
+                        setDelegate { banner, itemView, model, position ->
+                            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)
+                        }
 //                                setDelegate(new BGABanner.Delegate() {
 //                                    @Override
 //                                    public void onBannerItemClick(BGABanner banner, View itemView, @Nullable Object model, int position) {
@@ -272,271 +256,230 @@ class YrdzHomeFragment : BaseFragment<YrdzHomeViewModel>(){
 //                                });
 
 
-                                setAdapter(object : BGABanner.Adapter<CardView, BannerData> {
-                                    override fun fillBannerItem(
-                                        banner: BGABanner?,
-                                        itemView: CardView?,
-                                        model: BannerData?,
-                                        position: Int
-                                    ) {
-                                        val simpleDraweeView: SimpleDraweeView =
-                                            itemView!!.findViewById(R.id.sdv_item_fresco_content)
-                                        simpleDraweeView.setImageURI(
-                                            Uri.parse(
-                                                SPUtils.getInstance().getString(
-                                            Constant.openApiUrl) + model?.imagepath?.substring(1)))
-                                    }
-                                })
+                        setAdapter(object : BGABanner.Adapter<CardView, BannerData> {
+                            override fun fillBannerItem(
+                                banner: BGABanner?,
+                                itemView: CardView?,
+                                model: BannerData?,
+                                position: Int
+                            ) {
+                                val simpleDraweeView: SimpleDraweeView =
+                                    itemView!!.findViewById(R.id.sdv_item_fresco_content)
+                                simpleDraweeView.setImageURI(
+                                    Uri.parse(
+                                        SPUtils.getInstance().getString(
+                                            Constant.openApiUrl
+                                        ) + model?.imagepath?.substring(1)
+                                    )
+                                )
+                            }
+                        })
+
+                    }.lparams(matchParent, autoSize(400))
+
+                    itemView()
+
+                    linearLayout {
+                        visibility = View.GONE
+                        gravity = Gravity.CENTER_VERTICAL
+                        imageView {
+                            imageResource = R.mipmap.yrdz_nctice_icon
+                        }.lparams(autoSize(36), autoSize(36)) {
+                            marginStart = autoSize(36)
+                        }
+
+                        viewFlipper {
+                            noticeViewFlipper = this
+                            viewModel.noticeDataList.bindOptional(context) {
+                                initViewFlipper(it ?: arrayListOf())
+                            }
+                        }.lparams(matchParent, autoSize(72)) {
+                            marginStart = autoSize(36)
+                        }
+
+                    }.lparams(matchParent, autoSize(72))
+
+                    itemView()
 
-                            }.lparams(matchParent, autoSize(400))
+                    linearLayout {
+                        //参考行情
+                        relativeLayout {
+                            verticalLayout {
+                                onThrottleFirstClick {
+                                    val intent = Intent()
+                                    intent.setClass(
+                                        context,
+                                        ReferenceActivity::class.java
+                                    )
+                                    ActivityUtils.startActivity(intent)
+                                }
+                                imageView {
+                                    imageResource = R.mipmap.yrdz_reference_prices
+                                }.lparams(autoSize(72), autoSize(72)) {
+                                    gravity = Gravity.CENTER_HORIZONTAL
+                                }
 
-                            itemView()
+                                textView {
+                                    text = "参考行情"
+                                    textColorInt = R.color.black
+                                    textSizeAuto = 26
+                                }.lparams(wrapContent, wrapContent) {
+                                    topMargin = autoSize(20)
+                                    gravity = Gravity.CENTER_HORIZONTAL
+                                }
+                            }.lparams(matchParent, matchParent)
 
-                            linearLayout {
+                            textView {
                                 visibility = View.GONE
-                                gravity = Gravity.CENTER_VERTICAL
+                                textColorInt = R.color.p_global_write_color
+                                textSizeAuto = 15
+                                setPadding(
+                                    autoSize(10),
+                                    autoSize(6),
+                                    autoSize(10),
+                                    autoSize(6)
+                                )
+                                backgroundDrawable =
+                                    createRoundRectDrawable("#fe671a", 45)
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(130)
+                            }
+                        }.lparams(autoSize(225), matchParent)
+
+                        relativeLayout {
+                            verticalLayout {
+                                onThrottleFirstClick {
+                                    EventBus.getDefault()
+                                        .post(MainTabSelectMessageEvent(1))// 黄老板说的要跳去仓单贸易
+                                }
                                 imageView {
-                                    imageResource = R.mipmap.yrdz_nctice_icon
-                                }.lparams(autoSize(36), autoSize(36)){
-                                    marginStart = autoSize(36)
+                                    imageResource = R.mipmap.yrdz_home_wymh_icon
+                                }.lparams(autoSize(72), autoSize(72)) {
+                                    gravity = Gravity.CENTER_HORIZONTAL
                                 }
 
-                                viewFlipper {
-                                    noticeViewFlipper = this
-                                    viewModel.noticeDataList.bindOptional(context){
-                                        initViewFlipper(it ?: arrayListOf())
-                                    }
-                                }.lparams(matchParent, autoSize(72)){
-                                    marginStart = autoSize(36)
+                                textView {
+                                    text = "我要买货"
+                                    textColorInt = R.color.black
+                                    textSizeAuto = 26
+                                }.lparams(wrapContent, wrapContent) {
+                                    topMargin = autoSize(20)
+                                    gravity = Gravity.CENTER_HORIZONTAL
                                 }
+                            }.lparams(matchParent, matchParent)
 
-                            }.lparams(matchParent, autoSize(72))
-
-                            itemView()
-
-                            linearLayout {
-                                //参考行情
-                                relativeLayout {
-                                    verticalLayout {
-                                        onThrottleFirstClick {
-                                            val intent = Intent()
-                                            intent.setClass(
-                                                context,
-                                                ReferenceActivity::class.java
-                                            )
-                                            ActivityUtils.startActivity(intent)
-                                        }
-                                        imageView {
-                                            imageResource = R.mipmap.yrdz_reference_prices
-                                        }.lparams(autoSize(72), autoSize(72)) {
-                                            gravity = Gravity.CENTER_HORIZONTAL
-                                        }
-
-                                        textView {
-                                            text = "参考行情"
-                                            textColorInt = R.color.black
-                                            textSizeAuto = 26
-                                        }.lparams(wrapContent, wrapContent) {
-                                            topMargin = autoSize(20)
-                                            gravity = Gravity.CENTER_HORIZONTAL
-                                        }
-                                    }.lparams(matchParent, matchParent)
-
-                                    textView {
-                                        visibility = View.GONE
-                                        textColorInt = R.color.p_global_write_color
-                                        textSizeAuto = 15
-                                        setPadding(
-                                            autoSize(10),
-                                            autoSize(6),
-                                            autoSize(10),
-                                            autoSize(6)
-                                        )
-                                        backgroundDrawable =
-                                            createRoundRectDrawable("#fe671a", 45)
-                                    }.lparams(wrapContent, wrapContent) {
-                                        marginStart = autoSize(130)
-                                    }
-                                }.lparams(autoSize(225), matchParent)
-
-                                relativeLayout {
-                                    verticalLayout {
-                                        onThrottleFirstClick {
-                                            EventBus.getDefault().post(MainTabSelectMessageEvent(1))// 黄老板说的要跳去仓单贸易
-                                        }
-                                        imageView {
-                                            imageResource = R.mipmap.yrdz_home_wymh_icon
-                                        }.lparams(autoSize(72), autoSize(72)) {
-                                            gravity = Gravity.CENTER_HORIZONTAL
-                                        }
-
-                                        textView {
-                                            text = "我要买货"
-                                            textColorInt = R.color.black
-                                            textSizeAuto = 26
-                                        }.lparams(wrapContent, wrapContent) {
-                                            topMargin = autoSize(20)
-                                            gravity = Gravity.CENTER_HORIZONTAL
-                                        }
-                                    }.lparams(matchParent, matchParent)
-
-                                    textView {
-                                        visibility = View.GONE
-                                        textColorInt = R.color.p_global_write_color
-                                        textSizeAuto = 15
-                                        setPadding(
-                                            autoSize(10),
-                                            autoSize(6),
-                                            autoSize(10),
-                                            autoSize(6)
-                                        )
-                                        backgroundDrawable =
-                                            createRoundRectDrawable("#fe671a", 45)
-                                    }.lparams(wrapContent, wrapContent) {
-                                        marginStart = autoSize(130)
-                                    }
-                                }.lparams(autoSize(225), matchParent)
-
-                                relativeLayout {
-                                    verticalLayout {
-                                        onThrottleFirstClick {
-                                            val intent = Intent()
-                                            intent.setClass(
-                                                context,
-                                                BookingWarehouseActivity::class.java
-                                            )
-                                            ActivityUtils.startActivity(intent)
-                                        }
-                                        imageView {
-                                            imageResource = R.mipmap.yrdz_home_wyys_icon
-                                        }.lparams(autoSize(72), autoSize(72)) {
-                                            gravity = Gravity.CENTER_HORIZONTAL
-                                        }
-
-                                        textView {
-                                            text = "我要预售"
-                                            textColorInt = R.color.black
-                                            textSizeAuto = 26
-                                        }.lparams(wrapContent, wrapContent) {
-                                            topMargin = autoSize(20)
-                                            gravity = Gravity.CENTER_HORIZONTAL
-                                        }
-                                    }.lparams(matchParent, matchParent)
-
-                                    textView {
-                                        visibility = View.GONE
-                                        textColorInt = R.color.p_global_write_color
-                                        textSizeAuto = 15
-                                        setPadding(
-                                            autoSize(10),
-                                            autoSize(6),
-                                            autoSize(10),
-                                            autoSize(6)
-                                        )
-                                        backgroundDrawable =
-                                            createRoundRectDrawable("#fe671a", 45)
-                                    }.lparams(wrapContent, wrapContent) {
-                                        marginStart = autoSize(130)
-                                    }
-                                }.lparams(autoSize(225), matchParent)
-
-                                relativeLayout {
-                                    verticalLayout {
-                                        onThrottleFirstClick {
-                                            val intent = Intent()
-                                            intent.setClass(
-                                                context,
-                                                PerformanceInformationActivity::class.java
-                                            )
-                                            ActivityUtils.startActivity(intent)
-                                        }
-                                        imageView {
-                                            imageResource = R.mipmap.main_business_5
-                                        }.lparams(autoSize(72), autoSize(72)) {
-                                            gravity = Gravity.CENTER_HORIZONTAL
-                                        }
-
-                                        textView {
-                                            text = "履约管理"
-                                            textColorInt = R.color.black
-                                            textSizeAuto = 26
-                                        }.lparams(wrapContent, wrapContent) {
-                                            topMargin = autoSize(20)
-                                            gravity = Gravity.CENTER_HORIZONTAL
-                                        }
-                                    }.lparams(matchParent, matchParent)
-
-                                    textView {
-                                        visibility = View.GONE
-                                        textColorInt = R.color.p_global_write_color
-                                        textSizeAuto = 15
-                                        setPadding(
-                                            autoSize(10),
-                                            autoSize(6),
-                                            autoSize(10),
-                                            autoSize(6)
-                                        )
-                                        backgroundDrawable =
-                                            createRoundRectDrawable("#fe671a", 45)
-                                    }.lparams(wrapContent, wrapContent) {
-                                        marginStart = autoSize(130)
-                                    }
-                                }.lparams(autoSize(225), matchParent)
-
-                            }.lparams(matchParent, autoSize(140)) {
-                                topMargin = autoSize(40)
+                            textView {
+                                visibility = View.GONE
+                                textColorInt = R.color.p_global_write_color
+                                textSizeAuto = 15
+                                setPadding(
+                                    autoSize(10),
+                                    autoSize(6),
+                                    autoSize(10),
+                                    autoSize(6)
+                                )
+                                backgroundDrawable =
+                                    createRoundRectDrawable("#fe671a", 45)
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(130)
                             }
+                        }.lparams(autoSize(225), matchParent)
 
-                            tabSegment {
-                                segment = this
-                                background = resources.getDrawable(R.color.white)
-                                addOnTabSelectedListener(object :
-                                    QMUITabSegment.OnTabSelectedListener {
-                                    override fun onDoubleTap(index: Int) {}
-                                    override fun onTabReselected(index: Int) {}
-                                    override fun onTabUnselected(index: Int) {}
-                                    override fun onTabSelected(index: Int) {
-                                        selectedTabIndex = index
-                                    }
-                                })
-                                mode = QMUITabSegment.MODE_FIXED
-                                setIndicator(
-                                    QMUITabIndicator(
-                                        QMUIDisplayHelper.dp2px(context, 2),
-                                        false,
-                                        true
+                        relativeLayout {
+                            verticalLayout {
+                                onThrottleFirstClick {
+                                    val intent = Intent()
+                                    intent.setClass(
+                                        context,
+                                        BookingWarehouseActivity::class.java
                                     )
+                                    ActivityUtils.startActivity(intent)
+                                }
+                                imageView {
+                                    imageResource = R.mipmap.yrdz_home_wyys_icon
+                                }.lparams(autoSize(72), autoSize(72)) {
+                                    gravity = Gravity.CENTER_HORIZONTAL
+                                }
+
+                                textView {
+                                    text = "我要预售"
+                                    textColorInt = R.color.black
+                                    textSizeAuto = 26
+                                }.lparams(wrapContent, wrapContent) {
+                                    topMargin = autoSize(20)
+                                    gravity = Gravity.CENTER_HORIZONTAL
+                                }
+                            }.lparams(matchParent, matchParent)
+
+                            textView {
+                                visibility = View.GONE
+                                textColorInt = R.color.p_global_write_color
+                                textSizeAuto = 15
+                                setPadding(
+                                    autoSize(10),
+                                    autoSize(6),
+                                    autoSize(10),
+                                    autoSize(6)
                                 )
-                                setDefaultTextSize(
-                                    ConvertUtils.sp2px(16f),
-                                    ConvertUtils.sp2px(18f)
-                                )
+                                backgroundDrawable =
+                                    createRoundRectDrawable("#fe671a", 45)
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(130)
+                            }
+                        }.lparams(autoSize(225), matchParent)
+
+                        relativeLayout {
+                            verticalLayout {
+                                onThrottleFirstClick {
+                                    val intent = Intent()
+                                    intent.setClass(
+                                        context,
+                                        PerformanceInformationActivity::class.java
+                                    )
+                                    ActivityUtils.startActivity(intent)
+                                }
+                                imageView {
+                                    imageResource = R.mipmap.main_business_5
+                                }.lparams(autoSize(72), autoSize(72)) {
+                                    gravity = Gravity.CENTER_HORIZONTAL
+                                }
 
-                            }.lparams(matchParent, autoSize(100))
+                                textView {
+                                    text = "履约管理"
+                                    textColorInt = R.color.black
+                                    textSizeAuto = 26
+                                }.lparams(wrapContent, wrapContent) {
+                                    topMargin = autoSize(20)
+                                    gravity = Gravity.CENTER_HORIZONTAL
+                                }
+                            }.lparams(matchParent, matchParent)
 
-                            view {
-                                background = resources.getDrawable(R.color.main_hit_bg_color)
-                            }.lparams(matchParent, autoSize(1)) {
-                                marginStart = autoSize(32)
-                                marginEnd = autoSize(32)
+                            textView {
+                                visibility = View.GONE
+                                textColorInt = R.color.p_global_write_color
+                                textSizeAuto = 15
+                                setPadding(
+                                    autoSize(10),
+                                    autoSize(6),
+                                    autoSize(10),
+                                    autoSize(6)
+                                )
+                                backgroundDrawable =
+                                    createRoundRectDrawable("#fe671a", 45)
+                            }.lparams(wrapContent, wrapContent) {
+                                marginStart = autoSize(130)
                             }
-                            viewPager {
-                                background = resources.getDrawable(R.color.white)
-                                viewPager = this
-                                adapter = pagerAdapter
-                            }.lparams(matchParent, autoSize(800))
-
-                            segment.setupWithViewPager(viewPager)
-                            segment.selectTab(selectedTabIndex)
-                        }
-                    }.lparams(matchParent, matchParent)
+                        }.lparams(autoSize(225), matchParent)
+
+                    }.lparams(matchParent, autoSize(140)) {
+                        topMargin = autoSize(40)
+                    }
 
                     tabSegment {
-                        visibility = View.GONE
-                        segment1 = this
-                        visibility = View.INVISIBLE
+                        segment = this
                         background = resources.getDrawable(R.color.white)
-                        addOnTabSelectedListener(object : QMUITabSegment.OnTabSelectedListener {
+                        addOnTabSelectedListener(object :
+                            QMUITabSegment.OnTabSelectedListener {
                             override fun onDoubleTap(index: Int) {}
                             override fun onTabReselected(index: Int) {}
                             override fun onTabUnselected(index: Int) {}
@@ -544,6 +487,7 @@ class YrdzHomeFragment : BaseFragment<YrdzHomeViewModel>(){
                                 selectedTabIndex = index
                             }
                         })
+                        mode = QMUITabSegment.MODE_FIXED
                         setIndicator(
                             QMUITabIndicator(
                                 QMUIDisplayHelper.dp2px(context, 2),
@@ -551,16 +495,29 @@ class YrdzHomeFragment : BaseFragment<YrdzHomeViewModel>(){
                                 true
                             )
                         )
-                        setDefaultTextSize(ConvertUtils.sp2px(16f), ConvertUtils.sp2px(16f))
-//                        setHasIndicator(true)
-//                        setDefaultNormalColor(Color.parseColor("#000000"))
-//                        setDefaultSelectedColor(Color.parseColor("#60a1e3"))
-//                        setTabTextSize(ConvertUtils.sp2px(16f))
+                        setDefaultTextSize(
+                            ConvertUtils.sp2px(16f),
+                            ConvertUtils.sp2px(18f)
+                        )
+
                     }.lparams(matchParent, autoSize(100))
 
-                    segment1.setupWithViewPager(viewPager)
-                    segment1.selectTab(selectedTabIndex)
+                    view {
+                        background = resources.getDrawable(R.color.main_hit_bg_color)
+                    }.lparams(matchParent, autoSize(1)) {
+                        marginStart = autoSize(32)
+                        marginEnd = autoSize(32)
+                    }
+                    viewPager {
+                        background = resources.getDrawable(R.color.white)
+                        viewPager = this
+                        adapter = pagerAdapter
+                    }.lparams(matchParent, matchParent)
+
+                    segment.setupWithViewPager(viewPager)
+                    segment.selectTab(selectedTabIndex)
                 }
+
             }
         }.view
     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/yrdz/YrdzHomeSonUI.kt

@@ -2,9 +2,13 @@ package cn.muchinfo.rma.view.base.home.yrdz
 
 import android.annotation.SuppressLint
 import android.view.Gravity
+import android.view.View
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.MutableLiveData
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import cn.muchinfo.rma.R
+import cn.muchinfo.rma.global.data.DeliveryGoodsSectionData
 import cn.muchinfo.rma.global.data.NoticeData
 import cn.muchinfo.rma.global.data.SiteColumnDetailData
 import cn.muchinfo.rma.global.data.WrSpotGroupTradeSumData
@@ -13,12 +17,12 @@ import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.lifecycle.getAppCompatActivity
 import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.base.home.AnnouncementViewHolder
-import cn.muchinfo.rma.view.base.home.HomeViewModel
-import cn.muchinfo.rma.view.base.home.yrdz.market.IndexData
 import cn.muchinfo.rma.view.base.home.yrdz.market.IndexViewHolder
+import cn.muchinfo.rma.view.base.home.yrdz.viewholder.ClassificationViewHolder
+import cn.muchinfo.rma.view.base.home.yrdz.viewholder.IndexChartViewHolder
 import cn.muchinfo.rma.view.base.home.yrdz.viewholder.YrdzInformationViewHolder
-import cn.muchinfo.rma.view.base.qhjhome.QhjInformationViewHolder
-import com.blankj.utilcode.util.TimeUtils
+import com.github.aachartmodel.aainfographics.aachartcreator.*
+import com.github.aachartmodel.aainfographics.aaoptionsmodel.AAScrollablePlotArea
 import mtp.polymer.com.autowidget.adapter.BaseAdapter
 import org.jetbrains.anko.*
 
@@ -52,15 +56,16 @@ class YrdzInformationUI(
                     recyclerView {
                         background = resources.getDrawable(R.color.white)
                         adapter = informationAdapter
-                        isNestedScrollingEnabled = false
                     }.lparams(matchParent, matchParent) {
                         marginStart = autoSize(32)
                         marginEnd = autoSize(20)
+
                     }
                 }
             }, emptyBlock = {
                 emptyView(hint = resources.getString(R.string.now_no_data))
             }).lparams(matchParent, matchParent)
+
             viewModule.SiteColumnDetailList.bindOptional(context) {
                 if (it?.isEmpty() == true || it?.size == 0) {
                     statusLayout.showEmpty()
@@ -108,7 +113,7 @@ class YrAnnouncementUI(
                     recyclerView {
                         background = resources.getDrawable(R.color.white)
                         adapter = announcementAdapter
-                        isNestedScrollingEnabled = false
+
                     }.lparams(matchParent, matchParent) {
                         marginStart = autoSize(32)
                         marginEnd = autoSize(20)
@@ -163,7 +168,7 @@ class YrMessageUI(
                     recyclerView {
                         background = resources.getDrawable(R.color.white)
                         adapter = announcementAdapter
-                        isNestedScrollingEnabled = false
+
                     }.lparams(matchParent, matchParent) {
                         marginStart = autoSize(32)
                         marginEnd = autoSize(20)
@@ -208,6 +213,9 @@ class YrdzIndexUI(
 
     lateinit var recyclerView: RecyclerView
 
+    //0 时显示数据列表 1 时显示图表
+    val selectShowUI: MutableLiveData<Int> = MutableLiveData<Int>().apply { value = 0 }
+
     val indexAdapter: BaseAdapter<WrSpotGroupTradeSumData, IndexViewHolder> =
         BaseAdapter { _, _ ->
             IndexViewHolder(
@@ -215,25 +223,73 @@ class YrdzIndexUI(
             )
         }
 
+    val indexChartViewHolder: BaseAdapter<WrSpotGroupTradeSumData, IndexChartViewHolder> =
+        BaseAdapter { _, _ ->
+            IndexChartViewHolder(
+                baseFragment,
+                viewModule
+            )
+        }
+
     @SuppressLint("SetTextI18n")
     val root = _FrameLayout(baseFragment.context!!).apply {
         verticalLayout {
             viewModule.querySpotGroupTradeSum()
-
+            viewModule.selectSpotGroupTradeSumData.bindOptional(context) {
+                if (it?.deliverygoodsid?.isNullOrEmpty()?.not() == true) {
+                    viewModule.querySpotGroupTradeSumDetail(deliverygoodsid = it.deliverygoodsid)
+                }
+            }
             linearLayout {
                 linearLayout {
+                    onThrottleFirstClick {
+                        if (selectShowUI.value == 0) {
+                            selectShowUI.postValue(1)
+                        } else {
+                            selectShowUI.postValue(0)
+                        }
+                    }
+                    gravity = Gravity.CENTER
                     imageView {
+                        selectShowUI.bindOptional(context) {
+                            if (it == 1) {
+                                imageResource = R.mipmap.yrdz_home_index
+                            } else {
+                                imageResource = R.mipmap.yrdz_chart_icon
+                            }
+                        }
                         imageResource = R.mipmap.yrdz_chart_icon
-                    }.lparams(autoSize(43), autoSize(43)){
-                        marginStart = autoSize(36)
-                    }
+                    }.lparams(autoSize(43), autoSize(43))
                 }.lparams(0, autoSize(70), 1f)
 
+                recyclerView {
+                    selectShowUI.bindOptional(context) {
+                        if (it == 1) {
+                            visibility = View.VISIBLE
+                        } else {
+                            visibility = View.GONE
+                        }
+                    }
+                    layoutManager =
+                        LinearLayoutManager(baseFragment.context, RecyclerView.HORIZONTAL, false)
+                    adapter = indexChartViewHolder
+                }.lparams(0, autoSize(70), 4f)
+
+                viewModule.spotGroupTradeSumDataList.bindOptional(context) {
+                    indexChartViewHolder.setNewData(it?.lst)
+                }
                 linearLayout {
+                    selectShowUI.bindOptional(context) {
+                        if (it == 0) {
+                            visibility = View.VISIBLE
+                        } else {
+                            visibility = View.GONE
+                        }
+                    }
                     gravity = Gravity.CENTER
                     textView {
-                        viewModule.spotGroupTradeSumDataList.bindOptional(context){
-                            text = it?.prereckondate?.toShowTime3("dd","yyyyMMdd") + "日"
+                        viewModule.spotGroupTradeSumDataList.bindOptional(context) {
+                            text = it?.prereckondate
                         }
                         textSizeAuto = 29
                         textColorInt = R.color.hint_text_color
@@ -241,10 +297,17 @@ class YrdzIndexUI(
                 }.lparams(0, autoSize(70), 1f)
 
                 linearLayout {
+                    selectShowUI.bindOptional(context) {
+                        if (it == 0) {
+                            visibility = View.VISIBLE
+                        } else {
+                            visibility = View.GONE
+                        }
+                    }
                     gravity = Gravity.CENTER
                     textView {
-                        viewModule.spotGroupTradeSumDataList.bindOptional(context){
-                            text = it?.reckondate?.toShowTime3("dd","yyyyMMdd") + "日"
+                        viewModule.spotGroupTradeSumDataList.bindOptional(context) {
+                            text = it?.reckondate
                         }
                         text
                         textSizeAuto = 29
@@ -253,6 +316,13 @@ class YrdzIndexUI(
                 }.lparams(0, autoSize(70), 1f)
 
                 linearLayout {
+                    selectShowUI.bindOptional(context) {
+                        if (it == 0) {
+                            visibility = View.VISIBLE
+                        } else {
+                            visibility = View.GONE
+                        }
+                    }
                     gravity = Gravity.CENTER
                     textView {
                         text = "涨跌"
@@ -262,6 +332,13 @@ class YrdzIndexUI(
                 }.lparams(0, autoSize(70), 1f)
 
                 linearLayout {
+                    selectShowUI.bindOptional(context) {
+                        if (it == 0) {
+                            visibility = View.VISIBLE
+                        } else {
+                            visibility = View.GONE
+                        }
+                    }
                     gravity = Gravity.CENTER
                     textView {
                         text = "涨幅"
@@ -270,7 +347,59 @@ class YrdzIndexUI(
                     }.lparams(wrapContent, wrapContent)
                 }.lparams(0, autoSize(70), 1f)
             }.lparams(matchParent, autoSize(70))
+
+            chartview {
+                selectShowUI.bindOptional(context) {
+                    if (it == 1) {
+                        visibility = View.VISIBLE
+                    } else {
+                        visibility = View.GONE
+                    }
+                }
+                visibility = View.GONE
+                val aaChartModel = AAChartModel()
+                    .chartType(AAChartType.Spline)
+                    .title("")
+                    .yAxisTitle("")
+                    .legendEnabled(false)
+                    .dataLabelsEnabled(false)
+                    .yAxisGridLineWidth(0f)
+                    .animationType(AAChartAnimationType.EaseOutQuart)
+                    .legendEnabled(false)
+                    .gradientColorEnable(true)
+                    .markerRadius(2f)
+                    .markerSymbol(AAChartSymbolType.Circle)
+                    .markerSymbolStyle(AAChartSymbolStyleType.InnerBlank)
+                    .colorsTheme(arrayOf("#FF9A2A", "#F39730"))
+                    .scrollablePlotArea(
+                        AAScrollablePlotArea()
+                            .minWidth(300)
+                            .scrollPositionX(1f)
+                    )
+
+                viewModule.spotGroupTradeSumDetailDataList.bindOptional(context) {
+                    val list = it
+                    val totalexposureelement = AASeriesElement()
+                        .lineWidth(2f)
+                        .name("")
+                        .step(true)
+                        .data(list?.map { it.price?.toDouble() ?: 0.0 }!!.toTypedArray())
+
+                    aaChartModel.categories(list.map { it.reckondate ?: "" }.toTypedArray())
+                    aaChartModel.series(arrayOf(totalexposureelement))
+                    aa_drawChartWithChartModel(aaChartModel)
+                }
+
+            }.lparams(matchParent, autoSize(416))
+
             statusLayout(contentBlock = {
+                selectShowUI.bindOptional(context) {
+                    if (it == 0) {
+                        visibility = View.VISIBLE
+                    } else {
+                        visibility = View.GONE
+                    }
+                }
                 statusLayout = this
 //                bindTaskStatus(viewModule.status)
                 swipeToLoadLayout {
@@ -282,7 +411,6 @@ class YrdzIndexUI(
                     recyclerView {
                         background = resources.getDrawable(R.color.white)
                         adapter = indexAdapter
-                        isNestedScrollingEnabled = false
                     }.lparams(matchParent, matchParent) {
                         marginStart = autoSize(32)
                         marginEnd = autoSize(20)
@@ -301,6 +429,64 @@ class YrdzIndexUI(
                     statusLayout.showSuccess()
                     indexAdapter.setNewData(it?.lst)
                 }
+            }
+        }
+    }
+}
+
+/**
+ * 分类UI
+ */
+class ClassificationUI(
+    private val baseFragment: Fragment,
+    private val viewModule: YrdzHomeViewModel
+) {
+    private lateinit var swipeToLayout: SwipeToLoadLayout
+    private lateinit var statusLayout: StatusLayout
+
+    lateinit var recyclerView: RecyclerView
+
+    private val announcementAdapter: BaseAdapter<DeliveryGoodsSectionData, ClassificationViewHolder> =
+        BaseAdapter { _, _ -> ClassificationViewHolder(baseFragment, viewModule) }
+
+    val root = _FrameLayout(baseFragment.context!!).apply {
+        verticalLayout {
+            viewModule.queryDeliveryGoodsSection()
+            statusLayout(contentBlock = {
+                statusLayout = this
+//                bindTaskStatus(viewModule.status)
+                swipeToLoadLayout {
+                    swipeToLayout = this
+                    setEnableRefresh(true)
+                    setEnableLoadMore(false)
+                    setOnRefreshListener {
+                        viewModule.queryDeliveryGoodsSection()
+                    }
+                    setEnableScrollContentWhenLoaded(false)
+                    setEnableLoadMoreWhenContentNotFull(false)
+                    recyclerView {
+                        background = resources.getDrawable(R.color.white)
+                        adapter = announcementAdapter
+
+                    }.lparams(matchParent, matchParent) {
+                        marginStart = autoSize(32)
+                        marginEnd = autoSize(20)
+
+                    }
+                }
+            }, emptyBlock = {
+                emptyView(hint = resources.getString(R.string.now_no_data))
+            }).lparams(matchParent, matchParent)
+            viewModule.deliveryGoodsSectionDataList.bindOptional(context) {
+                if (it?.isEmpty() == true || it?.size == 0) {
+                    statusLayout.showEmpty()
+                } else {
+                    if (swipeToLayout.getIsRefreshing()) {
+                        swipeToLayout.finishRefresh()
+                    }
+                    statusLayout.showSuccess()
+                    announcementAdapter.setNewData(it)
+                }
 
             }
         }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/yrdz/YrdzHomeViewModel.kt

@@ -2,10 +2,7 @@ package cn.muchinfo.rma.view.base.home.yrdz
 
 import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.global.GlobalDataCollection
-import cn.muchinfo.rma.global.data.BannerData
-import cn.muchinfo.rma.global.data.NoticeData
-import cn.muchinfo.rma.global.data.SiteColumnDetailData
-import cn.muchinfo.rma.global.data.SpotGroupTradeSumData
+import cn.muchinfo.rma.global.data.*
 import cn.muchinfo.rma.netManage.base.ResponseCallback
 import cn.muchinfo.rma.netManage.utils.MyOkHttpUtils
 import cn.muchinfo.rma.view.MyApplication
@@ -55,6 +52,67 @@ class YrdzHomeViewModel : BaseViewModel(){
     val spotGroupTradeSumDataList : MutableLiveData<SpotGroupTradeSumData> = MutableLiveData()
 
     /**
+     * 分类数据
+     */
+    val deliveryGoodsSectionDataList : MutableLiveData<List<DeliveryGoodsSectionData>> = MutableLiveData()
+
+    /**
+     * 指数图表选择显示信息
+     */
+    val selectSpotGroupTradeSumData : MutableLiveData<WrSpotGroupTradeSumData> = MutableLiveData()
+
+    /**
+     * 图表数据
+     */
+    val spotGroupTradeSumDetailDataList : MutableLiveData<List<SpotGroupTradeSumDetailData>> = MutableLiveData()
+
+    /**
+     * 查询
+     */
+    fun querySpotGroupTradeSumDetail(deliverygoodsid : String){
+        val params = mutableMapOf<String,String>().apply {
+            put("deliverygoodsid",deliverygoodsid)
+        }
+        MyApplication.getInstance()?.commonManager?.querySpotGroupTradeSumDetail(params = params){isSuccess, respData, error ->
+            if (isSuccess){
+                spotGroupTradeSumDetailDataList.postValue(respData)
+            }
+        }
+    }
+
+    /**
+     * 针对指数图表的点击切换
+     */
+    fun setSelectSpotGroupTradeSumData(deliverygoodsid : String){
+        val lstList = arrayListOf<WrSpotGroupTradeSumData>()
+        val newData = SpotGroupTradeSumData()
+        newData.reckondate = spotGroupTradeSumDataList.value?.reckondate
+        newData.prereckondate = spotGroupTradeSumDataList.value?.prereckondate
+        spotGroupTradeSumDataList.value?.lst?.forEach {
+            if (deliverygoodsid == it.deliverygoodsid){
+                lstList.add(it.copy(isOnClick = 1))
+                selectSpotGroupTradeSumData.postValue(it)
+            }else{
+                lstList.add(it.copy(isOnClick = 0))
+            }
+        }
+        newData.lst = lstList
+        spotGroupTradeSumDataList.postValue(newData)
+    }
+
+    /**
+     * 查询分类数据
+     */
+    fun queryDeliveryGoodsSection(){
+        val params = mutableMapOf<String, String>()
+        MyApplication.getInstance()?.commonManager?.queryDeliveryGoodsSection(params = params){isSuccess, respData, error ->
+            if (isSuccess){
+                deliveryGoodsSectionDataList.postValue(respData)
+            }
+        }
+    }
+
+    /**
      * 查询指数数据
      */
     fun querySpotGroupTradeSum(){
@@ -63,6 +121,7 @@ class YrdzHomeViewModel : BaseViewModel(){
             if (isSuccess){
                 if (respData?.size ?: 0 > 0){
                     spotGroupTradeSumDataList.postValue(respData?.get(0))
+                    selectSpotGroupTradeSumData.postValue(respData?.get(0)?.lst?.get(0)?.copy(isOnClick = 1))
                 }
             }
         }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/yrdz/viewholder/ClassificationItemViewHolder.kt

@@ -0,0 +1,48 @@
+package cn.muchinfo.rma.view.base.home.yrdz.viewholder
+
+import android.os.Build
+import android.view.Gravity
+import android.widget.TextView
+import androidx.annotation.RequiresApi
+import androidx.fragment.app.Fragment
+import cn.muchinfo.rma.R
+import cn.muchinfo.rma.global.data.DeliveryGoodsSectionData
+import cn.muchinfo.rma.global.data.WrDeliveryGoodsSectionConfig
+import cn.muchinfo.rma.lifecycle.bindOptional
+import cn.muchinfo.rma.view.autoWidget.*
+import cn.muchinfo.rma.view.base.home.yrdz.YrdzHomeViewModel
+import cn.muchinfo.rma.view.eventbus.MainTabSelectMessageEvent
+import mtp.polymer.com.autowidget.adapter.BaseViewHolder
+import org.greenrobot.eventbus.EventBus
+import org.jetbrains.anko.*
+
+class ClassificationItemViewHolder(private val baseFragment: Fragment,
+                                   private val viewModel: YrdzHomeViewModel
+) : BaseViewHolder<WrDeliveryGoodsSectionConfig>(baseFragment.activity!!){
+    override val itemSize: IntArray = intArrayOf(autoSize(150), autoSize(90))
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun _FrameLayout.createContentView() {
+        verticalLayout {
+            linearLayout {
+                background = resources.getDrawable(R.color.segtabment_bg_color)
+                onThrottleFirstClick {
+//                    EventBus.getDefault().post(MainTabSelectMessageEvent(1))
+                }
+                gravity = Gravity.CENTER
+
+                textView {
+                    gravity = Gravity.CENTER
+                    setAutoSizeTextTypeWithDefaults(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM)
+                    data.bindOptional(context){
+                        text = it?.deliverygoodsname//黄老板说张鹏说用name
+                        textColorInt = R.color.rma_black_33
+                    }
+                    textSizeAuto = 31
+                }.lparams(autoSize(210), wrapContent)
+            }.lparams(autoSize(150), autoSize(80))
+
+        }.lparams(autoSize(150), autoSize(90))
+    }
+
+}

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/yrdz/viewholder/ClassificationViewHolder.kt

@@ -0,0 +1,79 @@
+package cn.muchinfo.rma.view.base.home.yrdz.viewholder
+
+import android.view.Gravity
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.StaggeredGridLayoutManager
+import cn.muchinfo.rma.R
+import cn.muchinfo.rma.global.data.DeliveryGoodsSectionData
+import cn.muchinfo.rma.global.data.WrDeliveryGoodsSectionConfig
+import cn.muchinfo.rma.global.data.WrStandardFactoryItem
+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.future.trade.itemView
+import cn.muchinfo.rma.view.base.home.contract.verticalEmptyView
+import cn.muchinfo.rma.view.base.home.yrdz.YrdzHomeViewModel
+import cn.muchinfo.rma.view.base.warehousereceipt.viewholder.WrStandardFactoryItemSonViewHolder
+import com.blankj.utilcode.util.SPUtils
+import mtp.polymer.com.autowidget.adapter.BaseAdapter
+import mtp.polymer.com.autowidget.adapter.BaseViewHolder
+import org.jetbrains.anko.*
+
+class ClassificationViewHolder(private val baseFragment: Fragment,
+                               private val viewModel: YrdzHomeViewModel
+) : BaseViewHolder<DeliveryGoodsSectionData>(baseFragment.activity!!){
+    override val itemSize: IntArray = intArrayOf(matchParent, wrapContent)
+
+    lateinit var recyclerview : RecyclerView
+
+    override fun _FrameLayout.createContentView() {
+        verticalLayout {
+            linearLayout {
+                gravity = Gravity.CENTER_VERTICAL
+                verticalLayout {
+                    gravity = Gravity.CENTER_HORIZONTAL
+                    verticalEmptyView()
+                    imageView {
+                        data.bindOptional(context){
+                            if (it?.imagepath.isNullOrEmpty()){
+                                imageResource = R.mipmap.yrdz_banner_placeholder
+                            }else{
+                                showImage(SPUtils.getInstance().getString(Constant.uploadUrl).replace("/upload","") + it?.imagepath?.substring(1))
+                            }
+                        }
+                    }.lparams(matchParent, autoSize(100))
+
+                    textView {
+                        data.bindOptional(context){
+                            text = it?.sectionname
+                        }
+                        textSizeAuto = 31
+                        textColorInt = R.color.rma_black_33
+                    }.lparams(wrapContent, wrapContent)
+
+                    verticalEmptyView()
+                }.lparams(0, autoSize(180),1f)
+
+                recyclerView {
+                    recyclerview = this
+                    val staggeredGridLayoutManager = StaggeredGridLayoutManager(4, StaggeredGridLayoutManager.VERTICAL)
+                    layoutManager = staggeredGridLayoutManager
+                    background = resources.getDrawable(R.color.white)
+                }.lparams(0, wrapContent,4f)
+
+                data.bindOptional(context){
+                    //要素子item
+                    val spotCategoryAdapter: BaseAdapter<WrDeliveryGoodsSectionConfig, ClassificationItemViewHolder> =
+                        BaseAdapter { _, _ -> ClassificationItemViewHolder(baseFragment, viewModel) }
+                    recyclerview.adapter = spotCategoryAdapter
+                    spotCategoryAdapter.setNewData(it?.dglst)
+                }
+            }.lparams(matchParent, wrapContent)
+
+            itemView()
+        }.lparams(matchParent, wrapContent)
+
+    }
+
+}

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/yrdz/viewholder/IndexChartViewHolder.kt

@@ -0,0 +1,46 @@
+package cn.muchinfo.rma.view.base.home.yrdz.viewholder
+
+import android.view.Gravity
+import androidx.fragment.app.Fragment
+import cn.muchinfo.rma.R
+import cn.muchinfo.rma.global.data.WrSpotGroupTradeSumData
+import cn.muchinfo.rma.lifecycle.bindOptional
+import cn.muchinfo.rma.view.autoWidget.autoSize
+import cn.muchinfo.rma.view.autoWidget.onThrottleFirstClick
+import cn.muchinfo.rma.view.autoWidget.textColorInt
+import cn.muchinfo.rma.view.autoWidget.textSizeAuto
+import cn.muchinfo.rma.view.base.home.yrdz.YrdzHomeViewModel
+import mtp.polymer.com.autowidget.adapter.BaseViewHolder
+import org.jetbrains.anko.*
+
+class IndexChartViewHolder(private val baseFragment: Fragment,
+                           private val viewModel: YrdzHomeViewModel
+) : BaseViewHolder<WrSpotGroupTradeSumData>(baseFragment.activity!!){
+    override val itemSize: IntArray = intArrayOf(autoSize(120), autoSize(70))
+
+    override fun _FrameLayout.createContentView() {
+        linearLayout {
+            onThrottleFirstClick {
+                viewModel.setSelectSpotGroupTradeSumData(data.value?.deliverygoodsid ?: "")
+            }
+
+            gravity = Gravity.CENTER
+            textView {
+                gravity = Gravity.CENTER
+                data.bindOptional(context){
+                    text = it?.deliverygoodsname//黄老板说用name
+                    if (it?.isOnClick == 1){
+                        backgroundResource = R.drawable.yrdz_item_select_bg
+                        textColorInt = R.color.white
+                    }else{
+                        backgroundResource = R.drawable.yrdz_item_normal_bg
+                        textColorInt = R.color.rma_black_33
+                    }
+                }
+                textSizeAuto = 29
+                textColorInt = R.color.rma_black_33
+            }.lparams(autoSize(99), autoSize(50))
+        }.lparams(autoSize(120), autoSize(70))
+    }
+
+}

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/yrdz/viewholder/YrdzInformationViewHolder.kt

@@ -61,7 +61,7 @@ class YrdzInformationViewHolder(
 
                     textView {
                         data.bindOptional(context){
-                            text = it?.publishdate?.toShowTime3("MM-dd")
+                            text = it?.publishdate?.toShowTime3("yyyy-MM-dd")
                         }
                         textSizeAuto = 24
                         textColorInt = R.color.rma_gray_color
@@ -74,7 +74,7 @@ class YrdzInformationViewHolder(
                 imageView {
                     data.bindOptional(context){
                         if (it?.coverimage.isNullOrEmpty()){
-                            imageResource = R.mipmap.yrdz_banner_placeholder
+
                         }else{
                             showImage(SPUtils.getInstance().getString(Constant.uploadUrl).replace("/upload","") + it?.coverimage?.substring(1))
                         }

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

@@ -271,6 +271,11 @@ class LoginActivity : BaseActivity<LoginViewModel>(), UserPopupWindow.OnClearAcc
                 }
 
                 textView {
+                    if (SPUtils.getInstance().getString(Constant.mobileOpenUrl).isNullOrEmpty()){
+                        visibility = View.GONE
+                    }else{
+                        visibility = View.VISIBLE
+                    }
                     onThrottleFirstClick {
                         if (SPUtils.getInstance().getString(Constant.oem) == "qhj" || SPUtils.getInstance().getString(Constant.oem) == "qyfg") {
                             val intent = Intent()
@@ -279,7 +284,7 @@ class LoginActivity : BaseActivity<LoginViewModel>(), UserPopupWindow.OnClearAcc
                         }else{
                             if (SPUtils.getInstance().getString(Constant.openApiUrl).isNotEmpty()){
                                 val intent = Intent()
-                                intent.putExtra("url",SPUtils.getInstance().getString(Constant.openApiUrl))
+                                intent.putExtra("url",SPUtils.getInstance().getString(Constant.mobileOpenUrl))
                                 intent.putExtra("title","用户注册")
                                 intent.setClass(context,WebActivity::class.java)
                                 ActivityUtils.startActivity(intent)
@@ -288,7 +293,6 @@ class LoginActivity : BaseActivity<LoginViewModel>(), UserPopupWindow.OnClearAcc
                             }
 
                         }
-
                     }
                     text = "用户注册"
                     textColorInt = R.color.white

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

@@ -161,7 +161,13 @@ class InvoiceInformationViewHolder(
                     backgroundDrawable = createRoundRectDrawable("#828E95", 20)
                     gravity = Gravity.CENTER
                     textView {
-                        text = "企业"
+                        data.bindOptional(context){
+                                if (it?.receipttype == "1"){//发票类型 - 1:个人 2:企业
+                                    text = "个人"
+                                }else{
+                                    text = "企业"
+                                }
+                            }
                         textSizeAuto = 25
                         textColorInt = R.color.white
                     }.lparams(wrapContent, wrapContent)
@@ -214,7 +220,7 @@ class InvoiceInformationViewHolder(
                     onThrottleFirstClick {
                         activity.createWarningDialog {
                             setTitle("温馨提示")
-                            setMessage("确定删除此现货市价吗？")
+                            setMessage("确定删除此发票信息吗？")
                             addAction("取消") { dialog, _ ->
                                 dialog.dismiss()
                             }
@@ -270,7 +276,7 @@ class InvoiceInformationViewHolder(
                     onThrottleFirstClick {
                         activity.createWarningDialog {
                             setTitle("温馨提示")
-                            setMessage("确定删除此现货市价吗？")
+                            setMessage("确定删除此发票信息吗？")
                             addAction("取消") { dialog, _ ->
                                 dialog.dismiss()
                             }
@@ -295,8 +301,9 @@ class InvoiceInformationViewHolder(
                 textView {
                     onThrottleFirstClick {
                         val intent = Intent()
+                        intent.putExtra("type","3")
                         intent.putExtra("data",data.value)
-                        intent.setClass(context, SpotMarketDetailsActivity::class.java)
+                        intent.setClass(context, AddInvoiceInformationActivity::class.java)
                         ActivityUtils.startActivity(intent)
                     }
                     backgroundResource = R.drawable.rma_item_click_bg

RMA/app/src/main/res/drawable/yrdz_item_select_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <stroke
+        android:color="#368FDF"
+        android:width="0.5dp" />
+    <solid android:color="#2291FF"/>
+    <corners android:radius="3dp"/>
+</shape>