Commit 7c738f62 authored by 小费同学阿's avatar 小费同学阿 💬

基础搭建

功能开发
1:bug 修复 客商端大字体部分界面影响使用修复
parent 7828a958
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
style="@style/xxTextContent" style="@style/xxTextContent"
android:layout_marginTop="17dp" android:layout_marginTop="17dp"
android:text="展位号" android:text="展位号"
android:textSize="16dp"
android:textColor="@color/text_foreground" android:textColor="@color/text_foreground"
app:layout_constraintEnd_toStartOf="@+id/guideline5" app:layout_constraintEnd_toStartOf="@+id/guideline5"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -128,6 +129,7 @@ ...@@ -128,6 +129,7 @@
android:id="@+id/textView2" android:id="@+id/textView2"
style="@style/xxTextContent" style="@style/xxTextContent"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:textSize="16dp"
android:text="@{viewModel.electricMsg.boothNumber}" android:text="@{viewModel.electricMsg.boothNumber}"
android:textColor="@color/xx_text_red" android:textColor="@color/xx_text_red"
app:layout_constraintEnd_toStartOf="@+id/guideline5" app:layout_constraintEnd_toStartOf="@+id/guideline5"
...@@ -139,6 +141,7 @@ ...@@ -139,6 +141,7 @@
style="@style/xxTextContent" style="@style/xxTextContent"
android:layout_marginTop="17dp" android:layout_marginTop="17dp"
android:text="设备数量" android:text="设备数量"
android:textSize="16dp"
android:textColor="@color/text_foreground" android:textColor="@color/text_foreground"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline5" app:layout_constraintStart_toStartOf="@+id/guideline5"
...@@ -151,6 +154,7 @@ ...@@ -151,6 +154,7 @@
android:text="@{viewModel.electricMsg.ElectricityNumber()}" android:text="@{viewModel.electricMsg.ElectricityNumber()}"
android:textColor="@color/xx_text_red" android:textColor="@color/xx_text_red"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:textSize="16dp"
app:layout_constraintStart_toStartOf="@+id/guideline5" app:layout_constraintStart_toStartOf="@+id/guideline5"
app:layout_constraintTop_toBottomOf="@+id/textView" /> app:layout_constraintTop_toBottomOf="@+id/textView" />
......
This diff is collapsed.
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
tools:ignore="MissingConstraints"> tools:ignore="MissingConstraints">
<!--活动中心-图标--> <!--活动中心-图标-->
<ImageView <ImageView
android:layout_width="3dp" android:layout_width="3sp"
android:layout_height="22dp" android:layout_height="22dp"
android:layout_marginTop="1dp" android:layout_marginTop="1dp"
android:contentDescription="TODO" android:contentDescription="TODO"
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
tools:ignore="ContentDescription,HardcodedText" /> tools:ignore="ContentDescription,HardcodedText" />
<!--活动中心-文字--> <!--活动中心-文字-->
<TextView <TextView
android:layout_width="80dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:text="@string/activity_center" android:text="@string/activity_center"
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
tools:ignore="MissingConstraints"> tools:ignore="MissingConstraints">
<!--资讯信息-图标--> <!--资讯信息-图标-->
<ImageView <ImageView
android:layout_width="3dp" android:layout_width="3sp"
android:layout_height="22dp" android:layout_height="22dp"
android:layout_marginTop="1dp" android:layout_marginTop="1dp"
android:contentDescription="TODO" android:contentDescription="TODO"
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
tools:ignore="ContentDescription,HardcodedText" /> tools:ignore="ContentDescription,HardcodedText" />
<!--资讯信息-文字--> <!--资讯信息-文字-->
<TextView <TextView
android:layout_width="80dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:text="@string/information" android:text="@string/information"
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
style="@style/CommText" style="@style/CommText"
android:text="@={mineViewModel.nickName}" android:text="@={mineViewModel.nickName}"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="20sp" android:textSize="20dp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintRight_toRightOf="@+id/tv_ame_num1" app:layout_constraintRight_toRightOf="@+id/tv_ame_num1"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
</LinearLayout> </LinearLayout>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="20dp" android:layout_height="wrap_content"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="8dp" android:paddingRight="8dp"
android:background="@drawable/bg_red_radius_4" android:background="@drawable/bg_red_radius_4"
...@@ -115,9 +115,10 @@ ...@@ -115,9 +115,10 @@
<TextView <TextView
style="@style/CommText" style="@style/CommText"
android:layout_marginTop="13dp" android:layout_marginTop="13dp"
android:layout_height="wrap_content"
android:text="@={mineViewModel.createTime}" android:text="@={mineViewModel.createTime}"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="14sp" /> android:textSize="14dp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment