tt/VscoolOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:1.7

Browse Source 
fix:
update:增加抢购，修复bug
This commit is contained in:
Fanhuitong
2023-01-02 14:42:27 +08:00
parent 6f073ef28d
commit 4b01f9987f
117 changed files with 3598 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

260
app/src/main/res/layout-land/fragment_second.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".fragment.SecondFragment">
tools:context="fragment.second.SecondFragment">
<LinearLayout
android:layout_width="match_parent"
@@ -19,10 +19,10 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/custom_bg">
@@ -30,20 +30,31 @@
android:id="@+id/textView9"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginStart="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_12"
android:maxLines="1"
android:text="秒杀抢购"
android:textColor="@color/black"
android:textSize="18sp"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_spike_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_12"
android:maxLines="1"
android:text="查看更多"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv1"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_64"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/nodata"
@@ -52,123 +63,13 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl1"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_goods"
android:layout_width="match_parent"
android:layout_height="0dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView9">
<ImageView
android:id="@+id/iv_img"
android:layout_width="152dp"
android:layout_height="152dp"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_goods_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:maxLines="1"
android:text="商品名称"
android:textColor="@color/black"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@+id/iv_img"
app:layout_constraintTop_toTopOf="@+id/iv_img" />
<TextView
android:id="@+id/tv_goods_desc"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="8dp"
android:maxLines="5"
android:textColor="@color/black"
app:layout_constraintBottom_toBottomOf="@+id/iv_img"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_goods_name"
app:layout_constraintTop_toBottomOf="@+id/tv_goods_name" />
<TextView
android:id="@+id/textView14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="购买信息"
android:textColor="@color/red"
app:layout_constraintStart_toStartOf="@+id/iv_img"
app:layout_constraintTop_toBottomOf="@+id/iv_img" />
<TextView
android:id="@+id/textView15"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="秒杀价格"
android:textColor="@color/red"
app:layout_constraintStart_toStartOf="@+id/textView14"
app:layout_constraintTop_toBottomOf="@+id/textView14" />
<TextView
android:id="@+id/textView16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="￥"
android:textColor="@color/red"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="@+id/textView15"
app:layout_constraintStart_toEndOf="@+id/textView15" />
<TextView
android:id="@+id/tv_buying_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="100.00"
android:textColor="@color/red"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="@+id/textView16"
app:layout_constraintStart_toEndOf="@+id/textView16" />
<ProgressBar
android:id="@+id/progressBar"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="160dp"
android:layout_height="8dp"
android:layout_marginTop="8dp"
android:max="100"
android:progress="50"
android:progressDrawable="@drawable/main_pb_bg"
app:layout_constraintStart_toStartOf="@+id/textView15"
app:layout_constraintTop_toBottomOf="@+id/textView15" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:text=""
app:layout_constraintBottom_toBottomOf="@+id/progressBar"
app:layout_constraintStart_toEndOf="@+id/progressBar"
app:layout_constraintTop_toTopOf="@+id/progressBar"
app:layout_constraintVertical_bias="0.5" />
<TextView
android:id="@+id/tv_snapup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:text="立刻抢购"
android:textSize="22sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
app:layout_constraintTop_toBottomOf="@+id/textView9"
tools:layout_editor_absoluteX="0dp" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
@@ -181,10 +82,10 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="4dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="4dp"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/custom_bg">
@@ -192,20 +93,31 @@
android:id="@+id/textView13"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginStart="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_12"
android:maxLines="1"
android:text="养生资讯"
android:textColor="@color/black"
android:textSize="18sp"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_info_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_12"
android:maxLines="1"
android:text="查看更多"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv2"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_64"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/nodata"
@@ -214,6 +126,15 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_article"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView13" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl2"
android:layout_width="match_parent"
@@ -233,11 +154,11 @@
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginStart="@dimen/dp_8"
android:maxLines="1"
android:text="sadas"
android:textColor="@color/black"
android:textSize="18sp"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@+id/iv_aimg"
app:layout_constraintTop_toTopOf="@+id/iv_aimg" />
@@ -246,7 +167,7 @@
android:id="@+id/tv_content"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="8dp"
android:layout_marginTop="@dimen/dp_8"
android:text=""
app:layout_constraintBottom_toBottomOf="@+id/iv_aimg"
app:layout_constraintEnd_toEndOf="parent"
@@ -257,8 +178,8 @@
android:id="@+id/tv_readnow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:layout_marginEnd="@dimen/dp_12"
android:layout_marginBottom="@dimen/dp_12"
android:text="阅读全文"
android:textSize="22sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -270,17 +191,18 @@
android:id="@+id/cl_activity"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginEnd="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/custom_bg">
android:background="@drawable/custom_bg"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginEnd="@dimen/dp_12"
android:maxLines="1"
android:text="查看更多"
app:layout_constraintEnd_toEndOf="parent"
@@ -288,8 +210,8 @@
<ImageView
android:id="@+id/iv3"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_64"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/nodata"
@@ -303,21 +225,30 @@
android:id="@+id/textView18"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginStart="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_12"
android:maxLines="1"
android:text="附近活动"
android:textColor="@color/black"
android:textSize="18sp"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_activity"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView18" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl3"
android:layout_width="0dp"
android:layout_height="0dp"
android:visibility="visible"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -338,7 +269,7 @@
android:id="@+id/tv_title_a"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginStart="@dimen/dp_12"
android:maxLines="1"
android:text="活动名称"
android:textColor="@color/black"
@@ -403,7 +334,6 @@
app:layout_constraintBottom_toBottomOf="@+id/imageView2"
app:layout_constraintStart_toEndOf="@+id/imageView2"
app:layout_constraintTop_toTopOf="@+id/imageView2" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.shehuan.niv.NiceImageView
@@ -484,18 +414,18 @@
android:id="@+id/cl_demand"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginEnd="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/custom_bg"
android:visibility="gone">
<ImageView
android:id="@+id/iv4"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_64"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/nodata"
@@ -508,7 +438,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginEnd="@dimen/dp_12"
android:maxLines="1"
android:text="查看更多"
app:layout_constraintEnd_toEndOf="parent"
@@ -518,12 +448,12 @@
android:id="@+id/textView19"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginStart="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_12"
android:maxLines="1"
android:text="服务需求"
android:textColor="@color/black"
android:textSize="18sp"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -552,7 +482,7 @@
android:id="@+id/tv_title_d"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginStart="@dimen/dp_12"
android:maxLines="1"
android:text="活动名称"
android:textColor="@color/black"
@@ -572,7 +502,7 @@
app:layout_constraintBottom_toBottomOf="@+id/tv_title_d"
app:layout_constraintStart_toEndOf="@+id/tv_title_d"
app:layout_constraintTop_toTopOf="@+id/tv_title_d"
app:layout_goneMarginStart="4dp" />
app:layout_goneMarginStart="@dimen/dp_4" />
<TextView
android:id="@+id/tv_time_d"
@@ -599,9 +529,7 @@
android:textSize="20sp"
app:layout_constraintStart_toStartOf="@+id/tv_time_d"
app:layout_constraintTop_toBottomOf="@+id/tv_time_d" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</LinearLayout>