huting
před 2 roky
15 změnil soubory, kde provedl 673 přidání a 297 odebrání
+ 8
- 0
app/src/main/AndroidManifest.xml
Zobrazit soubor
| @@ -350,6 +350,14 @@ | |||
| <activity android:name=".project.ui.activity.user.EditPwdActivity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait" /> | |||
| <!--申请换货第一步--> | |||
| <activity android:name=".project.ui.activity.order.ApplyExGoodsStep1Activity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait"/> | |||
| <!--申请换货第二步--> | |||
| <activity android:name=".project.ui.activity.order.ApplyExGoodsStep2Activity" | |||
| android:launchMode="singleTop" | |||
| android:screenOrientation="portrait"/> | |||
| </application> | |||
| </manifest> | |||
+ 12
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/DotBean.java
Zobrazit soubor
| @@ -0,0 +1,12 @@ | |||
| package com.huntersun.vkyes.etcopencard.project.api.bean; | |||
| /** | |||
| * Date ：2023-03-14 | |||
| * Description：网点bean | |||
| */ | |||
| public class DotBean { | |||
| public String agencyId; //机构号 | |||
| public String agencyName;//机构名称 | |||
| public String servicehallId;//网点编号 | |||
| public String name;//网点名称 | |||
| } | |||
+ 7
- 1
app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/IFCode.java
Zobrazit soubor
| @@ -61,6 +61,8 @@ public class IFCode { | |||
| LoadingMsgMap.put(IFCode.IFCODE74, "VFJ-修改系统信息中..."); | |||
| LoadingMsgMap.put(IFCode.IFCODE75, "VFJ-修改车辆信息中..."); | |||
| LoadingMsgMap.put(IFCode.IFCODE78, "VFJ-修改车辆信息中..."); | |||
| LoadingMsgMap.put(IFCode.IFCODE168, "网点信息查询中..."); | |||
| LoadingMsgMap.put(IFCode.IFCODE167, "申请换货中..."); | |||
| } | |||
| public static final String IFCODE2 = "2"; //统一会员平台发送验证码接口 | |||
| @@ -87,7 +89,7 @@ public class IFCode { | |||
| public static final String IFCODE148 = "148"; //apk 版本查询接口 | |||
| public static final String IFCODE149 = "149"; //根据订单ID获取部分订单信息（车辆信息、用户信息） | |||
| public static final String IFCODE150 = "150"; //查询全部待发货订单 | |||
| public static final String IFCODE155 = "155"; //查询全部待发货订单 | |||
| public static final String IFCODE155 = "155"; //订单完成收货 | |||
| public static final String IFCODE171 = "171"; //根据车辆ID获取正常的状态储值卡 | |||
| public static final String IFCODE9 = "9"; //根据订单ID查询订单详情 | |||
| @@ -122,4 +124,8 @@ public class IFCode { | |||
| public static final String IFCODE71 = "71"; //圈存修复V3(写指令) | |||
| public static final String IFCODE72 = "72"; //圈存确认 | |||
| public static final String IFCODE165 = "165"; //订单申请退货 | |||
| public static final String IFCODE167 = "167"; //订单申请换货 | |||
| public static final String IFCODE168 = "168"; //根据机构号获取服务网点信息 | |||
| } | |||
+ 142
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/dialog/DotListDialog.java
Zobrazit soubor
| @@ -0,0 +1,142 @@ | |||
| package com.huntersun.vkyes.etcopencard.project.dialog; | |||
| import android.content.Context; | |||
| import android.os.Bundle; | |||
| import android.text.TextUtils; | |||
| import android.view.Gravity; | |||
| import android.view.View; | |||
| import android.widget.Button; | |||
| import android.widget.EditText; | |||
| import com.alibaba.fastjson.JSONArray; | |||
| import com.blankj.utilcode.util.LogUtils; | |||
| import com.chad.library.adapter.base.BaseQuickAdapter; | |||
| import com.chad.library.adapter.base.BaseViewHolder; | |||
| import com.google.gson.Gson; | |||
| import com.huntersun.vkyes.etcopencard.R; | |||
| import com.huntersun.vkyes.etcopencard.project.api.Api; | |||
| import com.huntersun.vkyes.etcopencard.project.api.Converter; | |||
| import com.huntersun.vkyes.etcopencard.project.api.MyRetrofit; | |||
| import com.huntersun.vkyes.etcopencard.project.api.RequestParameters; | |||
| import com.huntersun.vkyes.etcopencard.project.api.Result; | |||
| import com.huntersun.vkyes.etcopencard.project.api.bean.DotBean; | |||
| import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode; | |||
| import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean; | |||
| import com.huntersun.vkyes.etcopencard.project.api.bean.SendTheVerificationCodeBean; | |||
| import com.huntersun.vkyes.etcopencard.project.utils.FunHelper; | |||
| import com.huntersun.vkyes.etcopencard.src.action.ToastAction; | |||
| import com.huntersun.vkyes.etcopencard.src.ui.activity.LoginActivity; | |||
| import com.huntersun.vkyes.etcopencard.src.ui.dialog.CommonDialog; | |||
| import com.jeremyliao.liveeventbus.LiveEventBus; | |||
| import java.util.ArrayList; | |||
| import java.util.List; | |||
| import androidx.recyclerview.widget.RecyclerView; | |||
| import retrofit2.Response; | |||
| /** | |||
| * 网点列表 | |||
| */ | |||
| public class DotListDialog { | |||
| public static final class Builder extends CommonDialog.Builder<Builder> implements ToastAction { | |||
| private final Context Context; | |||
| private final EditText mInputView; | |||
| private final RecyclerView recyclerView; | |||
| private final Button search; | |||
| private List<DotBean> list; | |||
| public Builder(Context context, ResultItem result) { | |||
| super(context); | |||
| Context = context; | |||
| setCustomView(R.layout.dialog_menu_mail); | |||
| mInputView = findViewById(R.id.tv_input_message); | |||
| recyclerView = findViewById(R.id.recycler); | |||
| search = findViewById(R.id.search); | |||
| recyclerView.setAdapter(adapter); | |||
| //背景层开关 | |||
| setCanceledOnTouchOutside(true); | |||
| list = new ArrayList<>(); | |||
| setTitle("请选择换货网点"); | |||
| initData(result); | |||
| search.setOnClickListener(new View.OnClickListener() { | |||
| @Override | |||
| public void onClick(View v) { | |||
| if (TextUtils.isEmpty(mInputView.getText() + "")) { | |||
| adapter.replaceData(list); | |||
| return; | |||
| } | |||
| List<DotBean> list2 = new ArrayList<>(); | |||
| for (DotBean item : list) { | |||
| if (item.name.contains(mInputView.getText() + "")) { | |||
| list2.add(item); | |||
| } | |||
| } | |||
| if (list2.size() > 0) { | |||
| adapter.replaceData(list2); | |||
| } else { | |||
| toast("无包含内容"); | |||
| } | |||
| } | |||
| }); | |||
| } | |||
| public void initData(ResultItem resultItem) { | |||
| SendTheVerificationCodeBean bizContent = new SendTheVerificationCodeBean(); | |||
| RequestParameters parameters = new RequestParameters(IFCode.IFCODE168, new Gson().toJson(bizContent)); | |||
| new MyRetrofit().getRetrofit().create(Api.class).message2(parameters) | |||
| .enqueue(new Converter<Result>(true) { | |||
| @Override | |||
| protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) { | |||
| list = JSONArray.parseArray(resultBean.getBizContent() + "", DotBean.class); | |||
| if (list.size() > 0) { | |||
| adapter.replaceData(list); | |||
| } | |||
| } | |||
| @Override | |||
| public void onError(String err, Response<Result> resp) { | |||
| super.onError(err, resp); | |||
| } | |||
| }); | |||
| adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { | |||
| @Override | |||
| public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) { | |||
| if (view.getId() == R.id.text) { | |||
| resultItem.success((DotBean) baseQuickAdapter.getData().get(i)); | |||
| dismiss(); | |||
| } | |||
| } | |||
| }); | |||
| } | |||
| BaseQuickAdapter<DotBean, BaseViewHolder> adapter = new BaseQuickAdapter<DotBean, BaseViewHolder>(R.layout.item_msg) { | |||
| @Override | |||
| protected void convert(BaseViewHolder helper, DotBean item) { | |||
| helper.setText(R.id.text, item.name); | |||
| } | |||
| }; | |||
| @Override | |||
| public Builder setBottom() { | |||
| return super.setBottom(); | |||
| } | |||
| @Override | |||
| public Builder setCancel(CharSequence text) { | |||
| return super.setCancel(null); | |||
| } | |||
| @Override | |||
| public Builder setGravity(int gravity) { | |||
| return super.setGravity(Gravity.CENTER); | |||
| } | |||
| } | |||
| public interface ResultItem { | |||
| void success(DotBean item); | |||
| } | |||
| } | |||
+ 1
- 14
app/src/main/java/com/huntersun/vkyes/etcopencard/project/dialog/MenuMailDialog.java
Zobrazit soubor
| @@ -1,17 +1,11 @@ | |||
| package com.huntersun.vkyes.etcopencard.project.dialog; | |||
| import android.bluetooth.BluetoothAdapter; | |||
| import android.bluetooth.BluetoothDevice; | |||
| import android.content.Context; | |||
| import android.text.TextUtils; | |||
| import android.view.Gravity; | |||
| import android.view.View; | |||
| import android.widget.Button; | |||
| import android.widget.EditText; | |||
| import android.widget.LinearLayout; | |||
| import androidx.annotation.NonNull; | |||
| import androidx.recyclerview.widget.RecyclerView; | |||
| import com.alibaba.fastjson.JSONArray; | |||
| import com.chad.library.adapter.base.BaseQuickAdapter; | |||
| @@ -26,20 +20,13 @@ import com.huntersun.vkyes.etcopencard.project.api.Result; | |||
| import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode; | |||
| import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean; | |||
| import com.huntersun.vkyes.etcopencard.project.api.bean.SendTheVerificationCodeBean; | |||
| import com.huntersun.vkyes.etcopencard.project.bluetooth.BluetoothReceiver; | |||
| import com.huntersun.vkyes.etcopencard.project.ui.activity.mail.FormDeliveryActivity; | |||
| import com.huntersun.vkyes.etcopencard.project.ui.adapter.DeviceAdapter; | |||
| import com.huntersun.vkyes.etcopencard.src.action.ToastAction; | |||
| import com.huntersun.vkyes.etcopencard.src.aop.SingleClick; | |||
| import com.huntersun.vkyes.etcopencard.src.ui.dialog.CommonDialog; | |||
| import com.scwang.smart.refresh.layout.SmartRefreshLayout; | |||
| import com.scwang.smart.refresh.layout.api.RefreshLayout; | |||
| import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener; | |||
| import com.scwang.smart.refresh.layout.listener.OnRefreshListener; | |||
| import java.util.ArrayList; | |||
| import java.util.List; | |||
| import androidx.recyclerview.widget.RecyclerView; | |||
| import retrofit2.Response; | |||
| /** | |||
+ 15
- 2
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/HomeListInfo.java
Zobrazit soubor
| @@ -29,6 +29,7 @@ import com.huntersun.vkyes.etcopencard.project.copapply.ObuActivateRequester; | |||
| import com.huntersun.vkyes.etcopencard.project.copapply.ObuActivation; | |||
| import com.huntersun.vkyes.etcopencard.project.tool.Utils; | |||
| import com.huntersun.vkyes.etcopencard.project.ui.activity.mail.FormDeliveryActivity; | |||
| import com.huntersun.vkyes.etcopencard.project.ui.activity.order.ApplyExGoodsStep1Activity; | |||
| import com.huntersun.vkyes.etcopencard.project.utils.FunHelper; | |||
| import com.huntersun.vkyes.etcopencard.src.action.StatusAction; | |||
| import com.huntersun.vkyes.etcopencard.src.aop.SingleClick; | |||
| @@ -39,6 +40,7 @@ import com.jeremyliao.liveeventbus.LiveEventBus; | |||
| import retrofit2.Response; | |||
| /** | |||
| * 订单详情 | |||
| * @author admin | |||
| */ | |||
| public class HomeListInfo extends AppActivity implements StatusAction { | |||
| @@ -141,12 +143,23 @@ public class HomeListInfo extends AppActivity implements StatusAction { | |||
| binding.nextStep.setVisibility(View.GONE); | |||
| break; | |||
| } | |||
| //取消订单 | |||
| binding.cancel.setOnClickListener(new View.OnClickListener() { | |||
| @Override | |||
| @SingleClick | |||
| public void onClick(View v) { | |||
| new Utils().showMessDialog(getActivity(), "是否确认取消订单?", dialog -> { | |||
| //TODO 做测试 需要删除 | |||
| Bundle bundle = new Bundle(); | |||
| bundle.putString("id",bizContent1.getId()); | |||
| bundle.putString("orderId",bizContent1.getOrderId()); | |||
| bundle.putString("vehiclePlate",bizContent1.getVehiclePlate()); | |||
| bundle.putString("amount",bizContent1.getAmount()); | |||
| bundle.putString("orderStep",bizContent1.getOrderStep()); | |||
| jumpToPage(ApplyExGoodsStep1Activity.class,bundle); | |||
| /*new Utils().showMessDialog(getActivity(), "是否确认取消订单?", dialog -> { | |||
| FatherBean<SendTheVerificationCodeBean> fatherBean2 = new FatherBean<>(); | |||
| fatherBean2.bizContent = new SendTheVerificationCodeBean(); | |||
| fatherBean2.bizContent.setId(bizContent1.getId()); | |||
| @@ -163,7 +176,7 @@ public class HomeListInfo extends AppActivity implements StatusAction { | |||
| post(() -> finish()); | |||
| } | |||
| }); | |||
| }); | |||
| });*/ | |||
| } | |||
| }); | |||
| //下一步按钮 | |||
+ 157
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/order/ApplyExGoodsStep1Activity.java
Zobrazit soubor
| @@ -0,0 +1,157 @@ | |||
| package com.huntersun.vkyes.etcopencard.project.ui.activity.order; | |||
| import android.os.Bundle; | |||
| import android.view.View; | |||
| import com.blankj.utilcode.util.LogUtils; | |||
| import com.huntersun.vkyes.etcopencard.databinding.ActivityApplyExGoodsStep1Binding; | |||
| import com.huntersun.vkyes.etcopencard.project.api.MyRetrofit; | |||
| import com.huntersun.vkyes.etcopencard.project.api.bean.DotBean; | |||
| import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode; | |||
| import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean; | |||
| import com.huntersun.vkyes.etcopencard.project.dialog.DotListDialog; | |||
| import com.huntersun.vkyes.etcopencard.project.dialog.MenuMailDialog; | |||
| import com.huntersun.vkyes.etcopencard.project.tool.MyShared; | |||
| import com.huntersun.vkyes.etcopencard.project.tool.Utils; | |||
| import com.huntersun.vkyes.etcopencard.project.utils.FunHelper; | |||
| import com.huntersun.vkyes.etcopencard.src.app.AppActivity; | |||
| import com.huntersun.vkyes.etcopencard.src.manager.ActivityManager; | |||
| import com.huntersun.vkyes.etcopencard.src.ui.activity.LoginActivity; | |||
| import com.jeremyliao.liveeventbus.LiveEventBus; | |||
| import java.util.HashMap; | |||
| import java.util.Map; | |||
| /** | |||
| * Date ：2023-03-14 | |||
| * Description：申请换货 | |||
| */ | |||
| public class ApplyExGoodsStep1Activity extends AppActivity { | |||
| private ActivityApplyExGoodsStep1Binding binding; | |||
| private String id; //订单id | |||
| private String orderId;//订单编号 | |||
| private String vehiclePlate; //订单车牌 | |||
| private String amount; //订单金额 | |||
| private String orderStep; //订单状态 | |||
| private DotBean curDotBean; //当前选择的退货网点 | |||
| @Override | |||
| protected View getLayoutView() { | |||
| binding = ActivityApplyExGoodsStep1Binding.inflate(getLayoutInflater()); | |||
| return binding.getRoot(); | |||
| } | |||
| @Override | |||
| protected void initView() { | |||
| getParams(); | |||
| setDataToView(); | |||
| binding.btnApply.setOnClickListener(new View.OnClickListener() { | |||
| @Override | |||
| public void onClick(View view) { | |||
| checkParams(); | |||
| } | |||
| }); | |||
| binding.LLOutlet.setOnClickListener(new View.OnClickListener() { | |||
| @Override | |||
| public void onClick(View view) { | |||
| showChooseDotDialog(); | |||
| } | |||
| }); | |||
| } | |||
| @Override | |||
| protected void initData() { | |||
| } | |||
| /* | |||
| * 获取参数 | |||
| */ | |||
| private void getParams(){ | |||
| id = getIntent().getStringExtra("id"); | |||
| orderId = getIntent().getStringExtra("orderId"); | |||
| vehiclePlate = getIntent().getStringExtra("vehiclePlate"); | |||
| amount = getIntent().getStringExtra("amount"); | |||
| orderStep = getIntent().getStringExtra("orderStep"); | |||
| } | |||
| /* | |||
| * 设置界面数据 | |||
| */ | |||
| private void setDataToView(){ | |||
| binding.tvOrderId.setText(orderId); | |||
| binding.tvVehiclePlate.setText(vehiclePlate); | |||
| binding.tvAmount.setText("¥ " + (Integer.parseInt(amount) * 0.01)); | |||
| binding.tvOrderStep.setText(FunHelper.getOrderStatusName(Integer.parseInt(orderStep))); | |||
| } | |||
| /* | |||
| * 显示选择网点弹窗 | |||
| */ | |||
| private void showChooseDotDialog(){ | |||
| new DotListDialog.Builder(getActivity(), new DotListDialog.ResultItem() { | |||
| @Override | |||
| public void success(DotBean item) { | |||
| curDotBean = item; | |||
| binding.tvDot.setText(item.name); | |||
| } | |||
| }).setBottom().show(); | |||
| } | |||
| /* | |||
| * 提交参数校验 | |||
| */ | |||
| private void checkParams(){ | |||
| if (curDotBean == null || FunHelper.isEmpty(curDotBean.servicehallId)){ | |||
| toast("请选择换货网点"); | |||
| return; | |||
| } | |||
| if (FunHelper.isEmpty(FunHelper.getText(binding.etReason))){ | |||
| toast("请输入换货原因"); | |||
| return; | |||
| } | |||
| if (FunHelper.isEmpty(id)){ | |||
| toast("订单id为空，请返回重试"); | |||
| return; | |||
| } | |||
| new Utils().showMessDialog(getActivity(), "是否确认发起换货?", dialog -> { | |||
| doExGoods(); | |||
| }); | |||
| } | |||
| /* | |||
| * 执行换货 | |||
| */ | |||
| private void doExGoods(){ | |||
| showDialog("换货申请中..."); | |||
| Map<String, String> params = new HashMap<>(); | |||
| params.put("id", id); | |||
| params.put("exchangeMode", "OFFLINE"); | |||
| params.put("exchangeNetworkId", curDotBean.servicehallId); | |||
| params.put("exchangeNetworkName", curDotBean.name); | |||
| params.put("exchangeReason", FunHelper.getText(binding.etReason)); | |||
| params.put("opId", (String) MyShared.getInstance().get(MyShared.OPENID,"")); | |||
| MyRetrofit.newInstance(IFCode.IFCODE167, params, new MyRetrofit.ReturnResult() { | |||
| @Override | |||
| public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) { | |||
| hideDialog(); | |||
| Bundle bundle = new Bundle(); | |||
| bundle.putString("id",id); | |||
| jumpToPage(ApplyExGoodsStep2Activity.class,bundle); | |||
| finish(); | |||
| } | |||
| @Override | |||
| public void onError() { | |||
| MyRetrofit.ReturnResult.super.onError(); | |||
| hideDialog(); | |||
| } | |||
| }); | |||
| } | |||
| } | |||
+ 45
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/order/ApplyExGoodsStep2Activity.java
Zobrazit soubor
| @@ -0,0 +1,45 @@ | |||
| package com.huntersun.vkyes.etcopencard.project.ui.activity.order; | |||
| import android.content.Intent; | |||
| import android.os.Bundle; | |||
| import android.view.View; | |||
| import com.huntersun.vkyes.etcopencard.databinding.ActivityApplyExGoodsStep2Binding; | |||
| import com.huntersun.vkyes.etcopencard.project.ui.activity.HomeListInfo; | |||
| import com.huntersun.vkyes.etcopencard.src.app.AppActivity; | |||
| /** | |||
| * Date ：2023-03-14 | |||
| * Description：申请换货 | |||
| */ | |||
| public class ApplyExGoodsStep2Activity extends AppActivity { | |||
| private ActivityApplyExGoodsStep2Binding binding; | |||
| //订单id | |||
| private String id; | |||
| @Override | |||
| protected View getLayoutView() { | |||
| binding = ActivityApplyExGoodsStep2Binding.inflate(getLayoutInflater()); | |||
| return binding.getRoot(); | |||
| } | |||
| @Override | |||
| protected void initView() { | |||
| id = getIntent().getStringExtra("id"); | |||
| binding.btnCheckOrder.setOnClickListener(new View.OnClickListener() { | |||
| @Override | |||
| public void onClick(View view) { | |||
| Bundle bundle = new Bundle(); | |||
| bundle.putString("id", id); | |||
| jumpToPage(HomeListInfo.class,bundle); | |||
| finish(); | |||
| } | |||
| }); | |||
| } | |||
| @Override | |||
| protected void initData() { | |||
| } | |||
| } | |||
+ 1
- 1
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/order/AuditingActivity.java
Zobrazit soubor
| @@ -8,7 +8,7 @@ import com.huntersun.vkyes.etcopencard.src.app.AppActivity; | |||
| /** | |||
| * Date ：2023-03-13 | |||
| * Description：审核 | |||
| * Description：审核（未完成） | |||
| */ | |||
| public class AuditingActivity extends AppActivity { | |||
| private ActivityAuditingBinding binding; | |||
+ 20
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/order/CancelOrderStep1Activity.java
Zobrazit soubor
| @@ -0,0 +1,20 @@ | |||
| package com.huntersun.vkyes.etcopencard.project.ui.activity.order; | |||
| import com.huntersun.vkyes.etcopencard.src.app.AppActivity; | |||
| /** | |||
| * Date ：2023-03-14 | |||
| * Description：取消订单第一步 | |||
| */ | |||
| public class CancelOrderStep1Activity extends AppActivity { | |||
| @Override | |||
| protected void initView() { | |||
| } | |||
| @Override | |||
| protected void initData() { | |||
| } | |||
| } | |||
+ 20
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/order/CancelOrderStep2Activity.java
Zobrazit soubor
| @@ -0,0 +1,20 @@ | |||
| package com.huntersun.vkyes.etcopencard.project.ui.activity.order; | |||
| import com.huntersun.vkyes.etcopencard.src.app.AppActivity; | |||
| /** | |||
| * Date ：2023-03-14 | |||
| * Description：取消订单第2步 | |||
| */ | |||
| public class CancelOrderStep2Activity extends AppActivity { | |||
| @Override | |||
| protected void initView() { | |||
| } | |||
| @Override | |||
| protected void initData() { | |||
| } | |||
| } | |||
app/src/main/res/layout-v4/apply_success_layout.xml → app/src/main/res/layout-v1/activity_apply_ex_goods_step2.xml
Zobrazit soubor
| @@ -10,7 +10,7 @@ | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:background="@color/transparent" | |||
| app:leftIcon="@mipmap/back_three" | |||
| app:leftIcon="@mipmap/back_black" | |||
| android:id="@+id/title" | |||
| app:lineVisible="false" | |||
| app:title="申请换货" | |||
| @@ -27,14 +27,16 @@ | |||
| style="@style/blackTextStyleBold17" | |||
| android:layout_marginTop="@dimen/dp_21" | |||
| android:text="申请成功"/> | |||
| <com.ruffian.library.widget.RTextView | |||
| <Button | |||
| android:id="@+id/btnCheckOrder" | |||
| style="@style/BtnShortStyle" | |||
| android:layout_width="@dimen/dp_150" | |||
| android:layout_height="@dimen/dp_40" | |||
| android:layout_marginTop="@dimen/dp_68" | |||
| app:background_normal="@color/green01" | |||
| app:corner_radius="@dimen/dp_20" | |||
| android:id="@+id/btn_ckdd" | |||
| android:layout_gravity="center" | |||
| android:layout_marginTop="@dimen/dp_70" | |||
| android:text="查看订单" | |||
| android:gravity="center" | |||
| style="@style/whiteTextStyle15"/> | |||
| android:textSize="@dimen/sp_14" | |||
| android:layout_marginBottom="@dimen/dp_37" | |||
| android:layout_alignParentBottom="true" | |||
| android:layout_centerHorizontal="true"/> | |||
| </LinearLayout> | |||
+ 2
- 3
app/src/main/res/layout-v1/dialog_menu_mail.xml
Zobrazit soubor
| @@ -21,10 +21,9 @@ | |||
| android:layout_width="0dp" | |||
| android:layout_height="match_parent" | |||
| android:layout_gravity="center_horizontal" | |||
| android:hint="请输入物流公司名称" | |||
| android:hint="请输入搜索关键字" | |||
| android:layout_weight="1" | |||
| android:textSize="@dimen/sp_12" | |||
| tools:text="520425199710189912" /> | |||
| android:textSize="@dimen/sp_12" /> | |||
| <Button | |||
| android:id="@+id/search" | |||
+ 0
- 268
app/src/main/res/layout-v4/apply_cancel_change_goods_layout.xml
Zobrazit soubor
| @@ -1,268 +0,0 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | |||
| xmlns:app="http://schemas.android.com/apk/res-auto" | |||
| android:layout_width="match_parent" | |||
| android:background="@color/background_color" | |||
| android:layout_height="match_parent"> | |||
| <com.hjq.bar.TitleBar | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:background="@color/transparent" | |||
| app:leftIcon="@mipmap/back_three" | |||
| android:id="@+id/title" | |||
| app:lineVisible="false" | |||
| app:title="申请换货" | |||
| app:titleColor="@color/black" /> | |||
| <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout | |||
| android:id="@+id/hl_status_hint" | |||
| android:layout_width="match_parent" | |||
| android:layout_below="@+id/title" | |||
| android:layout_height="match_parent"> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:padding="@dimen/dp_15" | |||
| android:orientation="vertical"> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="订单详情" | |||
| style="@style/blackTextStyleBold16"/> | |||
| <com.ruffian.library.widget.RLinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| app:corner_radius="@dimen/dp_10" | |||
| app:background_normal="@color/white" | |||
| android:paddingLeft="@dimen/dp_15" | |||
| android:paddingTop="@dimen/dp_15" | |||
| android:paddingBottom="@dimen/dp_15" | |||
| android:paddingRight="@dimen/dp_20" | |||
| android:orientation="vertical" | |||
| android:layout_marginTop="@dimen/dp_12"> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| style="@style/black02TextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:text="订单编号" /> | |||
| <TextView | |||
| android:id="@+id/tv_ddbh" | |||
| style="@style/blackTextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="12536223" /> | |||
| </LinearLayout> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginTop="@dimen/dp_15" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| style="@style/black02TextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:text="订单车牌号" /> | |||
| <TextView | |||
| android:id="@+id/tv_ddcph" | |||
| style="@style/blackTextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="贵A123654" /> | |||
| </LinearLayout> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginTop="@dimen/dp_15" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| style="@style/black02TextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:text="订单金额" /> | |||
| <TextView | |||
| android:id="@+id/tv_ddje" | |||
| style="@style/greenTextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="￥120" /> | |||
| </LinearLayout> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginTop="@dimen/dp_15" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| style="@style/black02TextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:text="订单状态" /> | |||
| <TextView | |||
| android:id="@+id/tv_ddzt" | |||
| style="@style/redTextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="换货" /> | |||
| </LinearLayout> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginTop="@dimen/dp_15" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| style="@style/black02TextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:text="发货卡号" /> | |||
| <TextView | |||
| android:id="@+id/tv_fhkh" | |||
| style="@style/blackTextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="152364236" /> | |||
| </LinearLayout> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginTop="@dimen/dp_15" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| style="@style/black02TextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:text="发货签号" /> | |||
| <TextView | |||
| android:id="@+id/tv_fhqh" | |||
| style="@style/blackTextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="152364236" /> | |||
| </LinearLayout> | |||
| </com.ruffian.library.widget.RLinearLayout> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginTop="@dimen/dp_15" | |||
| android:text="换货填写" | |||
| style="@style/blackTextStyleBold16"/> | |||
| <com.ruffian.library.widget.RLinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| app:corner_radius="@dimen/dp_10" | |||
| app:background_normal="@color/white" | |||
| android:paddingLeft="@dimen/dp_15" | |||
| android:paddingTop="@dimen/dp_15" | |||
| android:paddingBottom="@dimen/dp_15" | |||
| android:paddingRight="@dimen/dp_20" | |||
| android:orientation="vertical" | |||
| android:layout_marginTop="@dimen/dp_12"> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:gravity="center_vertical" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| style="@style/redStar"/> | |||
| <TextView | |||
| style="@style/black02TextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="换货网点" /> | |||
| <TextView | |||
| android:id="@+id/tv_hhwd" | |||
| style="@style/grayTextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_weight="1" | |||
| android:gravity="center" | |||
| android:layout_height="wrap_content" | |||
| android:text="请选择" /> | |||
| <ImageView | |||
| android:layout_width="@dimen/dp_7" | |||
| android:layout_height="@dimen/dp_7" | |||
| android:scaleType="centerCrop" | |||
| android:src="@mipmap/the_right"/> | |||
| </LinearLayout> | |||
| <View | |||
| android:layout_width="match_parent" | |||
| android:layout_height="0.5dp" | |||
| android:layout_marginTop="@dimen/dp_15" | |||
| android:background="@color/gray01"/> | |||
| <RelativeLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginTop="@dimen/dp_15" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:id="@+id/red_star" | |||
| style="@style/redStar"/> | |||
| <TextView | |||
| style="@style/black02TextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:id="@+id/tv_hhyy_title" | |||
| android:layout_toRightOf="@+id/red_star" | |||
| android:layout_weight="1" | |||
| android:text="换货原因" /> | |||
| <EditText | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:background="@color/white" | |||
| android:layout_below="@+id/tv_hhyy_title" | |||
| android:paddingTop="@dimen/dp_15" | |||
| android:paddingLeft="@dimen/dp_7" | |||
| android:gravity="left" | |||
| android:maxLength="50" | |||
| android:hint="请输入换货原因，限制50字以内" | |||
| android:textColorHint="@color/text98" | |||
| android:minHeight="@dimen/dp_100" | |||
| style="@style/black02TextStyle14"/> | |||
| </RelativeLayout> | |||
| </com.ruffian.library.widget.RLinearLayout> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="请核对实收物与上述货物编号是否一致" | |||
| android:drawableLeft="@mipmap/tips" | |||
| android:layout_marginTop="@dimen/dp_12" | |||
| android:drawablePadding="@dimen/dp_10" | |||
| style="@style/orangeTextStyle10"/> | |||
| </LinearLayout> | |||
| </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout> | |||
| <com.ruffian.library.widget.RTextView | |||
| android:layout_width="@dimen/dp_150" | |||
| android:layout_height="@dimen/dp_40" | |||
| android:layout_marginBottom="@dimen/dp_37" | |||
| android:layout_alignParentBottom="true" | |||
| android:layout_centerHorizontal="true" | |||
| app:background_normal="@color/green01" | |||
| app:corner_radius="@dimen/dp_20" | |||
| android:text="申请换货" | |||
| android:gravity="center" | |||
| style="@style/whiteTextStyle15"/> | |||
| </RelativeLayout> | |||
+ 233
- 0
app/src/main/res/layout/activity_apply_ex_goods_step1.xml
Zobrazit soubor
| @@ -0,0 +1,233 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | |||
| xmlns:app="http://schemas.android.com/apk/res-auto" | |||
| android:layout_width="match_parent" | |||
| android:background="@color/background_color" | |||
| android:layout_height="match_parent"> | |||
| <com.hjq.bar.TitleBar | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:background="@color/transparent" | |||
| app:leftIcon="@mipmap/back_black" | |||
| android:id="@+id/title" | |||
| app:lineVisible="false" | |||
| app:title="申请换货" | |||
| app:titleColor="@color/black" /> | |||
| <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout | |||
| android:id="@+id/hl_status_hint" | |||
| android:layout_width="match_parent" | |||
| android:layout_below="@+id/title" | |||
| android:layout_height="match_parent"> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:padding="@dimen/dp_15" | |||
| android:orientation="vertical"> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="订单详情" | |||
| style="@style/blackTextStyleBold16"/> | |||
| <com.ruffian.library.widget.RLinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| app:corner_radius="@dimen/dp_10" | |||
| app:background_normal="@color/white" | |||
| android:paddingLeft="@dimen/dp_15" | |||
| android:paddingTop="@dimen/dp_15" | |||
| android:paddingBottom="@dimen/dp_15" | |||
| android:paddingRight="@dimen/dp_20" | |||
| android:orientation="vertical" | |||
| android:layout_marginTop="@dimen/dp_12"> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| style="@style/black02TextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:text="订单编号" /> | |||
| <TextView | |||
| android:id="@+id/tvOrderId" | |||
| style="@style/blackTextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| /> | |||
| </LinearLayout> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginTop="@dimen/dp_15" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| style="@style/black02TextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:text="订单车牌号" /> | |||
| <TextView | |||
| android:id="@+id/tvVehiclePlate" | |||
| style="@style/blackTextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| /> | |||
| </LinearLayout> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginTop="@dimen/dp_15" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| style="@style/black02TextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:text="订单金额" /> | |||
| <TextView | |||
| android:id="@+id/tvAmount" | |||
| style="@style/greenTextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="" /> | |||
| </LinearLayout> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginTop="@dimen/dp_15" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| style="@style/black02TextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_weight="1" | |||
| android:text="订单状态" /> | |||
| <TextView | |||
| android:id="@+id/tvOrderStep" | |||
| style="@style/redTextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="" /> | |||
| </LinearLayout> | |||
| </com.ruffian.library.widget.RLinearLayout> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginTop="@dimen/dp_15" | |||
| android:text="换货填写" | |||
| style="@style/blackTextStyleBold16"/> | |||
| <com.ruffian.library.widget.RLinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| app:corner_radius="@dimen/dp_10" | |||
| app:background_normal="@color/white" | |||
| android:paddingLeft="@dimen/dp_15" | |||
| android:paddingBottom="@dimen/dp_15" | |||
| android:paddingRight="@dimen/dp_20" | |||
| android:orientation="vertical" | |||
| android:layout_marginTop="@dimen/dp_12"> | |||
| <LinearLayout | |||
| android:id="@+id/LLOutlet" | |||
| style="@style/MatchWrap" | |||
| android:paddingTop="@dimen/dp_15" | |||
| android:paddingBottom="@dimen/dp_15" | |||
| android:gravity="center_vertical" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| style="@style/redStar"/> | |||
| <TextView | |||
| style="@style/black02TextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="换货网点" /> | |||
| <TextView | |||
| android:id="@+id/tvDot" | |||
| style="@style/grayTextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_weight="1" | |||
| android:gravity="center" | |||
| android:textColorHint="@color/text98" | |||
| android:textColor="@color/color_333333" | |||
| android:layout_height="wrap_content" | |||
| android:hint="请选择" /> | |||
| <ImageView | |||
| android:layout_width="@dimen/dp_15" | |||
| android:layout_height="@dimen/dp_15" | |||
| android:scaleType="centerCrop" | |||
| android:src="@mipmap/the_right"/> | |||
| </LinearLayout> | |||
| <View | |||
| android:layout_width="match_parent" | |||
| android:layout_height="0.5dp" | |||
| android:background="@color/gray01"/> | |||
| <RelativeLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginTop="@dimen/dp_15" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:id="@+id/red_star" | |||
| style="@style/redStar"/> | |||
| <TextView | |||
| style="@style/black02TextStyle14" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:id="@+id/tv_hhyy_title" | |||
| android:layout_toRightOf="@+id/red_star" | |||
| android:layout_weight="1" | |||
| android:text="换货原因" /> | |||
| <EditText | |||
| android:id="@+id/etReason" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:background="@color/white" | |||
| android:layout_below="@+id/tv_hhyy_title" | |||
| android:paddingTop="@dimen/dp_15" | |||
| android:paddingLeft="@dimen/dp_7" | |||
| android:gravity="left" | |||
| android:maxLength="50" | |||
| android:hint="请输入换货原因，限制50字以内" | |||
| android:textColorHint="@color/text98" | |||
| android:minHeight="@dimen/dp_100" | |||
| style="@style/black02TextStyle14"/> | |||
| </RelativeLayout> | |||
| </com.ruffian.library.widget.RLinearLayout> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="请核对实收物与上述货物编号是否一致" | |||
| android:drawableLeft="@mipmap/tips" | |||
| android:layout_marginTop="@dimen/dp_12" | |||
| android:drawablePadding="@dimen/dp_10" | |||
| android:visibility="gone" | |||
| style="@style/orangeTextStyle10"/> | |||
| </LinearLayout> | |||
| </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout> | |||
| <Button | |||
| android:id="@+id/btnApply" | |||
| style="@style/BtnShortStyle" | |||
| android:layout_width="@dimen/dp_150" | |||
| android:layout_height="@dimen/dp_40" | |||
| android:layout_gravity="center" | |||
| android:layout_marginTop="@dimen/dp_200" | |||
| android:text="申请换货" | |||
| android:textSize="@dimen/sp_14" | |||
| android:layout_marginBottom="@dimen/dp_37" | |||
| android:layout_alignParentBottom="true" | |||
| android:layout_centerHorizontal="true"/> | |||
| </RelativeLayout> | |||
Načítá se…