1.去掉无用架包

app/build.gradle

@@ -144,10 +144,9 @@ dependencies {
 
     //高仿微信朋友圈图片展示效果 ImageWatcher
     implementation 'com.github.iielse:ImageWatcher:2.1.2'
-    //各种图标折线图
-    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
 
-    implementation 'cat.ereza:customactivityoncrash:2.3.0'
+
+   // implementation 'cat.ereza:customactivityoncrash:2.3.0'
 //二维码扫描页面
     implementation 'cn.yipianfengye.android:zxing-library:2.2'
     implementation 'androidx.multidex:multidex:2.0.0'

app/src/main/java/com/hdl/xl/App.kt

@@ -1,13 +1,12 @@
 package com.hdl.xl
 
 import android.speech.tts.TextToSpeech
-import cat.ereza.customactivityoncrash.config.CaocConfig
 import com.uuzuche.lib_zxing.activity.ZXingLibrary
 import com.ysnows.base.base.BApp
 import com.ysnows.base.config.IConfig
 import com.ysnows.update.component.UpdateUtils
-import com.hdl.xl.activity.CustomErrorActivity
 import com.hdl.xl.config.Config
+import com.tencent.mmkv.MMKV
 import java.util.*
 
 
@@ -19,15 +18,18 @@ class App : BApp(){
     override fun init() {
         config = Config
 
-        com.hdl.xl.App.Companion.instance = this
+       instance = this
 
-        com.hdl.xl.App.Companion.tts = TextToSpeech(applicationContext) { status ->
+       tts = TextToSpeech(applicationContext) { status ->
             if (status == TextToSpeech.SUCCESS) com.hdl.xl.App.Companion.tts?.language = Locale.CHINESE
         }
+        val isEnable= MMKV.defaultMMKV().getBoolean("Enable", false)
 
-        UpdateUtils.init(this)
-        //二维码库
-        ZXingLibrary.initDisplayOpinion(this)
+        if(isEnable) {
+            UpdateUtils.init(this)
+            //二维码库
+            ZXingLibrary.initDisplayOpinion(this)
+        }
 
 
         //注册微信
@@ -41,11 +43,7 @@ class App : BApp(){
 //                .init()
 //                .subscribe();
 
-        //整个配置属性，可以设置一个或多个，也可以一个都不设置
-        CaocConfig.Builder.create()
-                .showErrorDetails(true)
-                .errorActivity(CustomErrorActivity::class.java) // .eventListener(new CustomEventListener())
-                .apply()
+
     }
 
     override fun config(): IConfig? {

app/src/main/java/com/hdl/xl/activity/CollectDetailsActivity.kt

@@ -54,7 +54,7 @@ class CollectDetailsActivity : MBActivity<CollectDetailsVModel, ActivityCollectD
             GlideUtils.lImg(this, it.pro_info.describe, 16, binding.imgDeatils)
             //设置头 图片
 
-            GlideUtils.lImg(this, it.cover, 20, binding.imageView)
+            GlideUtils.lImg(this, it.cover,  binding.imageView)
 
 
 

app/src/main/java/com/hdl/xl/activity/CustomErrorActivity.kt

@@ -1,79 +0,0 @@
-package com.hdl.xl.activity
-
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.os.Bundle
-import cat.ereza.customactivityoncrash.CustomActivityOnCrash
-import cat.ereza.customactivityoncrash.config.CaocConfig
-import com.hdl.xl.base.MBActivity
-import com.hdl.xl.databinding.ActivityErrorBinding
-import com.qmuiteam.qmui.kotlin.onClick
-import com.ysnows.base.base.BRepository
-import com.ysnows.base.base.BViewModel
-
-
-/**
- *Created by shihuiyun
- *on 2020/11/10
- */
-class CustomErrorActivity : MBActivity<BViewModel<BRepository>, ActivityErrorBinding>(){
-
-
-    override fun init(savedInstanceState: Bundle?) {
-        super.init(savedInstanceState)
-        var config: CaocConfig? =null
-        try {
-            binding.errorDetails.text=CustomActivityOnCrash.getStackTraceFromIntent(intent)
-             config = CustomActivityOnCrash.getConfigFromIntent(intent)
-
-        }catch (e:Exception){
-        }
-
-        binding.restartCopy.onClick {
-            //复制错误信息
-
-            val cm: ClipboardManager = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-            // 创建普通字符型ClipData
-            val mClipData = ClipData.newPlainText(null, binding.errorDetails.text)
-            // 将ClipData内容放到系统剪贴板里。
-            // 将ClipData内容放到系统剪贴板里。
-            cm.setPrimaryClip(mClipData)
-            toast("错误信息已复制到粘贴板")
-        }
-
-
-        if (config == null) {
-            finish()
-            return
-        }
-
-        if (config.isShowRestartButton && config.restartActivityClass != null) {
-            binding.restartButton.text="重启应用"
-
-            binding.restartButton.onClick {
-                CustomActivityOnCrash.restartApplication(this@CustomErrorActivity, config)
-            }
-
-
-        } else {
-
-            binding.restartButton.onClick {
-                CustomActivityOnCrash.closeApplication(this@CustomErrorActivity, config)
-            }
-
-        }
-
-
-    }
-
-
-    override fun title(): String? {
-        return "错误信息"
-
-    }
-
-    override fun binding(): ActivityErrorBinding {
-        return ActivityErrorBinding.inflate(layoutInflater)
-    }
-}

app/src/main/java/com/hdl/xl/activity/LoginActivity.kt

@@ -1,5 +1,7 @@
 package com.hdl.xl.activity
 
+import android.Manifest
+import android.content.Intent
 import android.graphics.Color
 import android.graphics.LinearGradient
 import android.graphics.Shader
@@ -8,23 +10,126 @@ import android.os.Bundle
 import android.text.method.HideReturnsTransformationMethod
 import android.text.method.PasswordTransformationMethod
 import android.view.KeyEvent
+import androidx.lifecycle.lifecycleScope
+import com.eazypermissions.coroutinespermission.PermissionManager
 import com.hdl.xl.R
 import com.hdl.xl.base.MBActivity
 import com.hdl.xl.databinding.ActivityLoginBinding
+import com.hdl.xl.inte.ChoiceData
+import com.hdl.xl.utils.PopuLimitUtils
 import com.hdl.xl.vmodel.LoginVModel
 import com.qmuiteam.qmui.kotlin.onClick
+import com.tencent.mmkv.MMKV
+import com.uuzuche.lib_zxing.activity.ZXingLibrary
+import com.ysnows.base.ccretrofit.CCRetrofit
+import com.ysnows.base.route.IGaode
 import com.ysnows.base.utils.KeySimulateUtils
+import com.ysnows.update.component.UpdateUtils
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.launch
 
 
 class LoginActivity : MBActivity<LoginVModel, ActivityLoginBinding>() {
 
     //测试 13000000001    wang111111
     //15666879195 密码 123456
+    var isShow = false
+
+
+    override fun onResume() {
+        super.onResume()
+
+        if (isShow) {
+            isShow = false
+
+            var isEnable = MMKV.defaultMMKV().getBoolean("Enable", false)
+            if (!isEnable) {
+                PopuLimitUtils.show(context(), binding.ll, object : ChoiceData {
+                    override fun onRestuse(id: String?) {
+                        if (id.equals("0")) {//不开启友盟统计
+                            MMKV.defaultMMKV().putBoolean("Enable", false)
+                            //关闭应用
+                            isShow = true
+                            val home = Intent(Intent.ACTION_MAIN)
+                            home.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+                            home.addCategory(Intent.CATEGORY_HOME)
+                            startActivity(home)
+
+                        } else {
+                            MMKV.defaultMMKV().putBoolean("Enable", true)
+
+                            UpdateUtils.init(context = applicationContext)
+                            //二维码库
+                            ZXingLibrary.initDisplayOpinion( applicationContext)
+
+                            lifecycleScope.launch {
+                                PermissionManager.requestPermissions(
+                                        this@LoginActivity, 1000,
+                                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                                        Manifest.permission.READ_EXTERNAL_STORAGE,
+                                )
+                            }
+
+                        }
+
+                    }
+
+                })
+
+
+            }
+        }
+    }
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
         setTextColor()
 
+        launch {
+            flow<String> {
+                delay(1000)
+                emit("") // emit next value
+            }.collect {
+                var isEnable = MMKV.defaultMMKV().getBoolean("Enable", false)
+                if (!isEnable) {
+
+                    PopuLimitUtils.show(context(), binding.ll, object : ChoiceData {
+                        override fun onRestuse(id: String?) {
+                            if (id.equals("0")) {//不开启友盟统计
+                                MMKV.defaultMMKV().putBoolean("Enable", false)
+                                //关闭应用
+                                isShow = true
+                                val home = Intent(Intent.ACTION_MAIN)
+                                home.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+                                home.addCategory(Intent.CATEGORY_HOME)
+                                startActivity(home)
+
+                            } else {
+                                MMKV.defaultMMKV().putBoolean("Enable", true)
+
+                                UpdateUtils.init(context = applicationContext)
+                                //二维码库
+                                ZXingLibrary.initDisplayOpinion( applicationContext)
+
+                                lifecycleScope.launch {
+                                    PermissionManager.requestPermissions(
+                                            this@LoginActivity, 1000,
+                                            Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                                            Manifest.permission.READ_EXTERNAL_STORAGE,
+                                    )
+                                }
+                            }
+
+                        }
+
+                    })
+
+                }
+            }
+        }
+
 
     }
 

app/src/main/java/com/hdl/xl/activity/LotsDetailsActivity.kt

@@ -82,7 +82,7 @@ class LotsDetailsActivity : MBActivity<LotsDetailsVModel, ActivityLotsDetailsBin
             adapter?.addData(it.describe)
             //设置头 图片
 
-            GlideUtils.lImg(this, it.cover, 20, binding.imageView)
+            GlideUtils.lImg(this, it.cover, binding.imageView)
         }
 
 

app/src/main/java/com/hdl/xl/activity/TibetanDetailsActivity.kt

@@ -73,14 +73,14 @@ class TibetanDetailsActivity : MBActivity<TibetanDetailsVModel, ActivityTibetanD
             adapter?.clearList()
             adapter?.addData(it.describe)
             //设置头 图片
-            GlideUtils.lImg(this, it.cover, 20, binding.imageView)
+            GlideUtils.lImg(this, it.cover,  binding.imageView)
 
 
         }
 
         val uri = intent.data
         if (uri != null) {
-            // scheme 协议
+            // scheme 协
             val scheme = uri.scheme
             // 获取所有参数
             val query = uri.query

app/src/main/java/com/hdl/xl/fragment/AccountAnalysisFragment.kt

@@ -4,11 +4,6 @@ import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import com.github.mikephil.charting.components.XAxis
-import com.github.mikephil.charting.data.Entry
-import com.github.mikephil.charting.formatter.IndexAxisValueFormatter
-import com.github.mikephil.charting.highlight.Highlight
-import com.github.mikephil.charting.listener.OnChartValueSelectedListener
 import com.hdl.xl.R
 import com.hdl.xl.base.MBFragment
 import com.hdl.xl.databinding.FragmentAccountAnalysisBinding
@@ -19,110 +14,23 @@ import java.util.*
 class AccountAnalysisFragment : MBFragment<AccountAnalysisVModel, FragmentAccountAnalysisBinding>() {
 
 
-    private val mXData = ArrayList<String>()
-    private var mMarkerView: com.hdl.xl.mp.MyMarkerView? = null
-
-    private var mChartManager: com.hdl.xl.mp.LineChartManager? = null
 
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
 
-        vm.getInfo()
+
         // 初始化表格manager
-        mChartManager = com.hdl.xl.mp.LineChartManager(binding.chart)
-        mMarkerView = com.hdl.xl.mp.MyMarkerView(context, R.layout.chart_marker_view)
-        mChartManager!!.setMarkView(mMarkerView)
 
-        vm.info.observe(this, androidx.lifecycle.Observer {
 
-            initData(it)
-        })
 
 
 
     }
 
-   private fun  initData(bean: IconData){//给折线图数据
-       val list: ArrayList<com.hdl.xl.mp.MyFofChartBean> = ArrayList<com.hdl.xl.mp.MyFofChartBean>()
-
-       for((index,item)in bean!!.x.withIndex()){
-           val item = com.hdl.xl.mp.MyFofChartBean(item, bean.y[index].toFloat())
-           list.add(item)
-       }
-       binding.chart.setOnChartValueSelectedListener(object : OnChartValueSelectedListener {
-           private var mHighlight: Highlight? = null
-           override fun onValueSelected(entry: Entry, highlight: Highlight) {
-               mHighlight = highlight
-           }
-
-           override fun onNothingSelected() {
-               if (mHighlight == null) {
-                   mHighlight = Highlight(mMarkerView!!.highlightXValue, mMarkerView!!.highlightYValue, 1)
-               }
-               mMarkerView!!.showMarkView(mHighlight!!.x, mHighlight!!.y)
-           }
-       })
-       setLineChartData(list)
-
-   }
-
-
-    private fun setLineChartData(list: List<com.hdl.xl.mp.MyFofChartBean>?) {
-        if (list != null && !list.isEmpty()) {
-            mXData.clear()
-            val size = list.size
-            val entries: MutableList<Entry> = ArrayList()
-            for (i in 0 until size) {
-                val dataBean = list[i]
-                if (dataBean != null) {
-                    if (!java.lang.Float.isNaN(dataBean.networth)) { //getResources().getDrawable(R.drawable.icon_chart_dot)
-                        val e = Entry(i.toFloat(), dataBean.networth, null)
-                        entries.add(e)
-                    }
-                    mXData.add(dataBean.inputDate)
-                }
-            }
-            val xAxis: XAxis = binding.chart.xAxis
-            //            xAxis.setLabelCount(list.size());
-            xAxis.setLabelCount(3, true)
-            //            xAxis.setAxisMinimum(0f);
-//            xAxis.setAxisMaximum((float) list.size());
-            xAxis.valueFormatter = object : IndexAxisValueFormatter() {
-                override fun getFormattedValue(value: Float): String {
-                    val i = value.toInt()
-                    Log.e("-shy-", "i=$i")
-                    Log.e("-shy-", "mXData.size=" + mXData.size)
-                    return try {
-                        mXData[i]
-                    } catch (e: Exception) {
-                        ""
-                    }
-
-                }
-            }
-            // 设置lineChart的数据
-            mChartManager!!.setData(entries)
-            // 给y轴设置最大值
-            val yMax: Float = binding.chart.yMax
-            binding.chart.axisLeft.axisMaximum = yMax + 0.1f
-
-            // 设置X轴的label的集合
-            mMarkerView!!.setXAxisLabels(mXData)
-            // 指定最后一个点为高亮，让其自定显示MarkView
-            val entry = entries[size - 1]
-            mMarkerView!!.showMarkView(entry.x, entry.y)
-            binding.chart.animateXY(800, 800)
-            binding.chart.invalidate()
-        }else{//没有数据
-            if(mXData.size>0){//清空数据
-                binding.chart.clear()
-            }
-
-
-        }
 
-    }
+
+
 
 
     override fun vmClass(): Class<AccountAnalysisVModel> {

app/src/main/java/com/hdl/xl/model/TibetaDetails.kt

@@ -8,7 +8,7 @@ import com.ysnows.base.inter.IModel
  * state 1:进行中2：即将开售3：已售罄）
  *
  */
-data class TibetaDetails(var auth_name:String, var auth_img:String, var buy_count:String,
+data class TibetaDetails(var auth_name:String, var auth_img:String, var buy_count:Int,
                          var buy_notice:String, var cover:String,var describe:List<String>,
                          var detail_img:String, var first_cid:String, var first_time:String,
                          var format:String, var id:String, var instructions:String,

app/src/main/java/com/hdl/xl/mp/LineChartManager.java

@@ -1,163 +0,0 @@
-package com.hdl.xl.mp;
-
-import android.graphics.Color;
-import android.graphics.drawable.GradientDrawable;
-
-import com.github.mikephil.charting.charts.LineChart;
-import com.github.mikephil.charting.components.XAxis;
-import com.github.mikephil.charting.components.YAxis;
-import com.github.mikephil.charting.data.Entry;
-import com.github.mikephil.charting.data.LineData;
-import com.github.mikephil.charting.data.LineDataSet;
-import com.github.mikephil.charting.formatter.ValueFormatter;
-
-import java.text.DecimalFormat;
-import java.util.List;
-
-/**
- * Author :li ChuanWu on 2018/1/12
- * Blog  ：http://blog.csdn.net/lsyz0021/
- */
-public class LineChartManager {
-//    private DecimalFormat mDecimalFormat = new DecimalFormat("##,##0.0#");
-   private DecimalFormat mDecimalFormat = new DecimalFormat("0.0");
-
-    private LineChart mLineChart;
-
-    public LineChartManager(LineChart lineChart) {
-        mLineChart = lineChart;
-        initChart(lineChart);
-    }
-
-    private void initChart(LineChart lineChart) {
-        if (lineChart != null) {
-            lineChart.getLegend().setEnabled(false);// 不显示图例
-            lineChart.getDescription().setEnabled(false);// 不显示描述
-            lineChart.setScaleEnabled(true);   // 取消缩放
-            lineChart.setNoDataText("暂无数据");// 没有数据的时候默认显示的文字
-            lineChart.setNoDataTextColor(Color.GRAY);
-            lineChart.setBorderColor(Color.BLUE);
-            lineChart.setTouchEnabled(true);
-            lineChart.setDragEnabled(true);
-            // 如果x轴label文字比较大，可以设置边距
-            lineChart.setExtraRightOffset(25f);
-            lineChart.setExtraBottomOffset(10f);
-            lineChart.setExtraTopOffset(10f);
-
-            initChartXAxis(lineChart);
-            initChartYAxis(lineChart);
-        }
-    }
-
-
-
-
-    public void setMarkView(MyMarkerView markerView) {
-        if (markerView != null) {
-            markerView.setChartView(mLineChart);
-            mLineChart.setMarker(markerView);
-        }
-    }
-
-    public void setData(List<Entry> entries) {
-        mLineChart.setData(getLineData(entries));
-    }
-
-    /**
-     * 初始化Y轴
-     *
-     * @param lineChart
-     */
-    private void initChartYAxis(LineChart lineChart) {
-        if (lineChart != null) {
-            // 不显示右侧Y轴
-            YAxis yAxisRight = lineChart.getAxisRight();
-            yAxisRight.setEnabled(false);
-
-            YAxis yAxisLeft = lineChart.getAxisLeft();
-            // 强制显示Y轴5个坐标
-            yAxisLeft.setLabelCount(5, true);
-            // 将y轴0点轴的颜色设置为透明
-            yAxisLeft.setZeroLineColor(Color.WHITE);
-            yAxisLeft.setTextColor(Color.parseColor("#8F8E94"));
-            yAxisLeft.setTextSize(10);
-            // 设置y轴网格的颜色
-            yAxisLeft.setGridColor(Color.parseColor("#8F8E94"));
-            // yAxisLeft.setGranularity(0.5f);
-            yAxisLeft.setAxisMinimum(0.0f); // start at zero
-            //Y方向文字的位置，在线外侧.(默认在外侧)
-            yAxisLeft.setPosition(YAxis.YAxisLabelPosition.OUTSIDE_CHART);
-            // 格式化Y轴数据
-            yAxisLeft.setValueFormatter(new ValueFormatter() {
-                @Override
-                public String getFormattedValue(float value) {
-                    return mDecimalFormat.format(value)+"元";
-
-                }
-            });
-
-
-        }
-    }
-
-    /**
-     * 初始化X轴
-     *
-     * @param lineChart
-     */
-    private void initChartXAxis(LineChart lineChart) {
-        if (lineChart != null) {
-            // 设置x轴的数据
-            XAxis xAxis = lineChart.getXAxis();
-            xAxis.setPosition(XAxis.XAxisPosition.BOTTOM);
-            xAxis.setTextColor(Color.parseColor("#8F8E94"));
-            xAxis.setTextSize(10);
-            // 设置x轴网格的颜色
-            xAxis.setGridColor(Color.parseColor("#00000000"));
-
-            //x轴显示三个坐标
-//            xAxis.setLabelCount(3,true);
-
-           // xAxis.setGridColor(Color.parseColor("#8F8E94"));
-            xAxis.setGranularity(1.0f);
-            //如果设置为true，则在绘制时会避免“剪掉”在x轴上的图表或屏幕边缘的第一个和最后一个坐标轴标签项。
-            // xAxis.setAvoidFirstLastClipping(true);
-            // x轴最左多出空n个坐标
-            // xAxis.setSpaceMax(1.0f);
-            // 让左侧x轴不从0点开始
-            // xAxis.setSpaceMin(0.1f);
-
-        }
-    }
-
-    /**
-     * 获取含有数据的LineDataSet对象
-     *
-     * @param entries
-     * @return
-     */
-    private LineData getLineData(List<Entry> entries) {
-        LineDataSet lineDataSet = new LineDataSet(entries, null);
-        if (entries != null) {
-            // 点击圆点不显示高亮
-            lineDataSet.setDrawHighlightIndicators(true);
-            // 设置折线的颜色
-            lineDataSet.setColor(Color.parseColor("#4186F7"));
-            ///设置点的颜色
-            lineDataSet.setCircleColor(Color.parseColor("#4186F7"));
-            lineDataSet.setDrawCircles(true);//设置是否绘制点，默认是true
-            lineDataSet.setDrawValues(false);//是否绘制点上的文字，默认为true
-
-            // 填充颜色(渐变色)
-            lineDataSet.setDrawFilled(true);
-            lineDataSet.setFillDrawable(new GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM,
-                    new int[]{Color.parseColor("#99E8F3FE"), Color.parseColor("#40E8F3FE")}));
-            lineDataSet.setLineWidth(1f);
-            //设置曲线展示为圆滑曲线（如果不设置则默认折线）
-            lineDataSet.setMode(LineDataSet.Mode.CUBIC_BEZIER);
-
-        }
-        return new LineData(lineDataSet);
-    }
-
-}

app/src/main/java/com/hdl/xl/mp/MyFofChartBean.java

@@ -1,18 +0,0 @@
-package com.hdl.xl.mp;
-
-import java.io.Serializable;
-
-/**
- * Author :li ChuanWu on 2018/1/8
- * Blog  ：http://blog.csdn.net/lsyz0021/
- */
-public class MyFofChartBean implements Serializable {
-    private static final long serialVersionUID = 928892883514145198L;
-    public String inputDate; //日期
-    public Float networth;//万份收益
-
-    public MyFofChartBean(String inputDate, Float networth) {
-        this.inputDate = inputDate;
-        this.networth = networth;
-    }
-}

app/src/main/java/com/hdl/xl/mp/MyMarkerView.java

@@ -1,160 +0,0 @@
-package com.hdl.xl.mp;
-
-import android.content.Context;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.github.mikephil.charting.charts.Chart;
-import com.github.mikephil.charting.components.MarkerView;
-import com.github.mikephil.charting.data.Entry;
-import com.github.mikephil.charting.highlight.Highlight;
-import com.github.mikephil.charting.utils.MPPointF;
-import com.hdl.xl.R;
-
-import java.util.List;
-
-/**
- * Author :li ChuanWu on 2018/1/3
- * Blog  ：http://blog.csdn.net/lsyz0021/
- */
-public class MyMarkerView extends MarkerView {
-
-    private final TextView mTvDate;
-    private final TextView mTvMoney;
-    private final LinearLayout mLlTopArrow;
-    private final LinearLayout mLlBottomArrow;
-    private final ImageView mIvDot;
-    private List<String> mXAxisLabels;
-    private MPPointF mMPPointF = new MPPointF();
-    private float mHighlightXValue;
-    private float mHighlightYValue;
-
-    public MyMarkerView(Context context, int layoutResource) {
-        super(context, layoutResource);
-        mTvDate = (TextView) findViewById(R.id.tv_date);
-        mTvMoney = (TextView) findViewById(R.id.tv_money);
-        mLlTopArrow = (LinearLayout) findViewById(R.id.ll_move_top);
-        mLlBottomArrow = (LinearLayout) findViewById(R.id.ll_move_bottom);
-        mIvDot = (ImageView) findViewById(R.id.iv_bottom_dot);
-    }
-
-    @Override
-    public void refreshContent(Entry e, Highlight highlight) {
-        super.refreshContent(e, highlight);
-        if (mXAxisLabels == null) {
-            throw new NullPointerException("mXAxisLabels 不能为空，请调用setXAxisLabels()为其设置数据");
-        }
-        if (e != null) {
-            float x = e.getX();
-            float y = e.getY();
-            mTvDate.setText(String.format("%s 收益", mXAxisLabels.get((int) x)));
-//            mTvMoney.setText(String.format("%s %s", String.valueOf((char) 165), y));
-
-           // mTvMoney.setText(String.format("%d%% %n", String.valueOf((char) 165), y));
-
-            mTvMoney.setText(y+"%");
-        }
-    }
-
-    @Override
-    public MPPointF getOffsetForDrawingAtPoint(float posX, float posY) {
-        int widthHalf = getWidth() / 2;
-        mMPPointF.x = 0;
-        // 设置x轴MarkView的移动
-        int right = getChartView().getWidth();
-        if (posX < widthHalf) {
-            // 在最左侧的情况
-            mMPPointF.x = -posX;
-        } else if ((posX >= widthHalf) && (posX + widthHalf) <= right) {
-            mMPPointF.x = -widthHalf;
-        } else if ((posX + widthHalf) > right) {
-            // 在最右侧的情况
-            float dis = getWidth() - (right - posX);
-            mMPPointF.x = -dis;
-        }
-        moveArrow(Math.abs(mMPPointF.x));
-
-        // 设置y轴MarkView的移动 如果上面可以放下mark就在上面显示，否则在下面显示
-        if (posY > (getRootView().getHeight() + mIvDot.getHeight())) {
-            showTop(mMPPointF);
-        } else {
-            showBottom(mMPPointF);
-        }
-        // 这里必须要在重新测量、摆放,不然会使用上次的位置
-        refreshContent(null, null);
-        return mMPPointF;
-    }
-
-    /**
-     * mark在点的下方
-     *
-     * @param mpPointF
-     */
-    private void showBottom(MPPointF mpPointF) {
-        if (mpPointF != null) {
-            mpPointF.y = -mIvDot.getHeight() / 2;
-            mLlBottomArrow.setVisibility(GONE);
-            mLlTopArrow.setVisibility(VISIBLE);
-        }
-    }
-
-    private void showTop(MPPointF mpPointF) {
-        if (mpPointF != null) {
-            mpPointF.y = -(getHeight() - mIvDot.getHeight() / 2);
-            mLlBottomArrow.setVisibility(VISIBLE);
-            mLlTopArrow.setVisibility(GONE);
-        }
-    }
-
-    private void moveArrow(float left) {
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT);
-        params.leftMargin = (int) (left - mLlTopArrow.getWidth() / 2);
-        mLlBottomArrow.setLayoutParams(params);
-        mLlTopArrow.setLayoutParams(params);
-    }
-
-    public float getHighlightXValue() {
-        return mHighlightXValue;
-    }
-
-    public float getHighlightYValue() {
-        return mHighlightYValue;
-    }
-
-    /**
-     * 显示MarkView，设置坐标点为高亮即可显示MarkView.如果LineData的构造参数传入的对象为
-     *
-     * @param xValue 点X坐标坐标对应的值
-     * @param yValue 点Y坐标坐标对应的值
-     */
-    public void showMarkView(float xValue, float yValue) {
-        showMarkView(xValue, yValue, 0);
-    }
-
-    /**
-     * 显示MarkView，设置坐标点为高亮即可显示MarkView
-     *
-     * @param xValue       点X坐标坐标对应的值
-     * @param yValue       点Y坐标坐标对应的值
-     * @param dataSetIndex 设置集合的索引值，根据LineData构造中传入的对象来确定值：1、如果LineData()构造中传入的是LineDataSet对象，设置dataSetIndex为0，
-     *                     2、如果传入的是List集合对象，则dataSetIndex的值为该元素对应集合的索引值
-     */
-    public void showMarkView(float xValue, float yValue, int dataSetIndex) {
-        mHighlightXValue = xValue;
-        mHighlightYValue = yValue;
-        Chart chartView = getChartView();
-        if (chartView != null && chartView.getData() != null) {
-            chartView.highlightValue(xValue, yValue, 0);
-        }
-    }
-
-    /**
-     * 设置 X 轴label的集合
-     */
-    public void setXAxisLabels(List<String> xAxisLabels) {
-        mXAxisLabels = xAxisLabels;
-    }
-
-}

app/src/main/java/com/hdl/xl/utils/PopuBuyUtils.kt

@@ -21,6 +21,7 @@ import com.hdl.xl.config.ConfigRx
 import com.hdl.xl.inte.ChoiceData
 import com.hdl.xl.model.bean.PayTypeBen
 import com.qmuiteam.qmui.widget.popup.QMUIFullScreenPopup
+import java.lang.Exception
 
 
 /***
@@ -29,7 +30,9 @@ import com.qmuiteam.qmui.widget.popup.QMUIFullScreenPopup
 object PopuBuyUtils {
     var mNormalPopup: QMUIFullScreenPopup? = null
 
-    fun show(context: Context, cover: String?, name: String?, price: String?, view: View) {
+    fun show(context: Context, cover: String?, name: String?, price: String?,
+             buy_count:Int?,
+             view: View) {
 
          mNormalPopup = QMUIPopups.fullScreenPopup(context)
         val builder: QMUISkinValueBuilder = QMUISkinValueBuilder.acquire()
@@ -56,7 +59,23 @@ object PopuBuyUtils {
 
         val ll: LinearLayout = layout.findViewById(R.id.ll)
         val butCancel: ImageView = layout.findViewById(R.id.img_close)
+        val llOne: LinearLayout = layout.findViewById(R.id.ll_one)
+        val llTwo: LinearLayout = layout.findViewById(R.id.ll_two)
 
+        try {
+
+            if(buy_count!!>1){
+                llOne.visibility=View.GONE
+                llTwo.visibility=View.VISIBLE
+            }else{
+                llOne.visibility=View.VISIBLE
+                llTwo.visibility=View.GONE
+            }
+
+        }catch (e:Exception){
+            llOne.visibility=View.VISIBLE
+            llTwo.visibility=View.GONE
+        }
 
         imgCover.load(cover){
             size(150,150)

app/src/main/java/com/hdl/xl/utils/PopuLimitUtils.kt

@@ -0,0 +1,101 @@
+package com.hdl.xl.utils
+
+import android.content.Context
+import android.os.Bundle
+import android.text.TextUtils
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.*
+import com.hdl.xl.R
+import com.hdl.xl.activity.ArticleDetailActivity
+import com.hdl.xl.inte.ChoiceData
+import com.qmuiteam.qmui.kotlin.onClick
+import com.qmuiteam.qmui.layout.QMUIFrameLayout
+import com.qmuiteam.qmui.skin.QMUISkinValueBuilder
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+import com.qmuiteam.qmui.widget.popup.QMUIPopup
+import com.qmuiteam.qmui.widget.popup.QMUIPopups
+import com.tencent.mmkv.MMKV
+import com.ysnows.base.utils.B
+import com.ysnows.base.utils.Toasts
+import com.ysnows.base.utils.UiSwitch
+import com.ysnows.base.widget.DelEditText
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/21
+ */
+object PopuLimitUtils {
+
+    fun show(context: Context, view: View, choseData: ChoiceData?) {
+
+        var mNormalPopup = QMUIPopups.fullScreenPopup(context)
+        val builder: QMUISkinValueBuilder = QMUISkinValueBuilder.acquire()
+        val frameLayout = QMUIFrameLayout(context)
+        //自定义布局
+        val layoutInflater = context?.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        var layout = layoutInflater.inflate(R.layout.item_limit, null)
+
+        val tvOne: TextView = layout.findViewById(R.id.tv_one)
+        val tvTwo: TextView = layout.findViewById(R.id.tv_two)
+        val tvCancel: TextView = layout.findViewById(R.id.tv_cancel)
+        val tvSure: TextView = layout.findViewById(R.id.tv_sure)
+
+
+        tvOne.onClick {//服务协议
+
+            UiSwitch.bundle(context, ArticleDetailActivity::class.java,
+                    B().putString("type","2")
+                            .putString("chose","2")
+                            .ok())
+
+
+
+        }
+        tvTwo.onClick {//隐私协议
+
+            UiSwitch.bundle(context, ArticleDetailActivity::class.java,
+                    B().putString("type","2")
+                            .putString("chose","1")
+                            .ok())
+        }
+
+        tvCancel.onClick {
+
+            MMKV.defaultMMKV().putBoolean("limits", true)
+            choseData?.onRestuse("0")
+            mNormalPopup.dismiss()
+        }
+
+        tvSure.onClick {
+            MMKV.defaultMMKV().putBoolean("limits", true)
+
+            choseData?.onRestuse("1")
+            mNormalPopup.dismiss()
+        }
+
+
+        builder.release();
+
+        val size = QMUIDisplayHelper.getScreenWidth(context)
+
+
+        val lp: FrameLayout.LayoutParams = FrameLayout.LayoutParams(size,
+                FrameLayout.LayoutParams.WRAP_CONTENT)
+        frameLayout.addView(layout, lp)
+
+        mNormalPopup.addView(frameLayout)
+        mNormalPopup.onDismiss() {
+            MMKV.defaultMMKV().putBoolean("limits", true)
+
+        }
+
+        mNormalPopup.dismissIfOutsideTouch(false)
+        mNormalPopup.animStyle(QMUIPopup.ANIM_GROW_FROM_CENTER)
+        mNormalPopup.show(view)
+
+
+    }
+
+
+}

app/src/main/java/com/hdl/xl/vmodel/IntegralDetailsVModel.kt

@@ -64,7 +64,7 @@ class IntegralDetailsVModel(application: Application) : BViewModel<BRepository>(
     }
 
     fun  toBuy(view :View){//支付弹框
-        PopuBuyUtils.show(repository().context!!, data.value?.cover,data.value?.name,data.value?.price, view)
+        PopuBuyUtils.show(repository().context!!, data.value?.cover,data.value?.name,data.value?.price,data.value?.buy_count, view)
     }
 
     fun getUrl() {

app/src/main/java/com/hdl/xl/vmodel/LotsDetailsVModel.kt

@@ -299,7 +299,7 @@ class LotsDetailsVModel(application: Application) : BViewModel<BRepository>(appl
 
     fun  toBuy(view :View){//支付弹框
         popuBuyUtils= PopuBuyUtils
-        popuBuyUtils?.show(repository().context!!, data.value?.cover,data.value?.name,data.value?.price, view)
+        popuBuyUtils?.show(repository().context!!, data.value?.cover,data.value?.name,data.value?.price,data.value?.buy_count, view)
 
      // PopuBuyUtils.show(repository().context!!, data.value?.cover,data.value?.name,data.value?.price, view)
     }

app/src/main/java/com/hdl/xl/vmodel/TibetanDetailsVModel.kt

@@ -92,7 +92,7 @@ class TibetanDetailsVModel(application: Application) : BViewModel<BRepository>(a
 
     fun  toBuy(view :View){//支付弹框
         popuBuyUtils= PopuBuyUtils
-        popuBuyUtils?.show(repository().context!!, data.value?.cover,data.value?.name,data.value?.price, view)
+        popuBuyUtils?.show(repository().context!!, data.value?.cover,data.value?.name,data.value?.price,data.value?.buy_count, view)
 
      // PopuBuyUtils.show(repository().context!!, data.value?.cover,data.value?.name,data.value?.price, view)
     }

app/src/main/res/drawable/bg_chose_white.xml

@@ -5,7 +5,7 @@ android:shape="rectangle" >
 <!-- 填充的颜色-->
 
 
-    <solid android:color="#B3333333" />
+    <solid android:color="#00000000" />
 
     <corners
         android:radius="6dp"

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

@@ -60,10 +60,12 @@
 
 
 
-                            <ImageView
+                            <com.qmuiteam.qmui.widget.QMUIRadiusImageView
                                 android:id="@+id/image_view"
                                 android:layout_width="match_parent"
                                 android:layout_height="305dp"
+                                app:qmui_corner_radius="20dp"
+                                app:qmui_border_color="@color/translucent"
                                 android:src="@drawable/bg_need_error"
                                 android:scaleType="centerCrop" />
 
@@ -137,8 +139,8 @@
                         android:paddingTop="10dp"
                         android:paddingEnd="10dp"
                         android:paddingBottom="15dp"
-                        app:qmui_backgroundColor="#141414"
-                        app:qmui_borderColor="#141414"
+                        app:qmui_backgroundColor="#B3444444"
+                        app:qmui_borderColor="#B3444444"
                         app:qmui_borderWidth="@dimen/dp_1"
                         app:qmui_radius="16dp">
 
@@ -246,8 +248,8 @@
                         android:paddingTop="10dp"
                         android:paddingEnd="10dp"
                         android:paddingBottom="12dp"
-                        app:qmui_backgroundColor="#141414"
-                        app:qmui_borderColor="#141414"
+                        app:qmui_backgroundColor="#B3444444"
+                        app:qmui_borderColor="#B3444444"
                         app:qmui_borderWidth="@dimen/dp_1"
                         app:qmui_radius="16dp">
 
@@ -380,8 +382,8 @@
                         android:paddingTop="10dp"
                         android:paddingEnd="10dp"
                         android:paddingBottom="9dp"
-                        app:qmui_backgroundColor="#141414"
-                        app:qmui_borderColor="#141414"
+                        app:qmui_backgroundColor="#B3444444"
+                        app:qmui_borderColor="#B3444444"
                         app:qmui_borderWidth="@dimen/dp_1"
                         app:qmui_radius="16dp">
 
@@ -421,6 +423,9 @@
 
                     </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="30dp"/>
 
 
 

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

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-     >
-
-    <data >
-
-        <import type="com.hdl.xl.BuildConfig" />
-
-    </data >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        android:layout_height="match_parent" >
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:fillViewport="true">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:contentDescription="@null"
-                    android:src="@drawable/customactivityoncrash_error_image" />
-
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp"
-                    android:text="错误信息"
-                    android:textStyle="bold" />
-
-
-                <TextView
-                    android:id="@+id/error_details"
-                    android:layout_width="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
-                    android:textIsSelectable="true"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="6dp"
-                    android:text="未知异常" />
-            </LinearLayout>
-        </ScrollView>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:orientation="horizontal"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:gravity="center_horizontal"
-            android:layout_height="wrap_content">
-
-
-            <Button
-                android:id="@+id/restart_copy"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="20dp"
-                android:text="复制错误信息" />
-
-            <Button
-                android:id="@+id/restart_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="关闭程序" />
-
-        </LinearLayout>
-
-
-
-
-    </LinearLayout >
-</layout >

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

@@ -62,11 +62,13 @@
                             android:layout_height="wrap_content">
 
 
-                            <ImageView
+                            <com.qmuiteam.qmui.widget.QMUIRadiusImageView
                                 android:id="@+id/image_view"
                                 android:layout_width="match_parent"
                                 android:layout_height="305dp"
                                 android:scaleType="centerCrop"
+                                app:qmui_border_color="@color/translucent"
+                                app:qmui_corner_radius="20dp"
                                 android:src="@drawable/bg_need_error" />
 
 
@@ -296,8 +298,8 @@
                         android:paddingTop="10dp"
                         android:paddingEnd="10dp"
                         android:paddingBottom="15dp"
-                        app:qmui_backgroundColor="#141414"
-                        app:qmui_borderColor="#141414"
+                        app:qmui_backgroundColor="#B3444444"
+                        app:qmui_borderColor="#B3444444"
                         app:qmui_borderWidth="@dimen/dp_1"
                         app:qmui_radius="16sp">
 
@@ -404,8 +406,8 @@
                         android:paddingTop="10dp"
                         android:paddingEnd="10dp"
                         android:paddingBottom="12dp"
-                        app:qmui_backgroundColor="#141414"
-                        app:qmui_borderColor="#141414"
+                        app:qmui_backgroundColor="#B3444444"
+                        app:qmui_borderColor="#B3444444"
                         app:qmui_borderWidth="@dimen/dp_1"
                         app:qmui_radius="16sp">
 
@@ -518,8 +520,8 @@
                         android:paddingTop="10dp"
                         android:paddingEnd="10dp"
                         android:paddingBottom="9dp"
-                        app:qmui_backgroundColor="#141414"
-                        app:qmui_borderColor="#141414"
+                        app:qmui_backgroundColor="#B3444444"
+                        app:qmui_borderColor="#B3444444"
                         app:qmui_borderWidth="@dimen/dp_1"
                         app:qmui_radius="16sp">
 
@@ -571,8 +573,8 @@
                         android:paddingTop="10dp"
                         android:paddingEnd="10dp"
                         android:paddingBottom="9dp"
-                        app:qmui_backgroundColor="#141414"
-                        app:qmui_borderColor="#141414"
+                        app:qmui_backgroundColor="#B3444444"
+                        app:qmui_borderColor="#B3444444"
                         app:qmui_borderWidth="@dimen/dp_1"
                         app:qmui_radius="16sp">
 
@@ -624,8 +626,8 @@
                         android:paddingTop="10dp"
                         android:paddingEnd="10dp"
                         android:paddingBottom="9dp"
-                        app:qmui_backgroundColor="#141414"
-                        app:qmui_borderColor="#141414"
+                        app:qmui_backgroundColor="#B3444444"
+                        app:qmui_borderColor="#B3444444"
                         app:qmui_borderWidth="@dimen/dp_1"
                         app:qmui_radius="16sp">
 
@@ -676,8 +678,8 @@
                         android:paddingTop="10dp"
                         android:paddingEnd="10dp"
                         android:paddingBottom="9dp"
-                        app:qmui_backgroundColor="#141414"
-                        app:qmui_borderColor="#141414"
+                        app:qmui_backgroundColor="#B3444444"
+                        app:qmui_borderColor="#B3444444"
                         app:qmui_borderWidth="@dimen/dp_1"
                         app:qmui_radius="16sp">
 
@@ -717,6 +719,9 @@
 
                     </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="30dp"/>
 
                 </LinearLayout>
 

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

@@ -58,10 +58,12 @@
 
 
 
-                        <ImageView
+                        <com.qmuiteam.qmui.widget.QMUIRadiusImageView
                             android:id="@+id/image_view"
                             android:layout_width="match_parent"
                             android:layout_height="305dp"
+                            app:qmui_border_color="@color/translucent"
+                            app:qmui_corner_radius="20dp"
                             android:src="@drawable/bg_need_error"
                             android:scaleType="centerCrop" />
 
@@ -186,8 +188,8 @@
                     android:paddingTop="10dp"
                     android:paddingEnd="10dp"
                     android:paddingBottom="15dp"
-                    app:qmui_backgroundColor="#141414"
-                    app:qmui_borderColor="#141414"
+                    app:qmui_backgroundColor="#B3444444"
+                    app:qmui_borderColor="#B3444444"
                     app:qmui_borderWidth="@dimen/dp_1"
                     app:qmui_radius="16sp">
 
@@ -249,8 +251,7 @@
                         android:layout_marginTop="14dp"
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
-                        android:visibility="gone"
-                        tools:visibility="visible">
+                       >
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -294,8 +295,8 @@
                     android:paddingTop="10dp"
                     android:paddingEnd="10dp"
                     android:paddingBottom="12dp"
-                    app:qmui_backgroundColor="#141414"
-                    app:qmui_borderColor="#141414"
+                    app:qmui_backgroundColor="#B3444444"
+                    app:qmui_borderColor="#B3444444"
                     app:qmui_borderWidth="@dimen/dp_1"
                     app:qmui_radius="16sp">
 
@@ -409,8 +410,8 @@
                     android:paddingTop="10dp"
                     android:paddingEnd="10dp"
                     android:paddingBottom="9dp"
-                    app:qmui_backgroundColor="#141414"
-                    app:qmui_borderColor="#141414"
+                    app:qmui_backgroundColor="#B3444444"
+                    app:qmui_borderColor="#B3444444"
                     app:qmui_borderWidth="@dimen/dp_1"
                     app:qmui_radius="16sp">
 
@@ -462,8 +463,8 @@
                     android:paddingTop="10dp"
                     android:paddingEnd="10dp"
                     android:paddingBottom="9dp"
-                    app:qmui_backgroundColor="#141414"
-                    app:qmui_borderColor="#141414"
+                    app:qmui_backgroundColor="#B3444444"
+                    app:qmui_borderColor="#B3444444"
                     app:qmui_borderWidth="@dimen/dp_1"
                     app:qmui_radius="16sp">
 
@@ -515,8 +516,8 @@
                     android:paddingTop="10dp"
                     android:paddingEnd="10dp"
                     android:paddingBottom="9dp"
-                    app:qmui_backgroundColor="#141414"
-                    app:qmui_borderColor="#141414"
+                    app:qmui_backgroundColor="#B3444444"
+                    app:qmui_borderColor="#B3444444"
                     app:qmui_borderWidth="@dimen/dp_1"
                     app:qmui_radius="16sp">
 
@@ -568,8 +569,8 @@
                     android:paddingTop="10dp"
                     android:paddingEnd="10dp"
                     android:paddingBottom="9dp"
-                    app:qmui_backgroundColor="#141414"
-                    app:qmui_borderColor="#141414"
+                    app:qmui_backgroundColor="#B3444444"
+                    app:qmui_borderColor="#B3444444"
                     app:qmui_borderWidth="@dimen/dp_1"
                     app:qmui_radius="16sp">
 
@@ -609,6 +610,9 @@
 
                 </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"/>
 
             </LinearLayout>
 

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

@@ -169,14 +169,6 @@
                 ></TextView>
 
 
-            <com.github.mikephil.charting.charts.LineChart
-                android:id="@+id/chart"
-                android:layout_width="match_parent"
-                android:layout_height="150dp"
-                android:layout_marginStart="19dp"
-                android:layout_marginTop="17dp"
-                android:layout_marginEnd="16dp"
-                android:background="#fafafc"/>
 
 
 

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

@@ -80,7 +80,7 @@
                 android:layout_marginTop="5dp"
                 android:layout_marginEnd="10dp"
                 android:text="MOLLY 童心时光机"
-                android:textColor="@color/text_title"
+                android:textColor="@color/white"
                 android:textSize="14sp" />
 
             <LinearLayout

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

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+
+    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_marginStart="27dp"
+        android:layout_marginEnd="27dp"
+        android:background="@color/white"
+        app:qmui_radius="8dp"
+        app:qmui_backgroundColor="@color/white"
+        android:orientation="vertical">
+
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="22dp"
+            android:text="服务协议和隐私政策"
+            android:textColor="@color/text_title"
+            android:textSize="17sp" />
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:textColor="@color/text_title"
+            android:textSize="16sp"
+            android:text="请你务必审慎阅读、充分理解&quot;服务协议&quot;和&quot;隐私政策&quot;各条款，包含但不限于：为了向你提供即时通讯、内容分享等服务，我们需要收集你的设备信息、操作日志等个人信息。你可以在&quot;设置&quot;里查看、变更、删除个人信息并管理你的权限。 "
+            android:layout_marginStart="15dp"
+            android:lineSpacingExtra="@dimen/dp_1"
+            android:layout_marginEnd="15dp"
+            android:layout_marginTop="20dp"
+            android:layout_height="wrap_content" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="@dimen/dp_1"
+            android:layout_marginEnd="15dp"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:textSize="16sp"
+                android:textColor="@color/text_title"
+                android:layout_width="wrap_content"
+                android:text="你可阅读"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                android:id="@+id/tv_one"
+                android:text="《服务协议》"
+                android:layout_width="wrap_content"
+                android:textSize="16sp"
+                android:textColor="#2BA3FF"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                android:textSize="16sp"
+                android:textColor="@color/text_title"
+                android:layout_width="wrap_content"
+                android:text="和"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                android:id="@+id/tv_two"
+                android:text="《隐私政策》"
+                android:layout_width="wrap_content"
+                android:textSize="16sp"
+                android:textColor="#2BA3FF"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:text="了解信息信息。如果你同意，请点击&quot;同意&quot;开始接受我们的服务"
+            android:textSize="16sp"
+            android:lineSpacingExtra="@dimen/dp_1"
+            android:layout_marginBottom="20dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:textColor="@color/text_title"
+            android:layout_marginTop="@dimen/dp_1"
+            android:layout_height="wrap_content">
+
+        </TextView>
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#E3E4E5" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/tv_cancel"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginTop="15dp"
+                android:layout_marginBottom="17dp"
+                android:gravity="center"
+                android:text="暂不使用"
+                android:textColor="#9A9A9A"
+                android:textSize="17sp" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:background="#E3E4E5" />
+
+            <TextView
+                android:id="@+id/tv_sure"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:layout_marginBottom="17dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="同意"
+                android:textColor="#2BA3FF"
+                android:textSize="17sp" />
+
+
+        </LinearLayout>
+
+
+    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+</LinearLayout>

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

@@ -115,6 +115,7 @@
                             android:layout_weight="1" />
 
                         <LinearLayout
+                            android:id="@+id/ll_one"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:orientation="horizontal">
@@ -152,10 +153,9 @@
 
 
                         <LinearLayout
+                            android:id="@+id/ll_two"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:visibility="gone"
-                            tools:visibility="visible"
                             android:orientation="horizontal">
 
 

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

@@ -96,7 +96,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
-                android:paddingBottom="10dp"
                 android:layout_marginTop="6dp">
 
 
@@ -106,6 +105,7 @@
                     android:layout_height="16dp"
                     android:background="@drawable/bg_three_but"
                     android:paddingStart="9dp"
+                    android:layout_marginBottom="@dimen/dp_10"
                     android:paddingTop="2dp"
                     android:paddingEnd="9dp"
                     android:paddingBottom="2dp"
@@ -119,6 +119,7 @@
                     android:background="@drawable/bg_kuang_blue"
                     android:hint="100份"
                     android:paddingStart="9dp"
+                    android:layout_marginBottom="@dimen/dp_10"
                     android:paddingTop="2dp"
                     android:paddingEnd="9dp"
                     android:paddingBottom="2dp"
@@ -130,6 +131,7 @@
 
                  <TextView
                      android:text="数字商品"
+                     android:layout_marginBottom="@dimen/dp_10"
                      android:textSize="10sp"
                      android:textColor="#333333"
                      android:gravity="center"