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

fixed conflict

Browse Source
This commit is contained in:
lixiaopeng
2022-07-29 15:39:47 +08:00
parent 1b0e17e12c
commit 035759d3cf
46 changed files with 8465 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
View File

@@ -979,7 +979,7 @@ import java.util.*
.setImmersionStatusBar(true)
.setWindowHeight(LayoutParams.MATCH_PARENT)
.setWindowWidth(LayoutParams.MATCH_PARENT)
.setCountDownTime(6000)
// .setCountDownTime(6000)
.setAnimator(object : DefaultAnimator() {
override fun enterAnim(
view: View,
@@ -1016,6 +1016,10 @@ import java.util.*
}
}
override fun hideMaskView() {
dismissMaskView()
}
override fun showToolsView() {
if (toolsViewFloat == null) {
showToolsFloat()
@@ -1112,6 +1116,14 @@ import java.util.*
}
}
private fun dismissMaskView() {
maskViewFloat?.let {
WarningFloat.dismiss(it.config.floatTag, false)
maskViewFloat = null
maskView = null
}
}
private var isLeftLight :Boolean = false
private var isRightLight :Boolean = false
private var isDisappare :Boolean = false

56
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
View File

@@ -67,6 +67,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
private BluetoothAdapter mBluetoothAdapter;
private boolean isConnected;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -74,7 +75,13 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
EventBus.getDefault().register(this);
CallerLogger.INSTANCE.i(M_HMI + TAG, "onCreate");
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
// mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
}
@Override
public void onBackPressed() {
super.onBackPressed();
Log.d("liyz", "onBackPressed --------> ");
}
@Override
@@ -183,43 +190,34 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) { //向上长按
ToastUtils.showShort("长按 ↑↑↑");
// CallerHmiManager.INSTANCE.showMaskView(); //长按出现蒙层，
// CallerHmiManager.INSTANCE.showBindingcarDialog(); //长按出现dialog蒙层
return true;
} else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) { //下和中间键盘长按，减速为-2
ToastUtils.showShort("长按 ↓↓↓");
sendAcc(true, -2);
return true;
}
// return false;
return super.onKeyDown(keyCode, event);
}
@Override
public boolean dispatchKeyEvent(KeyEvent event) {
Log.d("liyz", "dispatchKeyEvent code = " + event.getKeyCode());
if (isConnected) { //如果连接蓝牙设备，屏蔽触摸事件
return true;
} else {
return false;
}
// return super.dispatchKeyEvent(event);
}
@Override
public boolean dispatchTouchEvent(MotionEvent event) {
Log.d("liyz", "dispatchTouchEvent event.getX() = " + event.getX() + "--event.getY() = " + event.getY());
Log.d("liyz", "dispatchTouchEvent event.getX() = " + event.getX() + "--event.getY() = " + event.getY() + "--action = " + event.getAction());
if (event.getX() == -1469.6875 && event.getY() == 530.0) { //向左变道
ToastUtils.showShort("← 向左变道");
CallerAutoPilotManager.INSTANCE.sendOperatorChangeLaneLeft();
// MogoMapUIController.getInstance().setLockMode( true );
MogoMapUIController.getInstance().setLockMode( true );
CallerHmiManager.INSTANCE.showModifyBindingcarDialog();
showBondedDevice(mBluetoothAdapter);
// showBondedDevice(mBluetoothAdapter);
return true;
} else if (event.getX() == -1096.25 && event.getY() == 132.5) { //鸣笛
ToastUtils.showShort("↑ 鸣笛 ");
// MogoMapUIController.getInstance().setLockMode( true );
MogoMapUIController.getInstance().setLockMode( true );
CallerAutoPilotManager.INSTANCE.sendOperatorSetHorn(1);
timerHorn = new Timer();
timerHorn.schedule(new TimerTask() {
@@ -233,21 +231,30 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
return true;
} else if (event.getX() == -863.4375 && event.getY() == 690.0) { //向右变道
CallerAutoPilotManager.INSTANCE.sendOperatorChangeLaneRight();
// MogoMapUIController.getInstance().setLockMode( true );
MogoMapUIController.getInstance().setLockMode( true );
// showBondedDevice(mBluetoothAdapter);
ToastUtils.showShort("→ 向右变道");
return true;
} else if (event.getX() == -1096.25 && event.getY() == 1099.0) { // -1减速
sendAcc(true, -1); //TODO 需要可以配置，向下直接退出鹰眼了，这个必须处理
ToastUtils.showShort("↓");
// MogoMapUIController.getInstance().setLockMode( true );
MogoMapUIController.getInstance().setLockMode( true );
return true;
} else if (event.getX() == -1096.25 && event.getY() == 690.0) { //复原
ToastUtils.showShort("O 复原 ");
// MogoMapUIController.getInstance().setLockMode( true );
MogoMapUIController.getInstance().setLockMode( true );
sendAcc(false, 0.0);
return true;
}
return super.dispatchTouchEvent(event);
// if (isConnected) { //如果连接了蓝牙
// return false;
// } else {
// return super.dispatchTouchEvent(event);
// }
}
@Override
@@ -313,13 +320,12 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
private void showBondedDevice(BluetoothAdapter bluetoothAdapter) {
Set<BluetoothDevice> deviceList = bluetoothAdapter.getBondedDevices();
for (BluetoothDevice device : deviceList) {
Log.d("liyz", "Name:" + device.getName() + " Mac:" + device.getAddress());
try {
//使用反射调用获取设备连接状态方法
Method isConnectedMethod = BluetoothDevice.class.getDeclaredMethod("isConnected", (Class[]) null);
isConnectedMethod.setAccessible(true);
boolean isConnected = (boolean) isConnectedMethod.invoke(device, (Object[]) null);
Log.d("Jason", "isConnected：" + isConnected);
isConnected = (boolean) isConnectedMethod.invoke(device, (Object[]) null);
Log.e("liyz", "showBondedDevice Name:" + device.getName() + " Mac:" + device.getAddress() + "---isConnected = " + isConnected);
} catch (NoSuchMethodException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {