Skip to content

android / dayu

Go to a project
Commit baa74de1 by 罗翻
Options

新增多任务

parent d2d8ad87
Inline Side-by-side
Showing with 499 additions and 457 deletions
build.gradle
...@@ -9,7 +9,7 @@ buildscript { ...@@ -9,7 +9,7 @@ buildscript {
ext.verson_name = "1.6.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 = false
ext.arouter_api_version = '1.3.1' ext.arouter_api_version = '1.3.1'
ext.arouter_compiler_version = '1.1.4' ext.arouter_compiler_version = '1.1.4'
......
orderCenter/src/main/java/com/dayu/order/api/OrderApiFactory.java
...@@ -111,4 +111,8 @@ public class OrderApiFactory { ...@@ -111,4 +111,8 @@ public class OrderApiFactory {
public static Observable<List<ShipperCompany>> queryShipperCompany() { public static Observable<List<ShipperCompany>> queryShipperCompany() {
return Api.getService(OrderService.class).queryShipperCompany().compose(Api.applySchedulers()); return Api.getService(OrderService.class).queryShipperCompany().compose(Api.applySchedulers());
} }
public static Observable<Order> getServerInfo(int orderId) {
return Api.getService(OrderService.class).getServerInfo(orderId).compose(Api.applySchedulers());
}
} }
orderCenter/src/main/java/com/dayu/order/api/OrderService.java
...@@ -253,4 +253,12 @@ import retrofit2.http.Query; ...@@ -253,4 +253,12 @@ import retrofit2.http.Query;
@GET(OrderConstant.QUERY_SHIPPER_COMPANY) @GET(OrderConstant.QUERY_SHIPPER_COMPANY)
Observable<BaseResponse<List<ShipperCompany>>> queryShipperCompany(); Observable<BaseResponse<List<ShipperCompany>>> queryShipperCompany();
/**
* 获取多任务列表
* @return
*/
@GET(OrderConstant.SERVER_INFO)
Observable<BaseResponse<Order>> getServerInfo(@Path("orderId") int orderId);
} }
orderCenter/src/main/java/com/dayu/order/api/protocol/ErrorOrder.java
...@@ -186,133 +186,4 @@ public class ErrorOrder { ...@@ -186,133 +186,4 @@ 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
...@@ -251,134 +251,4 @@ public class Order { ...@@ -251,134 +251,4 @@ public class Order {
public void setSopStatus(int sopStatus) { public void setSopStatus(int sopStatus) {
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/api/protocol/OrderDetail.java
...@@ -71,6 +71,15 @@ public class OrderDetail implements Serializable { ...@@ -71,6 +71,15 @@ public class OrderDetail implements Serializable {
private Integer kaCompanyId; private Integer kaCompanyId;
private Integer createdSource; //1.服务商自己填写的工单2.厂商系统派3.ka系统4.小程序添加的工单 private Integer createdSource; //1.服务商自己填写的工单2.厂商系统派3.ka系统4.小程序添加的工单
private List<accessories> accessories; private List<accessories> accessories;
private List<Spu> spus;
public List<Spu> getSpus() {
return spus;
}
public void setSpus(List<Spu> spus) {
this.spus = spus;
}
public Integer getCreatedSource() { public Integer getCreatedSource() {
return createdSource; return createdSource;
......
orderCenter/src/main/java/com/dayu/order/api/protocol/Spu.java 0 → 100644
package com.dayu.order.api.protocol;
/**
* Created by luofan
* on 2018/5/22.
*/
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;
private String time;
public String getTime() {
return time;
}
public void setTime(String time) {
this.time = time;
}
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;
}
}
\ No newline at end of file
orderCenter/src/main/java/com/dayu/order/common/OrderConstant.java
...@@ -117,4 +117,7 @@ public class OrderConstant { ...@@ -117,4 +117,7 @@ public class OrderConstant {
*/ */
public final static String MODIFY_PART = "/api-ka-order/" + "kaOrderSpareParts"; public final static String MODIFY_PART = "/api-ka-order/" + "kaOrderSpareParts";
public final static String SERVER_INFO = "/api-order/" + "/orders/findSimpleOrderVOById/{orderId}";
} }
orderCenter/src/main/java/com/dayu/order/presenter/serverinfo/ServerInfoContract.java
...@@ -14,5 +14,6 @@ public interface ServerInfoContract { ...@@ -14,5 +14,6 @@ public interface ServerInfoContract {
} }
abstract class Presenter extends BaseListPresenter<View> { abstract class Presenter extends BaseListPresenter<View> {
public abstract void getServerInfo();
} }
} }
orderCenter/src/main/java/com/dayu/order/presenter/serverinfo/ServerInfoPresenter.java
...@@ -2,19 +2,44 @@ package com.dayu.order.presenter.serverinfo; ...@@ -2,19 +2,44 @@ package com.dayu.order.presenter.serverinfo;
import android.databinding.ObservableField; import android.databinding.ObservableField;
import com.dayu.common.Constants;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.Spu;
import java.util.List;
/** /**
* Created by luofan * Created by luofan
* on 2017/11/8. * on 2017/11/8.
*/ */
public class ServerInfoPresenter extends ServerInfoContract.Presenter { public class ServerInfoPresenter extends ServerInfoContract.Presenter {
public ObservableField<Object> mDatas = new ObservableField<>();
public ObservableField<Object> mHeadDatas = new ObservableField<>();
private int mId;
@Override
public void onAttached() {
mId = mView.getBundle().getInt(Constants.ORDER_ID);
mId = 1885;
}
@Override @Override
public ObservableField<Object> getSourceDatas() { public ObservableField<Object> getSourceDatas() {
return null; return mDatas;
} }
@Override @Override
public void onAttached() { public ObservableField<Object> getHeaderDatas() {
return mHeadDatas;
}
@Override
public void getServerInfo() {
OrderApiFactory.getServerInfo(mId).subscribe(baseObserver(order -> {
mHeadDatas.set(order);
List<Spu> spus = order.getSpus();
spus.get(0).setTime(order.getConfirmDoorTime());
mDatas.set(spus);
}));
} }
} }
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
...@@ -2,13 +2,15 @@ package com.dayu.order.ui.activity; ...@@ -2,13 +2,15 @@ package com.dayu.order.ui.activity;
import com.dayu.base.ui.activity.BaseActivity; import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.order.R; import com.dayu.order.R;
import com.dayu.order.databinding.ActivityMultipleProcessBinding;
import com.dayu.order.presenter.multipleprocess.MultipleProcessPresenter;
/** /**
* Created by luofan * Created by luofan
* on 2018/5/21. * on 2018/5/21.
*/ */
public class MultipleProcessActivity extends BaseActivity{ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresenter,ActivityMultipleProcessBinding>{
@Override @Override
public void setPresenter() { public void setPresenter() {
......
orderCenter/src/main/java/com/dayu/order/ui/activity/ServerInfoActivity.java
...@@ -5,6 +5,7 @@ import com.dayu.order.R; ...@@ -5,6 +5,7 @@ import com.dayu.order.R;
import com.dayu.order.databinding.ActivityServerInfoBinding; import com.dayu.order.databinding.ActivityServerInfoBinding;
import com.dayu.order.presenter.serverinfo.ServerInfoContract; import com.dayu.order.presenter.serverinfo.ServerInfoContract;
import com.dayu.order.presenter.serverinfo.ServerInfoPresenter; import com.dayu.order.presenter.serverinfo.ServerInfoPresenter;
import com.dayu.order.ui.adapter.ServerInfoAdapter;
/** /**
* Created by luofan * Created by luofan
...@@ -15,7 +16,7 @@ public class ServerInfoActivity extends BaseActivity<ServerInfoPresenter, Activi ...@@ -15,7 +16,7 @@ public class ServerInfoActivity extends BaseActivity<ServerInfoPresenter, Activi
implements ServerInfoContract.View { implements ServerInfoContract.View {
@Override @Override
public void setPresenter() { public void setPresenter() {
mBind.setPresenter(mPresenter);
} }
@Override @Override
...@@ -25,6 +26,7 @@ public class ServerInfoActivity extends BaseActivity<ServerInfoPresenter, Activi ...@@ -25,6 +26,7 @@ public class ServerInfoActivity extends BaseActivity<ServerInfoPresenter, Activi
@Override @Override
public void initView() { public void initView() {
ServerInfoAdapter adapter = new ServerInfoAdapter(false);
mBind.recyclerView.setAdapter(adapter);
} }
} }
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
...@@ -12,6 +12,7 @@ import com.dayu.common.Constants; ...@@ -12,6 +12,7 @@ import com.dayu.common.Constants;
import com.dayu.location.base.LocationUtils; import com.dayu.location.base.LocationUtils;
import com.dayu.order.R; import com.dayu.order.R;
import com.dayu.order.api.protocol.Order; import com.dayu.order.api.protocol.Order;
import com.dayu.order.api.protocol.Spu;
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;
...@@ -245,16 +246,19 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -245,16 +246,19 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
if (item.getCreatedSource() == 4) { if (item.getCreatedSource() == 4) {
holder.itemTextWeixiu.setText(item.getSpus().get(0).getProviderTypeName()); holder.itemTextWeixiu.setText(item.getSpus().get(0).getProviderTypeName());
holder.itemTextWeixiuLeixing.setText(item.getSpus().get(0).getKaSpuName()); holder.itemTextWeixiuLeixing.setText(item.getSpus().get(0).getKaSpuName());
Order.Spu spu = mItem.getSpus().get(0); Spu spu = item.getSpus().get(0);
if (mItem.getSpus().size() > 1) { holder.tvServerType.setVisibility(View.VISIBLE);
String str = UIUtils.getString(R.string.server_name); if (item.getSpus().size() > 1) {
String result = String.format(str, mItem.getSpus().size()); String str = UIUtils.getString(R.string.server_num);
String result = String.format(str, item.getSpus().size());
holder.tvServerType.setText(result); holder.tvServerType.setText(result);
} else { } else {
String str = UIUtils.getString(R.string.single_server_num); String str = UIUtils.getString(R.string.single_server_num);
String result = String.format(str, spu.getFinNum(), spu.getFinNum()); String result = String.format(str, spu.getFinNum(), spu.getFinNum());
holder.tvServerType.setText(result); holder.tvServerType.setText(result);
} }
} else {
holder.tvServerType.setVisibility(View.GONE);
} }
} }
...@@ -352,8 +356,10 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -352,8 +356,10 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
Intent intent; Intent intent;
if (order.getSpus().size() > 1) { if (order.getSpus().size() > 1) {
intent = new Intent(mContext, ServerInfoActivity.class); intent = new Intent(mContext, ServerInfoActivity.class);
intent.putExtra(Constants.ORDER_ID, order.getId());
} else { } else {
intent = new Intent(mContext, ServerListActivity.class); intent = new Intent(mContext, ServerListActivity.class);
intent.putExtra(Constants.ORDER_ID, order.getId());
} }
mContext.startActivity(intent); mContext.startActivity(intent);
} }
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderThreeTabAdapter.java
...@@ -6,6 +6,7 @@ import android.view.View; ...@@ -6,6 +6,7 @@ import android.view.View;
import com.dayu.base.ui.adapter.CoreAdapter; 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.api.protocol.Spu;
import com.dayu.order.databinding.FragmentOrderErrorItemBinding; import com.dayu.order.databinding.FragmentOrderErrorItemBinding;
import com.dayu.utils.UIUtils; import com.dayu.utils.UIUtils;
import com.dayu.utils.UtilsDate; import com.dayu.utils.UtilsDate;
...@@ -73,7 +74,7 @@ public class OrderThreeTabAdapter extends CoreAdapter<ErrorOrder, FragmentOrderE ...@@ -73,7 +74,7 @@ public class OrderThreeTabAdapter extends CoreAdapter<ErrorOrder, FragmentOrderE
if (item.getCreatedSource() == 4) { if (item.getCreatedSource() == 4) {
helper.itemTextWeixiu.setText(item.getSpus().get(0).getProviderTypeName()); helper.itemTextWeixiu.setText(item.getSpus().get(0).getProviderTypeName());
helper.itemTextWeixiuLeixing.setText(item.getSpus().get(0).getKaSpuName()); helper.itemTextWeixiuLeixing.setText(item.getSpus().get(0).getKaSpuName());
ErrorOrder.Spu spu = item.getSpus().get(0); Spu spu = item.getSpus().get(0);
if (item.getSpus().size() > 1) { if (item.getSpus().size() > 1) {
String str = UIUtils.getString(R.string.server_name); String str = UIUtils.getString(R.string.server_name);
String result = String.format(str, item.getSpus().size()); String result = String.format(str, item.getSpus().size());
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/ServerInfoAdapter.java 0 → 100644
package com.dayu.order.ui.adapter;
import android.text.TextUtils;
import android.view.View;
import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.order.R;
import com.dayu.order.api.protocol.Spu;
import com.dayu.order.databinding.ItemServerInfoBinding;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UtilsDate;
import java.text.ParseException;
import static com.dayu.utils.UtilsDate.FORMAT_ONE;
import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
/**
* Created by luofan
* on 2018/5/22.
*/
public class ServerInfoAdapter extends CoreAdapter<Spu, ItemServerInfoBinding> {
public ServerInfoAdapter(boolean needFoot) {
super(needFoot);
}
@Override
protected void onBind(ItemServerInfoBinding holder, Spu item, int position) {
super.onBind(holder, item, position);
holder.tvRepairType.setText(item.getServiceType());
holder.tvRepairName.setText("-" + item.getProviderTypeName());
if (item.getServiceType() == 1) {
holder.tvServerType.setText("上门服务");
}
holder.tvServerRequest.setText(item.getKaSpuName());
String str = UIUtils.getString(R.string.single_server_num);
String result = String.format(str, item.getFinNum(), item.getFinNum());
holder.tvFinishNum.setText(result);
String time = getDatas().get(0).getTime();
if (TextUtils.isEmpty(time)) {
holder.itemTody.setText(mContext.getString(R.string.no_appointment));
holder.itemTime.setVisibility(View.GONE);
} else {
String dateTime = null;
try {
dateTime = UtilsDate.changeFormat(time, FORMAT_ONE, LONG_TIME_FORMAT_TWO);
} catch (ParseException e) {
e.printStackTrace();
}
holder.itemTody.setText(UtilsDate.getDayOrIsToday(time));
holder.itemTime.setText(dateTime);
holder.itemTime.setVisibility(View.VISIBLE);
}
}
}
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
...@@ -6,13 +6,14 @@ import com.dayu.base.ui.fragment.DataBindingFragment; ...@@ -6,13 +6,14 @@ import com.dayu.base.ui.fragment.DataBindingFragment;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.order.R; import com.dayu.order.R;
import com.dayu.order.api.protocol.OrderDetail; import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.databinding.FragmentMultiDetailBinding;
/** /**
* Created by luofan * Created by luofan
* on 2018/5/21. * on 2018/5/21.
*/ */
public class MultiOrderDetailFragment extends DataBindingFragment { public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiDetailBinding> {
public static MultiOrderDetailFragment newInstance(OrderDetail detail) { public static MultiOrderDetailFragment newInstance(OrderDetail detail) {
Bundle args = new Bundle(); Bundle args = new Bundle();
...@@ -24,7 +25,7 @@ public class MultiOrderDetailFragment extends DataBindingFragment { ...@@ -24,7 +25,7 @@ public class MultiOrderDetailFragment extends DataBindingFragment {
@Override @Override
public void initView() { public void initView() {
OrderDetail detail = (OrderDetail) getArguments().getSerializable(Constants.ORDER_DETAIL);
} }
@Override @Override
......
orderCenter/src/main/release/AndroidManifest.xml
...@@ -58,5 +58,14 @@ ...@@ -58,5 +58,14 @@
<activity <activity
android:name=".ui.activity.CheckContentActivity" android:name=".ui.activity.CheckContentActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ServerInfoActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ServerListActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.MultipleProcessActivity"
android:screenOrientation="portrait" />
</application> </application>
</manifest> </manifest>
orderCenter/src/main/res/layout/activity_server_info.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"> <layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data> <data>
<variable
name="presenter"
type="com.dayu.order.presenter.serverinfo.ServerInfoPresenter" />
</data> </data>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="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 <com.dayu.widgets.LRecyclerView
android:id="@+id/recyclerView" android:id="@+id/recyclerView"
setPresenter="@{presenter}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_15" android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15" /> android:layout_marginRight="@dimen/dp_15"
</LinearLayout> app:headType="@layout/recycler_server_info_header"
app:itemType="@layout/item_server_info" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
......
orderCenter/src/main/res/layout/activity_server_list.xml
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android"> <layout xmlns:android="http://schemas.android.com/apk/res/android">
<data> <data>
<variable
name="item"
type="com.dayu.order.api.protocol.Spu"/>
</data> </data>
...@@ -22,7 +24,7 @@ ...@@ -22,7 +24,7 @@
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginTop="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20"
android:text="安装" android:text="@{item.serviceType}"
android:textColor="@color/default_text_color" android:textColor="@color/default_text_color"
android:textSize="16sp" /> android:textSize="16sp" />
...@@ -32,7 +34,7 @@ ...@@ -32,7 +34,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20"
android:layout_toRightOf="@+id/tv_repair_type" android:layout_toRightOf="@+id/tv_repair_type"
android:text="-平板电视机" android:text='@{"-"+item.providerTypeName}'
android:textColor="@color/default_text_color" android:textColor="@color/default_text_color"
android:textSize="16sp" /> android:textSize="16sp" />
...@@ -41,7 +43,7 @@ ...@@ -41,7 +43,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/tv_repair_type" android:layout_below="@+id/tv_repair_type"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:text="无服务要求" android:text="@{item.kaSpuName}"
android:textColor="@color/default_editext_color" /> android:textColor="@color/default_editext_color" />
<TextView <TextView
......
orderCenter/src/main/res/layout/fragment_multi_detail.xml
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="43dp" android:layout_height="43dp"
android:paddingLeft="15dp" android:paddingLeft="15dp"
android:paddingTop="@dimen/dp_18" android:paddingTop="@dimen/dp_15"
android:text="工单概况" android:text="工单概况"
android:textColor="@color/tv_cl" android:textColor="@color/tv_cl"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<com.dayu.widgets.LRecyclerView <com.dayu.widgets.LRecyclerView
android:id="@+id/rl_server_content" android:id="@+id/rl_server_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="wrap_content"
android:layout_below="@id/tv_state" android:layout_below="@id/tv_state"
android:layout_marginLeft="19dp" android:layout_marginLeft="19dp"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
...@@ -146,29 +146,19 @@ ...@@ -146,29 +146,19 @@
<com.dayu.widgets.LRecyclerView <com.dayu.widgets.LRecyclerView
android:id="@+id/order_fujian" android:id="@+id/order_fujian"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="50dp" android:layout_height="wrap_content"
android:layout_below="@+id/tv_remark" android:layout_below="@+id/tv_remark"
android:layout_marginLeft="19dp" android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15" android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_remark"> 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> </RelativeLayout>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="43dp" android:layout_height="43dp"
android:paddingLeft="15dp" android:paddingLeft="15dp"
android:paddingTop="@dimen/dp_18" android:paddingTop="@dimen/dp_15"
android:text="客户信息" android:text="客户信息"
android:textColor="@color/tv_cl" android:textColor="@color/tv_cl"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -188,6 +178,16 @@ ...@@ -188,6 +178,16 @@
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <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" />
<TextView
android:id="@+id/tv_customer_name" android:id="@+id/tv_customer_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="43dp" android:layout_height="43dp"
android:paddingLeft="15dp" android:paddingLeft="15dp"
android:paddingTop="@dimen/dp_18" android:paddingTop="@dimen/dp_15"
android:text="客户信息" android:text="客户信息"
android:textColor="@color/tv_cl" android:textColor="@color/tv_cl"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -291,6 +291,7 @@ ...@@ -291,6 +291,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15" android:layout_marginLeft="@dimen/dp_15"
android:paddingBottom="10dp"
android:background="@color/white" android:background="@color/white"
android:orientation="horizontal"> android:orientation="horizontal">
......
orderCenter/src/main/res/layout/fragment_orderdoing_item.xml
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_marginTop="@dimen/dp_16.7" android:layout_marginTop="@dimen/dp_16.7"
android:textColor="@color/cl_tab_read" android:textColor="@color/cl_tab_init"
android:textSize="@dimen/size_login_hint_text" android:textSize="@dimen/size_login_hint_text"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
......
orderCenter/src/main/res/layout/item_server_info.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <layout>
<data>
<variable
name="item"
type="com.dayu.order.api.protocol.Order.Spu"/>
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
...@@ -46,8 +52,7 @@ ...@@ -46,8 +52,7 @@
android:layout_gravity="right" android:layout_gravity="right"
android:text="@string/tv_order_item_date" android:text="@string/tv_order_item_date"
android:textColor="@color/bg_button" android:textColor="@color/bg_button"
android:textSize="19sp" android:textSize="19sp" />
android:typeface="@{@string/tv_fonts}" />
</LinearLayout> </LinearLayout>
<ImageView <ImageView
...@@ -86,27 +91,28 @@ ...@@ -86,27 +91,28 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:text="已完成1/共3" android:text="@string/single_server_num"
android:textColor="@color/cl_tab_init" android:textColor="@color/cl_tab_init"
android:textSize="13sp" /> android:textSize="13sp" />
<TextView <TextView
android:id="@+id/tv_server_type" 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_below="@+id/tv_repair_type"
android:layout_marginTop="10dp"
android:text="服务方式" android:text="服务方式"
android:layout_below="@id/tv_repair_type"
android:textColor="@color/cl_tab_init" android:textColor="@color/cl_tab_init"
android:layout_marginTop="10dp"
android:textSize="13sp" /> android:textSize="13sp" />
<TextView <TextView
android:id="@+id/tv_server_request" android:id="@+id/tv_server_request"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/tv_server_type"
android:layout_marginTop="5dp"
android:text="服务要求" android:text="服务要求"
android:layout_below="@id/tv_server_type"
android:textColor="@color/cl_tab_init" android:textColor="@color/cl_tab_init"
android:layout_marginTop="5dp"
android:textSize="13sp" /> android:textSize="13sp" />
</RelativeLayout> </RelativeLayout>
...@@ -126,4 +132,5 @@ ...@@ -126,4 +132,5 @@
android:text="处理" android:text="处理"
android:textColor="@color/bg_button" android:textColor="@color/bg_button"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
\ No newline at end of file </layout>
\ No newline at end of file
orderCenter/src/main/res/layout/recycler_server_info_header.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="item"
type="com.dayu.order.api.protocol.Order" />
</data>
<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='@{item.customerType==1?"个人客户":"大客户"}'
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="@{item.customerName}"
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="@{item.customerMobile}"
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="@{item.customerTelphome}"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_phone"
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_phone"
android:layout_marginTop="14dp"
android:text="@{item.getProvinceName()}"
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="@{item.appointmentTime}"
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" />
</LinearLayout>
</layout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment