From 6a44973461e2a91f62f7eed681b4db3abb026289 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 24 十二月 2024 16:52:23 +0800
Subject: [PATCH] 1.优化地图相关代码，提高运行效率和可读性。 2.添加修改密码功能。 3.优化列表和详情页展示。
---
app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java | 30 -
app/src/main/assets/js/map.js | 117 ++--
app/src/main/java/com/dayu/pipirrapp/net/Constants.java | 5
app/src/main/res/layout/activity_change_pass_word.xml | 11
app/src/main/java/com/dayu/pipirrapp/utils/MapUtils.java | 33 +
app/src/main/res/layout/item_issue.xml | 8
app/src/main/res/layout/item_order.xml | 169 +++----
app/src/main/res/layout/activity_order_detail.xml | 429 ++++++++++---------
app/src/main/java/com/dayu/pipirrapp/activity/ChangePSActivity.java | 74 +++
app/src/main/java/com/dayu/pipirrapp/net/MyIntercepterApplication.java | 3
app/src/main/res/values/colors.xml | 2
app/src/main/res/drawable/bg_detail_wite.xml | 8
app/src/main/res/layout/fragment_order.xml | 2
app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java | 10
app/src/main/res/drawable/ic_choose_gray_edge.xml | 4
app/src/main/res/layout/activity_issue_detail.xml | 298 +++++++------
16 files changed, 672 insertions(+), 531 deletions(-)
diff --git a/app/src/main/assets/js/map.js b/app/src/main/assets/js/map.js
index 46dba57..cbd35c7 100644
--- a/app/src/main/assets/js/map.js
+++ b/app/src/main/assets/js/map.js
@@ -1,10 +1,18 @@
(function () {
- // 鍥剧墖璺緞
- const locationIMGPath = 'img/location.png';
- const markerBalckPath = 'img/marker_black.svg';
- const markerRedPath = 'img/marker_red.svg';
- const markerBluePath = 'img/marker_blue.svg';
- const centerPin = 'img/push_pin.svg';
+ // 寤鸿灏嗚繖浜涘父閲忕Щ鍒颁竴涓厤缃璞′腑缁熶竴绠＄悊
+ const CONFIG = {
+ IMAGES: {
+ LOCATION: 'img/location.png',
+ MARKER_BLACK: 'img/marker_black.svg',
+ MARKER_RED: 'img/marker_red.svg',
+ MARKER_BLUE: 'img/marker_blue.svg',
+ CENTER_PIN: 'img/push_pin.svg'
+ },
+ MAP: {
+ DEFAULT_ZOOM: 12,
+ TIANDITU_KEY: 'd8beed89b43160a9a185e5aff431f85d'
+ }
+ };
let map;
let lastMarker = null;
let lastClickedMarker = null;
@@ -115,13 +123,11 @@
function locationOverLay(lng, lag) {
console.log("function銆嬨�嬨�嬨�嬨�媗ocationOverLay");
map.centerAndZoom(new T.LngLat(lng, lag), map.getZoom());
-
- let icon = new T.Icon({
- iconUrl: locationIMGPath,
- iconSize: new T.Point(27, 27),
- iconAnchor: new T.Point(10, 25)
- });
- let marker = new T.Marker(new T.LngLat(lng, lag), { icon: icon });
+
+ let marker = new T.Marker(
+ new T.LngLat(lng, lag),
+ { icon: createIcon(CONFIG.IMAGES.LOCATION, 27) }
+ );
map.addOverLay(marker);
}
@@ -146,14 +152,7 @@
function closeWaterIntakeDetail(data) {
if (!isShowCenterPin) {
if (lastClickedMarker !== null) {
- // 濡傛灉鏈夌偣鍑诲彇姘村彛鍒欏皢鍙栨按鍙ｆ仮澶嶆垚榛戣壊
- // 涓婃鐐瑰嚮鐨勬爣娉ㄦ敼涓洪粦鑹�
- var defaulticon = new T.Icon({
- iconUrl: markerBluePath,
- iconSize: new T.Point(28, 28),
- iconAnchor: new T.Point(14, 28)
- });
- lastClickedMarker.setIcon(defaulticon);
+ lastClickedMarker.setIcon(createIcon(CONFIG.IMAGES.MARKER_BLUE));
}
if (isShowWaterIntakeDetail) {
// 鍋囧鏄剧ず浜嗗彇姘村彛璇︽儏鍒欓殣钘忓彇姘村彛璇︽儏
@@ -182,23 +181,11 @@
function chageMarkerIcon(data) {
// 鐐瑰嚮鐨勬爣娉ㄦ敼涓虹孩鑹�
var currentMarker = data.target;
- // 鐐瑰嚮鍚庡浘鏍�
- var clickedIcon = new T.Icon({
- iconUrl: markerRedPath,
- iconSize: new T.Point(28, 28),
- iconAnchor: new T.Point(14, 28)
- });
- // 璁剧疆褰撳墠鐐瑰嚮鐨� marker 涓虹偣鍑诲悗鍥炬爣
- currentMarker.setIcon(clickedIcon);
- // 鍒ゆ柇鐐瑰嚮鐨勪笉鏄悓涓�涓潗鏍�
+ currentMarker.setIcon(createIcon(CONFIG.IMAGES.MARKER_RED));
+
if (lastClickedMarker !== null) {
if (!isEqualsLngLat(data.target.getLngLat(), lastClickedMarker.getLngLat())) {
- var defaulticon = new T.Icon({
- iconUrl: markerBluePath,
- iconSize: new T.Point(28, 28),
- iconAnchor: new T.Point(14, 28)
- });
- lastClickedMarker.setIcon(defaulticon);
+ lastClickedMarker.setIcon(createIcon(CONFIG.IMAGES.MARKER_BLUE));
}
}
lastClickedMarker = data.target;
@@ -220,20 +207,11 @@
function addMarker(id, lng, lat, name, isRed) {
console.log("function銆嬨�嬨�嬨�嬨�媋ddMarker>>>id:" + id);
- var iconUrl;
- if (isRed) {
- iconUrl = markerRedPath;
- } else {
- iconUrl = markerBluePath;
- }
- var icon = new T.Icon({
- iconUrl: iconUrl,
- iconSize: new T.Point(28, 28),
- iconAnchor: new T.Point(14, 28)
- });
+ const iconUrl = isRed ? CONFIG.IMAGES.MARKER_RED : CONFIG.IMAGES.MARKER_BLUE;
let marker = new T.Marker(
- new T.LngLat(lng, lat) // 鍒涘缓鏍囨敞
- , { icon: icon });
+ new T.LngLat(lng, lat),
+ { icon: createIcon(iconUrl) }
+ );
//娣诲姞鐐瑰嚮浜嬩欢
marker.addEventListener("click", (data) => {
addMarkerListener(id, data)
@@ -257,18 +235,16 @@
map.addOverLay(marker); // 灏嗘爣娉ㄦ坊鍔犲埌鍦板浘涓�
return "addMarker鍔犺浇鎴愬姛 id:" + id
}
- //鏇存柊瀹氫綅鍧愭爣
+ //鏇存柊浣嶅潗鏍�
function updateLocation(log, lat) {
- let icon = new T.Icon({
- iconUrl: locationIMGPath,
- iconSize: new T.Point(20, 20),
- iconAnchor: new T.Point(10, 10)
- });
if (locationMarker) {
map.removeOverLay(locationMarker);
}
var newPoint = new T.LngLat(log, lat);
- locationMarker = new T.Marker(newPoint, { icon: icon });
+ locationMarker = new T.Marker(
+ newPoint,
+ { icon: createIcon(CONFIG.IMAGES.LOCATION, 20) }
+ );
map.addOverLay(locationMarker);
map.panTo(newPoint);
}
@@ -346,9 +322,32 @@
function mapMoveEnd(e) {
- var center = e.target.getCenter();
- console.log("lng:" + center.getLng() + " lat:" + center.getLat())
- window.Android.refreshCenter(center.getLng(), center.getLat());
+ debounce(() => {
+ const center = e.target.getCenter();
+ window.Android.refreshCenter(center.getLng(), center.getLat());
+ }, 300);
+ }
+
+ // 娣诲姞闃叉姈鍑芥暟
+ function debounce(fn, delay) {
+ let timer = null;
+ return function() {
+ if(timer) clearTimeout(timer);
+ timer = setTimeout(() => {
+ fn.apply(this, arguments);
+ }, delay);
+ }
+ }
+
+
+
+ // 鍒涘缓marker鍥炬爣鐨勬柟娉曞彲浠ユ娊鍙栧嚭鏉ュ鐢�
+ function createIcon(iconUrl, size = 28) {
+ return new T.Icon({
+ iconUrl: iconUrl,
+ iconSize: new T.Point(size, size),
+ iconAnchor: new T.Point(size/2, size)
+ });
}
})();
diff --git a/app/src/main/java/com/dayu/pipirrapp/activity/ChangePSActivity.java b/app/src/main/java/com/dayu/pipirrapp/activity/ChangePSActivity.java
index 69711eb..f61d087 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/ChangePSActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/ChangePSActivity.java
@@ -1,12 +1,23 @@
package com.dayu.pipirrapp.activity;
import android.os.Bundle;
+import android.text.TextUtils;
import android.view.LayoutInflater;
import androidx.annotation.Nullable;
+import com.dayu.pipirrapp.MyApplication;
+import com.dayu.pipirrapp.bean.net.IssueResult;
import com.dayu.pipirrapp.databinding.ActivityChangePassWordBinding;
+import com.dayu.pipirrapp.net.ApiManager;
+import com.dayu.pipirrapp.net.BaseResponse;
+import com.dayu.pipirrapp.net.Constants;
+import com.dayu.pipirrapp.net.subscribers.SubscriberListener;
+import com.dayu.pipirrapp.utils.ToastUtil;
import com.dayu.pipirrapp.view.TitleBar;
+
+import java.util.HashMap;
+import java.util.Map;
/**
* author: zuo
@@ -22,6 +33,67 @@
super.onCreate(savedInstanceState);
binding = ActivityChangePassWordBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
- new TitleBar(this).setTitleText("淇敼瀵嗙爜");
+ new TitleBar(this).setTitleText("淇敼瀵嗙爜").setLeftIco().setLeftIcoListening(v -> ChangePSActivity.this.finish());
+ initView();
+ }
+
+ private void initView() {
+ binding.changePSBtn.setOnClickListener(v -> {
+ String oldPassword = binding.oldPassword.getText().toString();
+ String newPSOne = binding.newPsone.getText().toString();
+ String newPStwo = binding.newPsTwo.getText().toString();
+ if (!TextUtils.isEmpty(oldPassword) && !TextUtils.isEmpty(newPSOne) && !TextUtils.isEmpty(newPStwo)) {
+ if (newPStwo.equals(newPSOne)) {
+ if (isPasswordComplex(newPSOne)) {
+ changePS(oldPassword, newPSOne);
+ } else {
+ ToastUtil.showToastShort(ChangePSActivity.this, "鏂板瘑鐮侀暱搴﹀簲涓�6-12浣嶏紝骞朵笖鑷冲皯鍖呭惈1涓暟瀛楁垨瀛楁瘝锛�");
+ }
+ } else {
+ ToastUtil.showToastShort(ChangePSActivity.this, "涓ゆ瀵嗙爜涓嶄竴鑷达紒");
+ }
+ } else {
+ ToastUtil.showToastShort(ChangePSActivity.this, "璇疯緭鍏ュ畬鏁翠俊鎭紒");
+ }
+ });
+ }
+
+
+ private void changePS(String oldPassword, String newPassword) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("id", MyApplication.myApplication.userId);
+ params.put("oldPassword", oldPassword);
+ params.put("newPassword", newPassword);
+ ApiManager.getInstance().requestPost(this, Constants.BASE_URL + "/base/user/changePassword", IssueResult.class, params, new SubscriberListener<BaseResponse<IssueResult>>() {
+ @Override
+ public void onNext(BaseResponse<IssueResult> t) {
+ if (t.isSuccess()) {
+ ToastUtil.showToastLong(ChangePSActivity.this, "淇敼鎴愬姛!");
+ ChangePSActivity.this.finish();
+ } else {
+ ToastUtil.showToast(ChangePSActivity.this, t.getMsg());
+ }
+ }
+
+ @Override
+ public void onCloose() {
+ super.onCloose();
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ super.onError(e);
+ ToastUtil.showToastLong(ChangePSActivity.this, "淇敼澶辫触锛岃绋嶅悗鍐嶈瘯");
+
+ }
+ });
+ }
+
+ // 妫�鏌ュ瘑鐮佸鏉傚害鐨勬柟娉�
+ boolean isPasswordComplex(String password) {
+ // 瀵嗙爜澶嶆潅搴﹁鍒欙細闀垮害鍦�6鍒�12浣嶄箣闂达紝鑷冲皯鍖呭惈涓�涓暟瀛楀拰涓�涓瓧姣�
+ return password.length() >= 6 && password.length() <= 12 &&
+ password.matches(".*\\d.*") && // 鑷冲皯鍖呭惈涓�涓暟瀛�
+ password.matches(".*[a-zA-Z].*"); // 鑷冲皯鍖呭惈涓�涓瓧姣�
}
}
diff --git a/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java b/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java
index c1650a9..f421db1 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/MainActivity.java
@@ -1,7 +1,5 @@
package com.dayu.pipirrapp.activity;
-import static androidx.core.content.ContextCompat.getSystemService;
-
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
@@ -148,6 +146,7 @@
binding.viewPager.setCurrentItem(1, false); // 榛樿鏄剧ず鍦板浘椤�
binding.viewPager.setOffscreenPageLimit(fragments.size());
binding.viewPager.setUserInputEnabled(false);
+
}
@Override
@@ -199,7 +198,12 @@
* 鏇存柊鏌愪釜 Tab 鐨� UI 鐘舵��
*/
private void updateTabUI(int position, int iconResId, int textColorResId) {
- binding.viewPager.setCurrentItem(position);
+ if (position == 1) {
+ binding.viewPager.setCurrentItem(position, true);
+ } else {
+ binding.viewPager.setCurrentItem(position, false);
+ }
+
switch (position) {
case 0:
binding.orderImg.setImageDrawable(ContextCompat.getDrawable(this, iconResId));
diff --git a/app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java b/app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java
index 1dc81ef..12f0033 100644
--- a/app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java
+++ b/app/src/main/java/com/dayu/pipirrapp/net/ApiManager.java
@@ -61,7 +61,8 @@
int uplodFilerepeatSize = 3;
ApiService apiService;
- private CompositeDisposable compositeDisposable = new CompositeDisposable(); // 绠＄悊璁㈤槄浜嬩欢
+ // 绠＄悊璁㈤槄浜嬩欢
+ private CompositeDisposable compositeDisposable = new CompositeDisposable();
/**
* 鍒濆鍖栭�氫俊妗嗘灦
@@ -136,7 +137,7 @@
public BaseResponse<T> apply(Object o) {
if (o instanceof BaseResponse) {
BaseResponse tem = (BaseResponse) o;
- if (tem.getCode().equals("0000")) {
+ if (tem.getCode().equals(Constants.TOKEN_INVALID)) {
//褰揷ode涓�0000鏄烦杞埌鐧诲綍鐣岄潰
tem.setMsg("鐧诲綍澶辨晥璇烽噸鏂扮櫥褰�");
redirectToLogin();
@@ -189,7 +190,6 @@
return null;
}
}
-
/**
@@ -248,8 +248,10 @@
Observable<ResponseBody> observable;
observable = apiService.downloadTile(urlPath);
observable
- .subscribeOn(Schedulers.io()) // 缃戠粶璇锋眰鍦� I/O 绾跨▼涓繘琛�
- .observeOn(Schedulers.io()) // 鍥炶皟澶勭悊涔熷湪 I/O 绾跨▼
+ // 缃戠粶璇锋眰鍦� I/O 绾跨▼涓繘琛�
+ .subscribeOn(Schedulers.io())
+ // 鍥炶皟澶勭悊涔熷湪 I/O 绾跨▼
+ .observeOn(Schedulers.io())
.subscribe(
responseBody -> {
@@ -341,23 +343,7 @@
}
- /**
- * 鍒ゆ柇褰撳墠code鏄惁鏄湭鐧诲綍鐘舵��
- *
- * @param responseBody the response body in JSON format
- * @return true if login is required, false otherwise
- */
- private boolean isLoginRequired(String responseBody) {
- try {
- Gson gson = new Gson();
- Map<String, Object> responseMap = gson.fromJson(responseBody, Map.class);
- String code = (String) responseMap.get("code");
- return "0000".equals(code); // Check if the code is not 0000
- } catch (Exception e) {
- e.printStackTrace();
- }
- return false;
- }
+
/**
* 褰揷ode涓衡��0000鈥濇椂璺宠浆鍒扮櫥褰曠晫闈�
diff --git a/app/src/main/java/com/dayu/pipirrapp/net/Constants.java b/app/src/main/java/com/dayu/pipirrapp/net/Constants.java
index 2b7b794..5954697 100644
--- a/app/src/main/java/com/dayu/pipirrapp/net/Constants.java
+++ b/app/src/main/java/com/dayu/pipirrapp/net/Constants.java
@@ -7,13 +7,14 @@
*/
public class Constants {
// public static final String BASE_URL = "http://192.168.10.52:8088";
-public static final String BASE_URL = "https://no253541tf71.vicp.fun";
+//public static final String BASE_URL = "https://no253541tf71.vicp.fun";
+public static final String BASE_URL = "http://fve2iz.natappfree.cc";
/**
* 浠ｈ〃璇锋眰鎴愬姛
*/
public static final String SUCCESS = "0001";
//浠ｈ〃token杩囨湡鐨刢ode鍊�
- public static final int TOKEN_INVALID = -10001;
+ public static final String TOKEN_INVALID = "0000";
/**
* 鏇存柊涓嬭浇鐨勬枃浠跺悕绉�
diff --git a/app/src/main/java/com/dayu/pipirrapp/net/MyIntercepterApplication.java b/app/src/main/java/com/dayu/pipirrapp/net/MyIntercepterApplication.java
index 2fa9142..67b62ab 100644
--- a/app/src/main/java/com/dayu/pipirrapp/net/MyIntercepterApplication.java
+++ b/app/src/main/java/com/dayu/pipirrapp/net/MyIntercepterApplication.java
@@ -56,7 +56,7 @@
try {
Request.Builder builder = request.newBuilder();
Map params = new HashMap();
- if (request.method().equals("GET")) {
+ if ("GET".equals(request.method())) {
builder.url(request.url().toString());
} else {
@@ -100,7 +100,6 @@
builder.message(message);
return builder.build();
}
-
}
diff --git a/app/src/main/java/com/dayu/pipirrapp/utils/MapUtils.java b/app/src/main/java/com/dayu/pipirrapp/utils/MapUtils.java
index 3f0b700..de30b9c 100644
--- a/app/src/main/java/com/dayu/pipirrapp/utils/MapUtils.java
+++ b/app/src/main/java/com/dayu/pipirrapp/utils/MapUtils.java
@@ -9,7 +9,7 @@
* gcj02 02骞存彁鍑猴紝鐏槦鍧愭爣锛岀粡杩囧姞瀵嗙畻娉曘�傚ぇ澶氭暟闈炵櫨搴︿腑鍥藉湴鍥惧巶鍟嗗熀鏈兘鏄娇鐢ㄧ殑鐏槦鍧愭爣锛氶珮寰凤紝鑵捐锛岃胺姝屼腑鍥絚n
* bd09 09骞存彁鍑猴紝鐧惧害鍧愭爣锛岀粡杩囩伀鏄熷潗鏍囧啀娆″姞瀵嗭紝鐩稿綋浜庡澶у湴鍧愭爣缁忚繃浜嗕簩娆″姞瀵嗐�傜櫨搴﹁嚜宸变娇鐢�
* 涓�鑸殑绠楁硶锛屾病鏈夌洿鎺d09->wgs84鎴栬�厀gs84->bd09锛岄兘闇�瑕佸�熷姪wgs84->gcj02鎴栬�単cj02->wgs84绠楁硶鎺ㄥ銆�
-
+ * <p>
* 澶囨敞锛氬潗鏍囩郴杞崲
*/
public class MapUtils {
@@ -47,10 +47,12 @@
* @return
*/
public static boolean outOfChina(double lat, double lon) {
- if (lon < 72.004 || lon > 137.8347)
+ if (lon < 72.004 || lon > 137.8347) {
return true;
- if (lat < 0.8293 || lat > 55.8271)
+ }
+ if (lat < 0.8293 || lat > 55.8271) {
return true;
+ }
return false;
}
@@ -103,7 +105,7 @@
* @param lon
* @return
*/
- public static Gps gcj02_To_Wgs84_exact(double lat,double lon) {
+ public static Gps gcj02_To_Wgs84_exact(double lat, double lon) {
if (outOfChina(lat, lon)) {
return gcj02_To_Wgs84(lat, lon);
}
@@ -127,8 +129,16 @@
if ((Math.abs(dLat) < threshold) && (Math.abs(dLon) < threshold)) {
break;
}
- if (dLat > 0) { pLat = wgsLat; } else { mLat = wgsLat;}
- if (dLon > 0) { pLon = wgsLon; } else { mLon = wgsLon;}
+ if (dLat > 0) {
+ pLat = wgsLat;
+ } else {
+ mLat = wgsLat;
+ }
+ if (dLon > 0) {
+ pLon = wgsLon;
+ } else {
+ mLon = wgsLon;
+ }
if (++i > 1000) break;
}
@@ -179,17 +189,20 @@
}
-class Gps{
- double lat,lon;
+class Gps {
+ double lat, lon;
+
public Gps() {
}
- public Gps(double lat,double lon){
+
+ public Gps(double lat, double lon) {
this.lat = lat;
this.lon = lon;
}
+
@Override
public String toString() {
- return "{"+lat+","+lon+"}";
+ return "{" + lat + "," + lon + "}";
}
}
diff --git a/app/src/main/res/drawable/bg_detail_wite.xml b/app/src/main/res/drawable/bg_detail_wite.xml
new file mode 100644
index 0000000..601adca
--- /dev/null
+++ b/app/src/main/res/drawable/bg_detail_wite.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <solid android:color="#FFFFFF" />
+ <corners android:radius="10dp" />
+ <stroke
+ android:width="1dp"
+ android:color="#ededed" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_choose_gray_edge.xml b/app/src/main/res/drawable/ic_choose_gray_edge.xml
index 71acd81..2605aa1 100644
--- a/app/src/main/res/drawable/ic_choose_gray_edge.xml
+++ b/app/src/main/res/drawable/ic_choose_gray_edge.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
- <solid android:color="#ffffff" />
- <corners android:radius="5dp" />
+ <solid android:color="#FFFFFF" />
+ <corners android:radius="7dp" />
<stroke
android:width="1dp"
android:color="#ededed" />
diff --git a/app/src/main/res/layout/activity_change_pass_word.xml b/app/src/main/res/layout/activity_change_pass_word.xml
index 517952b..3387ea3 100644
--- a/app/src/main/res/layout/activity_change_pass_word.xml
+++ b/app/src/main/res/layout/activity_change_pass_word.xml
@@ -11,10 +11,11 @@
layout="@layout/top_title" />
-
<EditText
+ android:id="@+id/oldPassword"
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"
+ android:layout_marginTop="10dp"
android:background="@color/white"
android:hint="璇疯緭鍏ユ棫瀵嗙爜"
android:paddingLeft="20dp"
@@ -27,29 +28,33 @@
android:gravity="bottom"
android:paddingLeft="20dp"
android:paddingBottom="3dp"
- android:textColor="@color/grey"
android:text="瀵嗙爜涓�6-12浣嶆暟瀛楁垨瀛楁瘝"
- />
+ android:textColor="@color/grey" />
<EditText
+ android:id="@+id/newPsone"
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"
android:background="@color/white"
android:hint="璇疯緭鍏ユ柊瀵嗙爜"
+ android:inputType="textPassword"
android:paddingLeft="20dp"
android:paddingRight="20dp" />
<EditText
+ android:id="@+id/newPsTwo"
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"
android:layout_marginTop="1dp"
android:background="@color/white"
android:hint="鍐嶆杈撳叆鏂板瘑鐮�"
+ android:inputType="textPassword"
android:paddingLeft="20dp"
android:paddingRight="20dp" />
<TextView
+ android:id="@+id/changePSBtn"
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"
android:layout_marginLeft="40dp"
diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml
index 5ef2931..f99b998 100644
--- a/app/src/main/res/layout/activity_issue_detail.xml
+++ b/app/src/main/res/layout/activity_issue_detail.xml
@@ -40,179 +40,206 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- android:padding="20dp">
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="30dp"
- android:orientation="horizontal">
-
- <ImageView
- android:id="@+id/ic_project"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:layout_centerVertical="true"
- android:layout_marginLeft="3dp"
- android:layout_marginRight="10dp"
- android:src="@drawable/ic_issue" />
-
- <TextView
- android:id="@+id/projectName"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
-
- android:layout_marginEnd="15dp"
- android:layout_toStartOf="@+id/stateText"
- android:layout_toEndOf="@+id/ic_project"
- android:ellipsize="end"
- android:maxLines="1"
- android:text="@{data.issueReportId}"
- android:textColor="@color/title_color"
- android:textSize="@dimen/order_detail_text_size" />
-
-
- <TextView
- android:id="@+id/stateText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:background="@drawable/ic_edt_gray_bg"
- android:gravity="center"
- android:paddingLeft="10dp"
- android:paddingTop="5dp"
- android:paddingRight="10dp"
- android:paddingBottom="5dp"
- android:text="@{data.state}"
- android:textColor="@color/black"
- android:textSize="@dimen/manage_item_text_state_size" />
-
-
- </RelativeLayout>
+ android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:gravity="center_vertical"
- android:orientation="horizontal">
+ android:layout_marginLeft="10dp"
+ android:layout_marginTop="15dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginBottom="20dp"
+ android:background="@drawable/bg_detail_wite"
+ android:orientation="vertical"
+ android:paddingLeft="10dp"
+ android:paddingTop="15dp"
+ android:paddingRight="10dp"
+ android:paddingBottom="20dp">
- <LinearLayout
- android:layout_width="0dp"
+ <RelativeLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- android:paddingRight="5dp">
+ android:minHeight="30dp"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/ic_project"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="3dp"
+ android:layout_marginRight="10dp"
+ android:src="@drawable/ic_issue" />
<TextView
+ android:id="@+id/projectName"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="15dp"
+ android:layout_toStartOf="@+id/stateText"
+ android:layout_toEndOf="@+id/ic_project"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:text="@{data.issueReportId}"
+ android:textColor="@color/title_color"
+ android:textSize="@dimen/order_detail_text_size" />
+
+
+ <TextView
+ android:id="@+id/stateText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="涓婃姤鏃堕棿锛�"
- android:textColor="@color/manage_item_text"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:background="@drawable/ic_edt_gray_bg"
+ android:gravity="center"
+ android:paddingLeft="10dp"
+ android:paddingTop="5dp"
+ android:paddingRight="10dp"
+ android:paddingBottom="5dp"
+ android:text="@{data.state}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/manage_item_text_state_size" />
+
+
+ </RelativeLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="5dp"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:paddingRight="5dp">
+
+ <TextView
+
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="涓婃姤鏃堕棿锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <TextView
+ android:id="@+id/xiangMuJianCheng"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:text="@{data.reportTime}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
+ </LinearLayout>
+
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:orientation="horizontal">
+
+
+ <TextView
+ android:id="@+id/daiShenPiTag"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="涓婃姤鍐呭锛�"
+ android:textColor="@color/item_name_text_color"
android:textSize="@dimen/order_detail_text_size" />
<TextView
- android:id="@+id/xiangMuJianCheng"
- android:layout_width="match_parent"
+ android:id="@+id/daiShenPi"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
- android:text="@{data.reportTime}"
+ android:text="@{data.content}"
android:textColor="@color/manage_item_text"
android:textSize="@dimen/order_detail_text_size" />
</LinearLayout>
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- android:orientation="horizontal">
-
-
- <TextView
- android:id="@+id/daiShenPiTag"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="涓婃姤鍐呭锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
-
- <TextView
- android:id="@+id/daiShenPi"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:maxLines="1"
- android:text="@{data.content}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
- </LinearLayout>
-
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginTop="10dp"
- android:orientation="vertical">
-
- <TextView
-
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="涓婃姤鍥剧墖锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
-
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/recyclerView"
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
+ android:layout_height="match_parent"
android:layout_marginTop="10dp"
- android:minHeight="80dp" />
+ android:orientation="vertical">
+
+ <TextView
+
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="涓婃姤鍥剧墖锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/recyclerView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:layout_marginTop="10dp"
+ android:minHeight="80dp" />
+ </LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/callBackLL"
android:layout_width="match_parent"
- android:orientation="vertical"
- android:layout_height="wrap_content">
- <LinearLayout
- android:id="@+id/orderDealLL"
- android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
android:layout_marginTop="15dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginBottom="20dp"
+ android:background="@drawable/bg_detail_wite"
android:orientation="vertical"
- android:visibility="visible">
+ android:paddingLeft="10dp"
+ android:paddingTop="15dp"
+ android:paddingRight="10dp"
+ android:paddingBottom="20dp">
- <View
- android:layout_width="match_parent"
- android:layout_height="2dp"
- android:background="@color/base_blue" />
-
- <TextView
+ <LinearLayout
+ android:id="@+id/orderDealLL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:gravity="center"
- android:text="鍥炲淇℃伅"
- android:textColor="@color/base_blue"
- android:textSize="@dimen/order_detail_text_size" />
- </LinearLayout>
+
+ android:orientation="vertical"
+ android:visibility="visible">
+
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="鍥炲淇℃伅"
+ android:textColor="@color/base_blue"
+ android:textSize="@dimen/order_detail_text_size"
+ android:textStyle="bold" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="2dp"
+ android:layout_marginTop="5dp"
+ android:background="@color/base_blue" />
+ </LinearLayout>
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
+ android:layout_marginTop="15dp"
android:orientation="horizontal">
@@ -221,7 +248,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鍥炲鏃堕棿锛�"
- android:textColor="@color/manage_item_text"
+ android:textColor="@color/item_name_text_color"
android:textSize="@dimen/order_detail_text_size" />
<TextView
@@ -239,6 +266,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
+ android:layout_marginBottom="10dp"
android:orientation="horizontal">
@@ -247,7 +275,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鍥炲鍐呭锛�"
- android:textColor="@color/manage_item_text"
+ android:textColor="@color/item_name_text_color"
android:textSize="@dimen/order_detail_text_size" />
<TextView
diff --git a/app/src/main/res/layout/activity_order_detail.xml b/app/src/main/res/layout/activity_order_detail.xml
index 5d73d1c..3136c82 100644
--- a/app/src/main/res/layout/activity_order_detail.xml
+++ b/app/src/main/res/layout/activity_order_detail.xml
@@ -20,6 +20,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/item_bg_color"
android:orientation="vertical">
<include
@@ -40,266 +41,296 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- android:padding="20dp">
+ android:orientation="vertical">
-
- <RelativeLayout
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="30dp"
- android:orientation="horizontal">
+ android:layout_marginLeft="10dp"
+ android:layout_marginTop="15dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginBottom="20dp"
+ android:background="@drawable/bg_detail_wite"
+ android:orientation="vertical"
+ android:paddingLeft="10dp"
+ android:paddingTop="15dp"
+ android:paddingRight="10dp"
+ android:paddingBottom="20dp">
- <ImageView
- android:id="@+id/ic_project"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:layout_centerVertical="true"
- android:layout_marginRight="15dp"
- android:src="@mipmap/icon_project" />
- <TextView
- android:id="@+id/projectName"
+ <RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
+ android:minHeight="30dp"
+ android:orientation="horizontal">
- android:layout_marginEnd="15dp"
- android:layout_toStartOf="@+id/stateText"
- android:layout_toEndOf="@+id/ic_project"
- android:ellipsize="end"
- android:maxLines="1"
- android:text="@{data.taskType}"
- android:textColor="@color/title_color"
- android:textSize="@dimen/order_detail_text_size" />
+ <ImageView
+ android:id="@+id/ic_project"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="15dp"
+ android:src="@mipmap/icon_project" />
+
+ <TextView
+ android:id="@+id/projectName"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+
+ android:layout_marginEnd="15dp"
+ android:layout_toStartOf="@+id/stateText"
+ android:layout_toEndOf="@+id/ic_project"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:text="@{data.taskType}"
+ android:textColor="@color/title_color"
+ android:textSize="@dimen/order_detail_text_size" />
- <TextView
- android:id="@+id/stateText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:background="@drawable/ic_edt_gray_bg"
- android:gravity="center"
- android:paddingLeft="10dp"
- android:paddingTop="5dp"
- android:paddingRight="10dp"
- android:paddingBottom="5dp"
- android:text="@{data.processingState}"
- android:textSize="@dimen/manage_item_text_state_size" />
+ <TextView
+ android:id="@+id/stateText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:background="@drawable/ic_edt_gray_bg"
+ android:gravity="center"
+ android:paddingLeft="10dp"
+ android:paddingTop="5dp"
+ android:paddingRight="10dp"
+ android:paddingBottom="5dp"
+ android:text="@{data.processingState}"
+ android:textSize="@dimen/manage_item_text_state_size" />
- </RelativeLayout>
+ </RelativeLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:orientation="horizontal">
-
-
- <TextView
- android:id="@+id/jinduTag"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="宸ュ崟ID锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
-
- <TextView
- android:id="@+id/jindu"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@{data.workOrderId}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
+ android:layout_marginTop="5dp"
+ android:orientation="horizontal">
- </LinearLayout>
+ <TextView
+ android:id="@+id/jinduTag"
+ android:layout_width="120dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="宸ュ崟ID锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/order_detail_text_size" />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:orientation="horizontal">
+ <TextView
+ android:id="@+id/jindu"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@{data.workOrderId}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
- <TextView
+ </LinearLayout>
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="娲惧崟浜哄鍚嶏細"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
-
- <TextView
-
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{data.dispatcher}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
-
-
- </LinearLayout>
-
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:orientation="horizontal">
-
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="娲惧崟鏃堕棿锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
-
- <TextView
-
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@{data.dispatchTime}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
+ android:layout_marginTop="5dp"
+ android:orientation="horizontal">
- </LinearLayout>
+ <TextView
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:gravity="center_vertical"
- android:orientation="horizontal">
+ android:layout_width="120dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="娲惧崟浜哄鍚嶏細"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <TextView
+
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{data.dispatcher}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
- <TextView
- android:layout_width="wrap_content"
+ </LinearLayout>
+
+
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="5dp"
+ android:orientation="horizontal">
+
+
+ <TextView
+ android:layout_width="120dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="娲惧崟鏃堕棿锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <TextView
+
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@{data.dispatchTime}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
+
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="5dp"
android:gravity="center_vertical"
- android:text="浠诲姟绫诲瀷锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
+ android:orientation="horizontal">
- <TextView
- android:id="@+id/startTime"
+
+ <TextView
+ android:layout_width="120dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="浠诲姟绫诲瀷锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <TextView
+ android:id="@+id/startTime"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@{data.taskType}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ </LinearLayout>
+
+
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@{data.taskType}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
-
- </LinearLayout>
+ android:layout_marginTop="5dp"
+ android:orientation="horizontal">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:orientation="horizontal">
+ <TextView
+ android:id="@+id/daiShenPiTag"
+ android:layout_width="120dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="瑕佹眰瀹屾垚鏃堕棿锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <TextView
+ android:id="@+id/daiShenPi"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@{data.deadLine}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
- <TextView
- android:id="@+id/daiShenPiTag"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="瑕佹眰瀹屾垚鏃堕棿锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
+ </LinearLayout>
- <TextView
- android:id="@+id/daiShenPi"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@{data.deadLine}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
+ android:layout_marginTop="5dp"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
- </LinearLayout>
+ <TextView
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:gravity="center_vertical"
- android:orientation="horizontal">
+ android:layout_width="120dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="瀹屾垚鏍囧噯锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <TextView
+ android:id="@+id/xiangMuJianCheng"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+
+ android:text="@{data.completeCriteria}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
- <TextView
+ </LinearLayout>
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="瀹屾垚鏍囧噯锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
- <TextView
- android:id="@+id/xiangMuJianCheng"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="5dp"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
- android:text="@{data.completeCriteria}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
+ <TextView
+ android:layout_width="120dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="浠诲姟鍐呭锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <TextView
+ android:id="@+id/xiangMuType"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@{data.taskContent}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
+
+
+ </LinearLayout>
</LinearLayout>
-
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:gravity="center_vertical"
- android:orientation="horizontal">
-
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="浠诲姟鍐呭锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
-
- <TextView
- android:id="@+id/xiangMuType"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@{data.taskContent}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
-
-
- </LinearLayout>
-
<LinearLayout
android:id="@+id/orderDealLL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="15dp"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginBottom="20dp"
+ android:background="@drawable/bg_detail_wite"
android:orientation="vertical"
- android:visibility="gone">
+ android:paddingLeft="10dp"
+ android:paddingTop="15dp"
+ android:paddingRight="10dp"
+ android:paddingBottom="20dp">
+
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+
+ android:layout_marginBottom="5dp"
+ android:gravity="center"
+ android:text="澶勭悊缁撴灉"
+ android:textColor="@color/base_blue"
+ android:textSize="@dimen/order_detail_text_size"
+ android:textStyle="bold" />
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@color/base_blue" />
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:gravity="center"
- android:text="澶勭悊缁撴灉"
- android:textColor="@color/base_blue"
- android:textSize="@dimen/order_detail_text_size" />
<LinearLayout
@@ -315,7 +346,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鍙嶉璇︽儏锛�"
- android:textColor="@color/manage_item_text"
+ android:textColor="@color/item_name_text_color"
android:textSize="@dimen/order_detail_text_size" />
<TextView
@@ -341,7 +372,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鍙嶉鏃堕棿锛�"
- android:textColor="@color/manage_item_text"
+ android:textColor="@color/item_name_text_color"
android:textSize="@dimen/order_detail_text_size" />
<TextView
@@ -365,7 +396,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鍙嶉鍥剧墖锛�"
- android:textColor="@color/manage_item_text"
+ android:textColor="@color/item_name_text_color"
android:textSize="@dimen/order_detail_text_size" />
<androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_order.xml b/app/src/main/res/layout/fragment_order.xml
index 6e15b97..5e378bb 100644
--- a/app/src/main/res/layout/fragment_order.xml
+++ b/app/src/main/res/layout/fragment_order.xml
@@ -214,7 +214,7 @@
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#fff"
+ android:background="@color/item_bg_color"
android:overScrollMode="never"
android:padding="10dp" />
diff --git a/app/src/main/res/layout/item_issue.xml b/app/src/main/res/layout/item_issue.xml
index 3bfda52..9fa0bce 100644
--- a/app/src/main/res/layout/item_issue.xml
+++ b/app/src/main/res/layout/item_issue.xml
@@ -80,7 +80,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="涓婃姤鍐呭锛�"
- android:textColor="@color/manage_item_text"
+ android:textColor="@color/item_name_text_color"
android:textSize="@dimen/manage_item_text_size" />
<TextView
@@ -108,7 +108,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="涓婃姤鏃堕棿锛�"
- android:textColor="@color/manage_item_text"
+ android:textColor="@color/item_name_text_color"
android:textSize="@dimen/manage_item_text_size" />
<TextView
@@ -137,7 +137,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="鍥炲鍐呭锛�"
- android:textColor="@color/manage_item_text"
+ android:textColor="@color/item_name_text_color"
android:textSize="@dimen/manage_item_text_size" />
<TextView
@@ -167,7 +167,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="鍥炲鏃堕棿锛�"
- android:textColor="@color/manage_item_text"
+ android:textColor="@color/item_name_text_color"
android:textSize="@dimen/manage_item_text_size" />
<TextView
diff --git a/app/src/main/res/layout/item_order.xml b/app/src/main/res/layout/item_order.xml
index 67769ca..8a62a37 100644
--- a/app/src/main/res/layout/item_order.xml
+++ b/app/src/main/res/layout/item_order.xml
@@ -32,6 +32,7 @@
android:layout_height="20dp"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
+ android:layout_marginLeft="10dp"
android:src="@mipmap/icon_project" />
<TextView
@@ -58,12 +59,12 @@
android:layout_centerVertical="true"
android:background="@drawable/ic_edt_gray_bg"
android:gravity="center"
- android:textColor="@color/black"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:paddingRight="10dp"
android:paddingBottom="5dp"
android:text="@{data.processingState}"
+ android:textColor="@color/black"
android:textSize="@dimen/manage_item_text_state_size" />
@@ -76,23 +77,23 @@
android:orientation="horizontal">
+ <TextView
+ android:id="@+id/jinduTag"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="宸ュ崟ID锛�"
- <TextView
- android:id="@+id/jinduTag"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="宸ュ崟ID锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/manage_item_text_size" />
- <TextView
- android:id="@+id/jindu"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{data.workOrderId}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
-
+ <TextView
+ android:id="@+id/jindu"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{data.workOrderId}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/manage_item_text_size" />
</LinearLayout>
@@ -104,25 +105,23 @@
android:orientation="horizontal">
+ <TextView
+ android:id="@+id/daiShenPiTag"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="瑕佹眰瀹屾垚鏃堕棿锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/manage_item_text_size" />
- <TextView
- android:id="@+id/daiShenPiTag"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="瑕佹眰瀹屾垚鏃堕棿锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
-
- <TextView
- android:id="@+id/daiShenPi"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{data.deadLine}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
- </LinearLayout>
-
-
+ <TextView
+ android:id="@+id/daiShenPi"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{data.deadLine}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/manage_item_text_size" />
+ </LinearLayout>
<LinearLayout
@@ -133,28 +132,25 @@
android:orientation="horizontal">
+ <TextView
- <TextView
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="瀹屾垚鏍囧噯锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/manage_item_text_size" />
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="瀹屾垚鏍囧噯锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
-
- <TextView
- android:id="@+id/xiangMuJianCheng"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:maxLines="1"
- android:text="@{data.completeCriteria}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
- </LinearLayout>
-
-
-
+ <TextView
+ android:id="@+id/xiangMuJianCheng"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:text="@{data.completeCriteria}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/manage_item_text_size" />
+ </LinearLayout>
<LinearLayout
@@ -165,23 +161,23 @@
android:orientation="horizontal">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="浠诲姟鍐呭锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
+ <TextView
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="浠诲姟鍐呭锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/manage_item_text_size" />
- <TextView
- android:id="@+id/xiangMuType"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:maxLines="1"
- android:text="@{data.taskContent}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
-
+ <TextView
+ android:id="@+id/xiangMuType"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:text="@{data.taskContent}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/manage_item_text_size" />
</LinearLayout>
@@ -190,28 +186,25 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
+ android:layout_marginBottom="5dp"
android:orientation="horizontal">
+ <TextView
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="娲惧崟鏃堕棿锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/manage_item_text_size" />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:text="娲惧崟鏃堕棿锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
-
- <TextView
- android:id="@+id/startTime"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@{data.dispatchTime}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
-
-
-
+ <TextView
+ android:id="@+id/startTime"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@{data.dispatchTime}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/manage_item_text_size" />
</LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 83f72ff..6aaba63 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -28,4 +28,6 @@
<color name="inspect_text_color_pause">#7fff00</color>
<color name="inspect_rl_bg_color">#ff6347</color>
<color name="delete_color">#ff0000</color>
+ <color name="item_bg_color">#F9F9F9</color>
+ <color name="item_name_text_color">#828282</color>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0