Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
FacePay
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘立
FacePay
Commits
d3aca767
Commit
d3aca767
authored
Aug 15, 2018
by
llxqb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
界面增加适配
parent
a2361c66
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
153 additions
and
142 deletions
+153
-142
app/src/main/java/com/freemud/app/facepay/LoginActivity.java
+21
-0
app/src/main/java/com/freemud/app/facepay/MainActivity.java
+15
-23
app/src/main/res/layout/activity_login.xml
+7
-7
app/src/main/res/layout/activity_main.xml
+12
-14
app/src/main/res/layout/activity_shopping_cart.xml
+24
-27
app/src/main/res/layout/common_title_layout.xml
+10
-10
app/src/main/res/layout/dialog_common.xml
+10
-10
app/src/main/res/layout/dialog_login.xml
+0
-0
app/src/main/res/layout/dialog_main.xml
+0
-0
app/src/main/res/layout/dialog_shoppingcart_pay.xml
+22
-22
app/src/main/res/layout/item_adapter_cartgoods.xml
+20
-22
app/src/main/res/layout/item_adapter_popwindow_bag.xml
+5
-5
app/src/main/res/values/dimens.xml
+0
-0
app/src/main/res/values/styles.xml
+7
-2
No files found.
app/src/main/java/com/freemud/app/facepay/LoginActivity.java
View file @
d3aca767
package
com
.
freemud
.
app
.
facepay
;
import
android.content.Context
;
import
android.os.Bundle
;
import
android.support.v7.app.AppCompatActivity
;
import
android.util.DisplayMetrics
;
import
android.util.Log
;
import
android.view.WindowManager
;
import
android.widget.TextView
;
import
android.widget.Toast
;
...
...
@@ -18,6 +22,7 @@ public class LoginActivity extends AppCompatActivity implements LoginDialog.Logi
setContentView
(
R
.
layout
.
activity_login
);
TextView
mGoMember
=
findViewById
(
R
.
id
.
go_member
);
getAndroiodScreenProperty
();
mGoMember
.
setOnClickListener
(
v
->
{
LoginDialog
loginDialog
=
LoginDialog
.
newInstance
();
loginDialog
.
setListener
(
LoginActivity
.
this
);
...
...
@@ -35,4 +40,20 @@ public class LoginActivity extends AppCompatActivity implements LoginDialog.Logi
}
}
public
void
getAndroiodScreenProperty
(){
WindowManager
wm
=
(
WindowManager
)
this
.
getSystemService
(
Context
.
WINDOW_SERVICE
);
DisplayMetrics
dm
=
new
DisplayMetrics
();
wm
.
getDefaultDisplay
().
getMetrics
(
dm
);
int
width
=
dm
.
widthPixels
;
// 屏幕宽度(像素)
int
height
=
dm
.
heightPixels
;
// 屏幕高度(像素)
float
density
=
dm
.
density
;
//屏幕密度(0.75 / 1.0 / 1.5)
int
densityDpi
=
dm
.
densityDpi
;
//屏幕密度dpi(120 / 160 / 240)
//屏幕宽度算法:屏幕宽度(像素)/屏幕密度
int
screenWidth
=
(
int
)
(
width
/
density
);
//屏幕宽度(dp)
int
screenHeight
=
(
int
)(
height
/
density
);
//屏幕高度(dp)
Log
.
e
(
TAG
,
screenWidth
+
"======"
+
screenHeight
);
}
}
app/src/main/java/com/freemud/app/facepay/MainActivity.java
View file @
d3aca767
...
...
@@ -2,39 +2,17 @@ package com.freemud.app.facepay;
import
android.content.Context
;
import
android.content.Intent
;
import
android.graphics.drawable.BitmapDrawable
;
import
android.graphics.drawable.ColorDrawable
;
import
android.os.Bundle
;
import
android.support.v7.app.AppCompatActivity
;
import
android.support.v7.widget.DividerItemDecoration
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.util.Log
;
import
android.view.Gravity
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.view.WindowManager
;
import
android.widget.LinearLayout
;
import
android.widget.PopupWindow
;
import
android.widget.TextView
;
import
android.widget.Toast
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.freemud.app.facepay.adapter.CartGoodsAdapter
;
import
com.freemud.app.facepay.adapter.ShoppingBagAdapter
;
import
com.freemud.app.facepay.entity.Goods
;
import
com.freemud.app.facepay.entity.ShoppingBag
;
import
com.freemud.app.facepay.help.DialogFactory
;
import
com.freemud.app.facepay.views.CommonDialog
;
import
com.freemud.app.facepay.views.CustomPopWindow
;
import
com.freemud.app.facepay.views.LoginDialog
;
import
com.freemud.app.facepay.views.MainDialog
;
import
java.util.ArrayList
;
import
java.util.List
;
public
class
MainActivity
extends
AppCompatActivity
implements
MainDialog
.
MainDialogListener
,
CommonDialog
.
CommonDialogListener
{
public
class
MainActivity
extends
AppCompatActivity
implements
View
.
OnClickListener
,
MainDialog
.
MainDialogListener
,
CommonDialog
.
CommonDialogListener
{
public
static
String
TAG
=
"MainActivity"
;
@Override
...
...
@@ -46,8 +24,12 @@ public class MainActivity extends AppCompatActivity implements MainDialog.MainDi
}
private
void
initView
()
{
TextView
mCommonTvLeft
=
findViewById
(
R
.
id
.
common_tv_left
);
TextView
mMainHineTitle
=
findViewById
(
R
.
id
.
main_hint_title
);
TextView
mMainHineHands
=
findViewById
(
R
.
id
.
main_barcode_hands
);
mCommonTvLeft
.
setOnClickListener
(
this
);
mMainHineTitle
.
setOnClickListener
(
v
->
{
// ShoppingCartActivity.start(MainActivity.this);
CommonDialog
commonDialog
=
CommonDialog
.
newInstance
();
...
...
@@ -61,6 +43,14 @@ public class MainActivity extends AppCompatActivity implements MainDialog.MainDi
});
}
@Override
public
void
onClick
(
View
v
)
{
switch
(
v
.
getId
())
{
case
R
.
id
.
common_tv_left
:
finish
();
break
;
}
}
public
static
void
start
(
Context
context
)
{
Intent
intent
=
new
Intent
(
context
,
MainActivity
.
class
);
...
...
@@ -77,4 +67,6 @@ public class MainActivity extends AppCompatActivity implements MainDialog.MainDi
public
void
commonDialogBtnOkListener
(
boolean
flag
)
{
ShoppingCartActivity
.
start
(
MainActivity
.
this
);
}
}
app/src/main/res/layout/activity_login.xml
View file @
d3aca767
...
...
@@ -9,7 +9,7 @@
<View
android:id=
"@+id/video_view"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/
height_790px
"
android:layout_height=
"@dimen/
dp_395
"
android:background=
"@color/video_view_bg"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
...
...
@@ -17,9 +17,9 @@
<Button
android:id=
"@+id/go_pay"
android:layout_width=
"@dimen/
height_480px
"
android:layout_height=
"@dimen/
height_80px
"
android:layout_marginTop=
"@dimen/
height_68px
"
android:layout_width=
"@dimen/
dp_240
"
android:layout_height=
"@dimen/
dp_40
"
android:layout_marginTop=
"@dimen/
dp_34
"
android:background=
"@drawable/app_btn_gopay_selector"
android:text=
"@string/go_pay_btn"
android:textColor=
"@color/write"
...
...
@@ -32,14 +32,14 @@
android:id=
"@+id/go_member"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/
height_68px
"
android:layout_marginTop=
"@dimen/
dp_34
"
android:drawableEnd=
"@drawable/img_login_arrow"
android:padding=
"@dimen/
height_10px
"
android:padding=
"@dimen/
dp_6
"
android:gravity=
"center"
android:text=
"@string/is_member"
android:textColor=
"@color/app_color"
android:background=
"@drawable/app_btn_login_selector"
android:textSize=
"@dimen/sp_
30px
"
android:textSize=
"@dimen/sp_
15
"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/go_pay"
/>
...
...
app/src/main/res/layout/activity_main.xml
View file @
d3aca767
...
...
@@ -12,9 +12,7 @@
<View
android:id=
"@+id/main_view_line"
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:background=
"@color/line_color"
style=
"@style/line_height_1"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/common_layout"
/>
...
...
@@ -23,13 +21,13 @@
android:id=
"@+id/main_hint_title"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/
height_100px
"
android:layout_marginStart=
"@dimen/
height_100px
"
android:layout_marginTop=
"@dimen/
height_300px
"
android:layout_marginEnd=
"@dimen/
dp_50
"
android:layout_marginStart=
"@dimen/
dp_50
"
android:layout_marginTop=
"@dimen/
dp_167
"
android:gravity=
"center_horizontal"
android:text=
"@string/main_hint_title"
android:textColor=
"@color/black"
android:textSize=
"@dimen/sp_
40px
"
android:textSize=
"@dimen/sp_
20
"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/main_view_line"
/>
...
...
@@ -37,24 +35,24 @@
<TextView
android:id=
"@+id/main_barcode_hands"
android:layout_width=
"wrap_content"
android:layout_height=
"@dimen/height_58px"
android:layout_marginTop=
"@dimen/height_40px"
android:layout_height=
"@dimen/dp_29"
android:layout_marginTop=
"@dimen/dp_20"
android:background=
"@drawable/app_btn_login_selector"
android:drawableEnd=
"@drawable/img_cart_arrow"
android:gravity=
"center"
android:padding=
"@dimen/dp_5"
android:text=
"@string/main_barcode_hands"
android:background=
"@drawable/app_btn_login_selector"
android:textColor=
"@color/color888"
android:textSize=
"@dimen/sp_
26px
"
android:textSize=
"@dimen/sp_
13
"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
android:padding=
"@dimen/height_10px"
app:layout_constraintTop_toBottomOf=
"@id/main_hint_title"
/>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"@dimen/
height_500px
"
android:layout_marginTop=
"@dimen/
height_60px
"
android:layout_height=
"@dimen/
dp_249
"
android:layout_marginTop=
"@dimen/
dp_40
"
android:src=
"@drawable/qr_scan"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
...
...
app/src/main/res/layout/activity_shopping_cart.xml
View file @
d3aca767
...
...
@@ -9,10 +9,10 @@
android:id=
"@+id/common_layout"
layout=
"@layout/common_title_layout"
/>
<View
android:id=
"@+id/cart_view_line"
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
style=
"@style/line_height_1"
android:layout_below=
"@id/common_layout"
android:background=
"@color/line_color"
/>
...
...
@@ -31,30 +31,27 @@
android:layout_below=
"@id/cart_view_line"
android:gravity=
"top"
android:orientation=
"vertical"
android:paddingStart=
"@dimen/
height_30px
"
android:paddingStart=
"@dimen/
dp_15
"
android:visibility=
"gone"
>
<TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/
height_130px
"
android:layout_height=
"@dimen/
dp_62
"
android:gravity=
"center_vertical"
android:text=
"@string/cart_no_shopping_hint"
android:textColor=
"@color/color888"
android:textSize=
"@dimen/sp_
30px
"
/>
android:textSize=
"@dimen/sp_
15
"
/>
<View
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:background=
"@color/line_color"
/>
<View
style=
"@style/line_height_1"
/>
</LinearLayout>
<RelativeLayout
android:id=
"@+id/cart_buttom_rl"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/
height_80px
"
android:layout_height=
"@dimen/
dp_40
"
android:layout_above=
"@id/cart_tv_goods_num"
android:layout_marginBottom=
"@dimen/
height_34px
"
android:layout_marginBottom=
"@dimen/
dp_17
"
android:background=
"@color/app_gray"
android:gravity=
"center_vertical"
>
...
...
@@ -64,26 +61,26 @@
android:layout_height=
"wrap_content"
android:layout_alignParentStart=
"true"
android:layout_centerVertical=
"true"
android:layout_marginStart=
"@dimen/
height_8px
"
android:layout_marginStart=
"@dimen/
dp_4
"
android:background=
"@drawable/app_btn_cart_click_selector"
android:orientation=
"horizontal"
android:padding=
"@dimen/
height_12px
"
>
android:padding=
"@dimen/
dp_6
"
>
<ImageView
android:id=
"@+id/cart_iv_bag"
android:layout_width=
"@dimen/
height_34px
"
android:layout_height=
"@dimen/
height_34px
"
android:layout_width=
"@dimen/
dp_17
"
android:layout_height=
"@dimen/
dp_17
"
android:src=
"@drawable/bag"
/>
<TextView
android:id=
"@+id/cart_tv_bag"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_marginStart=
"@dimen/
height_20px
"
android:layout_marginStart=
"@dimen/
dp_7
"
android:gravity=
"center"
android:text=
"添加购物袋"
android:textColor=
"@color/color4D"
android:textSize=
"@dimen/sp_
26px
"
/>
android:textSize=
"@dimen/sp_
13
"
/>
</LinearLayout>
...
...
@@ -95,10 +92,10 @@
android:background=
"@drawable/app_btn_cart_click_selector"
android:drawableEnd=
"@drawable/img_cart_arrow"
android:gravity=
"center_vertical|end"
android:padding
Left=
"@dimen/height_12px
"
android:padding
Start=
"@dimen/dp_6
"
android:text=
"@string/main_barcode_hands"
android:textColor=
"@color/color4D"
android:textSize=
"@dimen/sp_
26px
"
/>
android:textSize=
"@dimen/sp_
13
"
/>
</RelativeLayout>
<TextView
...
...
@@ -106,31 +103,31 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_above=
"@id/cart_tv_goods_price"
android:layout_marginBottom=
"@dimen/
height_22px
"
android:layout_marginBottom=
"@dimen/
dp_11
"
android:gravity=
"center_horizontal"
android:text=
"共1件商品,合计"
android:textColor=
"@color/black"
android:textSize=
"@dimen/sp_
26px
"
/>
android:textSize=
"@dimen/sp_
13
"
/>
<TextView
android:id=
"@+id/cart_tv_goods_price"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_above=
"@id/cart_btn_pay"
android:layout_marginBottom=
"@dimen/
height_28px
"
android:layout_marginBottom=
"@dimen/
dp_14
"
android:gravity=
"center_horizontal"
android:text=
"¥99.99"
android:textColor=
"@color/app_color"
android:textSize=
"@dimen/sp_
60px
"
/>
android:textSize=
"@dimen/sp_
30
"
/>
<Button
android:id=
"@+id/cart_btn_pay"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/
height_80px
"
android:layout_height=
"@dimen/
dp_40
"
android:layout_alignParentBottom=
"true"
android:layout_marginBottom=
"@dimen/
height_50px
"
android:layout_marginEnd=
"@dimen/
height_120px
"
android:layout_marginStart=
"@dimen/
height_120px
"
android:layout_marginBottom=
"@dimen/
dp_25
"
android:layout_marginEnd=
"@dimen/
dp_60
"
android:layout_marginStart=
"@dimen/
dp_60
"
android:background=
"@drawable/app_btn_gopay_selector"
android:text=
"去付款"
android:textColor=
"@color/write"
/>
...
...
app/src/main/res/layout/common_title_layout.xml
View file @
d3aca767
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/
height_100px
"
android:layout_height=
"@dimen/
dp_50
"
android:background=
"@color/app_gray"
>
<TextView
android:id=
"@+id/common_tv_left"
android:layout_width=
"@dimen/
height_120px
"
android:layout_height=
"@dimen/
height_60px
"
android:layout_width=
"@dimen/
dp_60
"
android:layout_height=
"@dimen/
dp_30
"
android:layout_centerVertical=
"true"
android:layout_marginStart=
"@dimen/
height_20px
"
android:layout_marginStart=
"@dimen/
dp_10
"
android:background=
"@drawable/app_btn_cart_exit_selector"
android:gravity=
"center"
android:text=
"退出"
android:textColor=
"@color/color353535"
android:textSize=
"@dimen/sp_
26px
"
/>
android:textSize=
"@dimen/sp_
13
"
/>
<TextView
...
...
@@ -23,12 +23,12 @@
android:layout_height=
"wrap_content"
android:layout_alignParentStart=
"@id/common_tv_left"
android:layout_centerHorizontal=
"true"
android:layout_marginStart=
"@dimen/height_56px"
android:layout_marginTop=
"@dimen/height_14px"
android:layout_marginTop=
"@dimen/dp_10"
android:singleLine=
"true"
android:layout_marginStart=
"@dimen/dp_10"
android:text=
"小明"
android:textColor=
"@color/black"
android:textSize=
"@dimen/sp_
30px
"
/>
android:textSize=
"@dimen/sp_
15
"
/>
<TextView
android:id=
"@+id/common_tv_title_card_integral"
...
...
@@ -37,10 +37,10 @@
android:layout_alignParentStart=
"@id/common_tv_left"
android:layout_below=
"@id/common_tv_title"
android:layout_centerHorizontal=
"true"
android:layout_marginTop=
"@dimen/
height_10px
"
android:layout_marginTop=
"@dimen/
dp_5
"
android:text=
"卡号 1234 积分 9999"
android:textColor=
"@color/color888"
android:textSize=
"@dimen/sp_
20px
"
/>
android:textSize=
"@dimen/sp_
10
"
/>
</RelativeLayout>
app/src/main/res/layout/dialog_common.xml
View file @
d3aca767
...
...
@@ -9,8 +9,8 @@
<LinearLayout
android:id=
"@+id/dialog_common_ll_center"
android:layout_width=
"@dimen/
height_460px
"
android:layout_height=
"@dimen/
height_300px
"
android:layout_width=
"@dimen/
dp_230
"
android:layout_height=
"@dimen/
dp_140
"
android:background=
"@drawable/app_write_bg"
android:gravity=
"center"
android:orientation=
"vertical"
>
...
...
@@ -18,34 +18,34 @@
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/
height_40px
"
android:layout_marginTop=
"@dimen/
dp_25
"
android:gravity=
"center_horizontal"
android:text=
"@string/common_dialog_no_find_shopping"
android:textColor=
"@color/black"
android:textSize=
"@dimen/sp_
30px
"
/>
android:textSize=
"@dimen/sp_
15
"
/>
<TextView
android:id=
"@+id/common_dialog_tv_barcode"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/
height_18px
"
android:layout_marginTop=
"@dimen/
dp_9
"
android:text=
"@string/common_dialog_shopping_barcode"
android:textColor=
"@color/color888"
android:textSize=
"@dimen/sp_
26px
"
/>
android:textSize=
"@dimen/sp_
13
"
/>
<View
style=
"@style/line_height05"
android:layout_marginTop=
"@dimen/
height_40px
"
/>
style=
"@style/line_height
_
05"
android:layout_marginTop=
"@dimen/
dp_20
"
/>
<TextView
android:id=
"@+id/common_dialog_tv_sure"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/
height_30px
"
android:layout_marginTop=
"@dimen/
dp_15
"
android:gravity=
"center"
android:text=
"@string/common_dialog_shopping_sure"
android:textColor=
"@color/app_color"
android:textSize=
"@dimen/sp_
30px
"
/>
android:textSize=
"@dimen/sp_
15
"
/>
</LinearLayout>
...
...
app/src/main/res/layout/dialog_login.xml
View file @
d3aca767
This diff is collapsed.
Click to expand it.
app/src/main/res/layout/dialog_main.xml
View file @
d3aca767
This diff is collapsed.
Click to expand it.
app/src/main/res/layout/dialog_shoppingcart_pay.xml
View file @
d3aca767
...
...
@@ -13,14 +13,14 @@
android:id=
"@+id/dialog_cart_cl_pay"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginTop=
"@dimen/
height_300px
"
android:layout_marginTop=
"@dimen/
dp_150
"
android:background=
"@color/write"
>
<LinearLayout
android:id=
"@+id/dialog_cart_ll_exit"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_margin=
"@dimen/
height_8px
"
android:layout_margin=
"@dimen/
dp_4
"
android:background=
"@drawable/dialog_iv_exit_selector"
android:orientation=
"horizontal"
app:layout_constraintLeft_toLeftOf=
"parent"
...
...
@@ -28,9 +28,9 @@
<ImageView
android:id=
"@+id/dialog_cart_iv_exit"
android:layout_width=
"@dimen/
height_38px
"
android:layout_height=
"@dimen/
height_38px
"
android:layout_margin=
"@dimen/
height_28px
"
android:layout_width=
"@dimen/
dp_19
"
android:layout_height=
"@dimen/
dp_19
"
android:layout_margin=
"@dimen/
dp_10
"
android:contentDescription=
"@string/app_name"
android:src=
"@drawable/exit"
/>
</LinearLayout>
...
...
@@ -38,10 +38,10 @@
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/
height_32px
"
android:layout_marginTop=
"@dimen/
dp_16
"
android:text=
"@string/dialog_cart_pay_title"
android:textColor=
"@color/black"
android:textSize=
"@dimen/sp_
30px
"
android:textSize=
"@dimen/sp_
15
"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
...
...
@@ -49,10 +49,10 @@
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/
height_330px
"
android:layout_marginEnd=
"@dimen/
height_36px
"
android:layout_marginStart=
"@dimen/
height_36px
"
android:layout_marginTop=
"@dimen/
height_326px
"
android:layout_height=
"@dimen/
dp_165
"
android:layout_marginEnd=
"@dimen/
dp_18
"
android:layout_marginStart=
"@dimen/
dp_18
"
android:layout_marginTop=
"@dimen/
dp_162
"
android:orientation=
"horizontal"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
...
...
@@ -68,26 +68,26 @@
android:orientation=
"vertical"
>
<ImageView
android:layout_width=
"@dimen/
height_144px
"
android:layout_height=
"@dimen/
height_140px
"
android:layout_width=
"@dimen/
dp_72
"
android:layout_height=
"@dimen/
dp_70
"
android:src=
"@drawable/facepay"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textSize=
"@dimen/sp_
30px
"
android:textSize=
"@dimen/sp_
15
"
android:textColor=
"@color/black"
android:layout_marginTop=
"@dimen/
height_30px
"
android:layout_marginTop=
"@dimen/
dp_16
"
android:text=
"@string/dialog_cart_pay_facePay"
/>
</LinearLayout>
<View
android:layout_width=
"1dp"
android:layout_height=
"@dimen/
height_180px
"
android:layout_height=
"@dimen/
dp_92
"
android:layout_gravity=
"center_vertical"
android:layout_marginEnd=
"@dimen/
height_20px
"
android:layout_marginStart=
"@dimen/
height_20px
"
android:layout_marginEnd=
"@dimen/
dp_10
"
android:layout_marginStart=
"@dimen/
dp_10
"
android:background=
"@color/line_color"
/>
<LinearLayout
...
...
@@ -100,16 +100,16 @@
android:orientation=
"vertical"
>
<ImageView
android:layout_width=
"@dimen/
height_144px
"
android:layout_height=
"@dimen/
height_140px
"
android:layout_width=
"@dimen/
dp_72
"
android:layout_height=
"@dimen/
dp_70
"
android:src=
"@drawable/qr_pay"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textSize=
"@dimen/sp_
30px
"
android:textSize=
"@dimen/sp_
15
"
android:textColor=
"@color/black"
android:layout_marginTop=
"@dimen/
height_30px
"
android:layout_marginTop=
"@dimen/
dp_16
"
android:text=
"@string/dialog_cart_pay_qrCodePay"
/>
</LinearLayout>
...
...
app/src/main/res/layout/item_adapter_cartgoods.xml
View file @
d3aca767
<?xml version="1.0" encoding="utf-8"?>
<com.freemud.app.facepay.views.SwipeMenuView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/
height_130px
"
>
android:layout_height=
"@dimen/
dp_63
"
>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:paddingEnd=
"@dimen/
height_30px
"
android:paddingStart=
"@dimen/
height_30px
"
>
android:paddingEnd=
"@dimen/
dp_15
"
android:paddingStart=
"@dimen/
dp_15
"
>
<LinearLayout
android:id=
"@+id/item_cartgoods_ll_num"
...
...
@@ -19,31 +19,31 @@
<ImageView
android:id=
"@+id/item_cartgoods_iv_reduceNum"
android:layout_width=
"@dimen/
height_44px
"
android:layout_height=
"@dimen/
height_44px
"
android:layout_width=
"@dimen/
dp_22
"
android:layout_height=
"@dimen/
dp_22
"
android:src=
"@drawable/reduce_normal"
/>
<TextView
android:id=
"@+id/item_cartgoods_tv_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/
height_28px
"
android:layout_marginStart=
"@dimen/
height_28px
"
android:layout_marginEnd=
"@dimen/
dp_14
"
android:layout_marginStart=
"@dimen/
dp_14
"
android:text=
"1"
android:textColor=
"@color/color4D"
android:textSize=
"@dimen/sp_
30px
"
/>
android:textSize=
"@dimen/sp_
15
"
/>
<ImageView
android:id=
"@+id/item_cartgoods_iv_addNum"
android:layout_width=
"@dimen/
height_44px
"
android:layout_height=
"@dimen/
height_44px
"
android:layout_width=
"@dimen/
dp_22
"
android:layout_height=
"@dimen/
dp_22
"
android:src=
"@drawable/add_normal"
/>
</LinearLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginEnd=
"@dimen/
height_30px
"
android:layout_marginEnd=
"@dimen/
dp_15
"
android:layout_toStartOf=
"@id/item_cartgoods_ll_num"
android:gravity=
"center_vertical"
>
...
...
@@ -53,42 +53,40 @@
android:layout_height=
"wrap_content"
android:layout_alignParentStart=
"true"
android:textColor=
"@color/black"
android:textSize=
"@dimen/sp_
30px
"
/>
android:textSize=
"@dimen/sp_
15
"
/>
<TextView
android:id=
"@+id/item_cartgoods_tv_discountPrice"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@id/item_cartgoods_tv_name"
android:layout_marginTop=
"@dimen/
height_10px
"
android:layout_marginTop=
"@dimen/
dp_5
"
android:singleLine=
"true"
android:textColor=
"@color/app_color"
android:textSize=
"@dimen/sp_
30px
"
/>
android:textSize=
"@dimen/sp_
15
"
/>
<TextView
android:id=
"@+id/item_cartgoods_tv_originalPrice"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@id/item_cartgoods_tv_name"
android:layout_marginStart=
"@dimen/
height_10px
"
android:layout_marginTop=
"@dimen/
height_20px
"
android:layout_marginStart=
"@dimen/
dp_5
"
android:layout_marginTop=
"@dimen/
dp_8
"
android:layout_toEndOf=
"@id/item_cartgoods_tv_discountPrice"
android:textColor=
"@color/colorAAA"
android:textSize=
"@dimen/sp_
20px
"
/>
android:textSize=
"@dimen/sp_
10
"
/>
</RelativeLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"0.4dp"
android:layout_alignParentBottom=
"true"
android:background=
"@color/line_color"
/>
style=
"@style/line_height_05"
android:layout_alignParentBottom=
"true"
/>
</RelativeLayout>
<Button
android:id=
"@+id/item_cartgoods_btn_delete"
android:layout_width=
"@dimen/
height_140px
"
android:layout_width=
"@dimen/
dp_70
"
android:layout_height=
"match_parent"
android:background=
"@color/item_cartgoods_delete_bg"
android:text=
"@string/item_cartgoods_delete"
...
...
app/src/main/res/layout/item_adapter_popwindow_bag.xml
View file @
d3aca767
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"@dimen/
height_188px
"
android:layout_height=
"@dimen/
height_100px
"
android:layout_margin=
"@dimen/
height_8px
"
android:layout_width=
"@dimen/
dp_94
"
android:layout_height=
"@dimen/
dp_54
"
android:layout_margin=
"@dimen/
dp_4
"
android:background=
"@drawable/app_btn_cart_click_selector"
android:gravity=
"center"
android:orientation=
"vertical"
>
...
...
@@ -13,13 +13,13 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"@color/color4C"
android:textSize=
"@dimen/sp_
26px
"
/>
android:textSize=
"@dimen/sp_
13
"
/>
<TextView
android:id=
"@+id/item_bag_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"@color/color4C"
android:textSize=
"@dimen/sp_
26px
"
/>
android:textSize=
"@dimen/sp_
13
"
/>
</LinearLayout >
app/src/main/res/values/dimens.xml
View file @
d3aca767
This diff is collapsed.
Click to expand it.
app/src/main/res/values/styles.xml
View file @
d3aca767
...
...
@@ -9,9 +9,14 @@
<item
name=
"android:windowNoTitle"
>
true
</item>
-->
</style>
<style
name=
"line_height05"
>
<style
name=
"line_height
_
05"
>
<item
name=
"android:layout_width"
>
match_parent
</item>
<item
name=
"android:layout_height"
>
0.5dp
</item>
<item
name=
"android:layout_height"
>
@dimen/dp_0_5
</item>
<item
name=
"android:background"
>
@color/line_color
</item>
</style>
<style
name=
"line_height_1"
>
<item
name=
"android:layout_width"
>
match_parent
</item>
<item
name=
"android:layout_height"
>
@dimen/dp_1
</item>
<item
name=
"android:background"
>
@color/line_color
</item>
</style>
...
...
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