Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ShenghuoquanBusiness
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bp
ShenghuoquanBusiness
Commits
35d7b0ac
Commit
35d7b0ac
authored
Jun 29, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix UI走查 个人认证信息、企业认证信息、生活号创建成功卡片
parent
166cdb76
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
225 additions
and
210 deletions
+225
-210
activity_life_account_enterprise_auth_complete.xml
...layout/activity_life_account_enterprise_auth_complete.xml
+3
-3
activity_life_account_personal_auth_complete.xml
...s/layout/activity_life_account_personal_auth_complete.xml
+0
-1
activity_merchant_auth_info.xml
...ntent/src/main/res/layout/activity_merchant_auth_info.xml
+1
-1
view_life_account_enterprise_auth_info.xml
...ain/res/layout/view_life_account_enterprise_auth_info.xml
+2
-2
view_life_account_merchant_info.xml
...t/src/main/res/layout/view_life_account_merchant_info.xml
+83
-74
view_life_account_personal_auth_info.xml
.../main/res/layout/view_life_account_personal_auth_info.xml
+136
-129
No files found.
Components/newscontent/src/main/res/layout/activity_life_account_enterprise_auth_complete.xml
View file @
35d7b0ac
...
...
@@ -46,9 +46,9 @@
<com.yidian.shenghuoquan.newscontent.widget.LifeAccountEnterpriseAuthInfoView
android:id=
"@+id/iv_enterprise_auth_info"
android:layout_width=
"
@dimen/dp302
"
android:layout_height=
"
@dimen/dp284
"
android:layout_marginTop=
"@dimen/dp3
1
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"
wrap_content
"
android:layout_marginTop=
"@dimen/dp3
2
"
app:cardCornerRadius=
"12dp"
app:cardElevation=
"3dp"
app:layout_constraintEnd_toEndOf=
"parent"
...
...
Components/newscontent/src/main/res/layout/activity_life_account_personal_auth_complete.xml
View file @
35d7b0ac
...
...
@@ -63,7 +63,6 @@
android:id=
"@+id/tv_enter_merchant_center"
android:layout_width=
"@dimen/dp115"
android:layout_height=
"@dimen/dp35"
android:layout_marginTop=
"@dimen/dp26"
android:background=
"@drawable/shape_bg_enter_merchant_center_btn"
android:gravity=
"center"
android:text=
"@string/to_experience"
...
...
Components/newscontent/src/main/res/layout/activity_merchant_auth_info.xml
View file @
35d7b0ac
...
...
@@ -25,7 +25,7 @@
<com.yidian.shenghuoquan.newscontent.widget.LifeAccountEnterpriseAuthInfoView
android:id=
"@+id/iv_enterprise_auth_info"
android:layout_width=
"
@dimen/dp315
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp30"
android:visibility=
"gone"
...
...
Components/newscontent/src/main/res/layout/view_life_account_enterprise_auth_info.xml
View file @
35d7b0ac
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView
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_par
ent"
>
android:layout_width=
"
@dimen/dp315
"
android:layout_height=
"
wrap_cont
ent"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
...
...
Components/newscontent/src/main/res/layout/view_life_account_merchant_info.xml
View file @
35d7b0ac
...
...
@@ -4,96 +4,105 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
>
<androidx.c
onstraintlayout.widget.ConstraintLayout
android:layout_width=
"@dimen/dp2
83
"
<androidx.c
ardview.widget.CardView
android:layout_width=
"@dimen/dp2
95
"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp32"
android:background=
"@drawable/shape_bg_merchant_info"
android:layout_marginBottom=
"@dimen/dp32"
app:cardCornerRadius=
"@dimen/dp12"
app:cardElevation=
"@dimen/dp3"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
<TextView
android:id=
"@+id/tv_life_account_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/dp19"
android:layout_marginTop=
"@dimen/dp38"
android:layout_marginEnd=
"@dimen/dp19"
android:includeFontPadding=
"false"
android:textColor=
"@color/color_333333"
android:textSize=
"@dimen/sp23"
app:layout_constraintEnd_toStartOf=
"@id/view_auth_complete"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@drawable/shape_bg_merchant_info"
>
<TextView
android:id=
"@+id/tv_title_manager"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp19"
android:includeFontPadding=
"false"
android:text=
"@string/manager"
android:textColor=
"@color/color_999999"
android:textSize=
"@dimen/sp15"
app:layout_constraintStart_toStartOf=
"@id/tv_life_account_name"
app:layout_constraintTop_toBottomOf=
"@id/tv_life_account_name"
/>
<TextView
android:id=
"@+id/tv_life_account_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/dp20"
android:layout_marginTop=
"@dimen/dp40"
android:layout_marginEnd=
"@dimen/dp20"
android:textColor=
"@color/color_333333"
android:textSize=
"@dimen/sp24"
android:textStyle=
"bold"
app:layout_constraintEnd_toStartOf=
"@id/view_auth_complete"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
android:id=
"@+id/tv_content_manager"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/dp92"
android:layout_marginTop=
"@dimen/dp19"
android:includeFontPadding=
"false"
android:textColor=
"@color/color_333333"
android:textSize=
"@dimen/sp15"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/tv_life_account_name"
/>
<TextView
android:id=
"@+id/tv_title_manager"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp20"
android:text=
"@string/manager"
android:textColor=
"@color/color_999999"
android:textSize=
"@dimen/sp16"
app:layout_constraintStart_toStartOf=
"@id/tv_life_account_name"
app:layout_constraintTop_toBottomOf=
"@id/tv_life_account_name"
/>
<TextView
android:id=
"@+id/tv_title_phone_number"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp19"
android:layout_marginBottom=
"@dimen/dp19"
android:includeFontPadding=
"false"
android:text=
"@string/phone_number"
android:textColor=
"@color/color_999999"
android:textSize=
"@dimen/sp15"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintStart_toStartOf=
"@id/tv_life_account_name"
app:layout_constraintTop_toBottomOf=
"@id/tv_title_manager"
/>
<TextView
android:id=
"@+id/tv_content_manager"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/dp96"
android:layout_marginTop=
"@dimen/dp20"
android:textColor=
"@color/color_333333"
android:textSize=
"@dimen/sp16"
android:textStyle=
"bold"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/tv_life_account_name"
/>
<TextView
android:id=
"@+id/tv_content_phone_number"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/dp92"
android:layout_marginTop=
"@dimen/dp19"
android:includeFontPadding=
"false"
android:textColor=
"@color/color_333333"
android:textSize=
"@dimen/sp15"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/tv_title_manager"
/>
<TextView
android:id=
"@+id/tv_title_phone_number"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp20"
android:layout_marginBottom=
"@dimen/dp20"
android:text=
"@string/phone_number"
android:textColor=
"@color/color_999999"
android:textSize=
"@dimen/sp16"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintStart_toStartOf=
"@id/tv_life_account_name"
app:layout_constraintTop_toBottomOf=
"@id/tv_title_manager"
/>
<View
android:id=
"@+id/view_auth_complete"
android:layout_width=
"@dimen/dp49"
android:layout_height=
"@dimen/dp58"
android:layout_marginTop=
"@dimen/dp36"
android:layout_marginEnd=
"@dimen/dp1"
android:background=
"@mipmap/icon_seal"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
android:id=
"@+id/tv_content_phone_number"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/dp96"
android:layout_marginTop=
"@dimen/dp20"
android:textColor=
"@color/color_333333"
android:textSize=
"@dimen/sp16"
android:textStyle=
"bold"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/tv_title_manager"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:id=
"@+id/view_auth_complete"
android:layout_width=
"@dimen/dp52"
android:layout_height=
"@dimen/dp60"
android:layout_marginTop=
"@dimen/dp38"
android:layout_marginEnd=
"@dimen/dp1"
android:background=
"@mipmap/icon_seal"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
<View
android:id=
"@+id/view_top"
android:layout_width=
"@dimen/dp3
22
"
android:layout_height=
"@dimen/dp5
4
"
android:layout_width=
"@dimen/dp3
35
"
android:layout_height=
"@dimen/dp5
6
"
android:background=
"@mipmap/icon_shop"
android:elevation=
"@dimen/dp3"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
...
...
Components/newscontent/src/main/res/layout/view_life_account_personal_auth_info.xml
View file @
35d7b0ac
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment