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

Merge branch 'dev_robotaxi-d-app-module_2100_220816_2.10.0' into 'test_robotaxi-d-app-module_2100_220816_2.10.0.1'

Browse Source 
Dev robotaxi d app module 2100 220816 2.10.0

See merge request zhjt/AndroidApp/MoGoEagleEye!135
This commit is contained in:
wangmingjun
2022-08-31 11:57:52 +00:00
parent 3d863228d5 b220c671f7
commit afe990e757
3 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/ToastUtilsOch.java Normal file
View File

@@ -0,0 +1,17 @@
package com.mogo.och.common.module.utils;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
public class ToastUtilsOch {
public static void showWithCodeMessage(int code,String message){
if(message==null){
return;
}
if (DebugConfig.isDebug()) {
ToastUtils.showShort(code+","+message);
}else {
ToastUtils.showShort(message);
}
}
}

22
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
View File

@@ -36,6 +36,7 @@ import com.mogo.map.navi.IMogoCarLocationChangedListener2;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil;
import com.mogo.och.common.module.utils.PinYinUtil;
import com.mogo.och.common.module.utils.ToastUtilsOch;
import com.mogo.och.taxi.R;
import com.mogo.och.taxi.bean.DriverServiceDataRespBean;
import com.mogo.och.taxi.bean.DriverStatusQueryRespBean;
@@ -278,7 +279,7 @@ public class TaxiModel {
StatusManager.setOpenOrderStatus(data.data.servingStatus);
//更新view
CallerLogger.INSTANCE.d(M_TAXI + TAG, "changeCarStatus:" + StatusManager.getLoginStatus());
startOrStopOrderLoop(StatusManager.isLogin());
startOrStopOrderLoop(StatusManager.isLogin()&&StatusManager.isOpeningOrderStatus());
if(mCarStatusCallback!=null) {
mCarStatusCallback.onCarLoginStatusChange(StatusManager.isLogin());
}
@@ -309,7 +310,7 @@ public class TaxiModel {
@Override
public void onFail(int code, String msg) {
ToastUtils.showShort(code + "," + msg);
ToastUtilsOch.showWithCodeMessage(code,msg);
if(mCarStatusCallback!=null) {
mCarStatusCallback.onCarLoginStatusChange(StatusManager.isLogin());
}
@@ -344,7 +345,7 @@ public class TaxiModel {
@Override
public void onFail(int code, String msg) {
ToastUtils.showShort(code + "," + msg);
ToastUtilsOch.showWithCodeMessage(code, msg);
}
});
@@ -490,7 +491,7 @@ public class TaxiModel {
@Override
public void onFail(int code, String msg) {
ToastUtils.showShort(code + "," + msg);
ToastUtilsOch.showWithCodeMessage(code,msg);
}
});
}
@@ -519,7 +520,7 @@ public class TaxiModel {
@Override
public void onFail(int code, String msg) {
ToastUtils.showShort(code + "," + msg);
ToastUtilsOch.showWithCodeMessage(code,msg);
}
});
}
@@ -573,7 +574,7 @@ public class TaxiModel {
@Override
public void onFail(int code, String msg) {
ToastUtils.showShort(code + "," + msg);
ToastUtilsOch.showWithCodeMessage(code,msg);
}
});
}
@@ -667,7 +668,7 @@ public class TaxiModel {
@Override
public void onFail(int code, String msg) {
ToastUtils.showShort(code + "," + msg);
ToastUtilsOch.showWithCodeMessage(code,msg);
}
});
}
@@ -761,7 +762,7 @@ public class TaxiModel {
@Override
public void onFail(int code, String msg) {
ToastUtils.showShort(code + "," + msg);
ToastUtilsOch.showWithCodeMessage(code,msg);
}
});
}
@@ -992,7 +993,7 @@ public class TaxiModel {
CallerLogger.INSTANCE.d(M_TAXI + TAG, "onIntentReceived = %s", intentStr);
if (ConnectivityManager.CONNECTIVITY_ACTION.equals(intentStr)) {
if (NetworkUtils.isConnected(mContext)) {
startOrStopOrderLoop(StatusManager.isLogin());
startOrStopOrderLoop(StatusManager.isLogin()&&StatusManager.isOpeningOrderStatus());
queryCarStatus();
}
}
@@ -1578,7 +1579,6 @@ public class TaxiModel {
@Override
public void onError() {
mCarStatusCallback.onCarLoginStatusChange(false);
if (!NetworkUtils.isConnected(mContext)) {
ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
} else {
@@ -1588,7 +1588,7 @@ public class TaxiModel {
@Override
public void onFail(int code, String msg) {
ToastUtils.showShort(code + "," + msg);
ToastUtilsOch.showWithCodeMessage(code,msg);
}
});
}

12
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiLoginDialogFragment.kt
View File

@@ -12,6 +12,7 @@ import androidx.appcompat.widget.AppCompatTextView
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.ContextCompat
import androidx.core.widget.addTextChangedListener
import androidx.fragment.app.DialogFragment
import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentTransaction
import com.mogo.commons.mvp.MvpDialogFragment
@@ -203,7 +204,16 @@ class TaxiLoginDialogFragment : MvpDialogFragment<TaxiLoginDialogFragment?, Taxi
*/
override fun show(manager: FragmentManager, tag: String?) {
try {
val cls = this.javaClass.superclass ?: return
var cls = this.javaClass.superclass ?: return
while (cls != null) {
if (cls.name == "java.lang.Object") {
break
}
cls = cls.superclass!!
if (cls == DialogFragment::class.java) {
break
}
}
val mDismissed = cls.getDeclaredField("mDismissed")
val mShownByMe = cls.getDeclaredField("mShownByMe")
mDismissed.isAccessible = true