From 13e6c5e22ec62856fe21000891b082a9a3d37293 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 29 Sep 2022 16:56:57 +0800 Subject: [PATCH 1/6] modify upgrade --- .../network/UpgradeAppNetWorkManager.java | 2 +- .../core/function/hmi/ui/MoGoHmiFragment.kt | 5 ++-- .../hmi/ui/bindingcar/UpgradeAppDialog.kt | 30 +++++++++++++++++-- .../main/res/layout/dialog_upgrade_app.xml | 13 ++++++++ .../eagle/core/data/bindingcar/AppInfo.java | 2 +- .../api/hmi/warning/IMoGoWaringProvider.kt | 2 +- .../function/call/hmi/CallerHmiManager.kt | 4 +-- 7 files changed, 49 insertions(+), 9 deletions(-) diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java index bc59268698..2f58262dfe 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java @@ -81,7 +81,7 @@ public class UpgradeAppNetWorkManager { CallerLogger.INSTANCE.d(TAG, "UpgradeAppInfo url = " + info.result.getAppUrl() + "----code = " + info.result.getVersionCode()); Log.d(TAG, "UpgradeAppInfo url = " + info.result.getAppUrl() + "----code = " + info.result.getVersionCode() + "--versionCode =" + versionCode + "--info.result = " + info.result); if (info.result.getVersionCode() > versionCode) { - CallerHmiManager.INSTANCE.showUpgradeDialog(info.result.getAppUrl().substring(info.result.getAppUrl().lastIndexOf("/")+1), info.result.getAppUrl(), info.result.getInstallTitle(), info.result.getInstallContent()); + CallerHmiManager.INSTANCE.showUpgradeDialog(info.result.getAppUrl().substring(info.result.getAppUrl().lastIndexOf("/")+1), info.result.getAppUrl(), info.result.getInstallTitle(), info.result.getInstallContent(), info.result.getInstallType()); } } else { Log.e(TAG, "onNext info == null"); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index f19e0e77cd..280763b9b8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -1304,11 +1304,12 @@ class MoGoHmiFragment : MvpFragment(), /** * 升级app弹框 */ - override fun showUpgradeDialog(name: String, url: String, title: String, content: String) { + override fun showUpgradeDialog(name: String, url: String, title: String, content: String, installType: String) { if (upgradeAppDialog == null) { upgradeAppDialog = UpgradeAppDialog(requireContext()) } - upgradeAppDialog!!.showUpgradeAppDialog(name, url, title, content) + upgradeAppDialog!!.setCanceledOnTouchOutside(false) + upgradeAppDialog!!.showUpgradeAppDialog(name, url, title, content, installType) } /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/UpgradeAppDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/UpgradeAppDialog.kt index 88a4e13640..3f2319fb5e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/UpgradeAppDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/UpgradeAppDialog.kt @@ -1,7 +1,9 @@ package com.mogo.eagle.core.function.hmi.ui.bindingcar import android.content.Context +import android.opengl.Visibility import android.util.Log +import android.view.View import android.widget.TextView import androidx.lifecycle.LifecycleObserver import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager @@ -23,6 +25,8 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb private var cancleTv: TextView? = null private var upgradeTitleTv: TextView? = null private var upgradeContentTv: TextView? = null + private var verticalLineView: View? = null + private var confirmForceTv: TextView? = null private var tag: String? = null private var downloarUrl: String? = null @@ -34,6 +38,8 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb upgradeContentTv = findViewById(R.id.tv_upgrade_content) confirmTv = findViewById(R.id.tv_upgrade_confirm) cancleTv = findViewById(R.id.tv_upgrade_cancel) + verticalLineView = findViewById(R.id.view_vertical_line) + confirmForceTv = findViewById(R.id.tv_upgrade_confirm_force) confirmTv?.setOnClickListener { downloadApp() @@ -42,6 +48,11 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb cancleTv?.setOnClickListener { dismiss() } + + confirmForceTv?.setOnClickListener { + downloadApp() + } + } /** @@ -58,16 +69,31 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb super.dismiss() } - fun showUpgradeAppDialog(name: String, url: String, title: String, content: String) { + // 升级类型 1:提示升级 2:静默升级 3:强制升级 + fun showUpgradeAppDialog(name: String, url: String, title: String, content: String, installType: String) { if (isShowing) { return } tag = name downloarUrl = url - upgradeTitleTv?.text = title upgradeContentTv?.text = content + if (installType.equals("1")) { + confirmForceTv?.visibility = View.GONE + confirmTv?.visibility = View.VISIBLE + cancleTv?.visibility = View.VISIBLE + verticalLineView?.visibility = View.VISIBLE + } else if (installType.equals("3")) { + confirmTv?.visibility = View.GONE + cancleTv?.visibility = View.GONE + verticalLineView?.visibility = View.GONE + + confirmForceTv?.visibility = View.VISIBLE + } else if (installType.equals("2")) { + //静默安装 + } + show() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_upgrade_app.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_upgrade_app.xml index 7c3e839b9a..54fecfe8d0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_upgrade_app.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_upgrade_app.xml @@ -93,5 +93,18 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/view_horizontal_line" /> + \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/AppInfo.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/AppInfo.java index eb573de5f3..86c04140ab 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/AppInfo.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/AppInfo.java @@ -14,7 +14,7 @@ public class AppInfo implements Serializable { private String screenType; private String installTitle; private String installContent; - private String installType; + private String installType; // 升级类型 1:提示升级 2:静默升级 3:强制升级 private String beginTime; private String endTime; diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt index 348e01b31f..aba129710c 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt @@ -222,7 +222,7 @@ interface IMoGoWaringProvider : IMoGoHmiViewProxy { /** * 展示升级app弹框 */ - fun showUpgradeDialog(name: String, url: String, title: String, content: String) + fun showUpgradeDialog(name: String, url: String, title: String, content: String, installType: String) /** * 呈现工控机升级确认框 diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt index cebf460606..c4d6fc3a55 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt @@ -292,8 +292,8 @@ object CallerHmiManager : CallerBase() { waringProviderApi?.showModifyBindingcarDialog() } - fun showUpgradeDialog(name: String, url: String, title: String, content: String) { - waringProviderApi?.showUpgradeDialog(name, url, title, content) + fun showUpgradeDialog(name: String, url: String, title: String, content: String, installType: String) { + waringProviderApi?.showUpgradeDialog(name, url, title, content, installType) } /** From 5f3a464e11515a8ed3f1f7b05eedea67d023a2dc Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 29 Sep 2022 17:03:54 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[fix]=20=E7=99=BB=E5=BD=95=E7=95=8C?= =?UTF-8?q?=E9=9D=A21s=E5=8F=AA=E5=B1=95=E7=A4=BA1=E6=AC=A1=20taxi=20?= =?UTF-8?q?=E4=B9=98=E5=AE=A2=E7=AB=AF=20=E8=A7=86=E9=A2=91=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E8=BF=9B=E7=A8=8B=E5=92=8C=E4=B8=BB=E8=BF=9B=E7=A8=8B?= =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A7=A3=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/biz/provider/LoginServiceImpl.kt | 25 +++--- .../module/biz/ui/TaxiLoginDialogFragment.kt | 3 + .../passenger/ui/leftmenu/LeftMenuOpen.kt | 79 +++++++++++++------ .../taxi/ui/TaxiPersonalDialogFragment.java | 4 +- 4 files changed, 76 insertions(+), 35 deletions(-) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/provider/LoginServiceImpl.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/provider/LoginServiceImpl.kt index dbaa5c5c53..17e0d21e9a 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/provider/LoginServiceImpl.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/provider/LoginServiceImpl.kt @@ -6,9 +6,10 @@ import androidx.fragment.app.DialogFragment import androidx.fragment.app.Fragment import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.function.call.hmi.CallerHmiManager -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d +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.util.AppStateManager.currentActivity +import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.och.common.module.biz.callback.ILoginCallback import com.mogo.och.common.module.biz.callback.ILoginViewCallback import com.mogo.och.common.module.biz.constant.LoginStatusManager @@ -57,7 +58,7 @@ class LoginServiceImpl : LoginService,ILoginViewCallback { if(uiModel) { fragment?.let { CallerHmiManager.hideToolsView() - val parentFragmentManager = it.parentFragmentManager + val parentFragmentManager = it.childFragmentManager val fragmentByTag: Fragment? = parentFragmentManager.findFragmentByTag(TAG) if (fragmentByTag is DialogFragment) { if (fragmentByTag.dialog != null && fragmentByTag.dialog!!.isShowing) { @@ -65,7 +66,7 @@ class LoginServiceImpl : LoginService,ILoginViewCallback { } if (fragmentByTag.dialog != null && fragmentByTag.isAdded) { if (currentActivity() == null) { // 没有在当前应用内 在启动页面关闭应用 - d(SceneConstant.M_TAXI + TAG, "showLoginDialogFragment 权限验证") + CallerLogger.d(SceneConstant.M_TAXI + TAG, "showLoginDialogFragment 权限验证") return } } @@ -83,18 +84,22 @@ class LoginServiceImpl : LoginService,ILoginViewCallback { parentFragmentManager.beginTransaction().remove(taxiLoginDialog) .commitAllowingStateLoss() } - d(SceneConstant.M_TAXI + TAG, "showLoginDialogFragment 展示登录界面") - taxiLoginDialog.show(parentFragmentManager, TAG) - taxiLoginDialog.setOnDismissListener(DialogInterface.OnDismissListener { dialog: DialogInterface? -> - taxiLoginDialogFragment?.clear() - presenter?.queryLoginStatus() - }) + if (ClickUtils.isFastClick()) { + taxiLoginDialog.show(parentFragmentManager, TAG) + taxiLoginDialog.setOnDismissListener(DialogInterface.OnDismissListener { dialog: DialogInterface? -> + taxiLoginDialogFragment?.clear() + presenter?.queryLoginStatus() + }) + CallerLogger.d(SceneConstant.M_TAXI + TAG, "showLoginDialogFragment 展示登录界面") + }else{ + CallerLogger.d(SceneConstant.M_TAXI + TAG, "showLoginDialogFragment 展示登录界面 1s内执行一次") + } } } } } override fun hideLoginDialogFragment() { - d(SceneConstant.M_TAXI + TAG, "hideLoginDialogFragment 隐藏登录界面") + CallerLogger.d(SceneConstant.M_TAXI + TAG, "hideLoginDialogFragment 隐藏登录界面") if (taxiLoginDialogFragment?.get() != null) { taxiLoginDialogFragment?.get()?.dismissAllowingStateLoss() } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/ui/TaxiLoginDialogFragment.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/ui/TaxiLoginDialogFragment.kt index 63efc0fd19..3dfc3389e2 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/ui/TaxiLoginDialogFragment.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/ui/TaxiLoginDialogFragment.kt @@ -261,6 +261,9 @@ class TaxiLoginDialogFragment : MvpDialogFragment Unit)? = null - private var cu: Cursor? = null - // 两部分主进程和子进程 private var dragList = mutableSetOf() @@ -85,11 +85,8 @@ object LeftMenuOpen { this.windowManager = null this.wl = null - cu?.let { - it.close() - cu = null - orderService = null - } + orderService = null + val iterator = dragList.iterator() while (iterator.hasNext()) { val next = iterator.next() @@ -208,11 +205,19 @@ object LeftMenuOpen { Observable.empty().subscribeOn(Schedulers.io()) .subscribe(object : Observer { override fun onCompleted() { - CallerLogger.d(M_TAXI_P + TAG, "tran--transmissionIndex---$index") - if (orderService == null) { - registerC() + try { + CallerLogger.d(M_TAXI_P + TAG, "tran--transmissionIndex---$index") + if (orderService == null) { + registerC() + } + orderService?.transmissionIndex(index) + }catch (ill:IllegalStateException){ + ill.printStackTrace() + }catch (onCo: OnCompletedFailedException){ + onCo.printStackTrace() + }catch (deadobjectexception: DeadObjectException){ + deadobjectexception.printStackTrace() } - orderService?.transmissionIndex(index) } override fun onError(e: Throwable?) {} override fun onNext(t: String?) {} @@ -250,13 +255,22 @@ object LeftMenuOpen { Observable.empty().subscribeOn(Schedulers.io()) .subscribe(object : Observer { override fun onCompleted() { - CallerLogger.d(M_TAXI_P + TAG, "tran--registerCallback--注册") - if (orderService == null) { - registerC() - } - cb?.let { - orderService?.registerCallback(it) - } + try { + CallerLogger.d(M_TAXI_P + TAG, "tran--registerCallback--注册") + if (orderService == null) { + registerC() + } + cb?.let { + orderService?.registerCallback(it) + } + }catch (ill:IllegalStateException){ + ill.printStackTrace() + }catch (onCo: OnCompletedFailedException){ + onCo.printStackTrace() + }catch (deadobjectexception: DeadObjectException){ + deadobjectexception.printStackTrace() + } + } override fun onError(e: Throwable?) {} override fun onNext(t: String?) {} @@ -272,7 +286,15 @@ object LeftMenuOpen { override fun onCompleted() { CallerLogger.d(M_TAXI_P + TAG, "tran--unregisterCallback--反注册") cb?.let { - orderService?.unRegisterCallback(it) + try { + orderService?.unRegisterCallback(it) + }catch (ill:IllegalStateException){ + ill.printStackTrace() + }catch (onCo: OnCompletedFailedException){ + onCo.printStackTrace() + }catch (deadobjectexception: DeadObjectException){ + deadobjectexception.printStackTrace() + } } } override fun onError(e: Throwable?) {} @@ -350,7 +372,7 @@ object LeftMenuOpen { CallerLogger.d(M_TAXI_P + TAG, "tran--registerC--获取jni") val resolver: ContentResolver = Utils.getApp().contentResolver - cu = resolver.query( + val cu = resolver.query( BinderProvider.CONTENT_URI, null, null, @@ -358,13 +380,22 @@ object LeftMenuOpen { null ) ?: return - val binder: IBinder = getBinder(cu!!) + val binder: IBinder = getBinder(cu) try { - orderService = ILeftMenuService.Stub.asInterface(binder) + try { + orderService = ILeftMenuService.Stub.asInterface(binder) + }catch (ill:IllegalStateException){ + ill.printStackTrace() + }catch (onCo: OnCompletedFailedException){ + onCo.printStackTrace() + }catch (deadobjectexception: DeadObjectException){ + deadobjectexception.printStackTrace() + } + } catch (e: RemoteException) { e.printStackTrace() - cu?.close() - cu = null + } finally { + cu.close() } } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java index 0cbec4fdce..919214147e 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java @@ -283,7 +283,9 @@ public class TaxiPersonalDialogFragment extends DialogFragment implements View.O } serverHadNoData = false; orders.addAll(ordersList); - mAdapter.notifyDataSetChanged(); + if(mAdapter!=null) { + mAdapter.notifyDataSetChanged(); + } mNextPage = mNextPage +1; } From dd10a4d19531fa12f98b581322946d30e13156b8 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Thu, 29 Sep 2022 17:00:30 +0800 Subject: [PATCH 3/6] =?UTF-8?q?[Fix]=E8=A7=A3=E5=86=B3ArrayList=E7=9A=84?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/eagle/core/function/map/MapFragment.java | 5 ++++- .../com/mogo/eagle/core/function/smp/AMapCustomView.java | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java index 6f1e3c704a..915f430be1 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java @@ -22,6 +22,7 @@ import com.mogo.eagle.core.function.overview.InfStructureManager; import com.mogo.eagle.core.function.overview.ViewModelExtKt; import com.mogo.eagle.core.function.overview.vm.OverViewModel; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; +import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.IMogoMap; import com.mogo.map.IMogoUiSettings; import com.mogo.map.MogoMapView; @@ -213,7 +214,9 @@ public class MapFragment extends MvpFragment @Override public void onAutopilotRotting(@Nullable MessagePad.GlobalPathResp globalPathResp) { - InfStructureManager.INSTANCE.savePlanningData(globalPathResp.getWayPointsList()); + UiThreadHandler.post(() -> { + InfStructureManager.INSTANCE.savePlanningData(globalPathResp.getWayPointsList()); + }); } @Override diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java index 0eac9be233..2159ede25a 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java @@ -322,13 +322,14 @@ public class AMapCustomView * @param locationList */ private void drawInfrastructureMarkers(List locationList) { + if (locationList == null) return; if (!pathMap.isEmpty()) { pathMap.clear(); } String geoHash; ArrayList infList; - for (MessagePad.Location location : locationList) { - LatLng latLng = MarkerDrawerManager.INSTANCE.coordinateConverterWgsToGcj(mContext, location); + for (int i = 0; i < locationList.size(); i++) { + LatLng latLng = MarkerDrawerManager.INSTANCE.coordinateConverterWgsToGcj(mContext, locationList.get(i)); geoHash = GeoHash.withCharacterPrecision(latLng.latitude, latLng.longitude, 7).toBase32(); // 网格内的轨迹点只取一次s if (!pathMap.containsKey(geoHash)) { From 22aea3bc7acd8c292984aed31f184aa254f6181b Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Thu, 29 Sep 2022 17:29:05 +0800 Subject: [PATCH 4/6] =?UTF-8?q?[Fix]=E5=8F=AA=E7=9B=91=E6=8E=A7=E9=83=A8?= =?UTF-8?q?=E5=88=86so=E4=B8=8D=E7=9B=91=E6=8E=A7=E7=B3=BB=E7=BB=9Fso?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 原因：KOOM框架监控系统so文件导致崩溃 --- .../com/mogo/eagle/core/function/main/MainActivity.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java index ad61a55aa2..dcde8ca87d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java @@ -304,7 +304,12 @@ public class MainActivity extends MvpActivity implement .setLoopInterval(50000) .setMonitorThreshold(16) .setNativeHeapAllocatedThreshold(0) - .setIgnoredSoList(new String[]{"libart", "libc"}) + .setSelectedSoList(new String[]{"libhdmap", "libmap", + "libAMapSDK_NAVI_v8_0_1", "librouting", "libZegoExpressEngine", + "libUtils", "libcommon", "libcntts", "libduiutils", + "libdatamgr", "libdatascript", "libguidance", "libndsprovider", + "libndssqlite", "libpbjni", "libsearch" + }) .setEnableLocalSymbolic(BuildConfig.DEBUG) .setLeakListener(leaks -> { StringBuilder stringBuilder = new StringBuilder(); From 9e74b7db316cbcdba738988c9ac8bcac4f56df28 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 29 Sep 2022 17:43:51 +0800 Subject: [PATCH 5/6] =?UTF-8?q?[fix]=20=E5=9C=B0=E5=9B=BE=E6=9C=AA?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96marker=E6=9C=AA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/bus/fragment/BusFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index 2bf59abf1c..aec54b198b 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java @@ -459,7 +459,7 @@ public class BusFragment extends BaseBusTabFragment IMogoMarker marker = MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) .addMarker(uuid, options); CenterLine centerLine = CallerHDMapManager.INSTANCE.getCenterLineInfo( longi,lat,-1); - if (null != centerLine){ // 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致 + if (null != centerLine && marker != null) { // 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致 地图未初始化会返回空 marker.setRotateAngle(centerLine.getAngle().floatValue()); } } From 2669aa9215ae1ee21790c272ba66328626281415 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 29 Sep 2022 19:26:16 +0800 Subject: [PATCH 6/6] =?UTF-8?q?[fix]=20taxi=20=E5=92=8Cbus=20=E5=AF=B9?= =?UTF-8?q?=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java index efc4886d88..8d0fa9709d 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java @@ -677,7 +677,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement IMogoMarker marker = MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).addMarker(uuid, options); CenterLine centerLine = CallerHDMapManager.INSTANCE.getCenterLineInfo(station.get(0) , station.get(1), -1); - if (null != centerLine) {// 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致 + if (null != centerLine && marker != null) {// 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致 marker.setRotateAngle(centerLine.getAngle().floatValue()); } }