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
6d07402c
Commit
6d07402c
authored
Jan 29, 2018
by
王海
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改注册绑定sn不能为空
parent
8fb156ee
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
3 deletions
+33
-3
app/src/main/java/com/xingdata/zzdpos/ui/login/LoginPresenter.java
...ain/java/com/xingdata/zzdpos/ui/login/LoginPresenter.java
+13
-0
app/src/main/java/com/xingdata/zzdpos/util/Global.java
app/src/main/java/com/xingdata/zzdpos/util/Global.java
+17
-0
app/src/main/res/layout/fragment_bale_seach.xml
app/src/main/res/layout/fragment_bale_seach.xml
+1
-1
app/src/main/res/layout/fragment_bale_seach_shop.xml
app/src/main/res/layout/fragment_bale_seach_shop.xml
+1
-1
app/src/main/res/layout/fragment_send_ticker_vip.xml
app/src/main/res/layout/fragment_send_ticker_vip.xml
+1
-1
No files found.
app/src/main/java/com/xingdata/zzdpos/ui/login/LoginPresenter.java
View file @
6d07402c
...
...
@@ -29,6 +29,7 @@ import com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean;
import
com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean
;
import
com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean
;
import
com.xingdata.zzdpos.ui.login.fragment.bean.UserStoreInfo
;
import
com.xingdata.zzdpos.util.Global
;
import
com.xingdata.zzdpos.util.PhoneFormatCheckUtils
;
import
com.xingdata.zzdpos.util.SystemUtil
;
...
...
@@ -249,6 +250,10 @@ public class LoginPresenter extends LoginContract.Presenter {
public
void
createCounter
(
long
shopMapId
,
PromptDialog
promptDialog
,
LoadingDialog
loadingDialog
)
{
ApiFactory
.
Test
.
addCounter
(
shopMapId
).
subscribe
(
addCounter
->
{
if
(
Global
.
isSnNull
())
{
ToastUtils
.
showLong
(
"Sn为空"
);
return
;
}
mView
.
bindingCounterSucc
(
promptDialog
,
loadingDialog
);
},
throwable
->
{
mView
.
errorInfo
(
throwable
.
getMessage
(),
promptDialog
,
loadingDialog
);
...
...
@@ -261,6 +266,10 @@ public class LoginPresenter extends LoginContract.Presenter {
public
void
bindingCounter
(
long
casherId
,
PromptDialog
promptDialog
,
LoadingDialog
loadingDialog
)
{
ApiFactory
.
Test
.
bindCounter
(
casherId
).
subscribe
(
bindCounter
->
{
if
(
Global
.
isSnNull
())
{
ToastUtils
.
showLong
(
"Sn为空"
);
return
;
}
mView
.
bindingCounterSucc
(
promptDialog
,
loadingDialog
);
},
throwable
->
{
mView
.
errorInfo
(
throwable
.
getMessage
(),
promptDialog
,
loadingDialog
);
...
...
@@ -299,6 +308,10 @@ public class LoginPresenter extends LoginContract.Presenter {
public
void
deviceRegister
(
String
phone
,
String
password
,
PromptDialog
promptDialog
,
LoadingDialog
loadingDialog
)
{
ApiFactory
.
Test
.
deviceRegister
().
subscribe
(
s
->
{
if
(
Global
.
isSnNull
())
{
ToastUtils
.
showLong
(
"Sn为空"
);
return
;
}
signIn
(
phone
,
password
,
promptDialog
,
loadingDialog
);
},
throwable
->
{
mView
.
errorInfo
(
throwable
.
getMessage
(),
new
PromptDialog
(),
loadingDialog
);
...
...
app/src/main/java/com/xingdata/zzdpos/util/Global.java
View file @
6d07402c
...
...
@@ -12,6 +12,21 @@ import android.widget.EditText;
*/
public
class
Global
{
public
static
boolean
isNull
(
String
str
)
{
if
(
null
==
str
||
str
.
equals
(
""
))
{
return
true
;
}
return
false
;
}
public
static
boolean
isSnNull
()
{
if
(
isNull
(
SystemUtil
.
getDeviceSN
()))
{
return
true
;
}
else
{
return
false
;
}
}
public
static
void
clickHideKeyboard
(
MotionEvent
ev
,
Activity
context
)
{
if
(
ev
.
getAction
()
==
MotionEvent
.
ACTION_DOWN
)
{
View
v
=
context
.
getCurrentFocus
();
...
...
@@ -52,4 +67,6 @@ public class Global {
}
return
false
;
}
}
app/src/main/res/layout/fragment_bale_seach.xml
View file @
6d07402c
...
...
@@ -75,7 +75,7 @@
android:paddingLeft=
"@dimen/all_padding"
android:saveEnabled=
"false"
android:textColor=
"@color/black_likui"
android:textSize=
"@dimen/all_text_size"
/>
android:textSize=
"@dimen/all_text_size
_low
"
/>
<TextView
android:id=
"@+id/btn_seach"
...
...
app/src/main/res/layout/fragment_bale_seach_shop.xml
View file @
6d07402c
...
...
@@ -67,7 +67,7 @@
android:labelFor=
"@+id/et_search"
android:saveEnabled=
"false"
android:textColor=
"@color/black_likui"
android:textSize=
"@dimen/all_text_size"
/>
android:textSize=
"@dimen/all_text_size
_low
"
/>
<TextView
android:id=
"@+id/btn_seach"
...
...
app/src/main/res/layout/fragment_send_ticker_vip.xml
View file @
6d07402c
...
...
@@ -67,7 +67,7 @@
android:maxLength=
"11"
android:textColor=
"@color/black_likui"
android:textColorHint=
"@color/gray_huanggai"
android:textSize=
"@dimen/all_text_size"
/>
android:textSize=
"@dimen/all_text_size
_low
"
/>
</LinearLayout>
...
...
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