Skip to content

android / dayu

Go to a project
Commit c660e10d by 罗翻
Options

android v1.91

parents 602bbe89 3038dee3 master … dev dev_xx dev_xx_241116 dev_xx_250108_toast dev_xx_250224_report dev_xx_web test v2.7.2 v2.7.1 v2.7.0 v2.6.9 v2.6.7 v2.6.6 v2.6.5 v2.6.4 v2.6.3 v2.6.2 v2.6.1 v2.6.0 v2.5.9 v2.5.7 v2.5.5 v2.5.4 v2.5.3 v2.5.2 v2.5.0 v2.4.6 v2.4.5 v2.4.0 v_2.4.0 v2.3.2 v2.3.1 dev20230405
Inline Side-by-side
Showing with 95 additions and 62 deletions
.idea/runConfigurations.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
</set>
</option>
</component>
</project>
\ No newline at end of file
app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java
......@@ -56,6 +56,8 @@ public class LocationService extends Service {
}
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
ApiFactory.commiteLocation(requestBody).subscribe(aBoolean -> {
}, throwable -> {
});
}
}));
......
baseSDK/src/main/res/values/strings.xml
......@@ -289,20 +289,23 @@
<string name="order_num">工单编号</string>
<string name="order_state">工单状态</string>
<string name="server_name">服务名称</string>
<string name="prodcut">产&#160;&#160;&#160;&#160;&#160;&#160;品</string>
<string name="prodcut_type">类&#160;&#160;&#160;&#160;&#160;&#160;型</string>
<string name="prodcut">产&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;品</string>
<string name="prodcut_type">类&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;型</string>
<string name="door_time">上门时间</string>
<string name="order_remark">工单备注</string>
<string name="order_attachment">附&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;件:</string>
<string name="server_content">服务内容</string>
<string name="order_attachment">附&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;件</string>
<string name="customer_info">客户信息</string>
<string name="customer_type">客户类型</string>
<string name="customer_name">客户姓名</string>
<string name="check_signature">查看签名</string>
<string name="lookforword_time">期望时间</string>
<string name="money_info">费用信息</string>
<string name="prodcut_info">产品信息</string>
<string name="prodcut_brand">品&#160;&#160;&#160;&#160;&#160;&#160;牌</string>
<string name="prodcut_num">型&#160;&#160;&#160;&#160;&#160;&#160;号</string>
<string name="prodcut_brand">品&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;牌</string>
<string name="prodcut_num">型&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;号</string>
<string name="quality_assurance_info">质保信息</string>
<string name="sn_num">SN&#160;&#160;&#160;&#160;码</string>
<string name="sn_num">SN&#160;&#160;&#160;&#160;&#160;&#160;码</string>
<string name="charge_record">收费记录</string>
<string name="total_money">总金额数</string>
<string name="total_price">总金额</string>
......
orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderContract.java
......@@ -54,6 +54,8 @@ public interface ProcessOrderContract {
void showSelectPayerDialog(OnCloseListener listener);
ArrayList<String> getSnImages();
String getTotalMoney();
}
abstract class Presenter extends BasePresenter<View> {
......
orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderPresenter.java
......@@ -161,7 +161,6 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
params.put("doorPriceComment", doorPriceComment);
params.put("engineerId", engineerId);
params.put("id", orderId);
params.put("isPay", isPay);
params.put("materialCost", materialCost);
params.put("materialCostComment", "");
params.put("otherPrice", otherPrice);
......@@ -205,6 +204,11 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
params.put("picsCost", null);
}
String totalMoney = mView.getTotalMoney();
if (!TextUtils.isEmpty(totalMoney) && Double.parseDouble(totalMoney) == 0.00 || TextUtils.isEmpty(totalMoney)) {
isPay = 1;
}
params.put("isPay", isPay);
JSONObject jsonObject = new JSONObject(params);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
OrderApiFactory.commitOrder(body).subscribe(baseObserver(integer -> {
......
orderCenter/src/main/java/com/dayu/order/presenter/receivingorder/ReceivingPresenter.java
......@@ -55,6 +55,7 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
@Override
public void receiveOrder(int orders, int engineer) {
mView.showDialog();
OrderApiFactory.receiveOrder(orders, engineer).subscribe(baseObserver(
aBoolean -> receiveOrderSuccess(), responeThrowable -> {
if ("ORDER0002".equals(responeThrowable.subCode) || "ORDER0003".equals(responeThrowable.subCode)) {
......
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
......@@ -88,14 +88,14 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
mIvWeight = (UtilsScreen.getScreenWidth(mActivity) - UtilsScreen.dip2px(mActivity, 20)) / 5;
mBind.recyclerView.mCoreAdapter.addFooterViewType(R.layout.item_multi_process_foot, null);
View view = LayoutInflater.from(mActivity).inflate(R.layout.item_multi_process_foot, null);
mBind.recyclerView.mCoreAdapter.addFootViwe(view,R.layout.item_multi_process_foot);
mBind.recyclerView.mCoreAdapter.addFootViwe(view, R.layout.item_multi_process_foot);
initFootView(view);
}
public void initFootView(View view) {
swtich = view.findViewById(R.id.iv_switch);
RelativeLayout rlPay = view.findViewById(R.id.rl_pay);
mSignature= view.findViewById(R.id.rl_signature);
mSignature = view.findViewById(R.id.rl_signature);
mDoorPrice = view.findViewById(R.id.et_door_price);
mServerPrice = view.findViewById(R.id.et_serve_price);
mMaterialsPrice = view.findViewById(R.id.et_materials_price);
......@@ -220,6 +220,10 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
} else {
repairType = 2;
}
String totalMoney = mTotalMoney.getText().toString().trim();
if (!TextUtils.isEmpty(totalMoney) && Double.parseDouble(totalMoney) == 0.00 || TextUtils.isEmpty(totalMoney)) {
isPay = 1;
}
params.put("repairType", repairType);
params.put("isPay", isPay);
return params;
......
orderCenter/src/main/java/com/dayu/order/ui/activity/ProcessOrderActivity.java
......@@ -306,6 +306,11 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
}
@Override
public String getTotalMoney() {
return mBind.tvTotalMoney.getText().toString().trim();
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == RESULT_OK) {
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
......@@ -214,15 +214,19 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
int errorState = item.getExcptionCode();
if (errorState == 1) {
holder.tvErrorState.setText(mContext.getString(R.string.receive_time_out));
holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_read));
holder.tvErrorState.setVisibility(View.VISIBLE);
} else if (errorState == 2) {
holder.tvErrorState.setText(mContext.getString(R.string.appointment_time_out));
holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_read));
holder.tvErrorState.setVisibility(View.VISIBLE);
} else if (errorState == 3) {
holder.tvErrorState.setText(mContext.getString(R.string.server_time_out));
holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_read));
holder.tvErrorState.setVisibility(View.VISIBLE);
} else if (errorState == 4) {
holder.tvErrorState.setText(mContext.getString(R.string.delivery_time_out));
holder.tvErrorState.setTextColor(mContext.getResources().getColor(R.color.cl_tab_read));
holder.tvErrorState.setVisibility(View.VISIBLE);
}
......
orderCenter/src/main/res/layout/activity_check_content.xml
......@@ -95,7 +95,7 @@
android:layout_marginLeft="90dp"
android:layout_toEndOf="@+id/text_one_text"
android:layout_toRightOf="@+id/text_one_text"
android:textColor="@color/cl_selector_hui"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15" />
</RelativeLayout>
......@@ -130,7 +130,7 @@
android:layout_toRightOf="@id/text_two_text"
android:background="@null"
android:hint="@string/order_brand_name"
android:textColor="@color/cl_selector_hui"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15" />
</RelativeLayout>
......@@ -166,7 +166,7 @@
android:layout_toRightOf="@id/tv_version"
android:background="@null"
android:hint="@string/order_product_model_hint"
android:textColor="@color/cl_selector_hui"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15" />
</RelativeLayout>
......@@ -201,7 +201,7 @@
android:layout_toRightOf="@id/tv_serial_num"
android:background="@null"
android:hint="@string/order_serail_hint"
android:textColor="@color/cl_selector_hui"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15" />
</RelativeLayout>
......@@ -258,7 +258,7 @@
android:layout_marginLeft="45dp"
android:layout_toRightOf="@id/tv_player"
android:background="@null"
android:textColor="@color/cl_selector_hui"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15" />
</RelativeLayout>
......@@ -364,7 +364,7 @@
android:paddingLeft="@dimen/dp_13"
android:paddingTop="@dimen/dp_11"
android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui"
android:textColorHint="@color/default_text_color"
android:textSize="@dimen/sp_13.3" />
</RelativeLayout>
......
orderCenter/src/main/res/layout/activity_multi_process_order.xml
......@@ -145,8 +145,8 @@
android:layout_marginLeft="90dp"
android:layout_toRightOf="@id/text_two_text"
android:background="@null"
android:maxEms="50"
android:hint="@string/order_brand_name"
android:maxLength="50"
android:text="@={presenter.mBrandName}"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15" />
......@@ -192,19 +192,18 @@
style="@style/line"
android:layout_below="@id/rl_verion" />
<LinearLayout
<RelativeLayout
android:id="@+id/rl_serial_num"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54"
android:layout_below="@id/line_version"
android:background="@color/cl_white"
android:gravity="center_vertical"
android:orientation="horizontal">
android:background="@color/cl_white">
<TextView
android:id="@+id/tv_serial_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_13"
android:text="@string/order_serail"
android:textColor="@color/cl_home_title_text_color"
......@@ -213,6 +212,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/tv_serial_num"
android:text="*"
android:textColor="#F74848"
android:textSize="@dimen/sp_15"
......@@ -220,24 +221,18 @@
<EditText
android:id="@+id/et_serial_num"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="75dp"
android:layout_weight="1"
android:layout_toRightOf="@id/tv_serial_num"
android:background="@null"
android:maxEms="50"
android:hint="@string/order_serail_hint"
android:maxLength="50"
android:text="@={presenter.mSn}"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15" />
<ImageView
android:id="@+id/scan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:src="@drawable/icon_navigation" />
</LinearLayout>
</RelativeLayout>
<ImageView
android:id="@+id/line_serial"
......@@ -312,9 +307,9 @@
android:background="@drawable/subscribe_time_shape"
android:gravity="top"
android:hint="@string/order_hint"
android:maxLength="200"
android:paddingLeft="@dimen/dp_13"
android:paddingTop="@dimen/dp_11"
android:maxEms="200"
android:text="@={presenter.mInfo}"
android:textColor="@color/cl_home_title_text_color"
android:textColorHint="@color/cl_selector_hui"
......
orderCenter/src/main/res/layout/fragment_multi_detail.xml
......@@ -48,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:text="工单编号:"
android:text="@string/order_num"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
......@@ -69,7 +69,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/tv_num"
android:layout_marginTop="15dp"
android:text="工单状态:"
android:text="@string/order_state"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
......@@ -81,7 +81,7 @@
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/tv_state"
android:text="进行中"
android:text="@string/order_doing"
android:textColor="@color/cl_tab_read"
android:textSize="14sp" />
......@@ -91,7 +91,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/tv_state"
android:layout_marginTop="15dp"
android:text="服务内容:"
android:text="@string/server_content"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
......@@ -115,7 +115,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_server_content"
android:text="上门时间:"
android:text="@string/door_time"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
......@@ -136,7 +136,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/tv_time"
android:layout_marginTop="15dp"
android:text="工单备注:"
android:text="@string/order_remark"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
......@@ -180,10 +180,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_remark"
android:layout_marginBottom="10dp"
android:layout_marginTop="15dp"
android:text="@string/order_attachment"
android:textColor="@color/tv_cl"
android:layout_marginBottom="10dp"
android:textSize="14sp" />
<LinearLayout
......@@ -191,9 +191,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_remark"
android:layout_marginBottom="10dp"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="10dp"
android:layout_toRightOf="@+id/tv_remark">
<android.support.v7.widget.RecyclerView
......@@ -209,7 +209,7 @@
android:layout_height="43dp"
android:paddingLeft="15dp"
android:paddingTop="@dimen/dp_15"
android:text="客户信息"
android:text="@string/customer_info"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
......@@ -224,7 +224,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:text="客户类型:"
android:text="@string/customer_type"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
......@@ -247,7 +247,7 @@
android:layout_alignBottom="@+id/customer_name"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:text="客户姓名:"
android:text="@string/customer_name"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
......@@ -267,14 +267,14 @@
android:id="@+id/customer_signature"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="19dp"
android:layout_below="@+id/tv_customer_type"
android:layout_alignParentRight="true"
android:layout_below="@+id/tv_customer_type"
android:layout_marginLeft="19dp"
android:layout_marginRight="@dimen/dp_15"
android:gravity="right"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@+id/customer_name"
android:text="查看签名"
android:gravity="right"
android:text="@string/check_signature"
android:textColor="@color/bg_button"
android:textSize="14sp" />
......@@ -284,7 +284,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/tv_customer_name"
android:layout_marginTop="@dimen/dp_15"
android:text="联系方式:"
android:text="@string/tv_two_text_three"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
......@@ -306,13 +306,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/customer_moblie"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@+id/tv_customer_mobile"
android:text='@{item.customerTelphome}'
android:visibility="@{TextUtils.isEmpty(item.customerTelphome)?View.GONE:View.VISIBLE}"
android:text="@{item.customerTelphome}"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3" />
android:textSize="14sp"
android:visibility="@{TextUtils.isEmpty(item.customerTelphome)?View.GONE:View.VISIBLE}" />
<TextView
......@@ -321,7 +321,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/tv_contact_tel"
android:layout_marginTop="@dimen/dp_15"
android:text="客户地址:"
android:text="@string/tv_two_text_foure"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
......@@ -329,17 +329,17 @@
android:id="@+id/navigation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_contact_tel"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_below="@+id/tv_contact_tel"
android:layout_toRightOf="@id/tv_address"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_customer_address"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="2"
android:text='@{item.provinceName+item.cityName+item.districtName+item.address}'
......@@ -349,10 +349,10 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:paddingBottom="5dp"
android:layout_gravity="center_vertical"
android:src="@drawable/icon_navigation" />
</LinearLayout>
......@@ -361,9 +361,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_address"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="10dp"
android:text="期望时间:"
android:layout_marginTop="@dimen/dp_15"
android:text="@string/lookforword_time"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
......@@ -372,9 +372,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_address"
android:layout_marginBottom="10dp"
android:layout_marginLeft="19dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="10dp"
android:layout_toRightOf="@+id/tv_end_time"
android:text='@{!TextUtils.isEmpty(item.appointmentTime)?item.appointmentTime:@string/no_data}'
android:textColor="@color/cl_home_title_text_color"
......@@ -386,14 +386,13 @@
android:layout_height="43dp"
android:paddingLeft="15dp"
android:paddingTop="@dimen/dp_15"
android:text="费用信息"
android:text="@string/money_info"
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"
android:paddingBottom="10dp">
......@@ -401,8 +400,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:text="费用承担方:"
android:text="@string/order_payer"
android:textColor="@color/tv_cl"
android:textSize="14sp" />
......
projectFilesBackup/.idea/workspace.xml 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
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