Commit 6d07402c authored by 王海's avatar 王海

修改注册绑定sn不能为空

parent 8fb156ee
......@@ -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);
......
......@@ -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;
}
}
......@@ -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"
......
......@@ -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"
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment