Skip to content

T
TangKuPos
Commit 3728f344 authored by 王海's avatar 王海
Browse files
Options

修改注册流程

parent 60d3f91a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 60 deletions
app/src/main/java/com/xingdata/zzdpos/api/ApiService.java
View file @ 3728f344
......@@ -85,7 +85,8 @@ interface ApiService {
*/
@POST(C.URL.LOGIN.register)
Observable<HttpMessage<Object>> register(@Query("operMobile") String operMobile, @Query
("loginPwd") String loginPwd, @Query("merName") String merName, @Query("shopName")
("loginPwd") String loginPwd, @Query("merName") String merName, @Query("operName")
String operName, @Query("shopName")
String shopName, @Query("mccId") int mccId,
@Query("cityCountyId") int
cityCountyId, @Query("cityAddress") String
......@@ -192,15 +193,19 @@ interface ApiService {
Observable<HttpMessage<Sta>> querySta();
@POST(C.URL.RCTRACE.query)
Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int pageNum, @Query
Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int
pageNum, @Query
("pageSize") int pageSize);
@POST(C.URL.RCTRACE.query)
Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("vipId") long vipId, @Query("pageNumber") int pageNum, @Query
Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("vipId") long vipId,
@Query("pageNumber") int
pageNum, @Query
("pageSize") int pageSize);
@POST(C.URL.RCTRACE.query)
Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int pageNum, @Query
Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int
pageNum, @Query
("pageSize") int pageSize, @Query("startDate") long startDate, @Query("endDate") long
endDate);
......@@ -228,11 +233,13 @@ interface ApiService {
@POST(C.URL.TICKET.query)
Observable<HttpMessage<Pager<Ticket>>> queryTicket(@Query("pageNumber") int pageNum, @Query
("pageSize") int pageSize, @Query("usedFlag") int usedFlag, @Query("ticketIsList") String ticketIsList);
("pageSize") int pageSize, @Query("usedFlag") int usedFlag, @Query("ticketIsList")
String ticketIsList);
@POST(C.URL.TICKET.query)
Observable<HttpMessage<Pager<Ticket>>> queryTicket(@Query("pageNumber") int pageNum, @Query
("pageSize") int pageSize, @Query("usedFlag") int usedFlag, @Query("ticketIsList") String ticketIsList, @Query("startDate") long startDate, @Query("endDate") long
("pageSize") int pageSize, @Query("usedFlag") int usedFlag, @Query("ticketIsList")
String ticketIsList, @Query("startDate") long startDate, @Query("endDate") long
endDate);
@POST(C.URL.TICKET.ticketBatchSend)
......@@ -248,7 +255,8 @@ interface ApiService {
Observable<HttpMessage<Saleorder>> addOrderPayMis(@Body Saleorder.Pay saleorderPay);
@POST(C.URL.SALEORDER.querySaleorderByVipId)
Observable<HttpMessage<Pager<Saleorder>>> querySaleorderByVipId(@Query("vipId") Long vipId, @Query
Observable<HttpMessage<Pager<Saleorder>>> querySaleorderByVipId(@Query("vipId") Long vipId,
@Query
("pageNumber") int pageNum, @Query("pageSize") int pageSize);
......@@ -313,6 +321,7 @@ interface ApiService {
@POST(C.URL.TRULE.truleQuery)
Observable<HttpMessage<Pager<Trule>>> truleQuery(@Query("startDate") String data);
@POST(C.URL.TRULE.truleQuery)
Observable<HttpMessage<Pager<Trule>>> truleQueryByVipId(@Query("vipId") long vipId);
......@@ -441,7 +450,7 @@ interface ApiService {
@POST(C.URL.VIP.query)
Observable<HttpMessage<Pager<Vip>>> getAllVipList(@Query("pageNumber") int pageNumber,
@Query("pageSize") int pageSize);
@Query("pageSize") int pageSize);
}
app/src/main/java/com/xingdata/zzdpos/ui/login/LoginContract.java
View file @ 3728f344
......@@ -190,7 +190,7 @@ public interface LoginContract {
* 创建门店操作
*/
abstract void createStore(String operMobile, String loginPwd, String
merName, String shopName, int cityCountyId, String cityAddress, int startWay,
merName,String operName, String shopName, int cityCountyId, String cityAddress, int startWay,
LoadingDialog loadingDialog);
/*********************************************************************************************************************************
绑定款台界面逻辑接口定义**********************************************************************************************************
......
app/src/main/java/com/xingdata/zzdpos/ui/login/LoginPresenter.java
View file @ 3728f344
......@@ -10,23 +10,6 @@ import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.SPUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.google.gson.Gson;
import org.json.JSONArray;
import org.json.JSONException;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.util.ArrayList;
import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import io.realm.Realm;
import io.realm.RealmResults;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.api.ApiException;
import com.xingdata.zzdpos.api.ApiFactory;
......@@ -42,13 +25,28 @@ import com.xingdata.zzdpos.ui.login.fragment.SignInFragment;
import com.xingdata.zzdpos.ui.login.fragment.SmsCodeFragment;
import com.xingdata.zzdpos.ui.login.fragment.bean.LoginBean;
import com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean;
import com.xingdata.zzdpos.ui.login.fragment.bean.Shops;
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.PhoneFormatCheckUtils;
import com.xingdata.zzdpos.util.SystemUtil;
import org.json.JSONArray;
import org.json.JSONException;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.util.ArrayList;
import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import io.realm.Realm;
import io.realm.RealmResults;
public class LoginPresenter extends LoginContract.Presenter {
/**
* 登录成功静态对象
......@@ -85,7 +83,6 @@ public class LoginPresenter extends LoginContract.Presenter {
}
@Override
public void createStoreFragmentinit(Context context, LoadingDialog loadingDialog) {
//加载城市数据列表，加载门店类型列表
......@@ -196,7 +193,8 @@ public class LoginPresenter extends LoginContract.Presenter {
@Override
public void createStore(String operMobile, String loginPwd, String merName, String shopName,
public void createStore(String operMobile, String loginPwd, String merName, String operName,
String shopName,
int cityCountyId, String cityAddress, int startWay, LoadingDialog
loadingDialog) {
if (PhoneFormatCheckUtils.isPhoneLegal(operMobile)) {
......@@ -204,7 +202,8 @@ public class LoginPresenter extends LoginContract.Presenter {
case 1: {
ApiFactory.Test.rigister(operMobile, EncryptUtils
.encryptMD5ToString(loginPwd),
merName, shopName, cityCountyId, cityAddress, SystemUtil.getDeviceSN(),
merName, operName, shopName, cityCountyId, cityAddress, SystemUtil
.getDeviceSN(),
SystemUtil.getDeviceModel(), getLoginBean().getSmsCode()).subscribe(
register -> {
logAndToast("注册成功");
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/ChoiceStoreFragment.java
View file @ 3728f344
......@@ -89,6 +89,7 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter,
}
mViewBinding.tvNickname.setText(LoginPresenter.userStoreInfo.getMerchant().getMerName());
list.clear();
for (int i = 0; i < LoginPresenter.userStoreInfo.getShops().size(); i++) {
list.add(LoginPresenter.userStoreInfo.getShops().get(i));
}
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/CreateStoreFragment.java
View file @ 3728f344
......@@ -31,7 +31,6 @@ public class CreateStoreFragment extends BaseFragment<LoginPresenter,
private ArrayList<ArrayList<ArrayList<String>>> listAddressItem3 = new ArrayList<>();
private ArrayList<StoreTypeJsonBean> listTypeItem1 = new ArrayList<>();
private ArrayList<ArrayList<String>> listTypeItem2 = new ArrayList<>();
LoadingDialog mLoadingDialog = new LoadingDialog();
......@@ -58,13 +57,19 @@ public class CreateStoreFragment extends BaseFragment<LoginPresenter,
}
});
if (startway == 1) {
mViewBinding.etMerchantsname.setVisibility(View.VISIBLE);
mViewBinding.etNickname.setVisibility(View.VISIBLE);
mViewBinding.tvNickname.setVisibility(View.GONE);
mViewBinding.tvMerchantsname.setVisibility(View.GONE);
} else {
mViewBinding.etNickname.setVisibility(View.GONE);
mViewBinding.etMerchantsname.setVisibility(View.GONE);
mViewBinding.tvNickname.setVisibility(View.VISIBLE);
mViewBinding.tvNickname.setText(LoginPresenter.userStoreInfo.getMerchant().getMerName
mViewBinding.tvMerchantsname.setVisibility(View.VISIBLE);
mViewBinding.tvMerchantsname.setText(LoginPresenter.userStoreInfo.getMerchant()
.getMerName
());
mViewBinding.tvNickname.setText(LoginPresenter.userStoreInfo.getOperName());
}
mLoadingDialog.show((BaseActivity) getActivity());
mPresenter.createStoreFragmentinit(getActivity(), mLoadingDialog);
......@@ -97,7 +102,8 @@ public class CreateStoreFragment extends BaseFragment<LoginPresenter,
if (isAllNull()) {
mLoadingDialog.show((BaseActivity) getActivity());
mPresenter.createStore(mPresenter.getLoginBean().getPhone_No(), mPresenter
.getLoginBean().getPwd(), mViewBinding.etNickname.getText()
.getLoginBean().getPwd(), mViewBinding.etMerchantsname
.getText().toString(), mViewBinding.etNickname.getText()
.toString(), mViewBinding.etStorename.getText().toString(),
addressId, mViewBinding.tvStoredetailedaddress.getText().toString
(), startway, mLoadingDialog);
......@@ -238,9 +244,9 @@ public class CreateStoreFragment extends BaseFragment<LoginPresenter,
//登录后新建门店
_isbl = mViewBinding.tvNickname.getText().toString().isEmpty();
}
return !(_isbl || mViewBinding
.etStorename.getText().toString().isEmpty() || mViewBinding.tvStoredetailedaddress
.getText().toString().isEmpty() || addressId == -1);
return !(_isbl || mViewBinding.tvMerchantsname.getText().toString().isEmpty() ||
mViewBinding.etStorename.getText().toString().isEmpty() || mViewBinding
.tvStoredetailedaddress.getText().toString().isEmpty() || addressId == -1);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SmsCodeFragment.java
View file @ 3728f344
......@@ -116,6 +116,9 @@ public class SmsCodeFragment extends BaseFragment<LoginPresenter,
}
}
});
mViewBinding.etPhone.setFocusable(true);
mViewBinding.etPhone.setFocusableInTouchMode(true);
mViewBinding.etPhone.requestFocus();
}
public void sendSmsSucc() {
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/bean/UserStoreInfo.java
View file @ 3728f344
......@@ -10,6 +10,15 @@ import java.util.List;
public class UserStoreInfo {
private List<Shops> shops = new ArrayList<>();
private Merchant merchant = new Merchant();
private String operName;
public String getOperName() {
return operName;
}
public void setOperName(String operName) {
this.operName = operName;
}
public void setShops(List<Shops> shops) {
this.shops = shops;
......
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
View file @ 3728f344
......@@ -55,7 +55,7 @@ public final class SystemUtil {
}
}
// return deviceSN;
return "548496";
return "548496116";
}
......
app/src/main/java/com/xingdata/zzdpos/view/PopupWindowDownList.java
View file @ 3728f344
......@@ -298,6 +298,7 @@ class DownlistAdapter extends BaseAdapter {
}
break;
}
_temp = oper.getOperName();
String entity = _temp + " " + oper.getOperMobile();
holder.item_tv.setText(entity);
break;
......
app/src/main/res/layout/fragment_create_store.xml
View file @ 3728f344
......@@ -25,6 +25,48 @@
android:layout_marginTop="@dimen/all_padding"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/et_padding"
android:text="@string/login_createstorefragment_tv_merchantsname"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_three_title"
android:textStyle="bold"/>
<TextView
android:id="@+id/tv_merchantsname"
android:layout_width="@dimen/et_width"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:ems="10"
android:gravity="center_vertical"
android:hint="@string/login_createstorefragment_et_nickname_hint"
android:lines="1"
android:maxLength="11"
android:padding="@dimen/et_padding"
android:singleLine="true"
android:textColor="@color/black_baozheng"
android:textColorHint="@color/hint"
android:textSize="@dimen/et_textsize"
android:visibility="gone"/>
<com.xingdata.zzdpos.view.ContainsEmojiEditText
android:id="@+id/et_merchantsname"
style="@style/editText_new"
android:ems="10"
android:hint="@string/login_createstorefragment_et_merchantsname_hint"
android:lines="1"
android:maxLength="11"
android:singleLine="true"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -197,7 +239,7 @@
android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_last"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize" />
android:textSize="@dimen/et_textsize"/>
<Button
android:id="@+id/btn_next"
......
app/src/main/res/layout/fragment_sms_code.xml
View file @ 3728f344
......@@ -40,7 +40,7 @@
android:id="@+id/et_phone"
style="@style/editText_new"
android:digits="1234567890"
android:drawableLeft="@mipmap/login_pwd01"
android:drawableLeft="@mipmap/login_username1"
android:ems="10"
android:gravity="center_vertical"
android:hint="@string/login_et_phone_hint"
......
app/src/main/res/values/strings.xml
View file @ 3728f344
......@@ -221,6 +221,7 @@
<string name="login_smscodefragment_et_one_input_password_hint">请输入密码</string>
<string name="login_smscodefragment_et_two_input_password_hint">请再次输入密码</string>
<!--创建门店界面-->
<string name="login_createstorefragment_tv_merchantsname">商户名</string>
<string name="login_createstorefragment_tv_nickname">昵称</string>
<string name="login_createstorefragment_tv_storename">门店名称</string>
<string name="login_createstorefragment_tv_storetype">门店类型</string>
......@@ -228,6 +229,7 @@
<string name="login_createstorefragment_tv_storeaddressmessage">详细地址</string>
<string name="login_createstorefragment_tv_storetype_hint">请选择门店类别（连锁/超市）</string>
<string name="login_createstorefragment_tv_storeaddress_hint">请选择门店地址（省/市/县）</string>
<string name="login_createstorefragment_et_merchantsname_hint">请输入商户名</string>
<string name="login_createstorefragment_et_nickname_hint">请输入昵称</string>
<string name="login_createstorefragment_et_storename_hint">请输入门店名称</string>
<string name="login_createstorefragment_et_storedetailedaddress_hint">请输入街道门牌号</string>
......
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