From 9c2908d8a110eaa28ec63a877291aeea61ee4e60 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 03 十二月 2024 09:38:24 +0800
Subject: [PATCH] 优化自定义二次确认Dialog回调
---
app/src/main/java/com/dayu/pipirrapp/fragment/MyFragment.java | 7 +
app/src/main/assets/js/map.js | 2
app/src/main/java/com/dayu/pipirrapp/view/TagDialog.java | 20 +--
app/src/main/java/com/dayu/pipirrapp/tool/InspectionUtils.java | 8 +
app/src/main/java/com/dayu/pipirrapp/MyApplication.java | 17 +-
app/src/main/java/com/dayu/pipirrapp/utils/CommonKeyName.java | 4
app/src/main/java/com/dayu/pipirrapp/view/ConfirmDialog.java | 24 +++-
app/src/main/java/com/dayu/pipirrapp/net/MyIntercepterApplication.java | 7 +
app/src/main/res/values/colors.xml | 3
app/src/main/java/com/dayu/pipirrapp/bean/db/InspectionLocationBean.java | 10 ++
app/src/main/res/layout/fragment_map.xml | 54 +++++++++-
app/src/main/java/com/dayu/pipirrapp/bean/db/InspectionBean.java | 8 +
app/src/main/java/com/dayu/pipirrapp/bean/net/InspectionRequest.java | 2
app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java | 108 +++++++++++++--------
14 files changed, 188 insertions(+), 86 deletions(-)
diff --git a/app/src/main/assets/js/map.js b/app/src/main/assets/js/map.js
index 4dc5294..1f20526 100644
--- a/app/src/main/assets/js/map.js
+++ b/app/src/main/assets/js/map.js
@@ -271,7 +271,7 @@
}
//淇濆瓨瀹氫綅鍧愭爣鐢熸垚杞ㄨ抗
var path=[];
- var lineLayer = new T.Polyline([], { color: 'red', weight: 3, opacity: 0.8 });
+ var lineLayer = new T.Polyline([], { color: '#ff4500', weight: 3, opacity: 0.8 });
function updateLocation(log,lat){
var lastLat=lat;
diff --git a/app/src/main/java/com/dayu/pipirrapp/MyApplication.java b/app/src/main/java/com/dayu/pipirrapp/MyApplication.java
index d0d67aa..e2281fc 100644
--- a/app/src/main/java/com/dayu/pipirrapp/MyApplication.java
+++ b/app/src/main/java/com/dayu/pipirrapp/MyApplication.java
@@ -34,14 +34,15 @@
// JPushInterface.init(this);
CrashReport.initCrashReport(getApplicationContext(), "3d4bcf7046", false);
- // 璁剧疆鍏ㄥ眬鐨刄ncaughtExceptionHandler
- Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
- @Override
- public void uncaughtException(Thread thread, Throwable ex) {
- // 杩欓噷澶勭悊鏈崟鑾风殑寮傚父
- CrashReport.postCatchedException(ex);
- }
- });
+// // 璁剧疆鍏ㄥ眬鐨刄ncaughtExceptionHandler
+// Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+// @Override
+// public void uncaughtException(Thread thread, Throwable ex) {
+// Log.e("MyApplication", ex.toString());
+// // 杩欓噷澶勭悊鏈崟鑾风殑寮傚父
+// CrashReport.postCatchedException(ex);
+// }
+// });
//璁剧疆
LiveEventBus.config()
// .lifecycleObserverAlwaysActive(false) // 鎺у埗鐢熷懡鍛ㄦ湡鐩戝惉鐨勯粯璁よ涓�
diff --git a/app/src/main/java/com/dayu/pipirrapp/bean/db/InspectionBean.java b/app/src/main/java/com/dayu/pipirrapp/bean/db/InspectionBean.java
index e43d988..ce6c214 100644
--- a/app/src/main/java/com/dayu/pipirrapp/bean/db/InspectionBean.java
+++ b/app/src/main/java/com/dayu/pipirrapp/bean/db/InspectionBean.java
@@ -15,9 +15,17 @@
@PrimaryKey(autoGenerate = true)
public long id;
String inspectId;//宸℃ID
+ String mInspectId;//鏈湴鏁版嵁搴撳贰妫�ID
String startTime;//寮�濮嬪贰妫�鏃堕棿
String stopTime;//鍋滄宸℃鏃堕棿
+ public String getmInspectId() {
+ return mInspectId;
+ }
+
+ public void setmInspectId(String mInspectId) {
+ this.mInspectId = mInspectId;
+ }
public String getInspectId() {
return inspectId;
diff --git a/app/src/main/java/com/dayu/pipirrapp/bean/db/InspectionLocationBean.java b/app/src/main/java/com/dayu/pipirrapp/bean/db/InspectionLocationBean.java
index 31e37e2..d78479a 100644
--- a/app/src/main/java/com/dayu/pipirrapp/bean/db/InspectionLocationBean.java
+++ b/app/src/main/java/com/dayu/pipirrapp/bean/db/InspectionLocationBean.java
@@ -16,11 +16,21 @@
public long id;
String inspectorId;//宸℃鍛業D
String inspectId;//宸℃ID
+ String mInspectId;//鏈湴鏁版嵁搴撳贰妫�ID
String lng;//缁忓害
String lat;//绾害
String locateTime;//鎵撶偣鏃堕棿
boolean isPost;//鏄惁宸茬粡涓婁紶
+
+ public String getmInspectId() {
+ return mInspectId;
+ }
+
+ public void setmInspectId(String mInspectId) {
+ this.mInspectId = mInspectId;
+ }
+
public String getInspectorId() {
return inspectorId;
}
diff --git a/app/src/main/java/com/dayu/pipirrapp/bean/net/InspectionRequest.java b/app/src/main/java/com/dayu/pipirrapp/bean/net/InspectionRequest.java
index d034eec..8e11af7 100644
--- a/app/src/main/java/com/dayu/pipirrapp/bean/net/InspectionRequest.java
+++ b/app/src/main/java/com/dayu/pipirrapp/bean/net/InspectionRequest.java
@@ -15,7 +15,7 @@
private String inspectId;
private String startTime;
private String stopTime;
- private List<Track> tracks;
+ private List<Track> tracks=new ArrayList<>();
public String getInspectorId() {
diff --git a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
index 1ce4b82..0cb878e 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
+++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MapFragment.java
@@ -9,7 +9,6 @@
import android.location.LocationManager;
import android.os.Build;
import android.os.Bundle;
-import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -26,6 +25,7 @@
import androidx.lifecycle.Observer;
import com.dayu.pipirrapp.MyApplication;
+import com.dayu.pipirrapp.R;
import com.dayu.pipirrapp.bean.db.CenterPointBean;
import com.dayu.pipirrapp.bean.db.InspectionBean;
import com.dayu.pipirrapp.bean.db.InspectionLocationBean;
@@ -61,9 +61,7 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.Random;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
@@ -85,8 +83,8 @@
WebView mWebView;
CenterPointBean centerPointBean;
String strMarkerJson;
- //鏄惁鏄剧ず
- boolean isStartInspec = false;
+ //褰撳墠宸℃鐘舵��
+ int mInspectionState;
MapFragmenObserver mapFragmenObserver;
//褰撳墠宸℃璁板綍鐨勭浉鍏充俊鎭�
InspectionBean mInspectionBean;
@@ -105,7 +103,7 @@
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Log.i(TAG, "onCreate");
- isStartInspec = SharedPreferencesHelper.getInstance(this.getContext()).get(CommonKeyName.isStartInspec, false);
+ mInspectionState = SharedPreferencesHelper.getInstance(this.getContext()).get(CommonKeyName.inspectionState, 0);
}
@Override
@@ -132,7 +130,7 @@
initLocalData();
getMarkerData();
//鏄剧ず宸℃鐘舵��
- chageInspecState();
+ chageInspecState(mInspectionState);
return binding.getRoot();
}
@@ -328,19 +326,19 @@
});
//宸℃鎸夐挳
binding.inspectButton.setOnClickListener(v -> {
- if (isStartInspec) {
- ConfirmDialog confirmDialog = new ConfirmDialog(MapFragment.this.getActivity(), "鎻愮ず", "纭鍏抽棴宸℃鍚楋紵", new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- isStartInspec = !isStartInspec;
- chageInspecState();
- }
- });
+ chageInspecState(InspectionUtils.STAT_INSPECTION);
+ });
+ //鏆傚仠宸℃
+ binding.inspectPause.setOnClickListener(v -> {
+ if (mInspectionState == InspectionUtils.STAT_INSPECTION) {
+ chageInspecState(InspectionUtils.PAUSE_INSPECTION);
} else {
- isStartInspec = !isStartInspec;
- chageInspecState();
+ chageInspecState(InspectionUtils.STAT_INSPECTION);
}
-
+ });
+ //鍋滄宸℃
+ binding.inspectClose.setOnClickListener(v -> {
+ chageInspecState(InspectionUtils.STOP_INSPECTION);
});
}
@@ -475,30 +473,60 @@
/**
* 淇敼宸℃鐘舵��
*/
- private void chageInspecState() {
+ private void chageInspecState(int inspectionState) {
Intent location = new Intent(this.getActivity(), MyLocationService.class);
location.putExtra("isSingle", false);
- if (isStartInspec) {
- //娣诲姞鏂扮殑宸℃璁板綍
- startInspection();
- //鑾峰彇瀹氫綅鏈嶅姟浼犺繃鏉ョ殑鍧愭爣鐐�
- LiveEventBus.get(CommonKeyName.locationData).observeForever(locationObserver);
- binding.stateText.setVisibility(View.VISIBLE);
- binding.inspectButton.setText("缁�");
- //寮�鍚畾浣�
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- this.getActivity().startForegroundService(location);
- } else {
- this.getActivity().startService(location);
- }
- mInspectionBean = InspectionUtils.startInspection(this.getContext());
- inspectionRequest = new InspectionRequest();
- } else {
- binding.stateText.setVisibility(View.GONE);
- binding.inspectButton.setText("宸�");
- LiveEventBus.get(CommonKeyName.locationData).removeObserver(locationObserver);
- //鍏抽棴瀹氫綅
- this.getActivity().stopService(location);
+ //0娌℃湁寮�濮嬶紝1寮�濮嬶紝2鏆傚仠,3鍏抽棴
+ switch (inspectionState) {
+ case 0:
+ binding.inspectButton.setVisibility(View.VISIBLE);
+ binding.inspectRL.setVisibility(View.GONE);
+ binding.inspectButton.setText("宸�");
+ LiveEventBus.get(CommonKeyName.locationData).removeObserver(locationObserver);
+ //鍏抽棴瀹氫綅
+ this.getActivity().stopService(location);
+ break;
+ case 1:
+ //娣诲姞鏂扮殑宸℃璁板綍
+ startInspection();
+ //鑾峰彇瀹氫綅鏈嶅姟浼犺繃鏉ョ殑鍧愭爣鐐�
+ LiveEventBus.get(CommonKeyName.locationData).observeForever(locationObserver);
+ binding.inspectRL.setVisibility(View.VISIBLE);
+ binding.inspectButton.setVisibility(View.GONE);
+ binding.inspectPause.setText("鏆傚仠");
+ binding.stateText.setText("宸插紑鍚贰妫�");
+ binding.inspectRL.setBackgroundColor(this.getContext().getResources().getColor(R.color.base_blue));
+ //寮�鍚畾浣�
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ this.getActivity().startForegroundService(location);
+ } else {
+ this.getActivity().startService(location);
+ }
+ mInspectionBean = InspectionUtils.startInspection(this.getContext());
+ inspectionRequest = new InspectionRequest();
+ break;
+ case 2://鏆傚仠
+
+ LiveEventBus.get(CommonKeyName.locationData).removeObserver(locationObserver);
+ //鍏抽棴瀹氫綅
+ this.getActivity().stopService(location);
+ binding.stateText.setText("宸叉殏鍋滃贰妫�");
+ binding.inspectPause.setText("缁х画");
+ binding.inspectRL.setBackgroundColor(this.getContext().getResources().getColor(R.color.inspect_rl_bg_color));
+ break;
+ case 3:
+ ConfirmDialog confirmDialog = new ConfirmDialog(MapFragment.this.getActivity(), "鎻愮ず", "纭鍏抽棴宸℃鍚楋紵", new ConfirmDialog.ConfirmOnClickListener() {
+ @Override
+ public void onClick(ConfirmDialog confirmDialog, View v) {
+ confirmDialog.dismiss();
+ chageInspecState(InspectionUtils.NO_INSPECTION);
+ }
+ });
+ confirmDialog.show();
+ break;
+ default:
}
+ mInspectionState = inspectionState;
+
}
}
diff --git a/app/src/main/java/com/dayu/pipirrapp/fragment/MyFragment.java b/app/src/main/java/com/dayu/pipirrapp/fragment/MyFragment.java
index c2526b3..635c5ab 100644
--- a/app/src/main/java/com/dayu/pipirrapp/fragment/MyFragment.java
+++ b/app/src/main/java/com/dayu/pipirrapp/fragment/MyFragment.java
@@ -28,6 +28,7 @@
*/
public class MyFragment extends BaseFragment {
FragmentMyBinding binding;
+ ConfirmDialog confirmDialog;
@Nullable
@Override
@@ -46,8 +47,9 @@
//閫�鍑虹櫥褰�
binding.loginOutRL.setOnClickListener((v) -> {
- ConfirmDialog confirmDialog = new ConfirmDialog(MyFragment.this.getActivity(), "纭畾閫�鍑哄悧锛�", v1 -> {
+ ConfirmDialog confirmDialog = new ConfirmDialog(MyFragment.this.getActivity(), "纭畾閫�鍑哄悧锛�", (confirmDialog1, v12) -> {
try {
+ confirmDialog1.dismiss();
CleanDataUtils.cleanUserData(MyFragment.this.getContext());
Intent intent = new Intent(MyFragment.this.getContext(), LoginActivity.class);
MyFragment.this.getActivity().startActivity(intent);
@@ -66,8 +68,9 @@
}
// 娓呴櫎缂撳瓨
binding.cleanDataRL.setOnClickListener(v -> {
- ConfirmDialog confirmDialog = new ConfirmDialog(MyFragment.this.getActivity(), "纭畾娓呴櫎缂撳瓨鍚楋紵", v1 -> {
+ ConfirmDialog confirmDialog = new ConfirmDialog(MyFragment.this.getActivity(), "纭畾娓呴櫎缂撳瓨鍚楋紵", (dialog, v1) -> {
try {
+ dialog.dismiss();
CleanDataUtils.cleanMapData(MyFragment.this.getContext());
ToastUtil.showToast(MyFragment.this.getActivity(), "娓呴櫎鎴愬姛");
} catch (Exception e) {
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 b32dfb5..8da13e0 100644
--- a/app/src/main/java/com/dayu/pipirrapp/net/MyIntercepterApplication.java
+++ b/app/src/main/java/com/dayu/pipirrapp/net/MyIntercepterApplication.java
@@ -1,5 +1,7 @@
package com.dayu.pipirrapp.net;
+import android.text.TextUtils;
+
import com.dayu.pipirrapp.MyApplication;
import com.dayu.pipirrapp.utils.ToastUtil;
import com.tencent.bugly.crashreport.CrashReport;
@@ -65,7 +67,10 @@
}
}
builder.addHeader("os", "app");
- builder.addHeader("token", MyApplication.myApplication.token);
+ if (!TextUtils.isEmpty(MyApplication.myApplication.token)) {
+ builder.addHeader("token", MyApplication.myApplication.token);
+ }
+
}
builder.addHeader("tag", MyApplication.myApplication.myTag);
return builder.build();
diff --git a/app/src/main/java/com/dayu/pipirrapp/tool/InspectionUtils.java b/app/src/main/java/com/dayu/pipirrapp/tool/InspectionUtils.java
index eb3a256..f4f3ebb 100644
--- a/app/src/main/java/com/dayu/pipirrapp/tool/InspectionUtils.java
+++ b/app/src/main/java/com/dayu/pipirrapp/tool/InspectionUtils.java
@@ -26,6 +26,12 @@
private static final String TAG = "InspectionUtils";
//鎵撶偣鐨勬渶灏忎袱鐐规渶灏忚窛绂�
private static final int MinMeters = 10;
+ //0娌℃湁寮�濮嬶紝1寮�濮嬶紝2鏆傚仠,3鍏抽棴
+ public static final int NO_INSPECTION = 0;
+ public static final int STAT_INSPECTION = 1;
+ public static final int PAUSE_INSPECTION = 2;
+ public static final int STOP_INSPECTION = 3;
+
/**
* 鑾峰彇褰撳墠宸℃璁板綍ID
@@ -49,7 +55,7 @@
public static InspectionBean startInspection(Context context) {
// 鍒涘缓宸℃璁板綍
InspectionBean inspectionBean = new InspectionBean();
- inspectionBean.setInspectId(UUID.randomUUID().toString());
+ inspectionBean.setmInspectId(UUID.randomUUID().toString());
inspectionBean.setStartTime(DateUtils.getNowDateStr());
// 寮傛鎻掑叆鍒版暟鎹簱
DaoSingleton.getAsynchInstance(context)
diff --git a/app/src/main/java/com/dayu/pipirrapp/utils/CommonKeyName.java b/app/src/main/java/com/dayu/pipirrapp/utils/CommonKeyName.java
index 752bc9f..13cb846 100644
--- a/app/src/main/java/com/dayu/pipirrapp/utils/CommonKeyName.java
+++ b/app/src/main/java/com/dayu/pipirrapp/utils/CommonKeyName.java
@@ -13,8 +13,8 @@
//鏄惁鏄剧ず楠岃瘉鐮�
public final static String isShowCode = "isShowCode";
- //鏄惁寮�濮嬪贰妫�
- public final static String isStartInspec = "isStartInspec";
+ //褰撳墠宸℃鐘舵�� 0娌℃湁寮�濮嬶紝1寮�濮嬶紝2鏆傚仠
+ public final static String inspectionState = "inspectionState";
//瀹氫綅鍚�
public final static String locationData = "locationData";
diff --git a/app/src/main/java/com/dayu/pipirrapp/view/ConfirmDialog.java b/app/src/main/java/com/dayu/pipirrapp/view/ConfirmDialog.java
index 17ce71a..4b71eb8 100644
--- a/app/src/main/java/com/dayu/pipirrapp/view/ConfirmDialog.java
+++ b/app/src/main/java/com/dayu/pipirrapp/view/ConfirmDialog.java
@@ -24,7 +24,7 @@
Activity mContext;
- View.OnClickListener mListner;
+ ConfirmOnClickListener mListner;
String mData;
String mTitle;
@@ -34,15 +34,15 @@
initView();
}
- public ConfirmDialog(@NonNull Activity context, View.OnClickListener listner) {
- super(context,R.style.showSelfDialog);
+ public ConfirmDialog(@NonNull Activity context, ConfirmOnClickListener listner) {
+ super(context, R.style.showSelfDialog);
mContext = context;
mListner = listner;
initView();
}
- public ConfirmDialog(@NonNull Activity context, String data, View.OnClickListener listner) {
+ public ConfirmDialog(@NonNull Activity context, String data, ConfirmOnClickListener listner) {
super(context, R.style.showSelfDialog);
mContext = context;
mListner = listner;
@@ -50,8 +50,8 @@
initView();
}
- public ConfirmDialog(@NonNull Activity context, String title, String data, View.OnClickListener listner) {
- super(context,R.style.showSelfDialog);
+ public ConfirmDialog(@NonNull Activity context, String title, String data, ConfirmOnClickListener listner) {
+ super(context, R.style.showSelfDialog);
mContext = context;
mListner = listner;
mData = data;
@@ -83,7 +83,12 @@
mContext.finish();
});
} else {
- ok.setOnClickListener(mListner);
+ ok.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ mListner.onClick(ConfirmDialog.this, v);
+ }
+ });
}
}
@@ -101,4 +106,9 @@
getWindow().getDecorView().setPadding(0, 0, 0, 0);
getWindow().setAttributes(layoutParams);
}
+
+
+ public interface ConfirmOnClickListener {
+ void onClick(ConfirmDialog confirmDialog, View v);
+ }
}
diff --git a/app/src/main/java/com/dayu/pipirrapp/view/TagDialog.java b/app/src/main/java/com/dayu/pipirrapp/view/TagDialog.java
index db668d5..4060add 100644
--- a/app/src/main/java/com/dayu/pipirrapp/view/TagDialog.java
+++ b/app/src/main/java/com/dayu/pipirrapp/view/TagDialog.java
@@ -2,15 +2,12 @@
import static android.view.Gravity.CENTER;
-
import android.app.Activity;
import android.app.Dialog;
-import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.RadioGroup;
import android.widget.TextView;
-
import com.dayu.pipirrapp.MyApplication;
import com.dayu.pipirrapp.R;
@@ -35,7 +32,6 @@
libraryBack mLibraryBack;
String data;
int type;
- ConfirmDialog confirmDialog;
public TagDialog(Activity context, libraryBack libraryBack) {
super(context, R.style.showSelfDialog);
@@ -74,16 +70,12 @@
okBtn.setOnClickListener(v -> {
if (ischose) {
//浜屾纭
- confirmDialog = new ConfirmDialog(mContext, data, new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- MyApplication.myApplication.myTag = tagBean.getTag();
-
- tagDao.insert(tagBean);
- mLibraryBack.listener(type);
- TagDialog.this.dismiss();
- confirmDialog.dismiss();
- }
+ ConfirmDialog confirmDialog = new ConfirmDialog(mContext, data, (dialog, v1) -> {
+ MyApplication.myApplication.myTag = tagBean.getTag();
+ tagDao.insert(tagBean);
+ mLibraryBack.listener(type);
+ TagDialog.this.dismiss();
+ dialog.dismiss();
});
confirmDialog.show();
diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml
index 73c122e..e51d0dc 100644
--- a/app/src/main/res/layout/fragment_map.xml
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -13,17 +13,52 @@
android:layout_height="match_parent" />
-
- <TextView
- android:id="@+id/stateText"
+ <RelativeLayout
+ android:id="@+id/inspectRL"
android:layout_width="match_parent"
android:layout_height="35dp"
- android:layout_alignParentTop="true"
- android:background="@color/base_blue"
- android:gravity="center"
- android:text="宸插紑鍚贰妫�"
- android:textColor="@color/white"
- android:textSize="18sp" />
+ android:background="@color/base_blue">
+
+ <TextView
+ android:id="@+id/inspectPause"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="10dp"
+ android:background="@drawable/ic_blue_background"
+ android:paddingLeft="15dp"
+ android:paddingRight="15dp"
+ android:text="鏆傚仠"
+ android:textColor="@color/inspect_text_color_pause" />
+
+
+ <TextView
+ android:id="@+id/stateText"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:layout_centerVertical="true"
+
+ android:gravity="center"
+ android:text="宸插紑鍚贰妫�"
+ android:textColor="@color/white"
+ android:textSize="18sp" />
+
+ <TextView
+ android:id="@+id/inspectClose"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="10dp"
+ android:background="@drawable/ic_blue_background"
+ android:paddingLeft="15dp"
+ android:paddingRight="15dp"
+ android:text="缁撴潫"
+ android:textColor="@color/inspect_text_color_close" />
+ </RelativeLayout>
+
<TextView
android:id="@+id/inspectButton"
@@ -32,6 +67,7 @@
android:layout_alignParentRight="true"
android:layout_marginTop="60dp"
android:layout_marginRight="15dp"
+
android:background="@drawable/ic_blue_background"
android:padding="10dp"
android:text="宸�"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9d0b954..0510356 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -21,4 +21,7 @@
<color name="manage_item_time">#AAAAAA</color>
<color name="app_color_f6">#f6f6f6</color>
<color name="app_color_white">#FFFFFF</color>
+ <color name="inspect_text_color_close">#ff0000</color>
+ <color name="inspect_text_color_pause">#7fff00</color>
+ <color name="inspect_rl_bg_color">#ff6347</color>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0