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

Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0

Browse Source
This commit is contained in:
donghongyu
2023-05-29 15:14:33 +08:00
parent 968e5d9574 3284224690
commit a2f67ab2bd
8 changed files with 62 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModelLoopManager.java
View File

@@ -62,9 +62,8 @@ public class TaxiPassengerModelLoopManager {
public void startRouteAndWipe() {
CallerLogger.INSTANCE.i(M_TAXI_P + TAG, "startRouteAndWipe()");
if (mRouteWipeDisposable != null) return;
if (mRouteWipeDisposable == null){
mRouteWipeDisposable = new CompositeDisposable();
}
mRouteWipeDisposable = new CompositeDisposable();
Disposable disposable = startLoopRouteAndWipe()
.doOnSubscribe(new Consumer<Disposable>() {
@Override

12
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java
View File

@@ -224,11 +224,15 @@ public class TaxiPassengerMapDirectionView
// 设置开始结束Marker位置
LatLng startLatLng = mCoordinatesLatLng.get(0);
LatLng endLatLng = mCoordinatesLatLng.get(mCoordinatesLatLng.size() - 1);
if (mStartMarker != null) {
mStartMarker.setPosition(startLatLng);
mStartMarker.setVisible(true);
}
mStartMarker.setPosition(startLatLng);
mEndMarker.setPosition(endLatLng);
mStartMarker.setVisible(true);
mEndMarker.setVisible(true);
if (mEndMarker != null) {
mEndMarker.setPosition(endLatLng);
mEndMarker.setVisible(true);
}
}
}

6
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModelLoopManager.java
View File

@@ -128,9 +128,9 @@ public class TaxiModelLoopManager {
CallerLogger.INSTANCE.i(M_TAXI + TAG, "startCalculateRouteInfoLoop()");
if (mCalculateRouteDisposable != null) return;
if (mCalculateRouteDisposable == null){
mCalculateRouteDisposable = new CompositeDisposable();
}
mCalculateRouteDisposable = new CompositeDisposable();
Disposable disposable = loopDynamicCalculateRouteInfo()
.doOnSubscribe(new Consumer<Disposable>() {
@Override

13
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiMapDirectionView.java
View File

@@ -228,11 +228,14 @@ public class TaxiMapDirectionView
// 设置开始结束Marker位置
LatLng startLatLng = mCoordinatesLatLng.get(0);
LatLng endLatLng = mCoordinatesLatLng.get(mCoordinatesLatLng.size() - 1);
mStartMarker.setPosition(startLatLng);
mEndMarker.setPosition(endLatLng);
mStartMarker.setVisible(true);
mEndMarker.setVisible(true);
if (mStartMarker != null) {
mStartMarker.setPosition(startLatLng);
mStartMarker.setVisible(true);
}
if (mEndMarker != null) {
mEndMarker.setPosition(endLatLng);
mEndMarker.setVisible(true);
}
}
}

3
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt
View File

@@ -93,6 +93,9 @@ class UpgradeAppNetWorkManager private constructor() {
deleteApkFile()
}
delay(TimeUnit.HOURS.toMillis(1))
if (mDownloadRequested) {
mDownloadRequested = false
}
getAppUpgradeInfo(context, mac, screenType)
}.also {
upgradeJob = it

26
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ActivityUtils.java
View File

@@ -2176,8 +2176,12 @@ public final class ActivityUtils {
mGetHomeActivities = method;
}
}
mReplacePreferredActivity.setAccessible(true);
mGetHomeActivities.setAccessible(true);
if (mReplacePreferredActivity != null) {
mReplacePreferredActivity.setAccessible(true);
}
if (mGetHomeActivities != null) {
mGetHomeActivities.setAccessible(true);
}
IntentFilter HOME_FILTER = new IntentFilter(Intent.ACTION_MAIN);
HOME_FILTER.addCategory(Intent.CATEGORY_HOME);
@@ -2185,18 +2189,22 @@ public final class ActivityUtils {
final List<ComponentName> allComponents = new ArrayList<>();
final List<ResolveInfo> homeActivities = new ArrayList<>();
try {
mGetHomeActivities.invoke(packageManager, homeActivities);
if (mGetHomeActivities != null) {
mGetHomeActivities.invoke(packageManager, homeActivities);
}
for (ResolveInfo info : homeActivities) {
final ActivityInfo appInfo = info.activityInfo;
ComponentName activityName = new ComponentName(appInfo.packageName, appInfo.name);
allComponents.add(activityName);
}
mReplacePreferredActivity.invoke(
packageManager,
HOME_FILTER,
IntentFilter.MATCH_CATEGORY_EMPTY,
allComponents.toArray(new ComponentName[0]),
componentName);
if (mReplacePreferredActivity != null) {
mReplacePreferredActivity.invoke(
packageManager,
HOME_FILTER,
IntentFilter.MATCH_CATEGORY_EMPTY,
allComponents.toArray(new ComponentName[0]),
componentName);
}
} catch (IllegalAccessException | InvocationTargetException e) {
e.printStackTrace();
}

16
libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
View File

@@ -391,12 +391,16 @@ public class AMapViewWrapper implements IMogoMapView,
)
@Override
public void setRoamTrajectory(String trajectory) {
mMapView.getMapAutoViewHelper().setRoamTrajectory(trajectory);
if (checkAMapView()) {
mMapView.getMapAutoViewHelper().setRoamTrajectory(trajectory);
}
}
@Override
public void setRomaMode(int mode) {
mMapView.getMapAutoViewHelper().setRoamStyle(mode,1800, MapAutoApi.ROAM_SPEED_40);
if (checkAMapView()) {
mMapView.getMapAutoViewHelper().setRoamStyle(mode,1800, MapAutoApi.ROAM_SPEED_40);
}
}
@Override
@@ -427,7 +431,9 @@ public class AMapViewWrapper implements IMogoMapView,
if (DebugConfig.isDebug()) {
CallerLogger.INSTANCE.d(M_MAP + TAG, Log.getStackTraceString(new Throwable()));
}
mMapView.getMapAutoViewHelper().animateCamera(new LonLatPoint(latLng.lon, latLng.lat));
if (checkAMapView()) {
mMapView.getMapAutoViewHelper().animateCamera(new LonLatPoint(latLng.lon, latLng.lat));
}
}
@Override
@@ -883,7 +889,9 @@ public class AMapViewWrapper implements IMogoMapView,
try {
mRtkEnable = !mRtkEnable;
TipToast.shortTip(mRtkEnable ? "已开启rtk道路匹配" : "已开启gps道路匹配");
mMapView.getLocationClient().rtkEnable(mRtkEnable);
if (mMapView != null && mMapView.getLocationClient() != null) {
mMapView.getLocationClient().rtkEnable(mRtkEnable);
}
} catch (Exception e) {
CallerLogger.INSTANCE.e(M_MAP + TAG, "rtkEnable has exception : " + e);
}

17
tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java
View File

@@ -623,15 +623,16 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
List<IMogoTTSCallback> callBacks = mCmdMap.get(cmd);
if (callBacks != null) {
callBacks.remove(callBack);
}
if (callBacks.isEmpty()) {
mCmdMap.remove(cmd);
try {
mVoiceClient.unRegisterCustomWakeupCmd(cmd);
} catch (Exception e) {
e.printStackTrace();
if (callBacks.isEmpty()) {
mCmdMap.remove(cmd);
try {
mVoiceClient.unRegisterCustomWakeupCmd(cmd);
} catch (Exception e) {
e.printStackTrace();
}
mCacheUnWakeupCommands.remove(cmd);
}
mCacheUnWakeupCommands.remove(cmd);
}
}
}