Skip to content

android / dayu

Go to a project
Commit ee9c2615 by luofan
Options

280提现跳转h5,sop图片增加水印

parent c3773903
Inline Side-by-side
Showing with 245 additions and 55 deletions
baseSDK/src/main/java/com/dayu/common/Constants.java
......@@ -30,13 +30,16 @@ public class Constants {
public final static String PATH_EDIT_BANK = "/userCenter/edit_bank";
public final static String PATH_USER_REWARD= "/userCenter/user_reward";
public final static String PATH_USER_REWARD = "/userCenter/user_reward";
public static final String PROGRAM_PATH = "pages/mallDetail/main?goodsId=gid&userId=uid&type=1"; //小程序路径
public static final String LEAEN_PROGRAM_PATH = "/pages/shareVideo/main?type=_type&id="; //课程视频小程序路径
public static final String USER_PROGRAM_PATH = " /pages/masterInfo/main?id=";
public static final String INVITE_NEW_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareMaster?code="; //邀请新人分享链接
public static final String INVITE_NEW_SHARE_URL_BUSINESS = "http://app.dl.kf.ai/ext/#/merchants?code="; //邀请商家分享链接
public static final String WITHDRAWAL_URL = "dayu-h5-withdrawal?";//申请提现链接.
public static final String ACCEPTANCE_URL = "dayu-h5-acceptance-code?";//用户验收二维码页面.
/**
......@@ -55,6 +58,7 @@ public class Constants {
public static final boolean IS_DEBUG = true;
public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
public static int XLR_PID = 239; //小绿人商家id
public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/";
/**
......@@ -73,8 +77,7 @@ public class Constants {
// public static final boolean IS_DEBUG = false;
// public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 14; //小绿人商家id
// public static String SCHEME_9099 = "http://uat.kf.ai:9099/#/";
/**
......@@ -93,7 +96,7 @@ public class Constants {
// public static final boolean IS_DEBUG = false;
// public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 1936; //小绿人商家id
// public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/";
/**
......@@ -268,10 +271,10 @@ public class Constants {
public static final int CAMERA_CODE = 100;
public static final int CAMERA_IMG = 101;
public static final int CAMERA_VIDEO = 102;
public static final int MINIMUM_COMPRESSSIZE = 10*1024; //图片压缩大小临界值
public static final HashMap<Integer,List<TreeAddressBean>> treeAddressMap = new HashMap<>(); //地址数据
public static final String MIN_TIME ="min_time";
public static final String MAX_TIME ="max_time";
public static final int MINIMUM_COMPRESSSIZE = 10 * 1024; //图片压缩大小临界值
public static final HashMap<Integer, List<TreeAddressBean>> treeAddressMap = new HashMap<>(); //地址数据
public static final String MIN_TIME = "min_time";
public static final String MAX_TIME = "max_time";
/**
* 主动申请备件.
......
build.gradle
......@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 17
ext.target_sdk_version = 26
ext.version_code = 279
ext.verson_name = "2.7.9"
ext.version_code = 280
ext.verson_name = "2.8.0"
ext.gradle_version = '3.1.4'
ext.isReleaseMinify = false
ext.isDebugMinify = false
......
orderCenter/src/main/java/com/dayu/order/api/OrderService.java
......@@ -32,6 +32,7 @@ import com.dayu.order.api.protocol.TranCompanyBean;
import com.dayu.order.api.protocol.bean.OrderPartListBean;
import com.dayu.order.api.protocol.bean.ServiceProviderBean;
import com.dayu.order.api.protocol.bean.ServiceStationBean;
import com.dayu.order.api.protocol.bean.SopAddress;
import com.dayu.order.api.protocol.bean.SopListBean;
import com.dayu.order.api.protocol.companyManager;
import com.dayu.order.api.protocol.data.AddDialRecordData;
......@@ -466,6 +467,15 @@ public interface OrderService {
Observable<BaseResponse<Boolean>> modifySop(@Body SopListBean data);
/**
* 更新水印.
* @param data
* @return
*/
@PUT(Constants.API_7200 + "//ordersRelationSpuItemSop/watermark")
Observable<BaseResponse<Boolean>> waterMark(@Body SopAddress data);
/**
* 待接单
*/
@GET(Constants.API_7500 + "/ordersStatistics/satisfiedOrders")
......
orderCenter/src/main/java/com/dayu/order/api/protocol/bean/SopAddress.java 0 → 100644
package com.dayu.order.api.protocol.bean;
public class SopAddress {
private int id;
private int orderId;
private String engineerName;
private String mobile;
private double latitude;
private double longitude;
private String province;
private String city;
private String district;
private String aoiName;
private String address;
private String poiName;
public String getPoiName() {
return poiName;
}
public void setPoiName(String poiName) {
this.poiName = poiName;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getOrderId() {
return orderId;
}
public void setOrderId(int orderId) {
this.orderId = orderId;
}
public String getEngineerName() {
return engineerName;
}
public void setEngineerName(String engineerName) {
this.engineerName = engineerName;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public double getLatitude() {
return latitude;
}
public void setLatitude(double latitude) {
this.latitude = latitude;
}
public double getLongitude() {
return longitude;
}
public void setLongitude(double longitude) {
this.longitude = longitude;
}
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
public String getAoiName() {
return aoiName;
}
public void setAoiName(String aoiName) {
this.aoiName = aoiName;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
}
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
package com.dayu.order.presenter.multipleprocess;
import android.content.Intent;
import android.databinding.ObservableField;
import android.os.Bundle;
import android.text.TextUtils;
......@@ -195,9 +196,11 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
if (integer == 6) {
if (mOrderDetail != null &&mOrderDetail.getIsCheck() == 1){
Bundle bundle = new Bundle();
bundle.putString(Constants.URL, Constants.SCHEME_9099 + Constants.ACCEPTANCE_URL + "accountId=" + mAccountId +
"&token=" + UserManager.getInstance().getUser().getToken()+"&orderId="+mSpus.get(0).getOrderId());
bundle.putString("title","客户验收");
bundle.putInt(Constants.TYPE, 1);
bundle.putInt(Constants.ORDER_ID, mSpus.get(0).getOrderId());
mView.startActivity(QrCodeActivity.class, bundle);
ARouter.getInstance().build(RouterPath.PATH_WEBVIEW).withBundle(Constants.BUNDLE, bundle).navigation();
}else {
mView.dumpBack();
}
......
orderCenter/src/main/java/com/dayu/order/ui/activity/SopLocalActivity.java
......@@ -4,11 +4,13 @@ import android.Manifest;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.location.LocationManager;
import android.os.Bundle;
import android.support.v7.widget.GridLayoutManager;
import android.text.TextUtils;
import android.view.View;
import com.amap.api.location.AMapLocation;
import com.dayu.base.api.Api;
import com.dayu.base.api.BaseApiFactory;
import com.dayu.base.ui.activity.BaseActivity;
......@@ -18,9 +20,11 @@ import com.dayu.base.ui.adapter.MediaChooseAdapter;
import com.dayu.base.ui.adapter.SpacesItemDecoration;
import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.common.Constants;
import com.dayu.location.base.LocationUtils;
import com.dayu.order.R;
import com.dayu.order.api.OrderService;
import com.dayu.order.api.protocol.Spu;
import com.dayu.order.api.protocol.bean.SopAddress;
import com.dayu.order.api.protocol.bean.SopListBean;
import com.dayu.order.common.FinishSopEvent;
import com.dayu.order.common.OrderConstant;
......@@ -28,6 +32,7 @@ import com.dayu.order.databinding.ActivitySopLocalBinding;
import com.dayu.provider.event.OrderState;
import com.dayu.utils.CommonUtils;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.LogUtils;
import com.dayu.utils.MPermissionUtils;
import com.dayu.utils.ToastUtils;
import com.dayu.widgets.TextDialog;
......@@ -46,6 +51,7 @@ import java.util.concurrent.TimeUnit;
import cn.jzvd.Jzvd;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.functions.Consumer;
import static com.dayu.order.common.OrderConstant.ORDER_SOP_FINISH;
import static com.dayu.order.common.OrderConstant.sopListData;
......@@ -63,6 +69,7 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
boolean canEdit = true;
private int step = 1;
private int orderId;
@Override
public void setPresenter() {
......@@ -94,7 +101,7 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
requestPermission();
mBundle = getIntent().getBundleExtra(Constants.BUNDLE);
canEdit = mBundle.getBoolean(Constants.SOP_CAN_EDIT, true);
int id = mBundle.getInt(Constants.ORDER_ID);
orderId = mBundle.getInt(Constants.ORDER_ID);
setInitStatus();
// showToast("edit: "+canEdit);
// showToast("id: "+id);
......@@ -116,7 +123,7 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
mBind.photo.addItemDecoration(new SpacesItemDecoration(10));
mBind.photo.setLayoutManager(new GridLayoutManager(mActivity, 5));
setImgAdapter();
initUser();
initData();
}
......@@ -137,7 +144,7 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
private void initData() {
if (OrderConstant.sopListData == null) {
showDialog();
Api.getService(OrderService.class).getSopList(mSopRid,100).compose(Api.applySchedulers())
Api.getService(OrderService.class).getSopList(mSopRid, 100).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(datas -> {
if (datas != null && datas.getData() != null) {
OrderConstant.sopListData = datas.getData();
......@@ -345,8 +352,38 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
showDialog();
Api.getService(OrderService.class).modifySop(currentSop).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(success -> {
getLocation();
toNext();
}));
getLocation();
}
/**
* 更新水印.
* @param bean
*/
private void waterMark(SopAddress bean) {
Api.getService(OrderService.class).waterMark(bean).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(aBoolean -> ToastUtils.showLongToast("更新成功!")));
}
private void getLocation() {
LocationUtils.getCurrentLocation(location -> {
SopAddress bean = new SopAddress();
bean.setId(currentSop.getId());
bean.setEngineerName(mUserInfo.getAccountName());
bean.setMobile(mUserInfo.getMobile());
bean.setOrderId(orderId);
bean.setLatitude(location.getLatitude());
bean.setLongitude(location.getLongitude());
bean.setProvince(location.getProvince());
bean.setCity(location.getCity());
bean.setDistrict(location.getDistrict());
bean.setAoiName(location.getAoiName());
bean.setPoiName(location.getPoiName());
bean.setAddress(location.getAddress());
waterMark(bean);
});
}
private void toNext() {
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
......@@ -14,6 +14,7 @@ import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
import com.bigkoo.pickerview.view.OptionsPickerView;
import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
import com.dayu.location.base.LocationUtils;
import com.dayu.order.R;
import com.dayu.order.api.protocol.Order;
......@@ -300,11 +301,13 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
} else if (item.getIsCheck() == 2) {
ToastUtils.showShortToast("请等待商家验收");
} else {
UserInfo info = UserManager.getInstance().getUser();
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, item.getId());
Intent intent = new Intent(mContext, QrCodeActivity.class);
intent.putExtra(Constants.BUNDLE, bundle);
mContext.startActivity(intent);
bundle.putString(Constants.URL, Constants.SCHEME_9099 + Constants.ACCEPTANCE_URL + "accountId=" + info.getAccountId() +
"&token=" + info.getToken() + "&orderId=" + item.getId());
bundle.putString("title", "客户验收");
ARouter.getInstance().build(RouterPath.PATH_WEBVIEW).withBundle(Constants.BUNDLE, bundle).navigation();
}
} else {
dumpSubcribeTimeActivity(id, position, item.getStatus(), temp);
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderServerAdapter.java
......@@ -73,7 +73,7 @@ public class OrderServerAdapter extends CoreAdapter<OrderDetail.RecordBean, Serv
} else {
holder.serverTimeComment.setText(UIUtils.getString(R.string.remark_order) + item.getCommentInfo());
}
holder.serverCheck.setText(UIUtils.getString(R.string.check_initial_state));
holder.serverCheck.setText("");
holder.serverTimeComment.setVisibility(View.VISIBLE);
} else if (UIUtils.getString(R.string.system_chcek).equals(item.getOperation())) {
holder.serverCheck.setText(UIUtils.getString(R.string.check_accept));
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
......@@ -18,6 +18,7 @@ import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
import com.dayu.location.base.LocationUtils;
import com.dayu.order.R;
import com.dayu.order.api.OrderApiFactory;
......@@ -43,6 +44,7 @@ import com.dayu.utils.CommonUtils;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager;
import com.dayu.utils.UtilsDate;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.TextDialog;
......@@ -181,11 +183,12 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
}
mBind.tvTakeOrder.setVisibility(detail.getStatus() == 1 ? View.VISIBLE : View.GONE);
mBind.customerAcceptance.setOnClickListener(v -> {
UserInfo info = UserManager.getInstance().getUser();
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, detail.getId());
Intent intent = new Intent(mActivity, QrCodeActivity.class);
intent.putExtra(Constants.BUNDLE, bundle);
mActivity.startActivity(intent);
bundle.putString(Constants.URL, Constants.SCHEME_9099 + Constants.ACCEPTANCE_URL + "accountId=" + info.getAccountId() +
"&token=" + info.getToken() + "&orderId=" + detail.getId());
bundle.putString("title", "客户验收");
ARouter.getInstance().build(RouterPath.PATH_WEBVIEW).withBundle(Constants.BUNDLE, bundle).navigation();
MobclickAgent.onEvent(mActivity, "customer_apponitment");
});
if (detail.getEsignatureImg() == null) {
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
......@@ -8,9 +8,11 @@ import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.base.ui.fragment.DataBindingFragment;
import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
import com.dayu.location.base.LocationUtils;
import com.dayu.order.R;
import com.dayu.order.api.protocol.OrderDetail;
......@@ -21,9 +23,11 @@ import com.dayu.order.ui.activity.EditeDetailActivity;
import com.dayu.order.ui.activity.PdfWebViewActivity;
import com.dayu.order.ui.activity.QrCodeActivity;
import com.dayu.order.ui.activity.ServerInstructionActivity;
import com.dayu.provider.router.RouterPath;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.listener.OnItemClickListener;
import com.umeng.analytics.MobclickAgent;
......@@ -77,11 +81,12 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
mBind.customerAcceptance.setVisibility(View.GONE);
}
mBind.customerAcceptance.setOnClickListener(v -> {
UserInfo info = UserManager.getInstance().getUser();
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, dataBean.getId());
Intent intent = new Intent(mActivity, QrCodeActivity.class);
intent.putExtra(Constants.BUNDLE, bundle);
startActivity(intent);
bundle.putString(Constants.URL, Constants.SCHEME_9099 + Constants.ACCEPTANCE_URL + "accountId=" + info.getAccountId() +
"&token=" + info.getToken() + "&orderId=" + dataBean.getId());
bundle.putString("title", "客户验收");
ARouter.getInstance().build(RouterPath.PATH_WEBVIEW).withBundle(Constants.BUNDLE, bundle).navigation();
MobclickAgent.onEvent(mActivity, "customer_apponitment");
});
mBind.tvOrderRmark.post(() -> {
......
provider/src/main/java/com/dayu/provider/router/RouterPath.java
......@@ -26,6 +26,7 @@ public class RouterPath {
* 我的模块.
*/
public final static String PATH_CERTIFICAITON = "/user/certificaiton";
public final static String PATH_WEBVIEW = "/user/webView";
/**
* 学习模块.
*/
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity/CommeWebViewActivity.java
......@@ -14,15 +14,21 @@ import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.LinearLayout;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.ui.activity.DataBindingActivity;
import com.dayu.baselibrary.databinding.ActivityWebviewBinding;
import com.dayu.common.Constants;
import com.dayu.provider.event.RefreshServe;
import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.R;
import com.dayu.utils.ProgressUtil;
import com.github.lzyzsd.jsbridge.BridgeHandler;
import com.github.lzyzsd.jsbridge.BridgeWebView;
import com.github.lzyzsd.jsbridge.CallBackFunction;
import org.greenrobot.eventbus.EventBus;
import java.io.File;
/**
......@@ -30,6 +36,7 @@ import java.io.File;
* on 2018/5/25.
*/
@Route(path = RouterPath.PATH_WEBVIEW)
public class CommeWebViewActivity extends DataBindingActivity<ActivityWebviewBinding> {
ValueCallback<Uri> mUploadMessage;
ValueCallback<Uri[]> uploadMessageAboveL;
......@@ -47,12 +54,20 @@ public class CommeWebViewActivity extends DataBindingActivity<ActivityWebviewBin
public void initView() {
Bundle bundle = getIntent().getBundleExtra(Constants.BUNDLE);
mUrl = bundle.getString(Constants.URL);
int type = bundle.getInt(Constants.TYPE);
String title = bundle.getString(Constants.TITLE);
if(TextUtils.isEmpty(title)){
if (TextUtils.isEmpty(title)) {
mBind.rlTitle.setVisibility(View.GONE);
}else {
} else {
mBind.tvTitle.setText(title);
mBind.titleBack.setOnClickListener(v -> finish());
mBind.titleBack.setOnClickListener(v -> {
if (type == 0) {
finish();
} else {
ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation();
EventBus.getDefault().post(new RefreshServe(1));
}
});
}
mWebView = new BridgeWebView(mActivity);
mWebView.setLayoutParams(new LinearLayout.LayoutParams(
......
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
......@@ -38,6 +38,7 @@ import com.dayu.usercenter.model.bean.UserBankInfoBean;
import com.dayu.usercenter.model.bean.UserIncomeBean;
import com.dayu.usercenter.presenter.homeuser.HomeUserContract;
import com.dayu.usercenter.presenter.homeuser.HomeUserPresenter;
import com.dayu.usercenter.ui.activity.CommeWebViewActivity;
import com.dayu.usercenter.ui.activity.PersonInfoActivity;
import com.dayu.usercenter.ui.activity2.CommonRecordActivity;
import com.dayu.usercenter.ui.activity2.EditAddressActivity;
......@@ -96,11 +97,11 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
mBind.tvSendCard.setOnClickListener(view -> sendUserCard());
mBind.ivEditNick.setOnClickListener(view -> startActivity(EditNickActivity.class));
mBind.tvFetch.setOnClickListener(view -> {
if (canWithdrawMoney > 0) {
applyWithdraw();
} else {
showToast("无可提现金额！");
}
// if (canWithdrawMoney > 0) {
applyWithdraw();
// } else {
// showToast("无可提现金额！");
// }
});
}
......@@ -348,23 +349,22 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
//申请提现
private void applyWithdraw() {
if (TextUtils.isEmpty(userIdentity)) {
showCertificationDialog();
return;
}
if (!hasBankInfo) {
String str = "请先完善您的银行卡信息才能提现";
showBankAddrDialog(str, EditBankActivity.class);
return;
}
showDialog();
ApplyWithdrawData data = new ApplyWithdrawData(mUserId);
Api.getService(UserService2.class).appplyWithdraw(data).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(success -> {
if (success)
showApplySuccessDialog();
}));
// showApplySuccessDialog();
// if (TextUtils.isEmpty(userIdentity)) {
// showCertificationDialog();
// return;
// }
// if (!hasBankInfo) {
// String str = "请先完善您的银行卡信息才能提现";
// showBankAddrDialog(str, EditBankActivity.class);
// return;
// }
Bundle bundle = new Bundle();
bundle.putString(Constants.URL, Constants.SCHEME_9099 + Constants.WITHDRAWAL_URL + "accountId=" + mUserInfo.getAccountId() +
"&token=" + mUserInfo.getToken());
bundle.putString("title","提现");
Intent intent = new Intent(mActivity, CommeWebViewActivity.class);
intent.putExtra(Constants.BUNDLE, bundle);
mActivity.startActivity(intent, bundle);
}
......
userCenter/src/main/res/layout/fragment_home_user.xml
......@@ -409,9 +409,7 @@
android:layout_width="91dp"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:background="@drawable/btn_green_commom_5"
android:text="@string/apply_fetch" />
......
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