Skip to content

android / dayu

Go to a project
Commit c846a5f6 by mReturn
Options

user

parent 3e07c10e
Expand all
Inline Side-by-side
Showing with 738 additions and 80 deletions
baseSDK/src/main/java/com/dayu/base/ui/activity/BaseActivity.java
...@@ -31,6 +31,7 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi ...@@ -31,6 +31,7 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
public P mPresenter; public P mPresenter;
private boolean isDialogShow = false; private boolean isDialogShow = false;
protected int mUserId; protected int mUserId;
protected UserInfo mUserInfo;
@Override @Override
protected void initPresenter() { protected void initPresenter() {
...@@ -163,5 +164,6 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi ...@@ -163,5 +164,6 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
protected void initUser(){ protected void initUser(){
UserInfo info = UserManager.getInstance().getUser(); UserInfo info = UserManager.getInstance().getUser();
mUserId = Integer.parseInt(info.getAccountId()); mUserId = Integer.parseInt(info.getAccountId());
mUserInfo = info;
} }
} }
baseSDK/src/main/java/com/dayu/widgets/DisableEditText.java 0 → 100644
package com.dayu.widgets;
import android.content.Context;
import android.support.v7.widget.AppCompatEditText;
public class DisableEditText extends AppCompatEditText {
public DisableEditText(Context context) {
super(context);
}
}
baseSDK/src/main/java/com/dayu/widgets/WheelDialog.java 0 → 100644
package com.dayu.widgets;
import android.app.Activity;
import android.app.Dialog;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.widget.Button;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.dayu.baselibrary.R;
import java.util.List;
public class WheelDialog {
public static WheelDialog instance;
private int selectedPos;
public static WheelDialog getInstance() {
if (instance == null) {
instance = new WheelDialog();
}
return instance;
}
public void show(final Activity activity, List<String> strs, onItemClickListener listener) {
View mView = View.inflate(activity, R.layout.dialog_wheelview, null);
Button btnConfirm = mView.findViewById(R.id.btn_comfirm);
Button btnCancle = mView.findViewById(R.id.btn_cancel);
WheelView wv = mView.findViewById(R.id.wheel_view);
wv.setOffset(2);
wv.setItems(strs);
wv.setSeletion(0);
Dialog mDialog = new android.app.Dialog(activity, R.style.CustomDialog);
mDialog.setContentView(mView);
Window window = mDialog.getWindow();
window.setGravity(Gravity.BOTTOM);
WindowManager.LayoutParams wl = window.getAttributes();
wl.width = ViewGroup.LayoutParams.MATCH_PARENT;
wl.height = ViewGroup.LayoutParams.WRAP_CONTENT;
mDialog.onWindowAttributesChanged(wl);
mDialog.show();
mDialog.setCanceledOnTouchOutside(true);
mDialog.setCancelable(true);
btnConfirm.setOnClickListener(view -> {
if (listener != null)
listener.onChoosed(wv.getSeletedIndex());
mDialog.dismiss();
});
btnCancle.setOnClickListener(view -> mDialog.dismiss());
}
public interface onItemClickListener {
void onChoosed(int pos);
}
}
baseSDK/src/main/res/drawable/bg_table_record_title1.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 边框颜色值 -->
<item>
<shape>
<solid android:color="@color/table_border" />
</shape>
</item>
<!--这个是按钮边框设置为四周 并且宽度为1-->
<item
android:right="@dimen/dp_sale_step"
android:left="@dimen/dp_sale_step"
android:top="@dimen/dp_sale_step"
android:bottom="@dimen/dp_sale_step"
>
<shape>
<!--这个是背景颜色-->
<solid android:color="@color/table_record_title_bg" />
<!--这个是按钮中的字体与按钮内的四周边距-->
<!--<padding android:bottom="10dp"-->
<!--android:left="10dp"-->
<!--android:right="10dp"-->
<!--android:top="10dp" />-->
</shape>
</item>
</layer-list>
\ No newline at end of file
baseSDK/src/main/res/drawable/bg_table_record_title2.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 边框颜色值 -->
<item>
<shape>
<solid android:color="@color/table_border" />
</shape>
</item>
<!--这个是按钮边框设置为四周 并且宽度为1-->
<item
android:top="@dimen/dp_sale_step"
android:bottom="@dimen/dp_sale_step"
>
<shape>
<!--这个是背景颜色-->
<solid android:color="@color/table_record_title_bg" />
</shape>
</item>
</layer-list>
\ No newline at end of file
baseSDK/src/main/res/drawable/bg_table_record_title3.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 边框颜色值 -->
<item>
<shape>
<solid android:color="@color/table_border" />
</shape>
</item>
<!--这个是按钮边框设置为四周 并且宽度为1-->
<item
android:top="@dimen/dp_sale_step"
android:bottom="@dimen/dp_sale_step"
android:right="@dimen/dp_sale_step"
>
<shape>
<!--这个是背景颜色-->
<solid android:color="@color/table_record_title_bg" />
</shape>
</item>
</layer-list>
\ No newline at end of file
baseSDK/src/main/res/drawable/btn_gray_commom.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="3dp"/>
<solid android:color="@color/cl_line"/>
</shape>
\ No newline at end of file
baseSDK/src/main/res/layout/dialog_wheelview.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/cl_white"
>
<com.dayu.widgets.WheelView
android:id="@+id/wheel_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="40dp"
android:paddingRight="40dp"
android:layout_marginTop="30dp"
android:layout_marginBottom="20dp"
>
<Button
android:id="@+id/btn_cancel"
style="@style/btn_bottom_common"
android:layout_width="0dp"
android:layout_weight="1"
android:background="@drawable/btn_gray_commom"
android:textColor="@color/text_common_green"
android:text="@string/cancle"
android:layout_marginRight="20dp"
/>
<Button
android:id="@+id/btn_comfirm"
style="@style/btn_bottom_common"
android:layout_width="0dp"
android:layout_weight="1"
android:background="@drawable/btn_green_commom"
android:text="@string/comfirm"
/>
</LinearLayout>
</LinearLayout>
baseSDK/src/main/res/values/colors.xml
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
<color name="color_ee">#eeeeee</color> <color name="color_ee">#eeeeee</color>
<color name="table_border">#666666</color> <color name="table_border">#666666</color>
<color name="table_title_bg">#d5d5d5</color> <color name="table_title_bg">#d5d5d5</color>
<color name="table_record_title_bg">#78d3f6</color>
......
baseSDK/src/main/res/values/styles.xml
...@@ -85,6 +85,16 @@ ...@@ -85,6 +85,16 @@
<item name="android:maxLines">1</item> <item name="android:maxLines">1</item>
</style> </style>
<style name="tv_user_addr">
<item name="android:layout_width">0dp</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:paddingLeft">5dp</item>
<item name="android:textColor">@color/default_text_color</item>
<item name="android:textSize">14sp</item>
<item name="android:maxLines">1</item>
</style>
<style name="btn_bottom_common"> <style name="btn_bottom_common">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">45dp</item> <item name="android:layout_height">45dp</item>
......
userCenter/src/main/java/com/dayu/usercenter/api/UserService2.java
...@@ -5,6 +5,7 @@ import com.dayu.base.api.protocol.BaseResponse; ...@@ -5,6 +5,7 @@ import com.dayu.base.api.protocol.BaseResponse;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.usercenter.model.ApplyLicenceData; import com.dayu.usercenter.model.ApplyLicenceData;
import com.dayu.usercenter.model.SaveSceneData; import com.dayu.usercenter.model.SaveSceneData;
import com.dayu.usercenter.model.bean.AddressInfoBean;
import com.dayu.usercenter.model.bean.BusinessSceneBean; import com.dayu.usercenter.model.bean.BusinessSceneBean;
import com.dayu.usercenter.model.EditBankData; import com.dayu.usercenter.model.EditBankData;
import com.dayu.usercenter.model.bean.GlobelRateBean; import com.dayu.usercenter.model.bean.GlobelRateBean;
...@@ -50,9 +51,34 @@ public interface UserService2 { ...@@ -50,9 +51,34 @@ public interface UserService2 {
* @param data * @param data
* @return * @return
*/ */
// @POST(Constants.API_7800+"/payAccountBank") @POST(Constants.API_7800+"/payAccountBank")
@PUT(Constants.API_7800+"/payAccountBank")
Observable<BaseResponse<Boolean>> setBankInfo(@Body EditBankData data); Observable<BaseResponse<Boolean>> setBankInfo(@Body EditBankData data);
/**
* 更新银行信息
*/
@PUT(Constants.API_7800+"/payAccountBank")
Observable<BaseResponse<Boolean>> updateBankInfo(@Body EditBankData data);
/**
* 获取地址信息.
* @return
*/
@GET(Constants.API_7100+"/engineerAddress/default/accountId/{accountId}")
Observable<BaseResponse<AddressInfoBean>> getAddressInfo(@Path("accountId") int accountId);
/**
* 设置地址信息
* @param data
* @return
*/
@POST(Constants.API_7100+"/engineerAddress")
Observable<BaseResponse<Boolean>> setAddressInfo(@Body AddressInfoBean data);
/**
* 更新地址信息
*/
@PUT(Constants.API_7100+"/engineerAddress")
Observable<BaseResponse<Boolean>> updateAddressInfo(@Body AddressInfoBean data);
/** /**
* 销售业务场景 * 销售业务场景
......
userCenter/src/main/java/com/dayu/usercenter/common/UserConstant.java
package com.dayu.usercenter.common; package com.dayu.usercenter.common;
import com.dayu.usercenter.model.bean.TreeAddressBean;
import java.util.HashMap;
import java.util.List;
/** /**
* Created by luofan * Created by luofan
* on 2018/2/9. * on 2018/2/9.
...@@ -11,6 +16,7 @@ public class UserConstant { ...@@ -11,6 +16,7 @@ public class UserConstant {
public static final String DETECT_STATE = "detect_state"; public static final String DETECT_STATE = "detect_state";
public static final String PHONE = "phone"; public static final String PHONE = "phone";
public static final String CODE = "code"; public static final String CODE = "code";
public static final HashMap<Integer,List<TreeAddressBean>> treeAddressMap = new HashMap<>();
/** /**
* 注册 * 注册
......
userCenter/src/main/java/com/dayu/usercenter/event/EditAddressEvent.java 0 → 100644
package com.dayu.usercenter.event;
public class EditAddressEvent {
public String name;
public String phone;
public String address;
public EditAddressEvent(String name, String phone, String address) {
this.name = name;
this.phone = phone;
this.address = address;
}
}
userCenter/src/main/java/com/dayu/usercenter/model/bean/AddressInfoBean.java 0 → 100644
package com.dayu.usercenter.model.bean;
public class AddressInfoBean {
/**
* accountId : 0
* address : string
* cityId : 0
* cityName : string
* createBy : string
* createTime : 2020-02-28T03:48:48.022Z
* defaultSelected : 0
* districtId : 0
* districtName : string
* id : 0
* mobile : string
* modifyBy : string
* modifyTime : 2020-02-28T03:48:48.022Z
* name : string
* provinceId : 0
* provinceName : string
*/
private int accountId;
private String address;
private int cityId;
private String cityName;
private String createBy;
private String createTime;
private int defaultSelected;
private int districtId;
private String districtName;
private int id;
private String mobile;
private String modifyBy;
private String modifyTime;
private String name;
private int provinceId;
private String provinceName;
public AddressInfoBean() {
}
public AddressInfoBean(int accountId, String address, int cityId, String cityName, int districtId,
String districtName, String mobile, String name, int provinceId, String provinceName) {
this.accountId = accountId;
this.address = address;
this.cityId = cityId;
this.cityName = cityName;
this.districtId = districtId;
this.districtName = districtName;
this.mobile = mobile;
this.name = name;
this.provinceId = provinceId;
this.provinceName = provinceName;
}
public int getAccountId() {
return accountId;
}
public void setAccountId(int accountId) {
this.accountId = accountId;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public int getCityId() {
return cityId;
}
public void setCityId(int cityId) {
this.cityId = cityId;
}
public String getCityName() {
return cityName;
}
public void setCityName(String cityName) {
this.cityName = cityName;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public int getDefaultSelected() {
return defaultSelected;
}
public void setDefaultSelected(int defaultSelected) {
this.defaultSelected = defaultSelected;
}
public int getDistrictId() {
return districtId;
}
public void setDistrictId(int districtId) {
this.districtId = districtId;
}
public String getDistrictName() {
return districtName;
}
public void setDistrictName(String districtName) {
this.districtName = districtName;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public String getModifyBy() {
return modifyBy;
}
public void setModifyBy(String modifyBy) {
this.modifyBy = modifyBy;
}
public String getModifyTime() {
return modifyTime;
}
public void setModifyTime(String modifyTime) {
this.modifyTime = modifyTime;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getProvinceId() {
return provinceId;
}
public void setProvinceId(int provinceId) {
this.provinceId = provinceId;
}
public String getProvinceName() {
return provinceName;
}
public void setProvinceName(String provinceName) {
this.provinceName = provinceName;
}
}
userCenter/src/main/java/com/dayu/usercenter/presenter/userinfo/UserInfoPresenter.java
...@@ -5,6 +5,7 @@ import android.databinding.ObservableField; ...@@ -5,6 +5,7 @@ import android.databinding.ObservableField;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
import com.dayu.usercenter.api.UserService2; import com.dayu.usercenter.api.UserService2;
import com.dayu.usercenter.model.bean.AddressInfoBean;
import com.dayu.usercenter.model.bean.UserBankInfoBean; import com.dayu.usercenter.model.bean.UserBankInfoBean;
import com.dayu.usercenter.model.bean.UserInfoBean; import com.dayu.usercenter.model.bean.UserInfoBean;
import com.dayu.utils.ToastUtils; import com.dayu.utils.ToastUtils;
...@@ -18,8 +19,10 @@ import io.reactivex.Observable; ...@@ -18,8 +19,10 @@ import io.reactivex.Observable;
*/ */
public class UserInfoPresenter extends UserInfoContract.Presenter { public class UserInfoPresenter extends UserInfoContract.Presenter {
public ObservableField<String> mUrl = new ObservableField<>(); public ObservableField<String> mUrl = new ObservableField<>();
public ObservableField<String> detailAddress = new ObservableField<>();
public ObservableField<UserInfoBean> info = new ObservableField<>(); public ObservableField<UserInfoBean> info = new ObservableField<>();
public ObservableField<UserBankInfoBean> bankInfo = new ObservableField<UserBankInfoBean>(); public ObservableField<UserBankInfoBean> bankInfo = new ObservableField<>();
public ObservableField<AddressInfoBean> addressInfo = new ObservableField<>();
// public ObservableField<Boolean> status = new ObservableField<>(); // public ObservableField<Boolean> status = new ObservableField<>();
private int mAccountId; private int mAccountId;
private int mDetectStatus; private int mDetectStatus;
...@@ -35,27 +38,30 @@ public class UserInfoPresenter extends UserInfoContract.Presenter { ...@@ -35,27 +38,30 @@ public class UserInfoPresenter extends UserInfoContract.Presenter {
@Override @Override
public void queryInfo(int accountId) { public void queryInfo(int accountId) {
// Api.getService(UserService2.class).getUserInfo(accountId).compose(Api.applySchedulers()) // Observable.mergeDelayError(
// .subscribe(baseObserver(userInfo -> { // Api.getService(UserService2.class).getUserInfo(accountId).compose(Api.applySchedulers()),
// info.set(userInfo); // Api.getService(UserService2.class).getUserBankInfo(accountId).compose(Api.applySchedulers()),
// if (!TextUtils.isEmpty(userInfo.getIdentity()) && mDetectStatus == 1) { // Api.getService(UserService2.class).getAddressInfo(accountId).compose(Api.applySchedulers()))
// status.set(false); // .subscribe(baseObserver(data -> {
// } else { // if (data instanceof UserInfoBean) {
// status.set(true); // info.set((UserInfoBean) data);
// } else if (data instanceof UserBankInfoBean) {
// bankInfo.set((UserBankInfoBean) data);
// } else if (data instanceof AddressInfoBean) {
// addressInfo.set((AddressInfoBean) data);
// detailAddress.set(((AddressInfoBean) data).getProvinceName()+" "+
// ((AddressInfoBean) data).getCityName()+" "+((AddressInfoBean) data).getDistrictName()
// +" "+((AddressInfoBean) data).getAddress());
// } // }
// })); // }));
mView.showDialog(); mView.showDialog();
Observable.mergeDelayError( Api.getService(UserService2.class).getUserInfo(accountId).compose(Api.applySchedulers())
Api.getService(UserService2.class).getUserInfo(accountId).compose(Api.applySchedulers()), .subscribe(baseObserver(data->
Api.getService(UserService2.class).getUserBankInfo(accountId).compose(Api.applySchedulers())) info.set(data)
.subscribe(baseObserver(data -> { ));
if (data instanceof UserInfoBean) { getBankInfo();
info.set((UserInfoBean) data); getAddrInfo();
} else if (data instanceof UserBankInfoBean) {
bankInfo.set((UserBankInfoBean) data);
}
}));
//星级佣金 //星级佣金
Api.getService(UserService2.class).getStarRatios().compose(Api.applySchedulers()) Api.getService(UserService2.class).getStarRatios().compose(Api.applySchedulers())
.subscribe(baseObserver(datas->mView.setStarRatioData(datas))); .subscribe(baseObserver(datas->mView.setStarRatioData(datas)));
...@@ -64,4 +70,22 @@ public class UserInfoPresenter extends UserInfoContract.Presenter { ...@@ -64,4 +70,22 @@ public class UserInfoPresenter extends UserInfoContract.Presenter {
.subscribe(baseObserver(data->mView.setGlobelRate(data))); .subscribe(baseObserver(data->mView.setGlobelRate(data)));
} }
public void getBankInfo() {
Api.getService(UserService2.class).getUserBankInfo(mAccountId).compose(Api.applySchedulers())
.subscribe(baseObserver(data->
bankInfo.set(data)
));
}
public void getAddrInfo() {
Api.getService(UserService2.class).getAddressInfo(mAccountId).compose(Api.applySchedulers())
.subscribe(baseObserver(data->{
addressInfo.set(data);
detailAddress.set(data.getProvinceName()+" "+data.getCityName()
+" "+data.getDistrictName()+" "+data.getAddress());
}
));
}
} }
userCenter/src/main/java/com/dayu/usercenter/presenter/userlicence/UserLicencePresent.java
...@@ -73,7 +73,7 @@ public class UserLicencePresent extends UserLicenceContract.Presenter{ ...@@ -73,7 +73,7 @@ public class UserLicencePresent extends UserLicenceContract.Presenter{
item.getLicenceAuthorityId(),item.getLicenceAuthorityName(),0); item.getLicenceAuthorityId(),item.getLicenceAuthorityName(),0);
Api.getService(UserService2.class).applyLicence(applyData).compose(Api.applySchedulers()) Api.getService(UserService2.class).applyLicence(applyData).compose(Api.applySchedulers())
.subscribe(baseObserver(result->{ .subscribe(baseObserver(result->{
ToastUtils.showShortToast("apply: "+result); ToastUtils.showShortToast(result?"申请成功":"申请失败");
})); }));
} }
} }
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/BusinessTypeActivity.java
...@@ -169,6 +169,8 @@ public class BusinessTypeActivity extends BaseActivity<SImplePresenter, Activity ...@@ -169,6 +169,8 @@ public class BusinessTypeActivity extends BaseActivity<SImplePresenter, Activity
Api.getService(UserService2.class).saveServiceType(ids, mUserId).compose(Api.applySchedulers()) Api.getService(UserService2.class).saveServiceType(ids, mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(bool -> { .subscribe(mPresenter.baseObserver(bool -> {
ToastUtils.showShortToast(bool?R.string.save_success:R.string.save_fail); ToastUtils.showShortToast(bool?R.string.save_success:R.string.save_fail);
if (bool)
finish();
})); }));
} }
} }
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/EditBankActivity.java
...@@ -90,8 +90,17 @@ public class EditBankActivity extends BaseActivity<SImplePresenter, ActivityEdit ...@@ -90,8 +90,17 @@ public class EditBankActivity extends BaseActivity<SImplePresenter, ActivityEdit
private void submit() { private void submit() {
showDialog(); showDialog();
EditBankData data = new EditBankData(bankAccount, bankName, bankHolder, mUserId, 1); EditBankData data = new EditBankData(bankAccount, bankName, bankHolder, mUserId, 1);
if (setted) {
Api.getService(UserService2.class).updateBankInfo(data).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(this::submitDone));
} else {
Api.getService(UserService2.class).setBankInfo(data).compose(Api.applySchedulers()) Api.getService(UserService2.class).setBankInfo(data).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(reslut -> { .subscribe(mPresenter.baseObserver(this::submitDone));
}
}
private void submitDone(Boolean reslut) {
ToastUtils.showShortToast(reslut ? R.string.submit_success : R.string.submit_fail); ToastUtils.showShortToast(reslut ? R.string.submit_success : R.string.submit_fail);
if (reslut) { if (reslut) {
EventBus.getDefault().post(new EditBankEvent(bankName, bankAccount, bankHolder)); EventBus.getDefault().post(new EditBankEvent(bankName, bankAccount, bankHolder));
...@@ -99,6 +108,5 @@ public class EditBankActivity extends BaseActivity<SImplePresenter, ActivityEdit ...@@ -99,6 +108,5 @@ public class EditBankActivity extends BaseActivity<SImplePresenter, ActivityEdit
} else { } else {
// ToastUtils.showShortToast(R.string.submit_fail); // ToastUtils.showShortToast(R.string.submit_fail);
} }
}));
} }
} }
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/UserInfoActivity.java
...@@ -11,6 +11,7 @@ import com.dayu.base.ui.activity.BaseActivity; ...@@ -11,6 +11,7 @@ import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
import com.dayu.usercenter.R; import com.dayu.usercenter.R;
import com.dayu.usercenter.databinding.ActivityUserInfoBinding; import com.dayu.usercenter.databinding.ActivityUserInfoBinding;
import com.dayu.usercenter.event.EditAddressEvent;
import com.dayu.usercenter.event.EditBankEvent; import com.dayu.usercenter.event.EditBankEvent;
import com.dayu.usercenter.model.bean.GlobelRateBean; import com.dayu.usercenter.model.bean.GlobelRateBean;
import com.dayu.usercenter.model.bean.StarRatioBean; import com.dayu.usercenter.model.bean.StarRatioBean;
...@@ -131,8 +132,15 @@ public class UserInfoActivity extends BaseActivity<UserInfoPresenter, ActivityUs ...@@ -131,8 +132,15 @@ public class UserInfoActivity extends BaseActivity<UserInfoPresenter, ActivityUs
@Subscribe @Subscribe
public void onBankInfoChange(EditBankEvent event){ public void onBankInfoChange(EditBankEvent event){
mBind.tvBankName.setText(event.bankName); // mBind.tvBankName.setText(event.bankName);
mBind.tvBankAccount.setText(event.bankAccount); // mBind.tvBankAccount.setText(event.bankAccount);
mBind.tvBankHolder.setText(event.bankHolder); // mBind.tvBankHolder.setText(event.bankHolder);
showDialog();
mPresenter.getBankInfo();
}
@Subscribe
public void onAddressInfoChange(EditAddressEvent event){
showDialog();
mPresenter.getAddrInfo();
} }
} }
userCenter/src/main/res/layout/activity_edit_address.xml
...@@ -60,20 +60,18 @@ ...@@ -60,20 +60,18 @@
<LinearLayout <LinearLayout
android:id="@+id/ll_province" android:id="@+id/ll_province"
style="@style/ll_user_edit" style="@style/ll_user_edit"
android:gravity="center_vertical"
android:layout_marginTop="2dp"> android:layout_marginTop="2dp">
<TextView <TextView
style="@style/tv_user_edit2" style="@style/tv_user_edit2"
android:text="@string/belong_province" /> android:text="@string/belong_province" />
<EditText <TextView
android:id="@+id/edt_province" android:id="@+id/tv_province"
style="@style/edt_user_edit" style="@style/tv_user_addr"
android:layout_width="wrap_content"
android:layout_weight="1"
android:enabled="false"
android:hint="@string/select_province_hint" android:hint="@string/select_province_hint"
android:inputType="number" /> />
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -83,6 +81,7 @@ ...@@ -83,6 +81,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:gravity="center_vertical"
android:id="@+id/ll_city" android:id="@+id/ll_city"
style="@style/ll_user_edit" style="@style/ll_user_edit"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
...@@ -92,14 +91,11 @@ ...@@ -92,14 +91,11 @@
style="@style/tv_user_edit2" style="@style/tv_user_edit2"
android:text="@string/setlect_ciy" /> android:text="@string/setlect_ciy" />
<EditText <TextView
android:id="@+id/edt_city" android:id="@+id/tv_city"
style="@style/edt_user_edit" style="@style/tv_user_addr"
android:layout_width="wrap_content"
android:layout_weight="1"
android:enabled="false"
android:hint="@string/setlect_ciy_hint" android:hint="@string/setlect_ciy_hint"
android:inputType="number" /> />
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -109,6 +105,7 @@ ...@@ -109,6 +105,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:gravity="center_vertical"
android:id="@+id/ll_area" android:id="@+id/ll_area"
style="@style/ll_user_edit" style="@style/ll_user_edit"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
...@@ -118,14 +115,11 @@ ...@@ -118,14 +115,11 @@
style="@style/tv_user_edit2" style="@style/tv_user_edit2"
android:text="@string/setlect_area" /> android:text="@string/setlect_area" />
<EditText <TextView
android:id="@+id/edt_area" android:id="@+id/tv_area"
style="@style/edt_user_edit" style="@style/tv_user_addr"
android:layout_width="wrap_content"
android:layout_weight="1"
android:enabled="false"
android:hint="@string/setlect_area_hint" android:hint="@string/setlect_area_hint"
android:inputType="number" /> />
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
userCenter/src/main/res/layout/activity_sale_record.xml
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/bg_order_step_title1" android:background="@drawable/bg_table_record_title1"
android:gravity="center" android:gravity="center"
android:text="@string/reward_money" android:text="@string/reward_money"
/> />
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="2" android:layout_weight="2"
android:background="@drawable/bg_order_step_title2" android:background="@drawable/bg_table_record_title2"
android:gravity="center" android:gravity="center"
android:text="@string/reward_company" /> android:text="@string/reward_company" />
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/bg_order_step_title1" android:background="@drawable/bg_table_record_title1"
android:gravity="center" android:gravity="center"
android:text="@string/reward_date" /> android:text="@string/reward_date" />
</LinearLayout> </LinearLayout>
......
userCenter/src/main/res/layout/activity_service_record.xml
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/bg_order_step_title1" android:background="@drawable/bg_table_record_title1"
android:gravity="center" android:gravity="center"
android:text="@string/income_money" /> android:text="@string/income_money" />
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="2" android:layout_weight="2"
android:background="@drawable/bg_order_step_title2" android:background="@drawable/bg_table_record_title2"
android:gravity="center" android:gravity="center"
android:text="@string/oreder_sender_payer" /> android:text="@string/oreder_sender_payer" />
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/bg_order_step_title1" android:background="@drawable/bg_table_record_title1"
android:gravity="center" android:gravity="center"
android:text="@string/pay_date" /> android:text="@string/pay_date" />
</LinearLayout> </LinearLayout>
......
userCenter/src/main/res/layout/activity_user_info.xml
...@@ -208,13 +208,19 @@ ...@@ -208,13 +208,19 @@
android:text="@string/user_addr_info" android:text="@string/user_addr_info"
android:textStyle="bold" /> android:textStyle="bold" />
<LinearLayout style="@style/sale_linearlayout"> <LinearLayout style="@style/sale_linearlayout"
android:layout_marginRight="75dp"
>
<TextView <TextView
style="@style/sale_item_text" style="@style/sale_item_text"
android:text="@string/user_receiver_addr" /> android:text="@string/user_receiver_addr" />
<TextView style="@style/sale_item_text2" /> <TextView
android:id="@+id/tv_addr_add"
style="@style/sale_item_text2"
android:text="@{presenter.detailAddress}"
/>
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/sale_linearlayout"> <LinearLayout style="@style/sale_linearlayout">
...@@ -223,7 +229,10 @@ ...@@ -223,7 +229,10 @@
style="@style/sale_item_text" style="@style/sale_item_text"
android:text="@string/user_receiver_name" /> android:text="@string/user_receiver_name" />
<TextView style="@style/sale_item_text2" /> <TextView
android:id="@+id/tv_addr_name"
style="@style/sale_item_text2"
android:text="@{presenter.addressInfo.name}"/>
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/sale_linearlayout"> <LinearLayout style="@style/sale_linearlayout">
...@@ -232,7 +241,10 @@ ...@@ -232,7 +241,10 @@
style="@style/sale_item_text" style="@style/sale_item_text"
android:text="@string/user_receiver_phone" /> android:text="@string/user_receiver_phone" />
<TextView style="@style/sale_item_text2" /> <TextView
android:id="@+id/tv_addr_phone"
style="@style/sale_item_text2"
android:text="@{presenter.addressInfo.mobile}"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
userCenter/src/main/res/layout/fragment_home_user.xml
...@@ -8,15 +8,9 @@ ...@@ -8,15 +8,9 @@
type="com.dayu.usercenter.presenter.homeuser.HomeUserPresenter" /> type="com.dayu.usercenter.presenter.homeuser.HomeUserPresenter" />
</data> </data>
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cl_white">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
...@@ -34,6 +28,18 @@ ...@@ -34,6 +28,18 @@
android:src="@drawable/person_setting" /> android:src="@drawable/person_setting" />
</RelativeLayout> </RelativeLayout>
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cl_white">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -52,11 +58,10 @@ ...@@ -52,11 +58,10 @@
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/icon_arrow_right"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
/> android:src="@drawable/icon_arrow_right" />
<com.dayu.widgets.CircleImageView <com.dayu.widgets.CircleImageView
android:id="@+id/iv_header" android:id="@+id/iv_header"
...@@ -315,4 +320,5 @@ ...@@ -315,4 +320,5 @@
</LinearLayout> </LinearLayout>
</android.support.v4.widget.NestedScrollView> </android.support.v4.widget.NestedScrollView>
</LinearLayout>
</layout> </layout>
\ No newline at end of file
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 sign in to comment