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
6ae62c00
Commit
6ae62c00
authored
Jan 16, 2018
by
陈前
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UI
parent
ca76e34a
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
77 additions
and
57 deletions
+77
-57
app/src/main/java/com/xingdata/zzdpos/util/RecyclerViewUtil.java
.../main/java/com/xingdata/zzdpos/util/RecyclerViewUtil.java
+2
-2
app/src/main/res/layout/dialog_handover.xml
app/src/main/res/layout/dialog_handover.xml
+2
-2
app/src/main/res/layout/fragment_casher.xml
app/src/main/res/layout/fragment_casher.xml
+0
-4
app/src/main/res/layout/fragment_inventory.xml
app/src/main/res/layout/fragment_inventory.xml
+30
-23
app/src/main/res/layout/fragment_inventory_add.xml
app/src/main/res/layout/fragment_inventory_add.xml
+1
-1
app/src/main/res/layout/fragment_replenishement.xml
app/src/main/res/layout/fragment_replenishement.xml
+3
-3
app/src/main/res/layout/fragment_replenishment_list.xml
app/src/main/res/layout/fragment_replenishment_list.xml
+1
-1
app/src/main/res/layout/fragment_user_list.xml
app/src/main/res/layout/fragment_user_list.xml
+2
-1
app/src/main/res/layout/item_menu_detail.xml
app/src/main/res/layout/item_menu_detail.xml
+2
-2
app/src/main/res/layout/item_statistics.xml
app/src/main/res/layout/item_statistics.xml
+3
-1
app/src/main/res/layout/title_search.xml
app/src/main/res/layout/title_search.xml
+14
-10
app/src/main/res/layout/view_order_detail.xml
app/src/main/res/layout/view_order_detail.xml
+6
-3
app/src/main/res/layout/view_ticket.xml
app/src/main/res/layout/view_ticket.xml
+5
-2
app/src/main/res/layout/view_vip_recharge.xml
app/src/main/res/layout/view_vip_recharge.xml
+5
-2
app/src/main/res/mipmap-xhdpi/inventory_cart.png
app/src/main/res/mipmap-xhdpi/inventory_cart.png
+0
-0
app/src/main/res/values/dimens.xml
app/src/main/res/values/dimens.xml
+1
-0
No files found.
app/src/main/java/com/xingdata/zzdpos/util/RecyclerViewUtil.java
View file @
6ae62c00
...
...
@@ -85,7 +85,7 @@ public class RecyclerViewUtil {
@Override
public
void
getItemOffsets
(
Rect
outRect
,
View
view
,
RecyclerView
parent
,
RecyclerView
.
State
state
)
{
super
.
getItemOffsets
(
outRect
,
view
,
parent
,
state
);
outRect
.
bottom
=
mDividerHight
+
1
;
outRect
.
top
=
mDividerHight
+
20
;
}
@Override
...
...
@@ -109,7 +109,7 @@ public class RecyclerViewUtil {
int
bottom
=
0
;
top
=
child
.
get
Bottom
()
+
params
.
bottom
Margin
;
top
=
child
.
get
Top
()
-
params
.
top
Margin
;
bottom
=
top
+
mDividerHight
;
//画分割线
mDividerDarwable
.
setBounds
(
left
,
top
,
right
,
bottom
);
...
...
app/src/main/res/layout/dialog_handover.xml
View file @
6ae62c00
...
...
@@ -90,8 +90,8 @@
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
android:paddingBottom=
"@dimen/all_padding"
android:paddingEnd=
"@dimen/
dp_4
"
android:paddingStart=
"@dimen/
dp_4
"
android:paddingEnd=
"@dimen/
all_padding_left_right
"
android:paddingStart=
"@dimen/
all_padding_left_right
"
android:paddingTop=
"@dimen/dp_4"
android:weightSum=
"2"
app:layout_constraintTop_toBottomOf=
"@id/view1"
>
...
...
app/src/main/res/layout/fragment_casher.xml
View file @
6ae62c00
...
...
@@ -74,14 +74,10 @@
android:id=
"@+id/fragment_casher_recycler"
android:layout_width=
"0dp"
android:layout_height=
"0dp"
android:layout_marginBottom=
"@dimen/all_padding"
android:layout_marginTop=
"@dimen/all_padding"
android:background=
"@color/white_caocao"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"@id/guideline"
/>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_inventory.xml
View file @
6ae62c00
...
...
@@ -45,34 +45,41 @@
</LinearLayout>
<TextView
android:id=
"@+id/tv_count"
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@drawable/singleline_zhouyu_huanggai"
android:paddingBottom=
"@dimen/all_padding"
android:paddingStart=
"@dimen/all_padding_left_right"
android:paddingTop=
"@dimen/all_padding"
android:text=
"共0人次盘库记录"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/all_text_size_low"
android:textStyle=
"bold"
/>
<android.support.v4.widget.SwipeRefreshLayout
android:id=
"@+id/srl_product"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_below=
"@id/ll_title"
>
android:layout_height=
"match_parent"
>
<android.support.v
7.widget.RecyclerView
android:id=
"@+id/
recycler_inventory
"
<android.support.v
4.widget.SwipeRefreshLayout
android:id=
"@+id/
srl_product
"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/gray_zhouyu"
>
android:layout_below=
"@id/tv_count"
android:layout_marginTop=
"@dimen/Minus_padding_left_right"
>
<android.support.v7.widget.RecyclerView
android:id=
"@+id/recycler_inventory"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/gray_zhouyu"
></android.support.v7.widget.RecyclerView>
</android.support.v4.widget.SwipeRefreshLayout>
<TextView
android:id=
"@+id/tv_count"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@drawable/singleline_zhouyu_huanggai"
android:paddingBottom=
"@dimen/all_padding"
android:paddingStart=
"@dimen/all_padding_left_right"
android:paddingTop=
"@dimen/all_padding"
android:text=
"共0人次盘库记录"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/all_text_size_low"
android:textStyle=
"bold"
/>
</RelativeLayout>
</android.support.v7.widget.RecyclerView>
</android.support.v4.widget.SwipeRefreshLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_inventory_add.xml
View file @
6ae62c00
...
...
@@ -144,7 +144,7 @@
android:layout_marginTop=
"@dimen/all_spacing"
android:contentDescription=
"@string/store_cart"
android:foreground=
"?attr/actionBarItemBackground"
android:src=
"@mipmap/
shopping
_cart"
/>
android:src=
"@mipmap/
inventory
_cart"
/>
<TextView
android:layout_width=
"@dimen/store_cart_count"
...
...
app/src/main/res/layout/fragment_replenishement.xml
View file @
6ae62c00
...
...
@@ -51,7 +51,7 @@
<android.support.design.widget.TabLayout
android:id=
"@+id/tab"
android:layout_width=
"
wrap_cont
ent"
android:layout_width=
"
match_par
ent"
android:layout_height=
"wrap_content"
app:tabMinWidth=
"150dp"
app:tabTextColor=
"@color/black_baozheng"
>
...
...
@@ -62,8 +62,8 @@
<View
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/
all_margin
"
android:background=
"@
drawable/singleline_zhouyu
_huanggai"
/>
android:layout_height=
"@dimen/
view_line_L050
"
android:background=
"@
color/gray
_huanggai"
/>
<android.support.v4.view.ViewPager
android:id=
"@+id/fragment_container"
...
...
app/src/main/res/layout/fragment_replenishment_list.xml
View file @
6ae62c00
...
...
@@ -15,9 +15,9 @@
<android.support.v7.widget.RecyclerView
android:id=
"@+id/recycler"
android:background=
"@color/gray_zhouyu"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/gray_zhouyu"
android:visibility=
"visible"
>
...
...
app/src/main/res/layout/fragment_user_list.xml
View file @
6ae62c00
...
...
@@ -17,11 +17,12 @@
android:layout_width=
"match_parent"
android:layout_height=
"?attr/actionBarSize"
android:orientation=
"horizontal"
>
<include
android:id=
"@+id/title_search"
layout=
"@layout/title_search"
android:layout_width=
"wrap_content"
android:layout_height=
"
wrap_cont
ent"
android:layout_height=
"
match_par
ent"
android:layout_weight=
"1"
/>
</LinearLayout>
...
...
app/src/main/res/layout/item_menu_detail.xml
View file @
6ae62c00
...
...
@@ -11,8 +11,8 @@
android:background=
"@color/white_caocao"
android:gravity=
"center"
android:orientation=
"vertical"
android:paddingBottom=
"25dp"
android:paddingTop=
"25dp"
>
android:paddingBottom=
"2
3.
5dp"
android:paddingTop=
"2
3.
5dp"
>
<ImageView
android:id=
"@+id/img"
...
...
app/src/main/res/layout/item_statistics.xml
View file @
6ae62c00
...
...
@@ -45,12 +45,14 @@
<TextView
android:id=
"@+id/tv_left_top"
android:layout_width=
"
wrap_content
"
android:layout_width=
"
0dp
"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/all_padding_left_right"
android:paddingEnd=
"@dimen/all_padding"
android:text=
"1231231244124124"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/all_text_size"
app:layout_constraintEnd_toStartOf=
"@id/tv_right_top"
app:layout_constraintStart_toEndOf=
"@id/img_left"
app:layout_constraintTop_toTopOf=
"@id/img_left"
/>
...
...
app/src/main/res/layout/title_search.xml
View file @
6ae62c00
...
...
@@ -13,22 +13,26 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<ImageView
android:layout_width=
"50dp"
<ImageButton
android:id=
"@+id/onBack"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:background=
"@mipmap/go_back"
/>
android:background=
"@color/transparent"
android:padding=
"@dimen/all_padding"
android:src=
"@mipmap/go_back"
/>
<EditText
style=
"@style/editText"
android:id=
"@+id/serchEditText"
style=
"@style/searchBarEditor"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_margin=
"0dp"
android:background=
"@color/gray_kongming"
android:layout_weight=
"1"
android:imeOptions=
"actionSearch"
android:hint=
"请输入手机号或会员姓名"
/>
android:layout_height=
"30dp"
android:layout_marginEnd=
"@dimen/all_padding"
android:drawablePadding=
"@dimen/all_padding"
android:hint=
"请输入手机号或会员姓名"
android:inputType=
"number"
android:textColor=
"@color/black_likui"
android:textSize=
"@dimen/all_text_size_low"
/>
</LinearLayout>
</LinearLayout>
...
...
app/src/main/res/layout/view_order_detail.xml
View file @
6ae62c00
...
...
@@ -53,14 +53,17 @@
android:layout_marginBottom=
"@dimen/all_margin"
android:layout_marginEnd=
"@dimen/all_padding_left_right"
android:layout_marginStart=
"@dimen/all_padding_left_right"
android:layout_marginTop=
"@dimen/all_margin"
android:padding=
"@dimen/dp_4"
>
android:layout_marginTop=
"@dimen/all_margin"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/white_caocao"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
android:paddingBottom=
"@dimen/dp_4"
android:paddingEnd=
"@dimen/all_padding_left_right"
android:paddingStart=
"@dimen/all_padding_left_right"
android:paddingTop=
"@dimen/dp_4"
>
<TextView
android:id=
"@+id/tv_amt_hint"
...
...
app/src/main/res/layout/view_ticket.xml
View file @
6ae62c00
...
...
@@ -28,13 +28,16 @@
android:layout_marginBottom=
"@dimen/all_margin"
android:layout_marginEnd=
"@dimen/all_padding_left_right"
android:layout_marginStart=
"@dimen/all_padding_left_right"
android:layout_marginTop=
"@dimen/all_margin"
android:padding=
"@dimen/dp_4"
>
android:layout_marginTop=
"@dimen/all_margin"
>
<android.support.constraint.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/white_caocao"
android:paddingBottom=
"@dimen/dp_4"
android:paddingEnd=
"@dimen/all_padding_left_right"
android:paddingStart=
"@dimen/all_padding_left_right"
android:paddingTop=
"@dimen/dp_4"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
>
...
...
app/src/main/res/layout/view_vip_recharge.xml
View file @
6ae62c00
...
...
@@ -46,13 +46,16 @@
android:layout_marginBottom=
"@dimen/all_margin"
android:layout_marginEnd=
"@dimen/all_padding_left_right"
android:layout_marginStart=
"@dimen/all_padding_left_right"
android:layout_marginTop=
"@dimen/all_margin"
android:padding=
"@dimen/dp_4"
>
android:layout_marginTop=
"@dimen/all_margin"
>
<android.support.constraint.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/white_caocao"
android:paddingBottom=
"@dimen/dp_4"
android:paddingEnd=
"@dimen/all_padding_left_right"
android:paddingStart=
"@dimen/all_padding_left_right"
android:paddingTop=
"@dimen/dp_4"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
>
...
...
app/src/main/res/mipmap-xhdpi/inventory_cart.png
0 → 100644
View file @
6ae62c00
4.26 KB
app/src/main/res/values/dimens.xml
View file @
6ae62c00
...
...
@@ -24,6 +24,7 @@
<dimen
name=
"all_title_size"
>
26sp
</dimen>
<dimen
name=
"all_padding"
>
10dp
</dimen>
<dimen
name=
"all_padding_left_right"
>
16dp
</dimen>
<dimen
name=
"Minus_padding_left_right"
>
-17dp
</dimen>
<dimen
name=
"all_text_size_big"
>
22sp
</dimen>
<dimen
name=
"all_text_size_big_big"
>
30sp
</dimen>
<dimen
name=
"all_text_size_super_big"
>
25sp
</dimen>
...
...
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