diff --git a/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1080x1920.xml b/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1080x1920.xml index 32eb65566f..d1e7bfdaae 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1080x1920.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1080x1920.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="@dimen/dp_751" - android:layout_height="@dimen/dp_568" + android:layout_height="wrap_content" android:background="@drawable/biz_login_error_info_1080x1920"> diff --git a/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1920x1080.xml b/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1920x1080.xml index e1363ccf09..e03a97c576 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1920x1080.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1920x1080.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="@dimen/dp_939" - android:layout_height="@dimen/dp_710" + android:layout_height="wrap_content" android:background="@drawable/biz_login_error_info"> diff --git a/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_2560x1600.xml b/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_2560x1600.xml index c0a9935842..c74b150b24 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_2560x1600.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_2560x1600.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="@dimen/dp_939" - android:layout_height="@dimen/dp_730" + android:layout_height="wrap_content" android:background="@drawable/biz_login_error_info"> ( val context: Any, val callback: OchCommonServiceCallback?, - val apiName: String + val apiName: String, + val writeLog:Boolean = true ) : SubscribeImpl(RequestOptions.create(context)) { companion object { @@ -19,27 +20,38 @@ class OchCommonSubscribeImpl( init { CallerLogger.e("$flavorTag$TAG", "$apiName: 去请求()") - OchChainLogManager.writeChainLogNet("接口:${apiName}","去请求") + if(writeLog) { + OchChainLogManager.writeChainLogNet("接口:${apiName}", "去请求") + } } override fun onSuccess(o: T) { super.onSuccess(o) CallerLogger.d("$flavorTag$TAG", "$apiName: onSuccess() ${o.msg}") - OchChainLogManager.writeChainLogNet("接口:${apiName}","请求成功:${o}") + if(writeLog) { + OchChainLogManager.writeChainLogNet("接口:${apiName}", "请求成功:${o}") + } callback?.onSuccess(o) } override fun onError(e: Throwable) { super.onError(e) CallerLogger.e("$flavorTag$TAG", "$apiName: onError() ${e.message}") - OchChainLogManager.writeChainLogNet("接口:${apiName}","请求失败:${e.message}") + if(writeLog) { + OchChainLogManager.writeChainLogNet("接口:${apiName}", "请求失败:${e.message}") + } callback?.onError("$apiName: onError() ${e.message}") } override fun onError(message: String, code: Int) { super.onError(message, code) CallerLogger.e("$flavorTag$TAG", "$apiName: onError() code = $code; message = $message") - OchChainLogManager.writeChainLogNet("接口:${apiName}","请求失败: onError() code = $code; message = $message\"") + if(writeLog) { + OchChainLogManager.writeChainLogNet( + "接口:${apiName}", + "请求失败: onError() code = $code; message = $message\"" + ) + } callback?.onFail(code, message) } } \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt index 9a393ab0ca..49f12a5216 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt @@ -59,8 +59,12 @@ object FlavorUtils { info.append(" qa ") } } + if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ + info.append(" Driver") + }else if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){ + info.append(" Passenger") + } - info.append(" Passenger") info.append(" ${AppUtils.getAppVersionName()}") info.append(" AppSN:${SharedPrefsMgr.getInstance().sn}") return info.toString() diff --git a/OCH/taxi/driver/build.gradle b/OCH/taxi/driver/build.gradle index bd5ec6b05c..8bc24cfeab 100644 --- a/OCH/taxi/driver/build.gradle +++ b/OCH/taxi/driver/build.gradle @@ -43,6 +43,15 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + + sourceSets { + main { + res.srcDirs = [ + 'src/main/res', + 'src/main/res/ani', + ] + } + } } dependencies { diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt index ee476f5637..7c91921a96 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt @@ -39,7 +39,7 @@ object TaxiServiceManager { SharedPrefsMgr.getInstance().sn ) .transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "queryOrdersInAndWaitService")) + .subscribe(OchCommonSubscribeImpl(context, callback, "queryOrdersInAndWaitService",false)) } /** @@ -58,7 +58,7 @@ object TaxiServiceManager { SharedPrefsMgr.getInstance().sn ) .transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "queryNewBookingOrder")) + .subscribe(OchCommonSubscribeImpl(context, callback, "queryNewBookingOrder",false)) } /** diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java index 43aa9fa48f..c0f3ace422 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java @@ -18,15 +18,13 @@ import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.Group; import androidx.fragment.app.FragmentTransaction; -import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.mvp.IView; import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.mvp.Presenter; -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager; @@ -38,25 +36,13 @@ import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxListView; import com.mogo.eagle.core.function.view.MapBizView; import com.mogo.eagle.core.function.smp.view.SmallMapView; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant; import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.VisualAngleMode; -import com.mogo.och.common.module.utils.AnimatorDrawableUtil; -import com.mogo.och.common.module.utils.FrameAnimatorContainer; import com.mogo.och.taxi.R; -import com.mogo.och.taxi.ui.speed.SpeedView; - -import java.util.Arrays; -import java.util.Objects; - -import bag_manager.BagManagerOuterClass; -import me.jessyan.autosize.utils.AutoSizeUtils; -import mogo.telematics.pad.MessagePad; -import record_cache.RecordPanelOuterClass; /** @@ -66,11 +52,10 @@ import record_cache.RecordPanelOuterClass; * * @author tongchenfei */ -public abstract class BaseTaxiTabFragment> extends MvpFragment implements IMogoMapListener, IMoGoAutopilotRecordListener { +public abstract class BaseTaxiTabFragment> extends MvpFragment implements IMogoMapListener { private static final String TAG = "BaseOchFragment"; private RelativeLayout ctvAutopilotStatusRL; - private ImageView mAnimFlowIv; protected TextView tvOperationStatus; protected TextView mDriverRole; protected FrameLayout flStationPanelContainer; @@ -92,22 +77,16 @@ public abstract class BaseTaxiTabFragment { if (groupTestPanel.getVisibility() == View.VISIBLE) { groupTestPanel.setVisibility(View.GONE); @@ -203,7 +176,6 @@ public abstract class BaseTaxiTabFragment { + if (isStarting && IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING != status) { + // 1. 主动开启自动驾驶中，不为2（为0、1）则继续loading + return; } - },UiThreadHandler.MODE.QUEUE); + if (isStarting && IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == status) { + // 2. 主动开启自动驾驶中，为2则停止loading，并isStarting = false + startAutopilotDone(true); + return; + } + // 3. 其他过程直接更新 + startOrStopLoadingAnim(false); + autopilotStatusAnimchanged(status); + }); } public void stopAnimAndUpdateBtnStatus() { @@ -408,46 +339,23 @@ public abstract class BaseTaxiTabFragment { flStationPanelContainer.setVisibility(View.GONE); - }},UiThreadHandler.MODE.QUEUE); + }); } public void showPanel() { - UiThreadHandler.post(new Runnable() { - @Override - public void run() { - flStationPanelContainer.setVisibility(View.VISIBLE); - } - },UiThreadHandler.MODE.QUEUE); - } - - public View getPanelView() { - return panelView; + getActivity().runOnUiThread(() -> { + flStationPanelContainer.setVisibility(View.VISIBLE); + }); } /** @@ -560,15 +459,12 @@ public abstract class BaseTaxiTabFragment { + if (tvOperationStatus == null) { + return; } - },UiThreadHandler.MODE.QUEUE); + tvOperationStatus.setVisibility(visible); + }); } protected void showAmapNaviToStationFragment(boolean isShow) { @@ -577,9 +473,7 @@ public abstract class BaseTaxiTabFragment grabOrderFragmentWR; + // 待服务信息 private WeakReference serverOrdersFragmentWR; + + // 查看运营情况 点击账户信息右边的箭头展示 private WeakReference personalDialogFragment = null; @Override @@ -423,9 +425,6 @@ public class TaxiFragment extends BaseTaxiTabFragment - - - - - - - - - - - - - - - diff --git a/OCH/taxi/driver/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png b/OCH/taxi/driver/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png deleted file mode 100644 index ef5a5ea880..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png b/OCH/taxi/driver/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png deleted file mode 100644 index 39194f8e55..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable-xhdpi/taxi_ic_autopilot_bg_pressed.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable-xhdpi/taxi_speed_selector.xml b/OCH/taxi/driver/src/main/res/drawable-xhdpi/taxi_speed_selector.xml deleted file mode 100644 index c87ede1476..0000000000 --- a/OCH/taxi/driver/src/main/res/drawable-xhdpi/taxi_speed_selector.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00000.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00000.png deleted file mode 100755 index e0c23e8bf6..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00000.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00001.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00001.png deleted file mode 100755 index 0149a8d568..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00001.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00002.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00002.png deleted file mode 100755 index ecd03ab028..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00002.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00003.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00003.png deleted file mode 100755 index 603bb5365f..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00003.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00004.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00004.png deleted file mode 100755 index d773fbc271..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00004.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00005.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00005.png deleted file mode 100755 index 8d2b53a324..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00005.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00006.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00006.png deleted file mode 100755 index 6a1ebb8c31..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00006.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00007.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00007.png deleted file mode 100755 index ec5c802776..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00007.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00008.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00008.png deleted file mode 100755 index d0d6b19d24..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00008.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00009.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00009.png deleted file mode 100755 index 30778eef76..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00009.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00010.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00010.png deleted file mode 100755 index abe4d221d8..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00010.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00011.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00011.png deleted file mode 100755 index bdc921b7d9..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00011.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00012.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00012.png deleted file mode 100755 index 8a3d483dff..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00012.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00013.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00013.png deleted file mode 100755 index 54ce2af7d3..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00013.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00014.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00014.png deleted file mode 100755 index b466e6501f..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00014.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00015.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00015.png deleted file mode 100755 index 5e838cdf3a..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00015.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00016.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00016.png deleted file mode 100755 index 4225748f00..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00016.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00017.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00017.png deleted file mode 100755 index 6e014ae4a7..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00017.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00018.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00018.png deleted file mode 100755 index 607c2376f9..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00018.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00019.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00019.png deleted file mode 100755 index 5ee80ce4d2..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00019.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00020.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00020.png deleted file mode 100755 index 3e4662ce40..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00020.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00021.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00021.png deleted file mode 100755 index 4fe5475a2e..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00021.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00022.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00022.png deleted file mode 100755 index 901a681f50..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00022.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00023.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00023.png deleted file mode 100755 index 9679529de3..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00023.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00024.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00024.png deleted file mode 100755 index 23a6e4959b..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00024.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00025.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00025.png deleted file mode 100755 index 40bf3c7add..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00025.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00026.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00026.png deleted file mode 100755 index 7217f2fad6..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00026.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00027.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00027.png deleted file mode 100755 index 7b6676d47a..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00027.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00028.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00028.png deleted file mode 100755 index 91367f87e1..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00028.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00029.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00029.png deleted file mode 100755 index 9ff2c176fc..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00029.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00030.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00030.png deleted file mode 100755 index 546e258fbf..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00030.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00031.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00031.png deleted file mode 100755 index 1489960566..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00031.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00032.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00032.png deleted file mode 100755 index 49fb411910..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00032.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00033.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00033.png deleted file mode 100755 index f1edc5bc88..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00033.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00034.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00034.png deleted file mode 100755 index a5b9c37106..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00034.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00035.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00035.png deleted file mode 100755 index 43a6225db0..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00035.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00036.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00036.png deleted file mode 100755 index a7232cf1fb..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00036.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00037.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00037.png deleted file mode 100755 index 136ddc0906..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00037.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00038.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00038.png deleted file mode 100755 index 6892edaae9..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00038.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00039.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00039.png deleted file mode 100755 index a50d62d9ec..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00039.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00040.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00040.png deleted file mode 100755 index 6b54e4d30d..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00040.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00041.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00041.png deleted file mode 100755 index fb664f264d..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00041.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00042.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00042.png deleted file mode 100755 index 4fc21f8560..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00042.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00043.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00043.png deleted file mode 100755 index c57629d01c..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00043.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00044.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00044.png deleted file mode 100755 index 06409fd5e0..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00044.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00045.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00045.png deleted file mode 100755 index 3d45b30abf..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00045.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00046.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00046.png deleted file mode 100755 index 28090a0036..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00046.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00047.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00047.png deleted file mode 100755 index 19a9364eae..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00047.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00048.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00048.png deleted file mode 100755 index 9aeecd3f48..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00048.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00049.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00049.png deleted file mode 100755 index 942b373341..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00049.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00050.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00050.png deleted file mode 100755 index f2e0b1464e..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00050.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00051.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00051.png deleted file mode 100755 index b2be366cb3..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00051.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00052.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00052.png deleted file mode 100755 index bdf082d673..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00052.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00053.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00053.png deleted file mode 100755 index 0074a849bd..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00053.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00054.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00054.png deleted file mode 100755 index febf15908e..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00054.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00055.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00055.png deleted file mode 100755 index b709392f8b..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00055.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00056.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00056.png deleted file mode 100755 index 13bca5e22d..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00056.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00057.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00057.png deleted file mode 100755 index a548c71f6b..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00057.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00058.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00058.png deleted file mode 100755 index 4d875f104a..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00058.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00059.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_00059.png deleted file mode 100755 index a3bac76723..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_00059.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00000.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00000.png deleted file mode 100755 index 41113e0a34..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00000.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00001.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00001.png deleted file mode 100755 index 8e479139bb..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00001.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00002.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00002.png deleted file mode 100755 index 329821726d..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00002.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00003.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00003.png deleted file mode 100755 index 4c08cf44ee..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00003.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00004.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00004.png deleted file mode 100755 index 15f8ece01f..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00004.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00005.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00005.png deleted file mode 100755 index a6b6ba6f4e..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00005.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00006.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00006.png deleted file mode 100755 index a604497cfa..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00006.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00007.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00007.png deleted file mode 100755 index 9f2e8bca3b..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00007.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00008.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00008.png deleted file mode 100755 index a849e1cf30..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00008.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00009.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00009.png deleted file mode 100755 index b94fd4e080..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00009.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00010.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00010.png deleted file mode 100755 index 59a1ee3ca1..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00010.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00011.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00011.png deleted file mode 100755 index a833cdbedd..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00011.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00012.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00012.png deleted file mode 100755 index 678d5e1f43..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00012.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00013.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00013.png deleted file mode 100755 index f09d14094f..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00013.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00014.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00014.png deleted file mode 100755 index 1d996567b2..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00014.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00015.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00015.png deleted file mode 100755 index 30a5ca609e..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00015.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00016.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00016.png deleted file mode 100755 index 19914eac75..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00016.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00017.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00017.png deleted file mode 100755 index 6457e75ae8..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00017.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00018.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00018.png deleted file mode 100755 index f0df474b87..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00018.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00019.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00019.png deleted file mode 100755 index 6c24204284..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00019.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00020.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00020.png deleted file mode 100755 index d2b48a1340..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00020.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00021.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00021.png deleted file mode 100755 index 69a50de46b..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00021.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00022.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00022.png deleted file mode 100755 index b373863b1a..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00022.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00023.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00023.png deleted file mode 100755 index 6d02b1dfeb..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00023.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00024.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00024.png deleted file mode 100755 index 95cc9034d6..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00024.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00025.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00025.png deleted file mode 100755 index f6275aa4f8..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00025.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00026.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00026.png deleted file mode 100755 index 5f1b0ffef8..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00026.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00027.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00027.png deleted file mode 100755 index ec2ee8ee5a..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00027.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00028.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00028.png deleted file mode 100755 index 113e0b341c..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00028.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00029.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00029.png deleted file mode 100755 index 15b6c39632..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00029.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00030.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00030.png deleted file mode 100755 index a363e97825..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00030.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00031.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00031.png deleted file mode 100755 index 10335a15af..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00031.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00032.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00032.png deleted file mode 100755 index 9e3b4fa240..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00032.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00033.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00033.png deleted file mode 100755 index 8447f738e7..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00033.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00034.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00034.png deleted file mode 100755 index 6a26403acb..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00034.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00035.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00035.png deleted file mode 100755 index 01494e84e6..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00035.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00036.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00036.png deleted file mode 100755 index 7127a20fdc..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00036.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00037.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00037.png deleted file mode 100755 index f808933e4c..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00037.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00038.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00038.png deleted file mode 100755 index e7b2637e1c..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00038.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00039.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00039.png deleted file mode 100755 index 7c7e6d5f82..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00039.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00040.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00040.png deleted file mode 100755 index 42ed69e297..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00040.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00041.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00041.png deleted file mode 100755 index a70c5664d9..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00041.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00042.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00042.png deleted file mode 100755 index 342410cc94..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00042.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00043.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00043.png deleted file mode 100755 index d9bfbb6aa9..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00043.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00044.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00044.png deleted file mode 100755 index 3afa872e55..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00044.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00045.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00045.png deleted file mode 100755 index 309437ede4..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00045.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00046.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00046.png deleted file mode 100755 index 9fdeb5c4fc..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00046.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00047.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00047.png deleted file mode 100755 index 5a51b33ca7..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00047.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00048.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00048.png deleted file mode 100755 index d766d1a8b5..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00048.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00049.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00049.png deleted file mode 100755 index 689e9c4940..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00049.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00050.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00050.png deleted file mode 100755 index d4fcdff5ca..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00050.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00051.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00051.png deleted file mode 100755 index 4cf20d5875..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00051.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00052.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00052.png deleted file mode 100755 index d4d7d4bfac..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00052.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00053.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00053.png deleted file mode 100755 index cb2faa96b5..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00053.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00054.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00054.png deleted file mode 100755 index 28c50833c6..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00054.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00055.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00055.png deleted file mode 100755 index a409e84139..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00055.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00056.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00056.png deleted file mode 100755 index 84acd73921..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00056.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00057.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00057.png deleted file mode 100755 index 1be70d9bb6..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00057.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00058.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00058.png deleted file mode 100755 index 1f5048dfb2..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00058.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00059.png b/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00059.png deleted file mode 100755 index d4894dba39..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/anim_flow_man_co_00059.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/img_taxi_operation_status_bg.9.png b/OCH/taxi/driver/src/main/res/drawable/img_taxi_operation_status_bg.9.png deleted file mode 100644 index 0af2b9db73..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/img_taxi_operation_status_bg.9.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable-xhdpi/taxi_autopilot_bg_selector.xml b/OCH/taxi/driver/src/main/res/drawable/taxi_autopilot_bg_selector.xml similarity index 100% rename from OCH/taxi/driver/src/main/res/drawable-xhdpi/taxi_autopilot_bg_selector.xml rename to OCH/taxi/driver/src/main/res/drawable/taxi_autopilot_bg_selector.xml diff --git a/OCH/taxi/driver/src/main/res/drawable/taxi_autopilot_status_bg_check.png b/OCH/taxi/driver/src/main/res/drawable/taxi_autopilot_status_bg_check.png deleted file mode 100644 index 28857974b5..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/taxi_autopilot_status_bg_check.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/taxi_autopilot_status_bg_nor.png b/OCH/taxi/driver/src/main/res/drawable/taxi_autopilot_status_bg_nor.png deleted file mode 100644 index f7d4f92c4b..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/taxi_autopilot_status_bg_nor.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/taxi_map_arrow_arrived.png b/OCH/taxi/driver/src/main/res/drawable/taxi_map_arrow_arrived.png deleted file mode 100644 index 36ef2e88d3..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/taxi_map_arrow_arrived.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/taxi_map_arrow_un_arrive.png b/OCH/taxi/driver/src/main/res/drawable/taxi_map_arrow_un_arrive.png deleted file mode 100644 index baa35592cb..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/taxi_map_arrow_un_arrive.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/taxi_map_car.png b/OCH/taxi/driver/src/main/res/drawable/taxi_map_car.png deleted file mode 100644 index dedaf093e9..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/taxi_map_car.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/taxi_map_view_dir_end.png b/OCH/taxi/driver/src/main/res/drawable/taxi_map_view_dir_end.png deleted file mode 100644 index a81336d4c2..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/taxi_map_view_dir_end.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/taxi_map_view_dir_start.png b/OCH/taxi/driver/src/main/res/drawable/taxi_map_view_dir_start.png deleted file mode 100644 index 3cee184981..0000000000 Binary files a/OCH/taxi/driver/src/main/res/drawable/taxi_map_view_dir_start.png and /dev/null differ diff --git a/OCH/taxi/driver/src/main/res/drawable/taxi_order_bg.xml b/OCH/taxi/driver/src/main/res/drawable/taxi_order_bg.xml deleted file mode 100644 index f5efecaa11..0000000000 --- a/OCH/taxi/driver/src/main/res/drawable/taxi_order_bg.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml index 1e1b93ecd6..bc77186cfe 100644 --- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml +++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml @@ -23,7 +23,7 @@ - - + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toBottomOf="@+id/taxi_speed_contain" + > + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_marginLeft="28dp" + android:layout_toRightOf="@+id/module_och_autopilot_iv" + android:text="自动驾驶" + android:textColor="@color/bus_autopilot_text_color_normal" + android:textSize="@dimen/dp_32" + android:textStyle="bold" /> @@ -197,11 +191,11 @@ android:id="@+id/module_mogo_och_station_panel_container" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="244dp" android:background="@android:color/transparent" - app:layout_constraintLeft_toLeftOf="@+id/taxi_speed_contain" - app:layout_constraintTop_toTopOf="parent" - app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call" + android:layout_marginStart="@dimen/dp_10" + android:layout_marginTop="-25dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/module_mogo_och_autopilot_status" tools:visibility="visible" /> - - - - - - - - - - - - - - - - -