Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TangKuPos
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
王海
TangKuPos
Commits
f70336df
Commit
f70336df
authored
Jan 30, 2018
by
姜敏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改线的粗细
parent
c4b2740c
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
78 additions
and
91 deletions
+78
-91
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java
.../com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java
+7
-6
app/src/main/res/layout/fragment_vip_info_edit.xml
app/src/main/res/layout/fragment_vip_info_edit.xml
+14
-31
app/src/main/res/layout/fragment_vip_level_edit.xml
app/src/main/res/layout/fragment_vip_level_edit.xml
+5
-27
app/src/main/res/layout/fragment_vip_level_list.xml
app/src/main/res/layout/fragment_vip_level_list.xml
+1
-5
app/src/main/res/layout/fragment_vip_list.xml
app/src/main/res/layout/fragment_vip_list.xml
+25
-8
app/src/main/res/layout/fragment_vip_serch.xml
app/src/main/res/layout/fragment_vip_serch.xml
+4
-3
app/src/main/res/layout/item_vip_expense_item.xml
app/src/main/res/layout/item_vip_expense_item.xml
+2
-4
app/src/main/res/layout/item_vip_list_item.xml
app/src/main/res/layout/item_vip_list_item.xml
+6
-7
app/src/main/res/layout/line_layout_margin_left.xml
app/src/main/res/layout/line_layout_margin_left.xml
+7
-0
app/src/main/res/layout/line_layout_margin_right.xml
app/src/main/res/layout/line_layout_margin_right.xml
+7
-0
app/src/main/res/mipmap-xhdpi/vip_level_bg.9.png
app/src/main/res/mipmap-xhdpi/vip_level_bg.9.png
+0
-0
app/src/main/res/mipmap-xhdpi/vip_level_bg.png
app/src/main/res/mipmap-xhdpi/vip_level_bg.png
+0
-0
No files found.
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java
View file @
f70336df
...
...
@@ -150,25 +150,26 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
if
(
radioButton
.
isChecked
())
{
strVipLevle
=
radioButton
.
getTag
()
==
null
?
null
:
radioButton
.
getTag
().
toString
();
radioButton
.
getPaint
().
setFakeBoldText
(
true
);
radioButton
.
setTextSize
(
1
7
);
radioButton
.
setTextSize
(
1
6
);
vipListAdapter
.
setEnableLoadMore
(
true
);
mPresenter
.
getVipList
(
0
,
strVipLevle
);
}
else
{
radioButton
.
setTextSize
(
15
);
radioButton
.
setTextSize
(
14
);
radioButton
.
getPaint
().
setFakeBoldText
(
false
);
}
}
@SuppressLint
(
"ResourceAsColor"
)
private
RadioButton
addRadioButton
(
LinearLayout
.
LayoutParams
layoutParams
,
Level
level
)
{
RadioButton
radioButton
=
new
RadioButton
(
getActivity
());
radioButton
.
setTextSize
(
1
5
);
radioButton
.
setTextSize
(
1
4
);
radioButton
.
setText
(
level
.
getVipLevelName
());
radioButton
.
setTag
(
level
.
getVipLevel
());
radioButton
.
setGravity
(
Gravity
.
CENTER
);
radioButton
.
setButtonDrawable
(
null
);
radioButton
.
getPaint
().
setFakeBoldText
(
true
);
//
radioButton.getPaint().setFakeBoldText(true);
radioButton
.
setBackgroundResource
(
R
.
drawable
.
checkbox_viplevel_bg
);
radioButton
.
setTextColor
(
R
.
color
.
black_baozheng
);
radioButton
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
black
)
);
radioButton
.
setLayoutParams
(
layoutParams
);
radioButton
.
setPadding
(
0
,
40
,
0
,
40
);
return
radioButton
;
...
...
@@ -196,7 +197,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
// setVipLevel(levelPager.getList(), mViewBinding.vipLevelRadioGroup.findViewById(id).getTag().toString());
for
(
int
i
=
0
;
i
<
mViewBinding
.
vipLevelR
.
getChildCount
();
i
++)
{
//动态设置按钮颜色
setRadioButtonChecked
(
id
);
setRadioButtonChecked
(
mViewBinding
.
vipLevelR
.
getChildAt
(
i
).
getId
()
);
}
});
if
(
levelPager
.
getList
().
size
()
!=
0
)
{
...
...
app/src/main/res/layout/fragment_vip_info_edit.xml
View file @
f70336df
...
...
@@ -59,11 +59,7 @@
android:hint=
"请输入姓名"
/>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginRight=
"@dimen/all_margin_left"
android:background=
"@color/line_bg"
/>
<include
layout=
"@layout/line_layout_margin_right"
></include>
<LinearLayout
android:layout_width=
"match_parent"
...
...
@@ -101,15 +97,12 @@
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_margin=
"@dimen/all_margin"
android:layout_gravity=
"center_vertical"
android:layout_margin=
"@dimen/all_margin"
android:background=
"@mipmap/iv_vip"
/>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:background=
"@color/line_bg"
/>
<include
layout=
"@layout/line_layout"
></include>
<LinearLayout
android:layout_width=
"match_parent"
...
...
@@ -132,22 +125,22 @@
android:text=
"性别"
/>
<RadioGroup
android:gravity=
"center_vertical"
android:id=
"@+id/vip_sex"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginLeft=
"@dimen/all_margin_left"
android:layout_marginRight=
"100dp"
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<RadioButton
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"@dimen/all_margin_left"
android:layout_weight=
"1"
android:background=
"@drawable/selector_checkbox_bg"
android:button=
"@null"
android:tag=
"1"
android:layout_marginRight=
"@dimen/all_margin_left"
android:text=
"男"
/>
<RadioButton
...
...
@@ -162,16 +155,13 @@
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:background=
"@color/line_bg"
/>
<include
layout=
"@layout/line_layout"
></include>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"center_vertical"
android:background=
"@color/white"
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<ImageView
...
...
@@ -186,20 +176,16 @@
android:text=
"级别"
/>
<TextView
style=
"@style/default_blacktext_nopadding_smallstyle"
android:id=
"@+id/vip_discounts"
style=
"@style/default_blacktext_nopadding_smallstyle"
android:layout_width=
"match_parent"
android:layout_marginLeft=
"@dimen/sp_12"
android:gravity=
"center_vertical"
android:layout_marginRight=
"100dp"
android:drawableRight=
"@mipmap/ic_expand"
android:gravity=
"center_vertical"
android:onClick=
"@{onClickListener}"
/>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:background=
"@color/line_bg"
/>
<include
layout=
"@layout/line_layout"
></include>
<LinearLayout
android:layout_width=
"match_parent"
...
...
@@ -218,16 +204,13 @@
android:id=
"@+id/vip_birthday"
style=
"@style/default_blacktext_nopadding_smallstyle"
android:layout_width=
"match_parent"
android:hint=
"请选择"
android:layout_marginLeft=
"21dp"
android:textSize=
"@dimen/all_body_size"
android:onClick=
"@{onClickListener}"
/>
android:hint=
"请选择"
android:onClick=
"@{onClickListener}"
android:textSize=
"@dimen/all_body_size"
/>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:background=
"@color/line_bg"
/>
<include
layout=
"@layout/line_layout"
></include>
<RelativeLayout
android:layout_width=
"match_parent"
...
...
app/src/main/res/layout/fragment_vip_level_edit.xml
View file @
f70336df
...
...
@@ -31,11 +31,6 @@
android:layout_height=
"wrap_content"
android:text=
"基本信息"
/>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"0.5dp"
android:background=
"@color/gray_huanggai"
/>
<include
layout=
"@layout/line_layout"
></include>
<LinearLayout
...
...
@@ -78,13 +73,7 @@
android:background=
"@null"
android:hint=
"请输入等级名称"
/>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"0.5dp"
android:layout_marginLeft=
"@dimen/all_margin_left"
android:layout_marginRight=
"@dimen/all_margin_left"
android:background=
"@color/line_bg"
/>
<include
layout=
"@layout/line_layout_margin"
></include>
<LinearLayout
android:layout_width=
"match_parent"
...
...
@@ -123,10 +112,7 @@
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:background=
"@color/line_bg"
/>
<include
layout=
"@layout/line_layout"
></include>
<LinearLayout
android:layout_width=
"match_parent"
...
...
@@ -142,10 +128,7 @@
android:text=
"本级标准"
/>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"0.5dp"
android:background=
"@color/line_bg"
/>
<include
layout=
"@layout/line_layout"
></include>
<LinearLayout
android:layout_width=
"match_parent"
...
...
@@ -179,12 +162,7 @@
android:text=
"天"
/>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"0.5dp"
android:layout_marginLeft=
"@dimen/all_margin_left"
android:layout_marginRight=
"@dimen/all_margin_left"
android:background=
"@color/line_bg"
/>
<include
layout=
"@layout/line_layout_margin"
></include>
<LinearLayout
android:layout_width=
"match_parent"
...
...
@@ -223,7 +201,7 @@
android:layout_marginLeft=
"@dimen/all_margin_left"
android:text=
"元"
/>
</LinearLayout>
<include
layout=
"@layout/line_layout"
></include>
<RelativeLayout
android:layout_width=
"match_parent"
...
...
app/src/main/res/layout/fragment_vip_level_list.xml
View file @
f70336df
...
...
@@ -59,11 +59,7 @@
</LinearLayout>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_margin=
"@dimen/view_line_L5"
android:background=
"@color/line1"
/>
<include
layout=
"@layout/line_layout"
></include>
<RelativeLayout
...
...
app/src/main/res/layout/fragment_vip_list.xml
View file @
f70336df
...
...
@@ -11,9 +11,13 @@
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/gray_zhouyu"
android:orientation=
"vertical"
>
<include
layout=
"@layout/title"
android:id=
"@+id/title_layout"
/>
<include
android:id=
"@+id/title_layout"
layout=
"@layout/title"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"?attr/actionBarSize"
...
...
@@ -30,26 +34,30 @@
<ImageView
android:layout_width=
"50dp"
android:layout_height=
"match_parent"
android:background=
"@mipmap/swipe_card_bg"
/>
android:background=
"@mipmap/swipe_card_bg"
android:visibility=
"gone"
/>
<ImageView
android:id=
"@+id/onScan"
android:layout_width=
"50dp"
android:layout_height=
"match_parent"
android:background=
"@mipmap/scan_bg"
android:onClick=
"@{onClickListener}"
/>
android:onClick=
"@{onClickListener}"
android:visibility=
"gone"
/>
</LinearLayout>
<View
android:layout_width=
"wrap_content"
android:layout_height=
"@dimen/all_margin_left"
></View>
<include
layout=
"@layout/line_layout"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_10"
android:background=
"@color/white"
android:orientation=
"horizontal"
>
android:orientation=
"horizontal"
android:paddingTop=
"@dimen/all_margin_left"
>
<TextView
android:id=
"@+id/vip_count_title"
...
...
@@ -74,7 +82,8 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/white"
android:orientation=
"horizontal"
>
android:orientation=
"horizontal"
android:paddingBottom=
"@dimen/all_margin_left"
>
<TextView
android:id=
"@+id/vip_count"
...
...
@@ -83,6 +92,7 @@
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:text=
"1111"
android:textSize=
"22sp"
android:textStyle=
"bold"
/>
...
...
@@ -93,6 +103,7 @@
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:text=
"1111"
android:textSize=
"22sp"
android:textStyle=
"bold"
/>
</LinearLayout>
...
...
@@ -104,7 +115,7 @@
android:id=
"@+id/addVipLinearLayout"
android:layout_width=
"match_parent"
android:layout_height=
"58dp"
android:layout_marginTop=
"
10dp
"
android:layout_marginTop=
"
@dimen/all_margin_left
"
android:background=
"@color/white"
android:gravity=
"center"
android:orientation=
"vertical"
>
...
...
@@ -138,10 +149,15 @@
<include
layout=
"@layout/line_layout"
/>
<View
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/all_margin_left"
></View>
<include
layout=
"@layout/line_layout"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginTop=
"@dimen/all_margin_left"
android:layout_weight=
"1"
android:orientation=
"horizontal"
>
...
...
@@ -158,6 +174,7 @@
android:orientation=
"vertical"
></RadioGroup>
</LinearLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout/fragment_vip_serch.xml
View file @
f70336df
...
...
@@ -61,17 +61,18 @@
<EditText
android:id=
"@+id/et_search"
style=
"@style/searchBarEditor"
android:hint=
"请输入手会员手机号"
android:layout_width=
"0dp"
android:layout_height=
"
match_parent
"
android:layout_height=
"
40dp
"
android:layout_weight=
"1"
android:textColor=
"@color/black_likui"
android:textColorHint=
"@color/gray_huanggai"
android:textSize=
"@dimen/all_text_size"
/>
android:textSize=
"@dimen/all_text_size
_small
"
/>
<TextView
android:id=
"@+id/search_ImageButton"
style=
"@style/textView_body"
android:layout_width=
"
60dp
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"match_parent"
android:onClick=
"@{OnClickListener}"
android:text=
"搜索"
/>
...
...
app/src/main/res/layout/item_vip_expense_item.xml
View file @
f70336df
...
...
@@ -73,10 +73,8 @@
android:textColor=
"@color/black_likui"
/>
</LinearLayout>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:background=
"@color/line_bg"
/>
<include
layout=
"@layout/line_layout"
/>
</LinearLayout>
...
...
app/src/main/res/layout/item_vip_list_item.xml
View file @
f70336df
...
...
@@ -4,6 +4,7 @@
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/white"
android:orientation=
"vertical"
>
<LinearLayout
...
...
@@ -13,10 +14,10 @@
android:orientation=
"horizontal"
>
<ImageView
android:layout_margin=
"@dimen/all_margin_left"
android:background=
"@mipmap/iv_vip"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
android:layout_margin=
"@dimen/all_margin_left"
android:background=
"@mipmap/iv_vip"
/>
<LinearLayout
android:layout_width=
"wrap_content"
...
...
@@ -46,10 +47,8 @@
android:layout_height=
"wrap_content"
android:text=
"85折"
/>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:background=
"@color/line_bg"
/>
<include
layout=
"@layout/line_layout_margin_left"
></include>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/line_layout_margin_left.xml
0 → 100644
View file @
f70336df
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"0.5dp"
android:background=
"@color/gray_huanggai"
android:layout_marginLeft=
"@dimen/all_margin_left"
></LinearLayout>
\ No newline at end of file
app/src/main/res/layout/line_layout_margin_right.xml
0 → 100644
View file @
f70336df
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"0.5dp"
android:background=
"@color/gray_huanggai"
android:layout_marginRight=
"@dimen/all_margin_left"
></LinearLayout>
\ No newline at end of file
app/src/main/res/mipmap-xhdpi/vip_level_bg.9.png
deleted
100644 → 0
View file @
c4b2740c
120 Bytes
app/src/main/res/mipmap-xhdpi/vip_level_bg.png
0 → 100644
View file @
f70336df
2.75 KB
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