diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt
index c68675ac85..7b62e380f0 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt
+++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionSoftFragment.kt
@@ -117,6 +117,7 @@ class BusPassengerFunctionSoftFragment :
 
     fun showAni(){
         iv_loading.visibility = View.VISIBLE
+        loadingAni.target = iv_loading
         loadingAni.start()
         g_aircondition_setting.visibility = View.GONE
         subscribeAnimator = Observable.timer(5000, TimeUnit.MILLISECONDS)
@@ -124,7 +125,9 @@ class BusPassengerFunctionSoftFragment :
             .subscribe {
                 loadingAni.cancel()
                 iv_loading.visibility = View.GONE
-                g_aircondition_setting.visibility = View.VISIBLE
+                if(tv_setting_aircondition.isChecked){
+                    g_aircondition_setting.visibility = View.VISIBLE
+                }
             }
     }
     private fun setAirconditionListener() {
@@ -625,6 +628,8 @@ class BusPassengerFunctionSoftFragment :
         mPresenter?.disposeSubscribe(subscribeLightTop1)
         mPresenter?.disposeSubscribe(subscribeLightTop2)
         mPresenter?.disposeSubscribe(subscribeAtmosphere)
+        mPresenter?.disposeSubscribe(subscribeAnimator)
+
         super.onDestroy()
     }
 
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml
index 58b2aa14d7..47d7a64006 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml
@@ -287,6 +287,17 @@
                 android:textSize="@dimen/dp_24" />
         </RadioGroup>
 
+        <ImageView
+            android:id="@+id/iv_loading"
+            android:visibility="gone"
+            android:src="@drawable/bus_p_loading"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/iv_aircondition"
+            android:layout_width="@dimen/dp_73"
+            android:layout_height="@dimen/dp_73"/>
+
         <androidx.constraintlayout.widget.Group
             android:id="@+id/g_aircondition_setting"
             android:layout_width="wrap_content"