diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt
index f689914e4c..591e16019c 100644
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt
@@ -119,7 +119,7 @@ class LoginProvider : LoginService {
         }
         if (loginFragment is ILoginViewCallback) {
             UiThreadHandler.post({
-                if (loginFragment!!.isAdded) {
+                if (loginFragment?.isAdded==true) {
                     (loginFragment as ILoginViewCallback).showErrorInfo(businessInfo)
                 }
             },UiThreadHandler.MODE.QUEUE)
@@ -142,7 +142,7 @@ class LoginProvider : LoginService {
                 changeStatus(checkAllEnv)
                 UiThreadHandler.post({
                     changeStatus(checkAllEnv)
-                    if (loginFragment!!.isAdded) {
+                    if (loginFragment?.isAdded==true) {
                         (loginFragment as ILoginViewCallback).checkAllEnv(checkAllEnv)
                     }
                 },UiThreadHandler.MODE.QUEUE)
@@ -153,7 +153,7 @@ class LoginProvider : LoginService {
     }
 
     override fun changeStatus(currentStatus: String) {
-        if (loginFragment!!.isAdded) {
+        if (loginFragment?.isAdded==true) {
             (loginFragment as ILoginViewCallback).updateStatus(currentStatus)
         }
     }
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt
index 04a8b118b4..44933b0a36 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt
@@ -304,6 +304,15 @@ object LineModel {
 
     }
 
+    fun isLastStation(end: BusStationBean):Boolean{
+        return if (stationList.isNullOrEmpty()) {
+            false
+        }else{
+            val last = stationList?.last()
+            return last==end
+        }
+    }
+
     fun getTaskTime():String {
         return DateTimeUtil.formatLongToString(
             currentTask?.taskStartTime?:System.currentTimeMillis(),
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt
index 44c56f12bf..c446c75c33 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt
@@ -111,7 +111,7 @@ object ThirdDeviceData {
                 lineInfo.lineName,
                 start.name,
                 end.name,
-                LineModel.isLastStation() == true
+                LineModel.isLastStation(end)
             )
         }
     }