From ded0e5b49350753090547cda10e7d5bb8e97a13e Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 22 May 2020 10:49:58 +0800 Subject: [PATCH] opt --- .../module_apps_ic_navigator_applist.png | Bin 2669 -> 4423 bytes .../module_apps_ic_navigator_media.png | Bin 2053 -> 4052 bytes .../module_apps_ic_navigator_navi.png | Bin 2140 -> 4080 bytes .../module_apps_ic_navigator_navi_disable.png | Bin 3951 -> 3926 bytes .../module_apps_ic_navigator_personcenter.png | Bin 2253 -> 4218 bytes .../src/main/res/values-ldpi/dimens.xml | 2 +- .../mogo/module/common/dialog/WMDialog.java | 81 ++---------- .../module/common/wm/WindowManagerView.java | 118 ++++++++++++++++++ .../module_ext_ic_navi_info3.png | Bin 336 -> 717 bytes .../module_map_layout_navi_info_panel.xml | 6 +- .../src/main/res/values-ldpi/dimens.xml | 14 +-- .../src/main/res/values-xhdpi/dimens.xml | 13 +- .../src/main/res/values/dimens.xml | 14 +-- .../service/intent/MockIntentHandler.java | 3 + .../service/adas/IMogoADASController.java | 1 + .../service/impl/adas/MogoADASController.java | 5 + 16 files changed, 163 insertions(+), 94 deletions(-) mode change 100755 => 100644 modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_applist.png mode change 100755 => 100644 modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_media.png mode change 100755 => 100644 modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_navi.png mode change 100755 => 100644 modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_personcenter.png create mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerView.java diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_applist.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_applist.png old mode 100755 new mode 100644 index 205ed11e64e67f89f9c38a93a6960d9e778ddc64..f884758d3d6737321c73d5356116d6fad15f8fe8 GIT binary patch literal 4423 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 diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_media.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_media.png old mode 100755 new mode 100644 index 3f47b7a60b45d23439a74e9670c4f7e2f18e8bea..d9f6df313de0d6867cb24a66fe9ddb6d27940bab GIT binary patch literal 4052 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 diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_navi.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_navi.png old mode 100755 new mode 100644 index 585e128e9a1964bc25114f133605544e0fa83dea..2401ce7c2a9e253bd6daf51dc9ca1c23b6954486 GIT binary patch literal 4080 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 i=uMP4i5W1Q(RX=#>< z5+W+{*kys`vCA$GdF`?bEPF4Y7$7sv6!k}8!Rh?&-Lvc>i?EmzyXVaOhG7=&?C-<( zdw#!j+52;I8^iMVe{mC}AY7}&p_yQzg!j(nfOCPIAUC(W zyaav$8&)k5t~)*f0gWjjN5~a&9v3m8aO1qi_^)Dp@%ak^l-|D2C?0v#D}U-c+=S+83gPGIT!5sq%XXF4z)lzVyh=q%msZXYq4E%Vu1f5P*qEqLJ`yZd_Q%J$xAtIu_=sI<- z6rK4=h0dNYL#Y?kD0HWorQk-0#~$}qV5JSDq^Z!kbT#@ZLxav=EJtTj6@BjR9x@8f zPHYbqu_jRV}FEstIj=?_;e?gM$|2{6$q?jvS!XTdc{c3_~l$)>LVlk-E}| z$}zOcY6e}cWzpp;ir-usT=3f;=?1N-wX!Bwnc13}N?v7EH4Lh*Yelu%HdNoxj+Vc? zO5?KNemIlUJ6r)E*5p-Y;#5{s--_yVZAh!Xh8h~LqZ21nJ6#f7z)PzuKxGzdVwFJw zAl4)*18B7v8mLUCzmD{c9jLMS29Az?FE8&xmjieB$jNT7W>KkGW!BcL2579sn%ahI zNN2c?3{4%V$@nuenmUn*?Lv~oLnfC3=k5K3qM%4OP-I;IDr^e?Z_Rd#H4Rv0%`HEp z7N!d^t=*`#{U)l{w){1D@?@#YfD0ETvKDKOPyj$>daSZWBZg*H8G+W;-h-Nr9sjIa z9a!!X;5&?v8Bq}4;i2Eib{Y1B?PG6;CSgTl2^$qHVZ||t z%)Zzp)1EyM1~-Ag`M|}-A7-r!z_7g;hGt?q`{Ux0nMso-72w~?^YQU5*|GEUCUYTR zKxrH_9OCHxY;$bql8$(3zS zSiU!dMmB73q){Na584W;8JP7oIDpSSyP)**Fmbb(+t-qqeKCmuj*W{?X5teLFbR@_ zEsxEZA$J;ZxiVGnU~krGW6jL0{9oogHCJV&vXQQpJ7vlg`MaC9)?1WDpd}n+B>NAU zUVkIF%2~kW==AOVLkobuvGrC+=xzgkU2aEZcCQBj{rm&UqQvnnJTy*ij0DHWAv?9s z0xmb@+@+gFv&sNkYFcK`EH9r@{F-bODzkgtY11Al2-)$ejzEL2D^~n>H#qOP;-*f0 zuplYJb(lF6!WLQCr)();L?A@r<(_S}^DUWycpC**)Gxhs4u0?)5L6UmMQm StIN^=00002oN9= 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 Q+W-In07*qoM6N<$f)jWjbpQYW literal 2253 zcmV;;2r~DHP);NYXoUebu;7ZcrLew%^2mcMTC)`rqFV(qJOlzE6hcB0AS572*a!}~tGhd* zUAC@{tkt@$R^=I9@)kP0pS9{Xs&= z@X7c4`~A+jIX^eI1za3X(ogBJTt0)9xIc!)dymfIU5jDF_eV1lMqj9)#}Ct)+)f6Q zcRq%}{T(wlF^9$CZ*u!Ft{C=?a5|HBn0VvC7Y@_{B8HjpAtRQb#^G>Yb{HCqwQH3L zn)wYPBDW5QghuqOS{>Z&L-X(S@}_lodcAnz?ent^KmS1enxJ*P8#XZqqUiA>R{v)U zJ$7gOqQNoP{B6W1(MA2iwd-U0i8t&do@#N%aCcwXw&s-ki0bT*F(D-nD_aAOvqxurMnapHA+dgjVp4HKe z_#yZUetv;^1k5&;EnD6a{>B!PPfRRVVGECusDMvw3jgIGf;D&e2Lw@VTd!67Qu`Ak z8MeYF0s>y?LZIeT-?A2}2V^jKi6lBU`|S;AF(d}jjq1apXD>WFyxL7wcZ9>qec25*fAE38HK9ES(9?rh zZM9IVuei8ffo?>LauWWqYW3^g2$21t;4zsy*0~Yuws(#2f)Tt0z>ALExe>ub@DMx% z55ZgFcP^`@6RO?0=3mUj6>Wd-}(J`b*cN<4vs(40bQQ+3Wb}bN%?)3xoK%i^KSZ zk4EtmO;`RM7ET{f$pb-*UaL93GBTCBlM<6V8X z@EnnB#wFnu$aG)Zwd!SCt3q%c-9~V|0~oHZsJrKq@QOW2F+ z2~R4o`-TM9+(&|Ip2MnFT5YY`O@SM_gAa|~#Y@X-?z$vAQGUgJD#tZHV~(>1H!=qB ztnB=oE(vdsARn7m9PC+@0yhruv5EUQlNmSYlJFQT&W#0uBXZoJ8QeX5bR0Z#cVGG& zR?h`IA0OY&a~}*no|WS|=Ff4XFOu*fV)jv)jG$K;0zD&$(vt33JeU=yEHrx56|`s9}YaUwyJfG z8?wrA6gb1oSNQQ0XTC;TQbY)Ii*K8A-1V8+Iqp-7Ri_DXQ-&`etzEmJ2f-tESC+S& zY`XaE>~`dHn;ZufH*@D3T&_^hpv_S0udw?1cQ(J@_8nzaV^zIxqc{lew?|KWfwtl2 z2v1M1c3s`?9}M64?6KLZ1|zufiO(KNB#LQt55wNKFoRz05{ab-ZS9eJHQEM{o-X{< z%gehR-2g&&&k(#Ng$HjJZVF=!^Z5I2?M`{;4mUA-+rtf3Ei?&a;O$M58dbLss?G>63&InXg4{e65E0<=3e+IK zPy-5zDu6^t*+S&%-<3sCk z4tVhbL$b-TP<0SqMy9Rmgiv*2E7cM3Bqqzs6jh|^6eiV`KB+orS+nXIK&|dDpwXNJ z-mek}c%D1st&@_g1HI>Wm&Bmp0D%3TX3P6&$9Ct z3X5fR2b~Ds_JmYJioHT1p07|;%`Oz0xeEoQx`TB`oC%)5VC?Oz3x(0LHie?VqB?8K z&Mp)>TgyJ7ItY&_80}60Z{5b|!Cxndu-$vaSW=1@gH3TtY5^ulE5uSWBv^W85tfl9 z#WICbEL$kYgd#bXlc&H$VkIWdFTwH)%di4T873)GVMWq%Oe$An#R?6kP--w`NhMZN zwjWces<3i(HKx{7V>!9`lkl7vTHB(vErN#v!9(z#A9(2Co+AhM(2>!_9~ni5l^r;& zjE>1Wa7-QzXmDUa0~!tDz-SOOl*XZL*tOpAT9?6aiI}#4vv5$)rW=;E^hds zMS*DSCHbAfg^s~M5 diff --git a/modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml index fb55520395..5b12d6e39c 100644 --- a/modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml @@ -23,7 +23,7 @@ 78px 78px - 16px + 17px 78px 78px \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/WMDialog.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/WMDialog.java index 097330f871..9dc367585c 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/WMDialog.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/WMDialog.java @@ -2,19 +2,12 @@ package com.mogo.module.common.dialog; import android.content.Context; import android.content.DialogInterface; -import android.graphics.PixelFormat; -import android.os.Build; -import android.view.Gravity; -import android.view.LayoutInflater; -import android.view.View; -import android.view.WindowManager; import android.widget.TextView; import androidx.annotation.StringRes; import com.mogo.module.common.R; -import com.mogo.module.common.utils.CarSeries; -import com.mogo.utils.WindowUtils; +import com.mogo.module.common.wm.WindowManagerView; /** * @author congtaowang @@ -25,54 +18,22 @@ import com.mogo.utils.WindowUtils; public class WMDialog implements DialogInterface { private WMDialogParams mParams; - private WindowManager mWindowManager; - private boolean mIsShowing = false; - private View mContentView; - private WindowManager.LayoutParams mLayoutParams; + private WindowManagerView mWindowManagerView; private WMDialog( WMDialogParams params ) { this.mParams = params; + mWindowManagerView = new WindowManagerView.Builder( mParams.mContext ).contentView( R.layout.module_commons_layout_wm_dialog ).build(); + initViews(); } public void show() { - if ( mIsShowing ) { - return; - } - mIsShowing = true; - if ( mWindowManager == null ) { - mWindowManager = ( WindowManager ) mParams.mContext.getApplicationContext().getSystemService( Context.WINDOW_SERVICE ); - } - if ( mContentView == null ) { - mLayoutParams = new WindowManager.LayoutParams(); - if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ) { - mLayoutParams.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; - } else { - mLayoutParams.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT; - } - mLayoutParams.format = PixelFormat.TRANSLUCENT; - mLayoutParams.gravity = Gravity.CENTER; - mLayoutParams.flags = WindowManager.LayoutParams.FLAG_DIM_BEHIND | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH; - - if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) { - mLayoutParams.width = 1920; - mLayoutParams.height = 1080; - } else { - mLayoutParams.width = WindowUtils.getScreenWidth( mParams.mContext ); - mLayoutParams.height = WindowUtils.getScreenHeight( mParams.mContext ); - } - mLayoutParams.dimAmount = 0.5f; - mLayoutParams.x = 0; - mLayoutParams.y = 0; - mContentView = initViews(); - } - mWindowManager.addView( mContentView, mLayoutParams ); + mWindowManagerView.show(); } - private View initViews() { - View contentView = LayoutInflater.from( mParams.mContext ).inflate( R.layout.module_commons_layout_wm_dialog, null ); - TextView ok = contentView.findViewById( R.id.module_commons_wm_dialog_button_ok ); - TextView cancel = contentView.findViewById( R.id.module_commons_wm_dialog_button_cancel ); - TextView content = contentView.findViewById( R.id.module_commons_wm_dialog_content ); + private void initViews() { + TextView ok = mWindowManagerView.findViewById( R.id.module_commons_wm_dialog_button_ok ); + TextView cancel = mWindowManagerView.findViewById( R.id.module_commons_wm_dialog_button_cancel ); + TextView content = mWindowManagerView.findViewById( R.id.module_commons_wm_dialog_content ); ok.setText( mParams.mOkButtonText ); if ( mParams.mOnOkButtonClickListener != null ) { @@ -92,7 +53,6 @@ public class WMDialog implements DialogInterface { } content.setText( mParams.mContent ); - return contentView; } @Override @@ -102,20 +62,11 @@ public class WMDialog implements DialogInterface { @Override public void dismiss() { - if ( !mIsShowing ) { - return; - } - if ( mContentView != null ) { - mWindowManager.removeViewImmediate( mContentView ); - } - if ( mParams.mOnDialogDismissListener != null ) { - mParams.mOnDialogDismissListener.onDismiss( this ); - } - mIsShowing = false; + mWindowManagerView.dismiss(); } public boolean isShowing() { - return mIsShowing; + return mWindowManagerView.isShowing(); } public static class Builder { @@ -129,16 +80,6 @@ public class WMDialog implements DialogInterface { mParams.mContext = context; } -// public Builder setTitle( CharSequence title ) { -// mParams.mTitle = title; -// return this; -// } -// -// public Builder setTitle( @StringRes int title ) { -// mParams.mTitle = mContext.getString( title ); -// return this; -// } - public Builder setContent( CharSequence content ) { mParams.mContent = content; return this; diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerView.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerView.java new file mode 100644 index 0000000000..29db8cd8fb --- /dev/null +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerView.java @@ -0,0 +1,118 @@ +package com.mogo.module.common.wm; + +import android.content.Context; +import android.graphics.PixelFormat; +import android.os.Build; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.WindowManager; + +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; + +import com.mogo.module.common.utils.CarSeries; +import com.mogo.utils.WindowUtils; + +/** + * @author congtaowang + * @since 2020-05-21 + *

+ * 往 window manager 添加view + */ +public class WindowManagerView { + + private WMViewParams mParams; + private boolean mIsShowing; + private WindowManager mWindowManager; + private WindowManager.LayoutParams mLayoutParams; + + private WindowManagerView( WMViewParams params ) { + this.mParams = params; + init(); + } + + private void init() { + mWindowManager = ( WindowManager ) mParams.mContext.getApplicationContext().getSystemService( Context.WINDOW_SERVICE ); + mLayoutParams = new WindowManager.LayoutParams(); + if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ) { + mLayoutParams.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; + } else { + mLayoutParams.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT; + } + mLayoutParams.format = PixelFormat.TRANSLUCENT; + mLayoutParams.gravity = Gravity.CENTER; + mLayoutParams.flags = WindowManager.LayoutParams.FLAG_DIM_BEHIND | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH; + + if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) { + mLayoutParams.width = 1920; + mLayoutParams.height = 1080; + } else { + mLayoutParams.width = WindowUtils.getScreenWidth( mParams.mContext ); + mLayoutParams.height = WindowUtils.getScreenHeight( mParams.mContext ); + } + mLayoutParams.dimAmount = 0.5f; + mLayoutParams.x = 0; + mLayoutParams.y = 0; + } + + public boolean isShowing() { + return mIsShowing; + } + + public < T extends View > T findViewById( @IdRes int id ) { + return mParams.mContentView.findViewById( id ); + } + + public void show() { + if ( mIsShowing ) { + return; + } + mIsShowing = true; + mWindowManager.addView( mParams.mContentView, mLayoutParams ); + } + + public void dismiss() { + if ( !mIsShowing ) { + return; + } + if ( mParams != null ) { + mWindowManager.removeViewImmediate( mParams.mContentView ); + } + mIsShowing = false; + } + + public static class Builder { + + private WMViewParams mParams = null; + + public Builder( Context context ) { + mParams = new WMViewParams(); + mParams.mContext = context; + } + + public Builder contentView( View contentView ) { + mParams.mContentView = contentView; + return this; + } + + public Builder contentView( @LayoutRes int contentViewId ) { + mParams.mContentView = LayoutInflater.from( mParams.mContext ).inflate( contentViewId, null ); + return this; + } + + public WindowManagerView build() { + if ( mParams.mContentView == null ) { + throw new NullPointerException( "WMViewParams#mContentView must not be null." ); + } + return new WindowManagerView( mParams ); + } + + } + + public static class WMViewParams { + + public View mContentView; + public Context mContext; + } +} diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_navi_info3.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_navi_info3.png index c8580d052c9c25596dea8f882f078ef16190da53..c62dfd068d24e0108ca5ec2f910955dafe56eca4 100755 GIT binary patch literal 717 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%3?x6Bmj*I0FbW3vgt!8^|6$5Z)oHEuXr+wwu4XZ9hK9Dk^L_qXPJo7y!aasE&D-gno=-k2%*&HS`dQTfkbzr%HGyKJ8SO_y*_ znxA{Lp;*Wu?0f#wZF~$jCSMX_n9pEvsVrBD;gr8&{*M{)|9nMRV)-^6BUC={Gt8qkzHF)z4*}Q$iB}Xy~Ix literal 336 zcmV-W0k8gvP)CU6oX$O!)4><-tJv6Vvvd1A{lKayVar$N;V^Z!Y!FiRxwKP=+(LP zI&t6kzNgM|`aYlM`F0*r@YtRN%D|2CGHmw(E5KT~<3YRE5@LH4SOwOBD$p01egGrC zAhx@JrIgzY(8}mq(&o>A?QLKKr~`v}S4>kU_#Q?WdDvt`i`qz)=vEBsGdawty?3A*mF9ecmKP izyok7>7o!MtI6NLQB05*H(WIU0000 15px - 9px - 9px - 18px - 18px - -1px + 9px + 9px + 18px + 18px + -1px 30px 23px @@ -111,7 +111,7 @@ 14px 20px 14px - 34px + 34px 8px 8px @@ -125,6 +125,6 @@ 66px 66px 16px - 22px + 14px 14px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index 624e689985..fc372e59cf 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -89,11 +89,11 @@ 24px 28px - 17px - 17px - 36px - 36px - -2px + 17px + 17px + 36px + 36px + -2px 30px 40px @@ -101,7 +101,7 @@ 15px 15px 5px - 50px + 50px 37px 26px 37px @@ -121,6 +121,7 @@ 120px 120px 30px + 122px 28px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index 4e5e031906..d4922bc498 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -90,11 +90,11 @@ 24px 28px - 17px - 17px - 36px - 36px - -2px + 17px + 17px + 36px + 36px + -2px 30px 40px @@ -108,7 +108,7 @@ 26px 37px 26px - 50px + 50px 15px 15px @@ -122,7 +122,7 @@ 120px 120px 30px - 14px + 22px 28px \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java index 972aa61212..ff9a355949 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java @@ -131,6 +131,9 @@ public class MockIntentHandler implements IntentHandler { query.setRadius( 1000 ); geoSearch.getFromLocationAsyn( query ); break; + case 11: + MarkerServiceHandler.getADASController().setSettingStatus( intent.getBooleanExtra( "status", false ) ); + break; } } } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java index 468c965b26..7be4dd6e4e 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java @@ -31,4 +31,5 @@ public interface IMogoADASController extends IProvider { */ void killADAS(); + void setSettingStatus(boolean show); } diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index c38edf1b56..f0602070b2 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -166,4 +166,9 @@ public class MogoADASController implements IMogoADASController { } return false; } + + @Override + public void setSettingStatus( boolean show ) { + AutopilotServiceManage.getInstance().setSettingStatus( show ); + } }