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
6fa63cca
Commit
6fa63cca
authored
Jan 09, 2018
by
王海
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
e1567729
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
2 deletions
+5
-2
app/src/main/AndroidManifest.xml
app/src/main/AndroidManifest.xml
+1
-0
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralGetFragment.java
...s/ui/marketing/integral/fragment/IntegralGetFragment.java
+1
-0
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java
...data/zzdpos/ui/sendticke/fragment/SendTickerFragment.java
+1
-0
app/src/main/res/layout/item_return_ticket.xml
app/src/main/res/layout/item_return_ticket.xml
+2
-2
No files found.
app/src/main/AndroidManifest.xml
View file @
6fa63cca
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
<activity
<activity
android:name=
".ui.splash.SplashActivity"
android:name=
".ui.splash.SplashActivity"
android:configChanges=
"keyboard|orientation|screenSize|keyboardHidden"
android:configChanges=
"keyboard|orientation|screenSize|keyboardHidden"
android:screenOrientation=
"portrait"
android:theme=
"@style/AppTheme"
>
android:theme=
"@style/AppTheme"
>
<intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<action
android:name=
"android.intent.action.MAIN"
/>
...
...
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralGetFragment.java
View file @
6fa63cca
package
com
.
xingdata
.
zzdpos
.
ui
.
marketing
.
integral
.
fragment
;
package
com
.
xingdata
.
zzdpos
.
ui
.
marketing
.
integral
.
fragment
;
import
android.app.IntentService
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.view.View
;
import
android.view.View
;
import
android.widget.ImageView
;
import
android.widget.ImageView
;
...
...
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java
View file @
6fa63cca
...
@@ -243,6 +243,7 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
...
@@ -243,6 +243,7 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
private
boolean
isNull
()
{
private
boolean
isNull
()
{
if
(
nowtype
==
0
)
{
if
(
nowtype
==
0
)
{
//单个会员发券
//单个会员发券
if
(
null
==
nowVip
||
nowTickerItemId
<
0
)
{
if
(
null
==
nowVip
||
nowTickerItemId
<
0
)
{
ToastUtils
.
showLong
(
"请选择会员或优惠券"
);
ToastUtils
.
showLong
(
"请选择会员或优惠券"
);
return
false
;
return
false
;
...
...
app/src/main/res/layout/item_return_ticket.xml
View file @
6fa63cca
...
@@ -10,13 +10,13 @@
...
@@ -10,13 +10,13 @@
</data>
</data>
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"
wrap_cont
ent"
android:layout_width=
"
match_par
ent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/all_padding"
android:layout_marginTop=
"@dimen/all_padding"
android:orientation=
"horizontal"
>
android:orientation=
"horizontal"
>
<LinearLayout
<LinearLayout
android:layout_width=
"
wrap_cont
ent"
android:layout_width=
"
match_par
ent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/all_padding"
android:layout_marginTop=
"@dimen/all_padding"
android:orientation=
"horizontal"
>
android:orientation=
"horizontal"
>
...
...
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