Skip to content

HBHAndroid
HBHAndroid
Commit 7c738f62 authored by 小费同学阿's avatar 小费同学阿 💬
Browse files
Options

基础搭建 

功能开发
1：bug 修复 客商端大字体部分界面影响使用修复
parent 7828a958
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 39 deletions
app/src/main/res/layout/activity_electric_pay.xml
View file @ 7c738f62
......@@ -119,6 +119,7 @@
style="@style/xxTextContent"
android:layout_marginTop="17dp"
android:text="展位号"
android:textSize="16dp"
android:textColor="@color/text_foreground"
app:layout_constraintEnd_toStartOf="@+id/guideline5"
app:layout_constraintStart_toStartOf="parent"
......@@ -128,6 +129,7 @@
android:id="@+id/textView2"
style="@style/xxTextContent"
android:layout_marginTop="10dp"
android:textSize="16dp"
android:text="@{viewModel.electricMsg.boothNumber}"
android:textColor="@color/xx_text_red"
app:layout_constraintEnd_toStartOf="@+id/guideline5"
......@@ -139,6 +141,7 @@
style="@style/xxTextContent"
android:layout_marginTop="17dp"
android:text="设备数量"
android:textSize="16dp"
android:textColor="@color/text_foreground"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline5"
......@@ -151,6 +154,7 @@
android:text="@{viewModel.electricMsg.ElectricityNumber()}"
android:textColor="@color/xx_text_red"
app:layout_constraintEnd_toEndOf="parent"
android:textSize="16dp"
app:layout_constraintStart_toStartOf="@+id/guideline5"
app:layout_constraintTop_toBottomOf="@+id/textView" />
......
app/src/main/res/layout/fragment_home.xml
View file @ 7c738f62
......@@ -114,7 +114,7 @@
android:paddingTop="7dp"
android:text="@string/today_deal"
android:textColor="@color/white"
android:textSize="15sp"
android:textSize="15dp"
app:layout_constraintTop_toTopOf="parent" />
<!--今日成交数-->
<TextView
......@@ -124,7 +124,7 @@
android:layout_marginTop="24dp"
android:text="@={homeViewModel.totalMoney}"
android:textColor="#FFFFFF"
android:textSize="30sp"
android:textSize="30dp"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_home_today" />
......@@ -160,10 +160,17 @@
style="@style/CommText"
android:text="@string/today_order"
android:textColor="#5971A4"
android:textSize="14sp"
android:textSize="14dp"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent" />
<!--今日订单数-->
<LinearLayout
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_home_to"
android:layout_width="match_parent"
android:orientation="horizontal"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_home_ton"
android:layout_width="wrap_content"
......@@ -171,21 +178,19 @@
android:layout_marginTop="13dp"
android:text="@={homeViewModel.orderCount}"
android:textColor="#C8382A"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_home_to" />
android:textSize="16dp"
android:gravity="center"
android:textStyle="bold"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="13dp"
android:text="个"
android:gravity="center"
android:textColor="#C8382A"
android:textSize="11sp"
app:layout_constraintBottom_toBottomOf="@+id/tv_home_ton"
app:layout_constraintLeft_toRightOf="@+id/tv_home_ton" />
android:textSize="11dp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<!--今日下单用户模块-->
<androidx.constraintlayout.widget.ConstraintLayout
......@@ -200,10 +205,17 @@
style="@style/CommText"
android:text="@string/today_customer"
android:textColor="#5971A4"
android:textSize="14sp"
android:textSize="14dp"
android:gravity="center"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent" />
<!--今日下单用户数-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_home_tu">
<TextView
android:id="@+id/tv_home_tun"
android:layout_width="wrap_content"
......@@ -211,10 +223,8 @@
android:layout_marginTop="13dp"
android:text="@={homeViewModel.memberCount}"
android:textColor="#C8382A"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_home_tu" />
android:textSize="16dp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
......@@ -222,10 +232,8 @@
android:layout_marginTop="13dp"
android:text="位"
android:textColor="#C8382A"
android:textSize="11sp"
app:layout_constraintBottom_toBottomOf="@+id/tv_home_tun"
app:layout_constraintLeft_toRightOf="@+id/tv_home_tun" />
android:textSize="11dp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<!--电费余额模块-->
......@@ -317,7 +325,7 @@
android:layout_marginTop="4dp"
android:text="@string/store_information"
android:textColor="#324E8D"
android:textSize="14sp"
android:textSize="14dp"
android:textStyle="bold" />
</LinearLayout>
......@@ -349,7 +357,7 @@
android:layout_marginTop="4dp"
android:text="@string/store_points"
android:textColor="#324E8D"
android:textSize="14sp"
android:textSize="14dp"
android:textStyle="bold"></TextView>
......@@ -381,7 +389,7 @@
android:layout_marginTop="4dp"
android:text="@string/clerk_management"
android:textColor="#324E8D"
android:textSize="14sp"
android:textSize="14dp"
android:textStyle="bold" />
</LinearLayout>
</GridLayout>
......@@ -389,7 +397,7 @@
<!--下方-导航栏(添加商品...)-->
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_marginTop="13dp"
android:background="@drawable/bg_white_radius_12"
android:paddingTop="13dp"
......@@ -430,7 +438,7 @@
android:layout_marginTop="10dp"
android:text="@string/goods_add"
android:textColor="#333333"
android:textSize="14sp"
android:textSize="14dp"
android:textStyle="bold" />
</LinearLayout>
......@@ -462,7 +470,7 @@
android:layout_marginTop="10dp"
android:text="@string/goods_management"
android:textColor="#333333"
android:textSize="14sp"
android:textSize="14dp"
android:textStyle="bold" />
</LinearLayout>
......@@ -494,7 +502,7 @@
android:layout_marginTop="10dp"
android:text="@string/order_add"
android:textColor="#333333"
android:textSize="14sp"
android:textSize="14dp"
android:textStyle="bold" />
</LinearLayout>
<!--订单管理模块-->
......@@ -525,7 +533,7 @@
android:layout_marginTop="10dp"
android:text="@string/order_management"
android:textColor="#333333"
android:textSize="14sp"
android:textSize="14dp"
android:textStyle="bold" />
</LinearLayout>
<!--2模块-->
......@@ -557,7 +565,7 @@
android:layout_marginTop="10dp"
android:text="@string/appeal_feedback"
android:textColor="#333333"
android:textSize="14sp"
android:textSize="14dp"
android:textStyle="bold" />
</LinearLayout>
......@@ -590,7 +598,7 @@
android:layout_marginTop="10dp"
android:text="@string/forwarding_statistics"
android:textColor="#333333"
android:textSize="14sp"
android:textSize="14dp"
android:textStyle="bold" />
</LinearLayout>
<!--人才招聘模块-->
......@@ -622,7 +630,7 @@
android:layout_marginTop="10dp"
android:text="@string/talent_recruitment"
android:textColor="#333333"
android:textSize="14sp"
android:textSize="14dp"
android:textStyle="bold" />
</LinearLayout>
......@@ -654,7 +662,7 @@
android:layout_marginTop="10dp"
android:text="物业缴费"
android:textColor="#333333"
android:textSize="14sp"
android:textSize="14dp"
android:textStyle="bold" />
</LinearLayout>
</GridLayout>
......
app/src/main/res/layout/fragment_huanbohai.xml
View file @ 7c738f62
......@@ -87,7 +87,7 @@
tools:ignore="MissingConstraints">
<!--活动中心-图标-->
<ImageView
android:layout_width="3dp"
android:layout_width="3sp"
android:layout_height="22dp"
android:layout_marginTop="1dp"
android:contentDescription="TODO"
......@@ -95,7 +95,7 @@
tools:ignore="ContentDescription,HardcodedText" />
<!--活动中心-文字-->
<TextView
android:layout_width="80dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:text="@string/activity_center"
......@@ -164,7 +164,7 @@
tools:ignore="MissingConstraints">
<!--资讯信息-图标-->
<ImageView
android:layout_width="3dp"
android:layout_width="3sp"
android:layout_height="22dp"
android:layout_marginTop="1dp"
android:contentDescription="TODO"
......@@ -172,7 +172,7 @@
tools:ignore="ContentDescription,HardcodedText" />
<!--资讯信息-文字-->
<TextView
android:layout_width="80dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:text="@string/information"
......
app/src/main/res/layout/fragment_mine.xml
View file @ 7c738f62
......@@ -87,7 +87,7 @@
style="@style/CommText"
android:text="@={mineViewModel.nickName}"
android:textColor="@color/black"
android:textSize="20sp"
android:textSize="20dp"
android:textStyle="bold"
app:layout_constraintRight_toRightOf="@+id/tv_ame_num1"
app:layout_constraintTop_toTopOf="parent" />
......@@ -103,7 +103,7 @@
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:background="@drawable/bg_red_radius_4"
......@@ -115,9 +115,10 @@
<TextView
style="@style/CommText"
android:layout_marginTop="13dp"
android:layout_height="wrap_content"
android:text="@={mineViewModel.createTime}"
android:textColor="@color/black"
android:textSize="14sp" />
android:textSize="14dp" />
</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