Skip to content

android / dayu

Go to a project
Commit 21d411a8 by 罗翻
Options

处理工单修改

parent 7e9d8d8e
Inline Side-by-side
Showing with 82 additions and 35 deletions
baseSDK/src/main/res/values/strings.xml
...@@ -407,7 +407,7 @@ ...@@ -407,7 +407,7 @@
<string name="error_ssl">证书验证错误</string> <string name="error_ssl">证书验证错误</string>
<string name="error_connect_time">连接超时</string> <string name="error_connect_time">连接超时</string>
<string name="error_unknow">未知错误</string> <string name="error_unknow">未知错误</string>
<string name="error_pdf">上传版本错误，请重新上传此文件。</string> <string name="error_pdf">上传文件格式错误，请重新上传此文件。</string>
<string name="engineer_identity_auditing">您的身份认证正在审核中，请耐心等待</string> <string name="engineer_identity_auditing">您的身份认证正在审核中，请耐心等待</string>
<string name="engineer_identity_not_audite">您的身份认证审核未通过，请重新修改再次提交</string> <string name="engineer_identity_not_audite">您的身份认证审核未通过，请重新修改再次提交</string>
......
build.gradle
...@@ -9,7 +9,7 @@ buildscript { ...@@ -9,7 +9,7 @@ buildscript {
ext.verson_name = "1.4.0" ext.verson_name = "1.4.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/sqlbean/CheckContentOrder.java
package com.dayu.order.sqlbean; package com.dayu.order.sqlbean;
import java.util.List;
/** /**
* Created by luofan * Created by luofan
* on 2018/4/23. * on 2018/4/23.
...@@ -17,6 +19,15 @@ public class CheckContentOrder { ...@@ -17,6 +19,15 @@ public class CheckContentOrder {
private String productModel; private String productModel;
private String sn; private String sn;
private String repairType; private String repairType;
private List<Pics> listOperatorPics;
public List<Pics> getListOperatorPics() {
return listOperatorPics;
}
public void setListOperatorPics(List<Pics> listOperatorPics) {
this.listOperatorPics = listOperatorPics;
}
public String getCustomerCheckComment() { public String getCustomerCheckComment() {
return customerCheckComment; return customerCheckComment;
...@@ -106,4 +117,42 @@ public class CheckContentOrder { ...@@ -106,4 +117,42 @@ public class CheckContentOrder {
this.categoryName = categoryName; this.categoryName = categoryName;
} }
public static class Pics {
private int id;
private int orderId;
private int pictureType;
private String pictureUrl;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getOrderId() {
return orderId;
}
public void setOrderId(int orderId) {
this.orderId = orderId;
}
public int getPictureType() {
return pictureType;
}
public void setPictureType(int pictureType) {
this.pictureType = pictureType;
}
public String getPictureUrl() {
return pictureUrl;
}
public void setPictureUrl(String pictureUrl) {
this.pictureUrl = pictureUrl;
}
}
} }
orderCenter/src/main/java/com/dayu/order/ui/activity/CheckContentActivity.java
...@@ -39,6 +39,8 @@ public class CheckContentActivity extends DataBindingActivity<ActivityCheckConte ...@@ -39,6 +39,8 @@ public class CheckContentActivity extends DataBindingActivity<ActivityCheckConte
@Override @Override
public void initView() { public void initView() {
mBind.title.setText("验收内容");
mBind.tvBack.setOnClickListener(v -> finish());
payerUrl = new ArrayList<>(); payerUrl = new ArrayList<>();
serverUrl = new ArrayList<>(); serverUrl = new ArrayList<>();
mdimension = (UtilsScreen.getScreenWidth(mActivity) - UtilsScreen.dip2px(mActivity, 20)) / 5; mdimension = (UtilsScreen.getScreenWidth(mActivity) - UtilsScreen.dip2px(mActivity, 20)) / 5;
...@@ -51,10 +53,12 @@ public class CheckContentActivity extends DataBindingActivity<ActivityCheckConte ...@@ -51,10 +53,12 @@ public class CheckContentActivity extends DataBindingActivity<ActivityCheckConte
ToastUtils.showShortToast("没有数据"); ToastUtils.showShortToast("没有数据");
return; return;
} }
List<OrderDetail.Pics> pics = detail.getPic(); Gson gson = new Gson();
CheckContentOrder info = gson.fromJson(obj, CheckContentOrder.class);
List<CheckContentOrder.Pics> pics = info.getListOperatorPics();
if (state == Constants.FINISH_ORDER) { if (state == Constants.FINISH_ORDER) {
if (pics != null && pics.size() > 0) { if (pics != null && pics.size() > 0) {
for (OrderDetail.Pics pic : pics) { for (CheckContentOrder.Pics pic : pics) {
if (pic.getPictureType() == 1) { if (pic.getPictureType() == 1) {
payerUrl.add(pic.getPictureUrl()); payerUrl.add(pic.getPictureUrl());
} else { } else {
...@@ -63,10 +67,6 @@ public class CheckContentActivity extends DataBindingActivity<ActivityCheckConte ...@@ -63,10 +67,6 @@ public class CheckContentActivity extends DataBindingActivity<ActivityCheckConte
} }
} }
} }
Gson gson = new Gson();
CheckContentOrder info = gson.fromJson(obj, CheckContentOrder.class);
mBind.title.setText("验收内容");
mBind.tvBack.setOnClickListener(v -> finish());
if (!TextUtils.isEmpty(info.getCategoryName())) { if (!TextUtils.isEmpty(info.getCategoryName())) {
mBind.tvProduct.setText(info.getCategoryName()); mBind.tvProduct.setText(info.getCategoryName());
} else { } else {
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderServerAdapter.java
package com.dayu.order.ui.adapter; package com.dayu.order.ui.adapter;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.Gravity;
import android.view.View; import android.view.View;
import com.dayu.base.ui.adapter.CoreAdapter; import com.dayu.base.ui.adapter.CoreAdapter;
...@@ -29,23 +30,25 @@ public class OrderServerAdapter extends CoreAdapter<OrderDetail.RecordBean, Serv ...@@ -29,23 +30,25 @@ public class OrderServerAdapter extends CoreAdapter<OrderDetail.RecordBean, Serv
if (position == 0) { if (position == 0) {
holder.ivCircle.setImageResource(R.drawable.icon_circle_blue); holder.ivCircle.setImageResource(R.drawable.icon_circle_blue);
holder.serverCheck.setBackgroundResource(R.drawable.tab_blue_react); holder.serverCheck.setBackgroundResource(R.drawable.tab_blue_react);
holder.serverCheck.setGravity(Gravity.CENTER);
holder.serverCheck.setTextColor(UIUtils.getColor(R.color.white)); holder.serverCheck.setTextColor(UIUtils.getColor(R.color.white));
holder.serverTimeComment.setTextColor(UIUtils.getColor(R.color.default_text_color)); holder.serverTimeComment.setTextColor(UIUtils.getColor(R.color.default_text_color));
holder.serverTime.setTextColor(UIUtils.getColor(R.color.default_text_color)); holder.serverTime.setTextColor(UIUtils.getColor(R.color.default_text_color));
holder.serverComment.setTextColor(UIUtils.getColor(R.color.default_text_color)); holder.serverComment.setTextColor(UIUtils.getColor(R.color.default_text_color));
holder.serverState.setTextColor(UIUtils.getColor(R.color.default_text_color)); holder.serverState.setTextColor(UIUtils.getColor(R.color.default_text_color));
} else { } else {
holder.ivCircle.setImageResource(R.drawable.icon_circle_gray); holder.ivCircle.setImageResource(R.drawable.icon_circle_gray);
holder.serverCheck.setBackground(null); holder.serverCheck.setBackground(null);
holder.serverCheck.setPadding(0, 0, 0, 0); holder.serverCheck.setGravity(Gravity.LEFT);
holder.serverCheck.setTextColor(UIUtils.getColor(R.color.cl_receiving_order_item_data)); holder.serverCheck.setTextColor(UIUtils.getColor(R.color.cl_receiving_order_item_data));
holder.serverTimeComment.setTextColor(UIUtils.getColor(R.color.cl_order_text_one)); holder.serverTimeComment.setTextColor(UIUtils.getColor(R.color.cl_order_text_one));
holder.serverTime.setTextColor(UIUtils.getColor(R.color.cl_order_text_one)); holder.serverTime.setTextColor(UIUtils.getColor(R.color.cl_order_text_one));
holder.serverComment.setTextColor(UIUtils.getColor(R.color.cl_order_text_one)); holder.serverComment.setTextColor(UIUtils.getColor(R.color.cl_order_text_one));
holder.serverState.setTextColor(UIUtils.getColor(R.color.cl_order_text_one)); holder.serverState.setTextColor(UIUtils.getColor(R.color.cl_order_text_one));
} }
holder.serverTime.setText(item.getCreateTime());
holder.serverState.setText("【" + item.getOperation() + "】"); holder.serverState.setText("【" + item.getOperation() + "】");
holder.serverCheck.setVisibility(View.VISIBLE);
holder.serverComment.setText(item.getOperationComment()); holder.serverComment.setText(item.getOperationComment());
if ((item.getCommentInfo() != null && item.getCommentInfo().contains("预约时间"))) { if ((item.getCommentInfo() != null && item.getCommentInfo().contains("预约时间"))) {
holder.serverTimeComment.setText(item.getCommentInfo()); holder.serverTimeComment.setText(item.getCommentInfo());
......
orderCenter/src/main/res/layout/serve_datails_item.xml
...@@ -32,28 +32,26 @@ ...@@ -32,28 +32,26 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal">
>
<TextView <TextView
android:id="@+id/server_state" android:id="@+id/server_state"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="@dimen/sp_14"
android:textColor="@color/default_text_color"
android:layout_marginLeft="@dimen/dp_12" android:layout_marginLeft="@dimen/dp_12"
android:layout_weight="1"
android:text="【系统验收】" android:text="【系统验收】"
/> android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_14" />
<TextView <TextView
android:id="@+id/server_time" android:id="@+id/server_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="@dimen/sp_12"
android:textColor="@color/default_text_color"
android:text="2017-08-04 14:47"
android:layout_marginRight="@dimen/dp_10" android:layout_marginRight="@dimen/dp_10"
/> android:text="2017-08-04 14:47"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_12" />
</LinearLayout> </LinearLayout>
...@@ -62,35 +60,32 @@ ...@@ -62,35 +60,32 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_12"
android:text="系统进行了验收费" android:text="系统进行了验收费"
android:textColor="@color/default_text_color" android:textColor="@color/default_text_color"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginLeft="@dimen/dp_20"
android:textSize="12sp" /> android:textSize="12sp" />
<TextView <TextView
android:id="@+id/server_time_comment" android:id="@+id/server_time_comment"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_10"
android:layout_marginLeft="@dimen/dp_20"
android:text="预约时间：2017-12-11 18:30:00" android:text="预约时间：2017-12-11 18:30:00"
android:textColor="@color/default_text_color" android:textColor="@color/default_text_color"
android:layout_marginLeft="@dimen/dp_20" android:textSize="12sp" />
android:layout_marginBottom="@dimen/dp_10"
android:textSize="12sp"
/>
<TextView <TextView
android:id="@+id/server_check" android:id="@+id/server_check"
android:layout_width="wrap_content" android:layout_width="84dp"
android:layout_height="wrap_content" android:layout_height="22dp"
android:textSize="@dimen/sp_12" android:gravity="center"
android:layout_marginLeft="@dimen/dp_20" android:layout_marginLeft="@dimen/dp_20"
android:text="查看请"
android:textColor="@color/default_text_color" android:textColor="@color/default_text_color"
android:paddingTop="5dp" android:textSize="@dimen/sp_12" />
android:paddingBottom="5dp"
android:paddingRight="6dp"
android:paddingLeft="6dp"
/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
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