Skip to content

android / dayu

Go to a project
Commit d2d8ad87 by 罗翻
Options

android1.7页面书写

parent f1146f74
Inline Side-by-side
Showing with 1637 additions and 17 deletions
app/release/output.json
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":9},"path":"app-release.apk","properties":{"packageId":"com.dayu.bigfish","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10},"path":"app-release.apk","properties":{"packageId":"com.dayu.bigfish","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
baseSDK/src/main/res/values/colors.xml
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
<color name="tv_cl">#FF888888</color> <color name="tv_cl">#FF888888</color>
<color name="common_red">#FF5A4B</color> <color name="common_red">#FF5A4B</color>
<color name="light_grey">#FF666666</color> <color name="light_grey">#FF666666</color>
<color name="bg_button">#FF3FAAFC</color>
......
baseSDK/src/main/res/values/strings.xml
...@@ -179,13 +179,13 @@ ...@@ -179,13 +179,13 @@
<string name="have_go_on">我已出发</string> <string name="have_go_on">我已出发</string>
<string name="begain_server">开始服务</string> <string name="begain_server">开始服务</string>
<string name="process_order">处理工单</string> <string name="process_order">处理工单</string>
<string name="check_upon_delivery">[等待验收]</string> <string name="check_upon_delivery">等待验收</string>
<string name="order_finish">[已完成]</string> <string name="order_finish">已完成</string>
<string name="order_cancle">[已取消]</string> <string name="order_cancle">已取消</string>
<string name="receive_time_out">[接单超时]</string> <string name="receive_time_out">接单超时</string>
<string name="appointment_time_out">[预约超时]</string> <string name="appointment_time_out">预约超时</string>
<string name="delivery_time_out">[验收超时]</string> <string name="delivery_time_out">验收超时</string>
<string name="server_time_out">[服务超时]</string> <string name="server_time_out">服务超时</string>
<string name="need_again_door">需要再次上门</string> <string name="need_again_door">需要再次上门</string>
<string name="waite_appointemnt">待预约</string> <string name="waite_appointemnt">待预约</string>
<string name="waite_server">待服务</string> <string name="waite_server">待服务</string>
...@@ -328,6 +328,10 @@ ...@@ -328,6 +328,10 @@
<string name="no_cancle">取消原因:暂无</string> <string name="no_cancle">取消原因:暂无</string>
<string name="check_content">验收内容</string> <string name="check_content">验收内容</string>
<string name="system_chcek">系统验收</string> <string name="system_chcek">系统验收</string>
<string name="single_server_num">已完成%1$d/%2$d共</string>
<string name="server_num">共%1$d项服务</string>
<!--消息--> <!--消息-->
......
build.gradle
...@@ -5,8 +5,8 @@ buildscript { ...@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.2" ext.build_tools_version = "27.0.2"
ext.min_sdk_version = 16 ext.min_sdk_version = 16
ext.target_sdk_version = 23 ext.target_sdk_version = 23
ext.version_code = 9 ext.version_code = 10
ext.verson_name = "1.5.0" ext.verson_name = "1.6.0"
ext.gradle_version = '3.0.1' ext.gradle_version = '3.0.1'
ext.isReleaseMinify = true ext.isReleaseMinify = true
ext.isDebugMinify = true ext.isDebugMinify = true
......
orderCenter/src/main/java/com/dayu/order/api/protocol/ErrorOrder.java
package com.dayu.order.api.protocol; package com.dayu.order.api.protocol;
import java.util.List;
/** /**
* Created by luofan on 2017/11/19. * Created by luofan on 2017/11/19.
*/ */
...@@ -22,6 +24,24 @@ public class ErrorOrder { ...@@ -22,6 +24,24 @@ public class ErrorOrder {
private int status; private int status;
private int excptionCode; private int excptionCode;
private String appointmentTime; private String appointmentTime;
private int createdSource;
private List<Spu> spus;
public List<Spu> getSpus() {
return spus;
}
public void setSpus(List<Spu> spus) {
this.spus = spus;
}
public int getCreatedSource() {
return createdSource;
}
public void setCreatedSource(int createdSource) {
this.createdSource = createdSource;
}
public String getAppointmentTime() { public String getAppointmentTime() {
return appointmentTime; return appointmentTime;
...@@ -166,4 +186,133 @@ public class ErrorOrder { ...@@ -166,4 +186,133 @@ public class ErrorOrder {
public void setExcptionCode(int excptionCode) { public void setExcptionCode(int excptionCode) {
this.excptionCode = excptionCode; this.excptionCode = excptionCode;
} }
public class Spu {
private int accreditPrice;
private int categoryThreeId;
private int finNum;
private int goodNum;
private int id;
private int kaSpuId;
private int orderId;
private int providerTypeId;
private int serviceType;
private int sopStatus;
private String categoryThreeName;
private String kaSpuName;
private String productModel;
private String providerTypeName;
public int getAccreditPrice() {
return accreditPrice;
}
public void setAccreditPrice(int accreditPrice) {
this.accreditPrice = accreditPrice;
}
public int getCategoryThreeId() {
return categoryThreeId;
}
public void setCategoryThreeId(int categoryThreeId) {
this.categoryThreeId = categoryThreeId;
}
public int getFinNum() {
return finNum;
}
public void setFinNum(int finNum) {
this.finNum = finNum;
}
public int getGoodNum() {
return goodNum;
}
public void setGoodNum(int goodNum) {
this.goodNum = goodNum;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getKaSpuId() {
return kaSpuId;
}
public void setKaSpuId(int kaSpuId) {
this.kaSpuId = kaSpuId;
}
public int getOrderId() {
return orderId;
}
public void setOrderId(int orderId) {
this.orderId = orderId;
}
public int getProviderTypeId() {
return providerTypeId;
}
public void setProviderTypeId(int providerTypeId) {
this.providerTypeId = providerTypeId;
}
public int getServiceType() {
return serviceType;
}
public void setServiceType(int serviceType) {
this.serviceType = serviceType;
}
public int getSopStatus() {
return sopStatus;
}
public void setSopStatus(int sopStatus) {
this.sopStatus = sopStatus;
}
public String getCategoryThreeName() {
return categoryThreeName;
}
public void setCategoryThreeName(String categoryThreeName) {
this.categoryThreeName = categoryThreeName;
}
public String getKaSpuName() {
return kaSpuName;
}
public void setKaSpuName(String kaSpuName) {
this.kaSpuName = kaSpuName;
}
public String getProductModel() {
return productModel;
}
public void setProductModel(String productModel) {
this.productModel = productModel;
}
public String getProviderTypeName() {
return providerTypeName;
}
public void setProviderTypeName(String providerTypeName) {
this.providerTypeName = providerTypeName;
}
}
} }
orderCenter/src/main/java/com/dayu/order/api/protocol/Order.java
package com.dayu.order.api.protocol; package com.dayu.order.api.protocol;
import java.util.List;
/** /**
* 工单列表，异常单列表,工单记录列表的bean * 工单列表，异常单列表,工单记录列表的bean
* Created by luofan on 2017/11/14. * Created by luofan on 2017/11/14.
...@@ -47,6 +49,24 @@ public class Order { ...@@ -47,6 +49,24 @@ public class Order {
private int excptionCode; private int excptionCode;
private String appointmentTime; private String appointmentTime;
private int sopStatus; private int sopStatus;
private int createdSource;
private List<Spu> spus;
public List<Spu> getSpus() {
return spus;
}
public void setSpus(List<Spu> spus) {
this.spus = spus;
}
public int getCreatedSource() {
return createdSource;
}
public void setCreatedSource(int createdSource) {
this.createdSource = createdSource;
}
public int getSubStatus() { public int getSubStatus() {
return subStatus; return subStatus;
...@@ -232,4 +252,133 @@ public class Order { ...@@ -232,4 +252,133 @@ public class Order {
this.sopStatus = sopStatus; this.sopStatus = sopStatus;
} }
public class Spu {
private int accreditPrice;
private int categoryThreeId;
private int finNum;
private int goodNum;
private int id;
private int kaSpuId;
private int orderId;
private int providerTypeId;
private int serviceType;
private int sopStatus;
private String categoryThreeName;
private String kaSpuName;
private String productModel;
private String providerTypeName;
public int getAccreditPrice() {
return accreditPrice;
}
public void setAccreditPrice(int accreditPrice) {
this.accreditPrice = accreditPrice;
}
public int getCategoryThreeId() {
return categoryThreeId;
}
public void setCategoryThreeId(int categoryThreeId) {
this.categoryThreeId = categoryThreeId;
}
public int getFinNum() {
return finNum;
}
public void setFinNum(int finNum) {
this.finNum = finNum;
}
public int getGoodNum() {
return goodNum;
}
public void setGoodNum(int goodNum) {
this.goodNum = goodNum;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getKaSpuId() {
return kaSpuId;
}
public void setKaSpuId(int kaSpuId) {
this.kaSpuId = kaSpuId;
}
public int getOrderId() {
return orderId;
}
public void setOrderId(int orderId) {
this.orderId = orderId;
}
public int getProviderTypeId() {
return providerTypeId;
}
public void setProviderTypeId(int providerTypeId) {
this.providerTypeId = providerTypeId;
}
public int getServiceType() {
return serviceType;
}
public void setServiceType(int serviceType) {
this.serviceType = serviceType;
}
public int getSopStatus() {
return sopStatus;
}
public void setSopStatus(int sopStatus) {
this.sopStatus = sopStatus;
}
public String getCategoryThreeName() {
return categoryThreeName;
}
public void setCategoryThreeName(String categoryThreeName) {
this.categoryThreeName = categoryThreeName;
}
public String getKaSpuName() {
return kaSpuName;
}
public void setKaSpuName(String kaSpuName) {
this.kaSpuName = kaSpuName;
}
public String getProductModel() {
return productModel;
}
public void setProductModel(String productModel) {
this.productModel = productModel;
}
public String getProviderTypeName() {
return providerTypeName;
}
public void setProviderTypeName(String providerTypeName) {
this.providerTypeName = providerTypeName;
}
}
} }
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessContract.java 0 → 100755
package com.dayu.order.presenter.multipleprocess;
import com.dayu.base.ui.presenter.BaseListPresenter;
import com.dayu.common.BaseView;
/**
* Created by luo
* on 2016/8/4.
*/
public interface MultipleProcessContract {
interface View extends BaseView {
}
abstract class Presenter extends BaseListPresenter<View> {
}
}
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java 0 → 100644
package com.dayu.order.presenter.multipleprocess;
import android.databinding.ObservableField;
/**
* Created by luofan
* on 2017/11/8.
*/
public class MultipleProcessPresenter extends MultipleProcessContract.Presenter {
@Override
public ObservableField<Object> getSourceDatas() {
return null;
}
@Override
public void onAttached() {
}
}
orderCenter/src/main/java/com/dayu/order/presenter/serverinfo/ServerInfoContract.java 0 → 100755
package com.dayu.order.presenter.serverinfo;
import com.dayu.base.ui.presenter.BaseListPresenter;
import com.dayu.common.BaseView;
/**
* Created by luo
* on 2016/8/4.
*/
public interface ServerInfoContract {
interface View extends BaseView {
}
abstract class Presenter extends BaseListPresenter<View> {
}
}
orderCenter/src/main/java/com/dayu/order/presenter/serverinfo/ServerInfoPresenter.java 0 → 100644
package com.dayu.order.presenter.serverinfo;
import android.databinding.ObservableField;
/**
* Created by luofan
* on 2017/11/8.
*/
public class ServerInfoPresenter extends ServerInfoContract.Presenter {
@Override
public ObservableField<Object> getSourceDatas() {
return null;
}
@Override
public void onAttached() {
}
}
orderCenter/src/main/java/com/dayu/order/presenter/serverlist/ServerListContract.java 0 → 100755
package com.dayu.order.presenter.serverlist;
import com.dayu.base.ui.presenter.BaseListPresenter;
import com.dayu.common.BaseView;
/**
* Created by luo
* on 2016/8/4.
*/
public interface ServerListContract {
interface View extends BaseView {
}
abstract class Presenter extends BaseListPresenter<View> {
}
}
orderCenter/src/main/java/com/dayu/order/presenter/serverlist/ServerListPresenter.java 0 → 100644
package com.dayu.order.presenter.serverlist;
import android.databinding.ObservableField;
/**
* Created by luofan
* on 2017/11/8.
*/
public class ServerListPresenter extends ServerListContract.Presenter {
@Override
public ObservableField<Object> getSourceDatas() {
return null;
}
@Override
public void onAttached() {
}
}
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java 0 → 100644
package com.dayu.order.ui.activity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.order.R;
/**
* Created by luofan
* on 2018/5/21.
*/
public class MultipleProcessActivity extends BaseActivity{
@Override
public void setPresenter() {
}
@Override
public int getLayoutId() {
return R.layout.activity_multiple_process;
}
@Override
public void initView() {
}
}
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsActivity.java
...@@ -12,6 +12,7 @@ import com.dayu.order.api.protocol.OrderDetail; ...@@ -12,6 +12,7 @@ import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.databinding.ActivityOrderDetailsBinding; import com.dayu.order.databinding.ActivityOrderDetailsBinding;
import com.dayu.order.presenter.orderdetail.OrderDetailContract; import com.dayu.order.presenter.orderdetail.OrderDetailContract;
import com.dayu.order.presenter.orderdetail.OrderDetailPresenter; import com.dayu.order.presenter.orderdetail.OrderDetailPresenter;
import com.dayu.order.ui.fragment.MultiOrderDetailFragment;
import com.dayu.order.ui.fragment.OrderDetaillsFragment; import com.dayu.order.ui.fragment.OrderDetaillsFragment;
import com.dayu.order.ui.fragment.OrderDetailsServeFragment; import com.dayu.order.ui.fragment.OrderDetailsServeFragment;
import com.dayu.order.ui.fragment.OrderPartFragment; import com.dayu.order.ui.fragment.OrderPartFragment;
...@@ -30,6 +31,7 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, Act ...@@ -30,6 +31,7 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, Act
private OrderDetaillsFragment orderDatailsFragment; private OrderDetaillsFragment orderDatailsFragment;
private OrderDetailsServeFragment orderDatailsServeFragment; private OrderDetailsServeFragment orderDatailsServeFragment;
private OrderPartFragment mOrderPartFragment; private OrderPartFragment mOrderPartFragment;
private MultiOrderDetailFragment mMultiDetailFragment;
private FragmentManager mFragmentManger; private FragmentManager mFragmentManger;
private ArrayList<Fragment> mFragments; private ArrayList<Fragment> mFragments;
private int mPosition; private int mPosition;
...@@ -52,9 +54,14 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, Act ...@@ -52,9 +54,14 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, Act
public void init(OrderDetail detail) { public void init(OrderDetail detail) {
mFragments = new ArrayList<>(); mFragments = new ArrayList<>();
orderDatailsFragment = OrderDetaillsFragment.newInstance(detail); orderDatailsFragment = OrderDetaillsFragment.newInstance(detail);
mMultiDetailFragment = MultiOrderDetailFragment.newInstance(detail);
orderDatailsServeFragment = OrderDetailsServeFragment.newInstance(detail); orderDatailsServeFragment = OrderDetailsServeFragment.newInstance(detail);
mOrderPartFragment = OrderPartFragment.newInstance(detail); mOrderPartFragment = OrderPartFragment.newInstance(detail);
mFragments.add(orderDatailsFragment); if (detail.getCreatedSource()==4){
mFragments.add(mMultiDetailFragment);
}else {
mFragments.add(orderDatailsFragment);
}
mFragments.add(orderDatailsServeFragment); mFragments.add(orderDatailsServeFragment);
mFragments.add(mOrderPartFragment); mFragments.add(mOrderPartFragment);
mBind.titleBack.setOnClickListener(v -> dumpBack()); mBind.titleBack.setOnClickListener(v -> dumpBack());
......
orderCenter/src/main/java/com/dayu/order/ui/activity/ServerInfoActivity.java 0 → 100644
package com.dayu.order.ui.activity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.order.R;
import com.dayu.order.databinding.ActivityServerInfoBinding;
import com.dayu.order.presenter.serverinfo.ServerInfoContract;
import com.dayu.order.presenter.serverinfo.ServerInfoPresenter;
/**
* Created by luofan
* on 2018/5/21.
*/
public class ServerInfoActivity extends BaseActivity<ServerInfoPresenter, ActivityServerInfoBinding>
implements ServerInfoContract.View {
@Override
public void setPresenter() {
}
@Override
public int getLayoutId() {
return R.layout.activity_server_info;
}
@Override
public void initView() {
}
}
orderCenter/src/main/java/com/dayu/order/ui/activity/ServerListActivity.java 0 → 100644
package com.dayu.order.ui.activity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.order.R;
import com.dayu.order.databinding.ActivityServerListBinding;
import com.dayu.order.presenter.serverlist.ServerListContract;
import com.dayu.order.presenter.serverlist.ServerListPresenter;
/**
* Created by luofan
* on 2018/5/21.
*/
public class ServerListActivity extends BaseActivity<ServerListPresenter, ActivityServerListBinding>
implements ServerListContract.View {
@Override
public void setPresenter() {
}
@Override
public int getLayoutId() {
return R.layout.activity_server_list;
}
@Override
public void initView() {
}
}
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
...@@ -15,11 +15,14 @@ import com.dayu.order.api.protocol.Order; ...@@ -15,11 +15,14 @@ import com.dayu.order.api.protocol.Order;
import com.dayu.order.databinding.FragmentOrderdoingItemBinding; import com.dayu.order.databinding.FragmentOrderdoingItemBinding;
import com.dayu.order.presenter.orderdoing.OrderDoingPresenter; import com.dayu.order.presenter.orderdoing.OrderDoingPresenter;
import com.dayu.order.ui.activity.ProcessOrderActivity; import com.dayu.order.ui.activity.ProcessOrderActivity;
import com.dayu.order.ui.activity.ServerInfoActivity;
import com.dayu.order.ui.activity.ServerListActivity;
import com.dayu.order.ui.activity.SopWebViewActivity; import com.dayu.order.ui.activity.SopWebViewActivity;
import com.dayu.order.ui.activity.SubcribeTimeActivity; import com.dayu.order.ui.activity.SubcribeTimeActivity;
import com.dayu.provider.event.RefreshServe; import com.dayu.provider.event.RefreshServe;
import com.dayu.provider.event.RefreshTab; import com.dayu.provider.event.RefreshTab;
import com.dayu.utils.ProgressUtil; import com.dayu.utils.ProgressUtil;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UtilsDate; import com.dayu.utils.UtilsDate;
import com.umeng.analytics.MobclickAgent; import com.umeng.analytics.MobclickAgent;
...@@ -239,13 +242,29 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -239,13 +242,29 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
MobclickAgent.onEvent(mContext, "take_phone", map_ekv); MobclickAgent.onEvent(mContext, "take_phone", map_ekv);
}); });
} }
if (item.getCreatedSource() == 4) {
holder.itemTextWeixiu.setText(item.getSpus().get(0).getProviderTypeName());
holder.itemTextWeixiuLeixing.setText(item.getSpus().get(0).getKaSpuName());
Order.Spu spu = mItem.getSpus().get(0);
if (mItem.getSpus().size() > 1) {
String str = UIUtils.getString(R.string.server_name);
String result = String.format(str, mItem.getSpus().size());
holder.tvServerType.setText(result);
} else {
String str = UIUtils.getString(R.string.single_server_num);
String result = String.format(str, spu.getFinNum(), spu.getFinNum());
holder.tvServerType.setText(result);
}
}
} }
private void processClick(Order it, FragmentOrderdoingItemBinding h, int posiiton) { private void processClick(Order it, FragmentOrderdoingItemBinding h, int posiiton) {
mItem = it; mItem = it;
mBind = h; mBind = h;
if (mItem.getStatus() == 4 && mItem.getSubStatus() == 3) { if (mItem.getCreatedSource() == 4 && mItem.getStatus() == 4) {
dumpServerActivity(mItem, posiiton);
} else if (mItem.getStatus() == 4 && mItem.getSubStatus() == 3) {
dumpProcessActivity(mItem, posiiton); dumpProcessActivity(mItem, posiiton);
} else if (mItem.getStatus() == 4 && mItem.getSubStatus() == 4) { } else if (mItem.getStatus() == 4 && mItem.getSubStatus() == 4) {
if (mItem.getSopStatus() == 1) {//sop启用 if (mItem.getSopStatus() == 1) {//sop启用
...@@ -329,6 +348,16 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -329,6 +348,16 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
MobclickAgent.onEvent(mContext, "process_order"); MobclickAgent.onEvent(mContext, "process_order");
} }
private void dumpServerActivity(Order order, int adapterPosition) {
Intent intent;
if (order.getSpus().size() > 1) {
intent = new Intent(mContext, ServerInfoActivity.class);
} else {
intent = new Intent(mContext, ServerListActivity.class);
}
mContext.startActivity(intent);
}
private void dumpSOPActivity(int id, int adapterPosition) { private void dumpSOPActivity(int id, int adapterPosition) {
Intent intent = new Intent(mContext, SopWebViewActivity.class); Intent intent = new Intent(mContext, SopWebViewActivity.class);
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderThreeTabAdapter.java
...@@ -7,6 +7,7 @@ import com.dayu.base.ui.adapter.CoreAdapter; ...@@ -7,6 +7,7 @@ import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.order.R; import com.dayu.order.R;
import com.dayu.order.api.protocol.ErrorOrder; import com.dayu.order.api.protocol.ErrorOrder;
import com.dayu.order.databinding.FragmentOrderErrorItemBinding; import com.dayu.order.databinding.FragmentOrderErrorItemBinding;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UtilsDate; import com.dayu.utils.UtilsDate;
import static com.dayu.utils.UtilsDate.FORMAT_ONE; import static com.dayu.utils.UtilsDate.FORMAT_ONE;
...@@ -69,6 +70,21 @@ public class OrderThreeTabAdapter extends CoreAdapter<ErrorOrder, FragmentOrderE ...@@ -69,6 +70,21 @@ public class OrderThreeTabAdapter extends CoreAdapter<ErrorOrder, FragmentOrderE
helper.errorState.setText(mContext.getString(R.string.delivery_time_out)); helper.errorState.setText(mContext.getString(R.string.delivery_time_out));
} }
if (item.getCreatedSource() == 4) {
helper.itemTextWeixiu.setText(item.getSpus().get(0).getProviderTypeName());
helper.itemTextWeixiuLeixing.setText(item.getSpus().get(0).getKaSpuName());
ErrorOrder.Spu spu = item.getSpus().get(0);
if (item.getSpus().size() > 1) {
String str = UIUtils.getString(R.string.server_name);
String result = String.format(str, item.getSpus().size());
helper.serverStyle.setText(result);
} else {
String str = UIUtils.getString(R.string.single_server_num);
String result = String.format(str, spu.getFinNum(), spu.getFinNum());
helper.serverStyle.setText(result);
}
}
} }
} }
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java 0 → 100644
package com.dayu.order.ui.fragment;
import android.os.Bundle;
import com.dayu.base.ui.fragment.DataBindingFragment;
import com.dayu.common.Constants;
import com.dayu.order.R;
import com.dayu.order.api.protocol.OrderDetail;
/**
* Created by luofan
* on 2018/5/21.
*/
public class MultiOrderDetailFragment extends DataBindingFragment {
public static MultiOrderDetailFragment newInstance(OrderDetail detail) {
Bundle args = new Bundle();
args.putSerializable(Constants.ORDER_DETAIL, detail);
MultiOrderDetailFragment fragment = new MultiOrderDetailFragment();
fragment.setArguments(args);
return fragment;
}
@Override
public void initView() {
}
@Override
public int getLayoutId() {
return R.layout.fragment_multi_detail;
}
}
orderCenter/src/main/res/layout/activity_multiple_process.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="43dp"
android:paddingTop="@dimen/dp_17"
android:text="工单概况"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<com.dayu.widgets.LRecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:layout_width="match_parent"
android:layout_height="43dp"
android:paddingLeft="@dimen/dp_15"
android:paddingTop="@dimen/dp_17"
android:text="费用承担方"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="51dp"
android:background="@color/white"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:paddingLeft="@dimen/dp_15"
android:text="费用承担方"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15" />
<TextView
android:id="@+id/tv_repair_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="@dimen/dp_15"
android:text="保内"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="43dp"
android:paddingLeft="@dimen/dp_15"
android:paddingTop="@dimen/dp_17"
android:text="收取费用"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="51dp"
android:background="@color/white"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:paddingLeft="@dimen/dp_15"
android:text="收取客户费用"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15" />
<com.dayu.widgets.SwitchImage
android:id="@+id/iv_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="@dimen/dp_15"
android:src="@drawable/set_switch_off" />
</LinearLayout>
<ImageView
android:id="@+id/image_nine_lin"
style="@style/line" />
<RelativeLayout
android:id="@+id/rl_pay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone">
<RelativeLayout
android:id="@+id/up_door"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_13"
android:text="@string/tv_order_updoor_feiyong"
android:textColor="@color/cl_tab_line"
android:textSize="@dimen/sp_13.3" />
<EditText
android:id="@+id/et_door_price"
android:layout_width="@dimen/dp_205"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_centerHorizontal="true"
android:background="@null"
android:hint="@string/input_up_door_money"
android:inputType="number"
android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_13"
android:text="@string/tv_order_yuan"
android:textColor="@color/cl_tab_line"
android:textSize="@dimen/sp_13.3" />
</RelativeLayout>
<ImageView
android:id="@+id/image_two_one_lin"
style="@style/line"
android:layout_below="@id/up_door" />
<RelativeLayout
android:id="@+id/up_serve"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54"
android:layout_below="@id/up_door">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_13"
android:text="@string/tv_order_serve_feiyong"
android:textColor="@color/cl_tab_line"
android:textSize="@dimen/sp_13.3" />
<EditText
android:id="@+id/et_serve_price"
android:layout_width="@dimen/dp_205"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_centerHorizontal="true"
android:background="@null"
android:hint="@string/input_up_money"
android:inputType="number"
android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_13"
android:text="@string/tv_order_yuan"
android:textColor="@color/cl_tab_line"
android:textSize="@dimen/sp_13.3" />
</RelativeLayout>
<ImageView
android:id="@+id/image_two_two_lin"
style="@style/line"
android:layout_below="@id/up_serve" />
<RelativeLayout
android:id="@+id/up_materials"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54"
android:layout_below="@id/up_serve">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_13"
android:text="@string/tv_order_cailiao_feiyong"
android:textColor="@color/cl_tab_line"
android:textSize="@dimen/sp_13.3" />
<EditText
android:id="@+id/et_materials_price"
android:layout_width="@dimen/dp_205"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_centerHorizontal="true"
android:background="@null"
android:hint="@string/input_cailiao_money"
android:inputType="number"
android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_13"
android:text="@string/tv_order_yuan"
android:textColor="@color/cl_tab_line"
android:textSize="@dimen/sp_13.3" />
</RelativeLayout>
<ImageView
android:id="@+id/image_two_three_lin"
style="@style/line"
android:layout_below="@id/up_materials" />
<RelativeLayout
android:id="@+id/up_other"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54"
android:layout_below="@id/up_materials">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_13"
android:text="@string/tv_order_other_feiyong"
android:textColor="@color/cl_tab_line"
android:textSize="@dimen/sp_13.3" />
<EditText
android:id="@+id/et_other_price"
android:layout_width="@dimen/dp_205"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_centerHorizontal="true"
android:background="@null"
android:hint="@string/input_other_money"
android:inputType="number"
android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_13"
android:text="@string/tv_order_yuan"
android:textColor="@color/cl_tab_line"
android:textSize="@dimen/sp_13.3" />
</RelativeLayout>
<ImageView
android:id="@+id/image_two_four_lin"
style="@style/line"
android:layout_below="@id/up_other" />
<EditText
android:id="@+id/et_door_info"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_163"
android:layout_below="@id/up_other"
android:layout_centerHorizontal="true"
android:layout_marginLeft="@dimen/dp_13.3"
android:layout_marginRight="@dimen/dp_13.3"
android:layout_marginTop="@dimen/dp_17"
android:background="@drawable/subscribe_time_shape"
android:gravity="top"
android:hint="@string/tv_order_other"
android:paddingTop="@dimen/dp_11"
android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" />
</RelativeLayout>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="49dp"
android:layout_alignParentBottom="true"
android:background="@color/bg_button"
android:gravity="center"
android:text="提交验收"
android:textColor="@color/white" />
</LinearLayout>
</layout>
\ No newline at end of file
orderCenter/src/main/res/layout/activity_server_info.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
</data>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="43dp"
android:paddingLeft="15dp"
android:paddingTop="@dimen/dp_18"
android:text="顾客信息"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:paddingLeft="15dp"
android:paddingRight="@dimen/dp_15">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:text="客户类型"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginTop="18dp"
android:text="客户类型"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_type"
android:layout_marginTop="14dp"
android:text="客户姓名"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@+id/tv_type"
android:layout_marginTop="14dp"
android:text="迈克尔"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_name"
android:layout_marginTop="14dp"
android:text="联系方式"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_mobile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@+id/tv_name"
android:layout_marginTop="14dp"
android:text="13567810832"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_mobile"
android:layout_marginTop="14dp"
android:text="座机"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@+id/tv_mobile"
android:layout_marginTop="14dp"
android:text="暂无"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_mobile"
android:layout_marginTop="14dp"
android:text="客户地址"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@+id/tv_mobile"
android:layout_marginTop="14dp"
android:text="北京市海淀区"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_address"
android:layout_marginBottom="@dimen/dp_15"
android:layout_marginTop="14dp"
android:text="预约时间"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@+id/tv_address"
android:layout_marginTop="14dp"
android:text="20173830"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="43dp"
android:paddingLeft="15dp"
android:paddingTop="@dimen/dp_18"
android:text="任务列表"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<com.dayu.widgets.LRecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="49dp"
android:layout_alignParentBottom="true"
android:background="@color/bg_button"
android:gravity="center"
android:text="提交验收"
android:textColor="@color/white" />
</RelativeLayout>
</layout>
\ No newline at end of file
orderCenter/src/main/res/layout/activity_server_list.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
</data>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="82dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/white"
android:paddingLeft="@dimen/dp_15">
<TextView
android:id="@+id/tv_repair_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginTop="@dimen/dp_20"
android:text="安装"
android:textColor="@color/default_text_color"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_repair_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:layout_toRightOf="@+id/tv_repair_type"
android:text="-平板电视机"
android:textColor="@color/default_text_color"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_repair_type"
android:layout_marginTop="6dp"
android:text="无服务要求"
android:textColor="@color/default_editext_color" />
<TextView
android:id="@+id/tv_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/iv_arrow"
android:text="已完成"
android:textColor="@color/bg_button"
android:textSize="@dimen/sp_14" />
<ImageView
android:id="@+id/iv_arrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginLeft="7dp"
android:layout_marginRight="15sp"
android:src="@drawable/icon_arrow_right" />
</RelativeLayout>
</layout>
\ No newline at end of file
orderCenter/src/main/res/layout/fragment_multi_detail.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
</data>
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="43dp"
android:paddingLeft="15dp"
android:paddingTop="@dimen/dp_18"
android:text="工单概况"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:paddingLeft="15dp">
<TextView
android:id="@+id/tv_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="工单编号:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_order_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="19dp"
android:layout_toRightOf="@+id/tv_num"
android:text="123456789"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_num"
android:layout_marginTop="15dp"
android:text="工单状态:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_order_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_num"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_num"
android:text="进行中"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_state"
android:layout_marginTop="15dp"
android:text="服务内容:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<com.dayu.widgets.LRecyclerView
android:id="@+id/rl_server_content"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_below="@id/tv_state"
android:layout_marginLeft="19dp"
android:layout_marginTop="15dp"
android:layout_toRightOf="@+id/tv_content" />
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/rl_server_content"
android:layout_marginTop="15dp"
android:text="上门时间:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/order_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/rl_server_content"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_time"
android:text="2018-09-30"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_remark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_time"
android:layout_marginTop="15dp"
android:text="工单备注:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/order_remark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_time"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_remark"
android:text="安装点时代工具箱"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_fujian"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_remark"
android:layout_marginTop="15dp"
android:text="附件:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<com.dayu.widgets.LRecyclerView
android:id="@+id/order_fujian"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_below="@+id/tv_remark"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_remark">
<TextView
android:id="@+id/customer_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="19dp"
android:layout_toRightOf="@+id/tv_customer_type"
android:text="123456789"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
</com.dayu.widgets.LRecyclerView>
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="43dp"
android:paddingLeft="15dp"
android:paddingTop="@dimen/dp_18"
android:text="客户信息"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:paddingLeft="15dp">
<TextView
android:id="@+id/tv_customer_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="客户类型:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_customer_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/customer_name"
android:layout_alignBottom="@+id/customer_name"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:text="客户姓名:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/customer_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_customer_type"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_customer_type"
android:text="123456789"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_customer_mobile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_customer_name"
android:layout_marginTop="@dimen/dp_15"
android:text="联系方式:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/customer_moblie"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_customer_name"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_customer_mobile"
android:text="123456789"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_customer_mobile"
android:layout_marginTop="@dimen/dp_15"
android:text="客户地址:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/customer_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_customer_mobile"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_address"
android:text="北京市海淀区"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_end_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_address"
android:layout_marginTop="@dimen/dp_15"
android:text="到期时间:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:id="@+id/end_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_address"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_end_time"
android:text="北京市海淀区"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="43dp"
android:paddingLeft="15dp"
android:paddingTop="@dimen/dp_18"
android:text="客户信息"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:background="@color/white"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:text="费用承担方:"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_15"
android:text="陈丹啊:"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</layout>
\ No newline at end of file
orderCenter/src/main/res/layout/fragment_order_error_item.xml
...@@ -61,13 +61,22 @@ ...@@ -61,13 +61,22 @@
android:textSize="@dimen/size_order_item_data_text" android:textSize="@dimen/size_order_item_data_text"
android:typeface="@{@string/tv_fonts}" /> android:typeface="@{@string/tv_fonts}" />
<TextView
android:id="@+id/error_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cl_tab_read"
android:textSize="@dimen/size_login_hint_text"
android:text="服务超市"
android:layout_gravity="right"
android:visibility="visible" />
</LinearLayout> </LinearLayout>
<ImageView <ImageView
android:id="@+id/item_line" android:id="@+id/item_line"
android:layout_width="@dimen/size_order_item_line_width" android:layout_width="@dimen/size_order_item_line_width"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginBottom="13.3dp"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginTop="@dimen/dp_21.3" android:layout_marginTop="@dimen/dp_21.3"
android:background="@color/cl_order_item_line_bg" /> android:background="@color/cl_order_item_line_bg" />
...@@ -126,7 +135,7 @@ ...@@ -126,7 +135,7 @@
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/error_state" android:id="@+id/server_style"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
......
orderCenter/src/main/res/layout/fragment_orderdoing_item.xml
...@@ -60,13 +60,22 @@ ...@@ -60,13 +60,22 @@
android:textSize="@dimen/size_order_item_data_text" android:textSize="@dimen/size_order_item_data_text"
android:typeface="@{@string/tv_fonts}" /> android:typeface="@{@string/tv_fonts}" />
<TextView
android:id="@+id/tv_error_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:textColor="@color/cl_tab_read"
android:textSize="@dimen/size_login_hint_text"
android:layout_gravity="right"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
<ImageView <ImageView
android:id="@+id/item_line" android:id="@+id/item_line"
android:layout_width="@dimen/size_order_item_line_width" android:layout_width="@dimen/size_order_item_line_width"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginBottom="25dp" android:layout_marginBottom="10dp"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginTop="@dimen/dp_21.3" android:layout_marginTop="@dimen/dp_21.3"
android:background="@color/cl_order_item_line_bg" /> android:background="@color/cl_order_item_line_bg" />
...@@ -125,7 +134,7 @@ ...@@ -125,7 +134,7 @@
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/tv_error_state" android:id="@+id/tv_server_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
...@@ -200,6 +209,7 @@ ...@@ -200,6 +209,7 @@
android:id="@+id/item_bottom_line" android:id="@+id/item_bottom_line"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/size_order_item_line_width" android:layout_height="@dimen/size_order_item_line_width"
android:layout_marginTop="5dp"
android:background="@color/cl_order_item_line_bg" /> android:background="@color/cl_order_item_line_bg" />
<LinearLayout <LinearLayout
......
orderCenter/src/main/res/layout/item_server_info.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:layout_marginBottom="12dp"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:background="@drawable/item_shape"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/tv_order_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="25.3dp"
android:layout_marginTop="28dp"
android:text="@string/tv_home_tab_one_subscribe_time"
android:textColor="@color/cl_tab_init"
android:textSize="13sp" />
<TextView
android:id="@+id/item_tody"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginTop="10dp"
android:text="@string/tv_order_item_time"
android:textColor="@color/bg_button"
android:textSize="@dimen/sp_12" />
<TextView
android:id="@+id/item_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:text="@string/tv_order_item_date"
android:textColor="@color/bg_button"
android:textSize="19sp"
android:typeface="@{@string/tv_fonts}" />
</LinearLayout>
<ImageView
android:id="@+id/item_line"
android:layout_width="@dimen/size_order_item_line_width"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginTop="20dp"
android:background="@color/cl_order_item_line_bg" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="12dp"
android:layout_marginTop="28dp">
<TextView
android:id="@+id/tv_repair_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="安装"
android:textColor="@color/cl_tab_init"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_repair_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/tv_repair_type"
android:text="-平板电视"
android:textColor="@color/cl_tab_init"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_finish_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="已完成1/共3"
android:textColor="@color/cl_tab_init"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_server_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="服务方式"
android:layout_below="@id/tv_repair_type"
android:textColor="@color/cl_tab_init"
android:layout_marginTop="10dp"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_server_request"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="服务要求"
android:layout_below="@id/tv_server_type"
android:textColor="@color/cl_tab_init"
android:layout_marginTop="5dp"
android:textSize="13sp" />
</RelativeLayout>
</LinearLayout>
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/size_order_item_line_width"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:background="@color/cl_order_item_line_bg" />
<TextView
android:layout_width="match_parent"
android:layout_height="39dp"
android:gravity="center"
android:text="处理"
android:textColor="@color/bg_button"
android:textSize="14sp" />
</LinearLayout>
\ 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