From 78112888f4ca1b1e00ae400d96466559864ccff8 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Wed, 4 Apr 2018 11:16:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=AF=9B=E9=B8=A1=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/qhclh/ytzh/home/RpcUrl.java |  1 +
 .../carsmannage/MaojiCarsinfoActivity.java    | 36 +++++++++++++++++++
 app/src/main/res/menu/close.xml               |  8 +++++
 3 files changed, 45 insertions(+)
 create mode 100644 app/src/main/res/menu/close.xml

diff --git a/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java b/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java
index ddcb0f9..f824f18 100644
--- a/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java
+++ b/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java
@@ -66,6 +66,7 @@ public class RpcUrl {
 
     public static String ToFoodFactoryTransportLogRpc_Query ="/MainSystem/B3_ZhongHui/Rpcs/ToFoodFactoryTransportLogRpc/Query";
     public static String ToFoodFactoryTransportLogRpc_Load ="/MainSystem/B3_ZhongHui/Rpcs/ToFoodFactoryTransportLogRpc/Load";
+    public static String ToFoodFactoryTransportLogRpc_Close ="/MainSystem/B3_ZhongHui/Rpcs/ToFoodFactoryTransportLogRpc/Close";
 
     public static String ToFoodFactoryTransportLogRpc_EnterBreedFactory ="/MainSystem/B3_ZhongHui/Rpcs/ToFoodFactoryTransportLogRpc/EnterBreedFactory";
     public static String ToFoodFactoryTransportLogRpc_LeaveBreedFactory ="/MainSystem/B3_ZhongHui/Rpcs/ToFoodFactoryTransportLogRpc/LeaveBreedFactory";
diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/MaojiCarsinfoActivity.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/MaojiCarsinfoActivity.java
index 2bfa112..f59ee99 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/MaojiCarsinfoActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/MaojiCarsinfoActivity.java
@@ -1,6 +1,8 @@
 package com.qhclh.ytzh.work.carsmannage;
 
 import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListView;
 
@@ -122,4 +124,38 @@ public class MaojiCarsinfoActivity extends BaseActivity {
         };
         loadTask.execute();
     }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.close, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.item_close:
+                close();
+                break;
+
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void close() {
+        ViewOnClickTask closeTask = new ViewOnClickTask(this,"加载中...") {
+            @Override
+            protected void successUI() {
+                showToast("已结束当前行程");
+                finish();
+            }
+
+            @Override
+            public Object call() throws Exception {
+                JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.ToFoodFactoryTransportLogRpc_Close,id);
+                return null;
+            }
+        };
+        closeTask.execute();
+    }
 }
diff --git a/app/src/main/res/menu/close.xml b/app/src/main/res/menu/close.xml
new file mode 100644
index 0000000..289dcb7
--- /dev/null
+++ b/app/src/main/res/menu/close.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/item_close"
+        android:title="结束行程"
+        android:orderInCategory="70"
+        app:showAsAction="always" />
+</menu>
\ No newline at end of file