bug fix: 修改分享框和左侧adas点击事件冲突问题,当前解决方式是分享框显示的时候隐藏adas

This commit is contained in:
tongchenfei
2020-08-17 14:34:27 +08:00
parent 434c333467
commit 4ae64fc939
3 changed files with 31 additions and 23 deletions

View File

@@ -5,6 +5,7 @@
<item name="android:windowFrame">@null</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:backgroundDimAmount">0.85</item>
<item name="android:backgroundDimEnabled">true</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:fullBright">@android:color/transparent</item>

View File

@@ -32,6 +32,8 @@ import com.mogo.service.intent.IMogoIntentListener;
import com.mogo.service.intent.IMogoIntentManager;
import com.mogo.service.module.IMogoModuleLifecycle;
import com.mogo.service.share.IMogoShareManager;
import com.mogo.service.statusmanager.IMogoStatusChangedListener;
import com.mogo.service.statusmanager.StatusDescriptor;
import com.mogo.service.tanlu.IMogoTanluProvider;
import com.mogo.service.tanlu.TanluUploadParams;
import com.mogo.utils.TipToast;
@@ -209,29 +211,16 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
AIAssist.getInstance(context).registerUnWakeupCommand(UNWAKE_UPLOAD_ROAD_CONSTRUCTION,
UPLOAD_ROAD_CONSTRUCTION, this);
}
// ServiceApisManager.serviceApis.getRegisterCenterApi().registerObuDataListener("share", new IMogoObuDataChangedListener() {
// @Override
// public void showCarLocationInfo(CarLocationInfo info) {
// Logger.d(TAG, "获取到car location info: " + info.carId);
// }
//
// @Override
// public void showOtherInfo(String info) {
// Logger.d(TAG, "获取到other info: " + info);
// }
//
// @Override
// public void showTrafficLightInfo(TrafficLightInfo info) {
// Logger.d(TAG, "获取到traffic light info: " + info.id);
// }
//
// @Override
// public void showCarEventInfo(CarEventInfo info) {
// Logger.d(TAG, "获取到car event info: " + info.describe);
// }
// });
if(!DebugConfig.isLauncher()) {
ServiceApisManager.serviceApis.getStatusManagerApi().registerStatusChangedListener(TAG, StatusDescriptor.MAIN_PAGE_RESUME, new IMogoStatusChangedListener() {
@Override
public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
if (!isTrue) {
dismissShareDialog();
}
}
});
}
Logger.d(TAG,"init over====");
}

View File

@@ -6,6 +6,7 @@ import android.view.WindowManager;
import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.module.common.dialog.BaseFloatDialog;
import com.mogo.module.share.R;
import com.mogo.module.share.manager.ISeekHelpListener;
@@ -193,4 +194,21 @@ public class LaucherShareDialog extends BaseFloatDialog implements View.OnClickL
UploadHelper.INSTANCE.upload(mContext, params,true);
}
@Override
public void show() {
Logger.d(TAG,"onShow====");
if(!DebugConfig.isLauncher()) {
mApis.getAdasControllerApi().closeADAS();
}
super.show();
}
@Override
public void dismiss() {
Logger.d(TAG,"onDismiss=====");
if (!DebugConfig.isLauncher()&&mApis.getStatusManagerApi().isMainPageOnResume()) {
mApis.getAdasControllerApi().showADAS();
}
super.dismiss();
}
}