yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.0.0/5.0.0]MessagePad.Line新增lineName字段:增加debug view信息

Browse Source
This commit is contained in:
pangfan
2023-08-23 16:06:32 +08:00
parent b6c4777ad4
commit c5b087afc3
8 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
View File

@@ -586,6 +586,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
*/
private View busTestBar;
private TextView lineIdTV;
private TextView lineNameTV;
private TextView trajMd5TV;
private TextView stopMd5TV;
private TextView trajMd5DPQPTV;
@@ -595,6 +596,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
if (busTestBar == null) {
busTestBar = findViewById(R.id.module_mogo_och_bus_test_bar);
lineIdTV = findViewById(R.id.bus_test_bar_current_line_id);
lineNameTV = findViewById(R.id.bus_test_bar_current_line_name);
trajMd5TV = findViewById(R.id.bus_test_bar_current_traj_md5);
stopMd5TV = findViewById(R.id.bus_test_bar_current_stop_md5);
trajMd5DPQPTV = findViewById(R.id.bus_test_bar_current_traj_md5_dpqp);
@@ -606,6 +608,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
} else {
BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult();
lineIdTV.setText("lineId:" + (routesResult == null ? "" : String.valueOf(routesResult.getLineId())));
lineNameTV.setText("lineName:" + (routesResult == null ? "" : routesResult.getName()));
trajMd5TV.setText("TMd5:" + (routesResult == null ? "" : routesResult.csvFileMd5));
stopMd5TV.setText("SMd5:" + (routesResult == null ? "" : routesResult.txtFileMd5));
trajMd5DPQPTV.setText("TMd5DPQP:" + (routesResult == null ? "" : routesResult.csvFileMd5DPQP));
@@ -618,6 +621,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
if (busTestBar != null && busTestBar.getVisibility() == View.VISIBLE) {
BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult();
lineIdTV.setText("lineId:" + (routesResult == null ? "" : String.valueOf(routesResult.getLineId())));
lineNameTV.setText("lineName:" + (routesResult == null ? "" : routesResult.getName()));
trajMd5TV.setText("TMd5:" + (routesResult == null ? "" : routesResult.csvFileMd5));
stopMd5TV.setText("SMd5:" + (routesResult == null ? "" : routesResult.txtFileMd5));
trajMd5DPQPTV.setText("TMd5DPQP:" + (routesResult == null ? "" : routesResult.csvFileMd5DPQP));

7
OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml
View File

@@ -11,6 +11,13 @@
android:textSize="@dimen/dp_24"
android:textColor="@android:color/white"/>
<TextView
android:id="@+id/bus_test_bar_current_line_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/dp_24"
android:textColor="@android:color/white"/>
<TextView
android:id="@+id/bus_test_bar_current_traj_md5"
android:layout_width="wrap_content"

4
OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
View File

@@ -593,6 +593,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
*/
private View busTestBar;
private TextView lineIdTV;
private TextView lineNameTV;
private TextView trajMd5TV;
private TextView stopMd5TV;
private TextView trajMd5DPQPTV;
@@ -602,6 +603,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
if (busTestBar == null) {
busTestBar = findViewById(R.id.module_mogo_och_bus_test_bar);
lineIdTV = findViewById(R.id.bus_test_bar_current_line_id);
lineNameTV = findViewById(R.id.bus_test_bar_current_line_name);
trajMd5TV = findViewById(R.id.bus_test_bar_current_traj_md5);
stopMd5TV = findViewById(R.id.bus_test_bar_current_stop_md5);
trajMd5DPQPTV = findViewById(R.id.bus_test_bar_current_traj_md5_dpqp);
@@ -613,6 +615,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
} else {
BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult();
lineIdTV.setText("lineId:" + (routesResult == null ? "" : String.valueOf(routesResult.getLineId())));
lineNameTV.setText("lineName:" + (routesResult == null ? "" : routesResult.getName()));
trajMd5TV.setText("TMd5:" + (routesResult == null ? "" : routesResult.csvFileMd5));
stopMd5TV.setText("SMd5:" + (routesResult == null ? "" : routesResult.txtFileMd5));
trajMd5DPQPTV.setText("TMd5DPQP:" + (routesResult == null ? "" : routesResult.csvFileMd5DPQP));
@@ -625,6 +628,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
if (busTestBar != null && busTestBar.getVisibility() == View.VISIBLE) {
BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult();
lineIdTV.setText("lineId:" + (routesResult == null ? "" : String.valueOf(routesResult.getLineId())));
lineNameTV.setText("lineName:" + (routesResult == null ? "" : routesResult.getName()));
trajMd5TV.setText("TMd5:" + (routesResult == null ? "" : routesResult.csvFileMd5));
stopMd5TV.setText("SMd5:" + (routesResult == null ? "" : routesResult.txtFileMd5));
trajMd5DPQPTV.setText("TMd5DPQP:" + (routesResult == null ? "" : routesResult.csvFileMd5DPQP));

7
OCH/mogo-och-shuttle/src/main/res/layout/bus_test_bar_view.xml
View File

@@ -11,6 +11,13 @@
android:textSize="@dimen/dp_24"
android:textColor="@android:color/white"/>
<TextView
android:id="@+id/bus_test_bar_current_line_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/dp_24"
android:textColor="@android:color/white"/>
<TextView
android:id="@+id/bus_test_bar_current_traj_md5"
android:layout_width="wrap_content"

4
OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
View File

@@ -396,6 +396,7 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
private View testBar;
private TextView testCurOrderId;
private TextView testCurLineId;
private TextView testCurLineName;
private TextView testCurTrajMd5;
private TextView testCurStopMd5;
private TextView testCurTrajMd5DPQP;
@@ -406,6 +407,7 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
testBar = findViewById(R.id.module_och_taxi_order_status_change_test_bar);
testCurOrderId = findViewById(R.id.test_bar_current_order_id);
testCurLineId = findViewById(R.id.test_bar_current_line_id);
testCurLineName = findViewById(R.id.test_bar_current_line_name);
testCurTrajMd5 = findViewById(R.id.test_bar_current_traj_md5);
testCurStopMd5 = findViewById(R.id.test_bar_current_stop_md5);
testCurTrajMd5DPQP = findViewById(R.id.test_bar_current_traj_md5_dpqp);
@@ -418,6 +420,7 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
OrderQueryRespBean.Result order = TaxiModel.getInstance().getCurrentOCHOrder();
testCurOrderId.setText("orderNo:" + (order == null ? "" : String.valueOf(order.orderNo)));
testCurLineId.setText("lineId:" + (order == null ? "" : String.valueOf(order.lineId)));
testCurLineName.setText("lineName:" + (order == null ? "" : order.lineName));
testCurTrajMd5.setText("TMd5:" + (order == null ? "" : order.csvFileMd5));
testCurStopMd5.setText("SMd5:" + (order == null ? "" : order.txtFileMd5));
testCurTrajMd5DPQP.setText("TMd5DPQP:" + (order == null ? "" : order.csvFileMd5DPQP));
@@ -431,6 +434,7 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
OrderQueryRespBean.Result order = TaxiModel.getInstance().getCurrentOCHOrder();
testCurOrderId.setText("orderNo:" + (order == null ? "" : String.valueOf(order.orderNo)));
testCurLineId.setText("lineId:" + (order == null ? "" : String.valueOf(order.lineId)));
testCurLineName.setText("lineName:" + (order == null ? "" : order.lineName));
testCurTrajMd5.setText("TMd5:" + (order == null ? "" : order.csvFileMd5));
testCurStopMd5.setText("SMd5:" + (order == null ? "" : order.txtFileMd5));
testCurTrajMd5DPQP.setText("TMd5DPQP:" + (order == null ? "" : order.csvFileMd5DPQP));

7
OCH/taxi/driver/src/main/res/layout/taxi_panel.xml
View File

@@ -38,6 +38,13 @@
android:textColor="@android:color/white"
android:textSize="@dimen/dp_24" />
<TextView
android:id="@+id/test_bar_current_line_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:textSize="@dimen/dp_24" />
<TextView
android:id="@+id/test_bar_current_traj_md5"
android:layout_width="wrap_content"

5
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/OrderDebugView.kt
View File

@@ -16,6 +16,7 @@ import kotlinx.android.synthetic.main.taxi_debug_order.view.taskStartSite
import kotlinx.android.synthetic.main.taxi_debug_order.view.taskStatus2
import kotlinx.android.synthetic.main.taxi_debug_order.view.taskType2
import kotlinx.android.synthetic.main.taxi_debug_order.view.test_bar_current_line_id
import kotlinx.android.synthetic.main.taxi_debug_order.view.test_bar_current_line_name
import kotlinx.android.synthetic.main.taxi_debug_order.view.test_bar_current_order_id
import kotlinx.android.synthetic.main.taxi_debug_order.view.test_bar_current_stop_md5
import kotlinx.android.synthetic.main.taxi_debug_order.view.test_bar_current_stop_md5_dpqp
@@ -40,6 +41,8 @@ class OrderDebugView @JvmOverloads constructor(
fun toggleOrderDebugView() {
val data = TaxiModel.getCurTaskAndOrder()
val curContrail = TaxiModel.getCurTaskContrail()
visibility =
if (visibility == View.VISIBLE)
View.GONE
@@ -47,6 +50,7 @@ class OrderDebugView @JvmOverloads constructor(
View.VISIBLE
test_bar_current_order_id.text = "orderNo: ${data?.order?.orderNo}"
test_bar_current_line_id!!.text = "当前任务lineId: ${data?.lineId}"
test_bar_current_line_name!!.text = "当前任务lineName: ${curContrail?.lineName}"
taskType2.text = "当前任务类型: ${data?.taskType}"
taskStatus2.text = "任务状态: ${data?.currentStatus}"
taskStartSite.text =
@@ -59,7 +63,6 @@ class OrderDebugView @JvmOverloads constructor(
orderToStartLines.text =
"接驾任务的lineId集合: " + GsonUtil.jsonFromObject(data?.order?.planningLines)
val curContrail = TaxiModel.getCurTaskContrail()
test_bar_current_traj_md5.text = "TrajMd5: ${curContrail?.csvFileMd5}"
test_bar_current_stop_md5.text = "StopMd5: ${curContrail?.txtFileMd5}"
test_bar_current_traj_md5_dpqp.text = "TrajMd5DPQP: ${curContrail?.csvFileMd5DPQP}"

7
OCH/taxi/unmanned-driver/src/main/res/layout/taxi_debug_order.xml
View File

@@ -19,6 +19,13 @@
android:textColor="@android:color/white"
android:textSize="@dimen/dp_24" />
<TextView
android:id="@+id/test_bar_current_line_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:textSize="@dimen/dp_24" />
<TextView
android:id="@+id/taskType2"
android:layout_width="wrap_content"