Skip to content

android / dayu

Go to a project
Commit 3984adc1 by mReturn
Options

v2.4.5

parent c68a49d0
Inline Side-by-side
Showing with 154 additions and 45 deletions
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -49,30 +49,30 @@ public class Constants { ...@@ -49,30 +49,30 @@ public class Constants {
/** /**
* uat环境配置. * uat环境配置.
*/ */
public static final String ENVIROMENT = "uat"; // public static final String ENVIROMENT = "uat";
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL; // public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static final String BASE_URL = "http://47.95.223.6:3112"; // public static final String BASE_URL = "http://47.95.223.6:3112";
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"; // public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop"; // public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail"; // public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail"; // public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult"; // public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop"; // public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
public static final boolean IS_DEBUG = true; // public static final boolean IS_DEBUG = true;
/** /**
* 正式环境. * 正式环境.
*/ */
// public static final String ENVIROMENT = "release"; public static final String ENVIROMENT = "release";
// public static final int LOG_LEVEL = LogUtils.LEVEL_OFF; public static final int LOG_LEVEL = LogUtils.LEVEL_OFF;
// public static final String BASE_URL = "https://mobile.kf.ai"; public static final String BASE_URL = "https://mobile.kf.ai";
// public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply"; public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// public final static String WEB_SOP = "https://sop.kf.ai/#/sop"; public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public final static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail"; public final static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
// public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail"; public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public final static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult"; public final static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
// public final static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop"; public final static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
// public static final boolean IS_DEBUG = false; public static final boolean IS_DEBUG = false;
/** /**
* 统一配置. * 统一配置.
......
baseSDK/src/main/res/values/colors.xml
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
<color name="light_grey">#FF666666</color> <color name="light_grey">#FF666666</color>
<color name="bg_button">#FF3FAAFC</color> <color name="bg_button">#FF3FAAFC</color>
<color name="text_common_blue">#FF3FAAFC</color> <color name="text_common_blue">#FF3FAAFC</color>
<color name="common_text_color">#3a3a3a</color>
<color name="editext_color">#FFB6B6B6</color> <color name="editext_color">#FFB6B6B6</color>
<color name="view_color">#E6E6E6 </color> <color name="view_color">#E6E6E6 </color>
......
baseSDK/src/main/res/values/strings.xml
...@@ -278,6 +278,7 @@ ...@@ -278,6 +278,7 @@
<string name="order_subsidy">工单补贴</string> <string name="order_subsidy">工单补贴</string>
<string name="order_save_success">数据保存成功</string> <string name="order_save_success">数据保存成功</string>
<string name="no_data">暂无数据</string> <string name="no_data">暂无数据</string>
<string name="dayu_platform">大鱼平台</string>
<string name="application_order_part">申请/收货</string> <string name="application_order_part">申请/收货</string>
<string name="return_order_part">返厂/发货</string> <string name="return_order_part">返厂/发货</string>
<string name="return_order_part_title">寄回备件</string> <string name="return_order_part_title">寄回备件</string>
...@@ -323,7 +324,7 @@ ...@@ -323,7 +324,7 @@
<string name="send_already">已发货</string> <string name="send_already">已发货</string>
<string name="modify_part_info">修改信息</string> <string name="modify_part_info">修改信息</string>
<string name="customer_acceptance">客户验收</string> <string name="customer_acceptance">客户验收</string>
<string name="scan_code_for_appointment">扫一扫验收/评价</string> <string name="scan_code_for_appointment">请使用微信扫一扫验收/评价</string>
<string name="scan_code_for_appointment_two">点击-上门服务-预约记录-进行绑定登录后，选择工单验收</string> <string name="scan_code_for_appointment_two">点击-上门服务-预约记录-进行绑定登录后，选择工单验收</string>
<string name="order_record">工单记录</string> <string name="order_record">工单记录</string>
<string name="order_num">工单编号</string> <string name="order_num">工单编号</string>
......
build.gradle
...@@ -4,9 +4,9 @@ buildscript { ...@@ -4,9 +4,9 @@ buildscript {
ext.compile_sdk_version = 27 ext.compile_sdk_version = 27
ext.build_tools_version = "27.0.3" ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 16 ext.min_sdk_version = 16
ext.target_sdk_version = 25 ext.target_sdk_version = 26
ext.version_code = 242 ext.version_code = 245
ext.verson_name = "2.4.2" ext.verson_name = "2.4.5"
ext.gradle_version = '3.1.4' ext.gradle_version = '3.1.4'
ext.isReleaseMinify = true ext.isReleaseMinify = true
ext.isDebugMinify = false ext.isDebugMinify = false
......
orderCenter/src/main/java/com/dayu/order/api/protocol/Order.java
...@@ -57,6 +57,33 @@ public class Order implements Serializable{ ...@@ -57,6 +57,33 @@ public class Order implements Serializable{
private Integer faceSwitch ;//0:关闭；1:打开 private Integer faceSwitch ;//0:关闭；1:打开
private String createdProvider; private String createdProvider;
private double price; private double price;
private int settlementType;
private double settlementPrice;
private String settlementDate;
public int getSettlementType() {
return settlementType;
}
public void setSettlementType(int settlementType) {
this.settlementType = settlementType;
}
public double getSettlementPrice() {
return settlementPrice;
}
public void setSettlementPrice(double settlementPrice) {
this.settlementPrice = settlementPrice;
}
public String getSettlementDate() {
return settlementDate;
}
public void setSettlementDate(String settlementDate) {
this.settlementDate = settlementDate;
}
public String getCreatedProvider() { public String getCreatedProvider() {
return createdProvider; return createdProvider;
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
...@@ -41,7 +41,9 @@ import com.umeng.analytics.MobclickAgent; ...@@ -41,7 +41,9 @@ import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -84,7 +86,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -84,7 +86,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.itemTextWeixiuLeixing.setText(item.getCategoryName()); holder.itemTextWeixiuLeixing.setText(item.getCategoryName());
holder.itemTextWeixiu.setText(item.getProviderName()); holder.itemTextWeixiu.setText(item.getProviderName());
holder.tvOrderSender.setText(TextUtils.isEmpty(item.getCreatedProvider()) holder.tvOrderSender.setText(TextUtils.isEmpty(item.getCreatedProvider())
? mContext.getString(R.string.no_data) : item.getCreatedProvider()); ? mContext.getString(R.string.dayu_platform) : item.getCreatedProvider());
holder.tvPrice.setText(item.getPrice() + "元"); holder.tvPrice.setText(item.getPrice() + "元");
holder.itemTextDizhi.setText(address); holder.itemTextDizhi.setText(address);
holder.tvErrorState.setVisibility(View.GONE); holder.tvErrorState.setVisibility(View.GONE);
...@@ -150,6 +152,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -150,6 +152,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
break; break;
case 3://待服务 case 3://待服务
holder.tvItemProcess.setVisibility(View.GONE); holder.tvItemProcess.setVisibility(View.GONE);
holder.rlItemEnd.setVisibility(View.VISIBLE);
holder.tvItemEnd.setVisibility(View.VISIBLE); holder.tvItemEnd.setVisibility(View.VISIBLE);
if (!haveCustomer) { if (!haveCustomer) {
...@@ -206,22 +209,40 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -206,22 +209,40 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
setTimeStatus(holder,time); setTimeStatus(holder,time);
break; break;
case 5://已完成 case 5://已完成
holder.tvErrorState.setText(mContext.getString(R.string.order_finish)); // holder.tvErrorState.setText(mContext.getString(R.string.order_finish));
holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_line)); // holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_line));
holder.tvErrorState.setVisibility(View.VISIBLE); // holder.tvErrorState.setVisibility(View.VISIBLE);
holder.rlItemMid.setVisibility(View.GONE); // holder.rlItemMid.setVisibility(View.GONE);
holder.rlItemEnd.setVisibility(View.GONE); // holder.rlItemEnd.setVisibility(View.GONE);
holder.orderLineOne.setVisibility(View.GONE); // holder.orderLineOne.setVisibility(View.GONE);
holder.orderLineTwo.setVisibility(View.GONE); // holder.orderLineTwo.setVisibility(View.GONE);
if (!haveCustomer) { // if (!haveCustomer) {
holder.llBottom.setVisibility(View.GONE); // holder.llBottom.setVisibility(View.GONE);
holder.itemBottomLine.setVisibility(View.GONE); // holder.itemBottomLine.setVisibility(View.GONE);
} else { // } else {
holder.llBottom.setVisibility(View.VISIBLE); // holder.llBottom.setVisibility(View.VISIBLE);
holder.itemBottomLine.setVisibility(View.VISIBLE); // holder.itemBottomLine.setVisibility(View.VISIBLE);
holder.itemTextPhone.setText(R.string.phone_back_customer); // holder.itemTextPhone.setText(R.string.phone_back_customer);
// }
holder.llBottom.setVisibility(View.GONE);
holder.llOrderDoneBootom.setVisibility(View.VISIBLE);
if (item.getSettlementType() ==1){
holder.tvSettlementStatus.setText(mContext.getString(R.string.no_settelment_price));
holder.tvSettlementDate.setTextColor(mContext.getResources().getColor(R.color.text_common_blue));
}else{
holder.tvSettlementStatus.setText(mContext.getString(R.string.settelmented_price));
holder.tvSettlementDate.setTextColor(mContext.getResources().getColor(R.color.common_text_color));
}
holder.tvSettlementPrice.setText(CommonUtils.getMoneyStr(mContext,item.getSettlementPrice()));
if (TextUtils.isEmpty(item.getSettlementDate())){
holder.tvSettlementDate.setText(mContext.getString(R.string.unknown));
}else{
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
Date sDate = df.parse(item.getSettlementDate());
holder.tvSettlementDate.setText(df.format(sDate));
} }
time = item.getConfirmDoorTime(); time = item.getConfirmDoorTime();
break; break;
default: default:
break; break;
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
...@@ -86,9 +86,14 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag ...@@ -86,9 +86,14 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
mServerAdapter.setViewType(R.layout.item_detail_server_info); mServerAdapter.setViewType(R.layout.item_detail_server_info);
mBind.rlServerContent.setAdapter(mServerAdapter); mBind.rlServerContent.setAdapter(mServerAdapter);
mServerAdapter.setData(detail.getSpus()); mServerAdapter.setData(detail.getSpus());
if (detail.getPayType() != null && detail.getPayType() == 1 && detail.getPayStatus() != 3){ if (detail.getPayType() != null && detail.getPayType() == 1) {
mBind.llNoReceivePrice.setVisibility(View.VISIBLE); if (detail.getPayStatus() != null && detail.getPayStatus() == 3) {
}else{ mBind.llNoReceivePrice.setVisibility(View.GONE);
} else {
mBind.llNoReceivePrice.setVisibility(View.VISIBLE);
setNoReceviePrice(detail);
}
} else {
mBind.llNoReceivePrice.setVisibility(View.GONE); mBind.llNoReceivePrice.setVisibility(View.GONE);
} }
...@@ -171,6 +176,17 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag ...@@ -171,6 +176,17 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
mBind.customerSignature.setOnClickListener(v -> imgMax(detail.getEsignatureImg())); mBind.customerSignature.setOnClickListener(v -> imgMax(detail.getEsignatureImg()));
} }
//代收款项
private void setNoReceviePrice(OrderDetail detail) {
double noRePrice = 0;
if (detail.getTotalPrice() != null) {
noRePrice = detail.getTotalPrice();
}else if (detail.getDoorPrice() != null && detail.getServicePrice() != null){
noRePrice = detail.getDoorPrice()+detail.getServicePrice();
}
mBind.tvNoReceivePrice.setText(noRePrice+"元");
}
private void setListenter() { private void setListenter() {
mBind.tvContactSeller.setOnClickListener(v -> { mBind.tvContactSeller.setOnClickListener(v -> {
if (phones == null || phones.size() == 0) { if (phones == null || phones.size() == 0) {
...@@ -192,7 +208,7 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag ...@@ -192,7 +208,7 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
ToastUtils.showLongToast(R.string.take_oreder_success_tosee); ToastUtils.showLongToast(R.string.take_oreder_success_tosee);
mBind.tvTakeOrder.setVisibility(View.GONE); mBind.tvTakeOrder.setVisibility(View.GONE);
mBind.tvOrderState.setText(getStaus(2)); mBind.tvOrderState.setText(getStaus(2));
}, responeThrowable ->{ }, responeThrowable -> {
EventBus.getDefault().post(new TakeOrderSuccessEvent()); EventBus.getDefault().post(new TakeOrderSuccessEvent());
ToastUtils.showShortToast(R.string.take_order_failure); ToastUtils.showShortToast(R.string.take_order_failure);
} }
......
orderCenter/src/main/res/layout/fragment_multi_detail.xml
...@@ -256,10 +256,10 @@ ...@@ -256,10 +256,10 @@
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:id="@+id/tv_no_receive_price"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="19dp" android:layout_marginLeft="19dp"
android:text='@{item.totalPrice+"元"}'
android:textColor="@color/common_red" android:textColor="@color/common_red"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
...@@ -533,7 +533,7 @@ ...@@ -533,7 +533,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10" android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_15" android:layout_marginTop="@dimen/dp_15"
android:text='@{!TextUtils.isEmpty(item.createdProvider)?item.createdProvider:@string/no_data}' android:text='@{!TextUtils.isEmpty(item.createdProvider)?item.createdProvider:@string/dayu_platform}'
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
......
orderCenter/src/main/res/layout/fragment_orderdoing_item.xml
...@@ -410,5 +410,44 @@ ...@@ -410,5 +410,44 @@
</LinearLayout> </LinearLayout>
<LinearLayout
android:visibility="gone"
android:id="@+id/ll_order_done_bootom"
android:layout_width="match_parent"
android:layout_height="43dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_settlement_status"
style="@style/common_text_style"
android:layout_marginLeft="25dp"
android:text="@string/no_settelment_price"
/>
<TextView
android:id="@+id/tv_settlement_price"
style="@style/common_text_style"
android:layout_marginLeft="20dp"
android:textColor="@color/common_red"
android:textStyle="bold"
android:text="0元"
/>
<View
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
/>
<TextView
style="@style/common_text_style"
android:text="@string/settlement_date"
/>
<TextView
android:id="@+id/tv_settlement_date"
style="@style/common_text_style"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:text="2020-01-01"
/>
</LinearLayout>
</LinearLayout> </LinearLayout>
</layout> </layout>
\ No newline at end of file
orderCenter/src/main/res/values/strings.xml
...@@ -28,4 +28,7 @@ ...@@ -28,4 +28,7 @@
<string name="pls_fill_pre_sn">请先补全上面的序列号</string> <string name="pls_fill_pre_sn">请先补全上面的序列号</string>
<string name="take_order_failure">抢单失败</string> <string name="take_order_failure">抢单失败</string>
<string name="take_oreder_success_tosee">接单成功,请移至待预约列表查看</string> <string name="take_oreder_success_tosee">接单成功,请移至待预约列表查看</string>
<string name="no_settelment_price">待结算工费</string>
<string name="settelmented_price">已结算工费</string>
<string name="settlement_date">结算日期</string>
</resources> </resources>
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