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
8bd880db
Commit
8bd880db
authored
Jan 22, 2018
by
王海
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改UI
parent
4a724a45
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
97 additions
and
7 deletions
+97
-7
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerSuccFragment.java
.../zzdpos/ui/sendticke/fragment/SendTickerSuccFragment.java
+18
-2
app/src/main/res/drawable/shape_red_r1_thr.xml
app/src/main/res/drawable/shape_red_r1_thr.xml
+10
-0
app/src/main/res/layout/fragment_send_succ_ticker.xml
app/src/main/res/layout/fragment_send_succ_ticker.xml
+17
-2
app/src/main/res/layout/fragment_send_ticker_vip.xml
app/src/main/res/layout/fragment_send_ticker_vip.xml
+1
-0
app/src/main/res/layout/fragment_ticker_main.xml
app/src/main/res/layout/fragment_ticker_main.xml
+49
-3
app/src/main/res/values/strings.xml
app/src/main/res/values/strings.xml
+2
-0
No files found.
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerSuccFragment.java
View file @
8bd880db
...
...
@@ -2,10 +2,12 @@ package com.xingdata.zzdpos.ui.sendticke.fragment;
import
android.view.View
;
import
com.blankj.utilcode.util.ActivityUtils
;
import
com.xingdata.zzdpos.R
;
import
com.xingdata.zzdpos.base.BaseFragment
;
import
com.xingdata.zzdpos.databinding.FragmentSendSuccTickerBinding
;
import
com.xingdata.zzdpos.ui.dialog.LoadingDialog
;
import
com.xingdata.zzdpos.ui.sendticke.SendTicketActivity
;
import
com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter
;
import
com.xingdata.zzdpos.util.OnClickListener
;
...
...
@@ -34,8 +36,22 @@ public class SendTickerSuccFragment extends BaseFragment<SendTicketPresenter,
mViewBinding
.
setOnClickListener
(
new
OnClickListener
()
{
@Override
protected
void
myOnClickListener
(
View
v
)
{
mPresenter
.
sendTickerIndexFragment
=
new
SendTickerIndexFragment
();
startWithPop
(
mPresenter
.
sendTickerIndexFragment
);
switch
(
v
.
getId
())
{
case
R
.
id
.
btn_over
:
{
ActivityUtils
.
finishActivity
(
SendTicketActivity
.
class
);
}
break
;
case
R
.
id
.
btn_continue_send
:
{
mPresenter
.
sendTickerIndexFragment
=
new
SendTickerIndexFragment
();
startWithPop
(
mPresenter
.
sendTickerIndexFragment
);
}
break
;
default
:
{
}
break
;
}
}
});
}
...
...
app/src/main/res/drawable/shape_red_r1_thr.xml
0 → 100644
View file @
8bd880db
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<corners
android:radius=
"@dimen/all_shape_radius"
/>
<solid
android:color=
"@color/white"
/>
<stroke
android:width=
"@dimen/edit_border"
android:color=
"@color/red_guanyu"
/>
</shape>
\ No newline at end of file
app/src/main/res/layout/fragment_send_succ_ticker.xml
View file @
8bd880db
...
...
@@ -129,10 +129,10 @@
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"@dimen/all_margin"
android:orientation=
"horizontal"
android:paddingBottom=
"@dimen/all_spacing"
android:paddingEnd=
"@dimen/all_margin"
android:layout_marginBottom=
"@dimen/all_margin"
android:paddingStart=
"@dimen/all_margin"
>
<TextView
...
...
@@ -155,6 +155,7 @@
</android.support.v7.widget.CardView>
<Button
android:id=
"@+id/btn_over"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"@dimen/all_margin"
...
...
@@ -163,9 +164,23 @@
android:background=
"@drawable/shape_red_r1"
android:foreground=
"?android:attr/selectableItemBackground"
android:onClick=
"@{OnClickListener}"
android:text=
"
确 定
"
android:text=
"
完 成
"
android:textColor=
"@color/white_caocao"
android:textSize=
"@dimen/all_text_size"
/>
<Button
android:id=
"@+id/btn_continue_send"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"@dimen/all_margin"
android:layout_marginEnd=
"@dimen/all_margin"
android:layout_marginStart=
"@dimen/all_margin"
android:background=
"@drawable/shape_red_r1_thr"
android:foreground=
"?android:attr/selectableItemBackground"
android:onClick=
"@{OnClickListener}"
android:text=
"继续发券"
android:textColor=
"@color/red_guanyu"
android:textSize=
"@dimen/all_text_size"
/>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_send_ticker_vip.xml
View file @
8bd880db
...
...
@@ -65,6 +65,7 @@
android:layout_weight=
"1"
android:inputType=
"number"
android:maxLength=
"11"
android:hint=
"@string/vip_seach_hint"
android:textColor=
"@color/black_likui"
android:textColorHint=
"@color/gray_huanggai"
android:textSize=
"@dimen/all_text_size"
/>
...
...
app/src/main/res/layout/fragment_ticker_main.xml
View file @
8bd880db
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
<layout
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
<data>
...
...
@@ -19,6 +19,52 @@
android:id=
"@+id/ic_title"
layout=
"@layout/title"
/>
<FrameLayout
android:id=
"@+id/fl_senior_title"
android:layout_width=
"match_parent"
android:layout_height=
"?attr/actionBarSize"
android:background=
"@color/white_caocao"
android:orientation=
"vertical"
app:layout_constraintTop_toBottomOf=
"@+id/ic_title"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_vertical"
android:layout_marginEnd=
"@dimen/all_margin"
android:layout_marginStart=
"@dimen/all_margin"
android:background=
"@drawable/shape_black_b2"
android:gravity=
"center_vertical"
android:padding=
"@dimen/all_spacing"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@drawable/shape_red_r1"
android:paddingBottom=
"@dimen/all_shape_radius"
android:paddingEnd=
"@dimen/all_spacing"
android:paddingStart=
"@dimen/all_spacing"
android:paddingTop=
"@dimen/all_shape_radius"
android:text=
"@string/ms_user_title"
android:textColor=
"@color/white_caocao"
/>
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/all_spacing"
android:layout_weight=
"1"
android:singleLine=
"true"
android:text=
"@string/ticket_hint"
android:textColor=
"@color/black_baozheng"
/>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/all_line_width"
android:layout_gravity=
"bottom"
android:background=
"@color/gray_kongming"
/>
</FrameLayout>
<LinearLayout
android:id=
"@+id/btn_add"
android:layout_width=
"match_parent"
...
...
@@ -30,7 +76,7 @@
app:layout_constraintBottom_toTopOf=
"@id/ll_menu"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/
ic
_title"
>
app:layout_constraintTop_toBottomOf=
"@+id/
fl_senior
_title"
>
<ImageView
...
...
app/src/main/res/values/strings.xml
View file @
8bd880db
...
...
@@ -437,6 +437,7 @@
<string
name=
"integral_exchange_title"
>
积分兑换规则
</string>
<!--优惠券-->
<string
name=
"return_ticket_title"
>
新增优惠券
</string>
<string
name=
"ticket_hint"
>
优惠券规则功能限时免费使用 1 个月
</string>
<string
name=
"tv_rule"
>
满%s可用
</string>
<string
name=
"tv_money"
>
%s 元优惠券
</string>
<string
name=
"tv_date"
>
有效期至: %s
</string>
...
...
@@ -499,6 +500,7 @@
<string
name=
"menu_ticket"
>
发券
</string>
<string
name=
"send_ticker_dialog_title"
>
确认发送优惠券?
</string>
<string
name=
"vip_seach_hint"
>
请输入会员手机号
</string>
<string
name=
"menu_statistics"
>
统计
</string>
...
...
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