diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt index 8218e6f9e4..eb426b94f2 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt @@ -432,7 +432,7 @@ class MoGoAutopilotProvider : * 向左变道 */ override fun sendOperatorChangeLaneLeft() { - Log.d("liyz", "MoGoAutopilotProvider sendOperatorChangeLaneLeft -------> ") +// Log.d("liyz", "MoGoAutopilotProvider sendOperatorChangeLaneLeft -------> ") AdasManager.getInstance().sendOperatorCmdChangeLaneLeft() } @@ -440,7 +440,7 @@ class MoGoAutopilotProvider : * 向右变道 */ override fun sendOperatorChangeLaneRight() { - Log.d("liyz", "MoGoAutopilotProvider sendOperatorChangeLaneRight -------> ") +// Log.d("liyz", "MoGoAutopilotProvider sendOperatorChangeLaneRight -------> ") AdasManager.getInstance().sendOperatorCmdChangeLaneRight() } @@ -448,7 +448,7 @@ class MoGoAutopilotProvider : * 发送设置加速度 acc>0加速 acc<0减速 acc=0复位 */ override fun sendOperatorSetAcceleratedSpeed(cc: Double) { - Log.d("liyz", "MoGoAutopilotProvider sendOperatorSetAcceleratedSpeed cc $cc ") +// Log.d("liyz", "MoGoAutopilotProvider sendOperatorSetAcceleratedSpeed cc $cc ") AdasManager.getInstance().sendOperatorCmdSetAcceleratedSpeed(cc) } @@ -456,7 +456,7 @@ class MoGoAutopilotProvider : * 鸣笛 value 1: honk 2: stop honking */ override fun sendOperatorSetHorn(value: Double) { - Log.d("liyz", "MoGoAutopilotProvider sendOperatorSetHorn value $value ") +// Log.d("liyz", "MoGoAutopilotProvider sendOperatorSetHorn value $value ") AdasManager.getInstance().sendOperatorCmdSetHorn(value) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index b2e11816f8..dae516b0ca 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -261,7 +261,6 @@ class DebugSettingView @JvmOverloads constructor( } } - btnOpenAllGestures.setOnClickListener { MogoMapUIController.getInstance().setAllGesturesEnabled(true) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index f06519c01e..8f171372f6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -4,6 +4,7 @@ import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_INIT; import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI; +import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAP; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; @@ -31,6 +32,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager; import com.mogo.eagle.core.function.hmi.R; import com.mogo.eagle.core.function.main.moujie.BluetoothMonitorReceiver; +import com.mogo.eagle.core.function.main.moujie.ConnectBluetoothEvent; import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; @@ -45,9 +47,11 @@ import com.zhjt.service.chain.TracingConstants; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.Timer; @@ -69,6 +73,8 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis private Timer timerAcc; private BluetoothMonitorReceiver mBluetoothReceiver = null; + private BluetoothAdapter mBluetoothAdapter; + private List mAreadlyConnectedList = new ArrayList<>();//已连接设备集合 @Override @@ -78,12 +84,22 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis EventBus.getDefault().register(this); CallerLogger.INSTANCE.i(M_HMI + TAG, "onCreate"); - SharedPrefsMgr.getInstance(getContext()).putBoolean("BLUETOOTH", false); - -// initBluetooth(); -// mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); } + @Override + protected void onResume() { + super.onResume(); + + initBluetooth(); + + mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); + if (!mBluetoothAdapter.isEnabled()) { + mBluetoothAdapter.enable(); + } + mBluetoothAdapter.startDiscovery(); + + showBondedDevice(mBluetoothAdapter); + } @Override protected void initViews() { @@ -190,28 +206,24 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis @Override public boolean onKeyDown(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) { //向上长按 开启自动驾驶 - setMapControl(); long currentTime = System.currentTimeMillis() / (1000); long oldTime = SharedPrefsMgr.getInstance(getContext()).getLong("old_time_up", 0); // Log.d("liyz", "time = " + (currentTime - oldTime)); - if (currentTime - oldTime > 8) { + if (currentTime - oldTime > 6) { SharedPrefsMgr.getInstance(getContext()).putLong("old_time_up", System.currentTimeMillis() / 1000); // ToastUtils.showShort("长按 ↑↑↑ 开启自动驾驶"); CallerAutoPilotManager.INSTANCE.setControlAutopilotCarAuto(true); } - recoverMapControl(); return true; } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) { //下和中间键盘长按,减速为-2 - setMapControl(); long currentTime = System.currentTimeMillis() / (1000); long oldTime = SharedPrefsMgr.getInstance(getContext()).getLong("old_time_down", 0); - if (currentTime - oldTime > 8) { + if (currentTime - oldTime > 6) { SharedPrefsMgr.getInstance(getContext()).putLong("old_time_down", System.currentTimeMillis() / 1000); // ToastUtils.showShort("长按 ↓↓↓ 减速 -2 "); sendAcc(true, -2); } - recoverMapControl(); return true; } return super.onKeyDown(keyCode, event); @@ -221,16 +233,12 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis public boolean dispatchTouchEvent(MotionEvent event) { // Log.d("liyz", "dispatchTouchEvent event.getX() = " + event.getX() + "--event.getY() = " + event.getY() + "--action = " + event.getAction()); if (event.getX() == -1469.6875 && event.getY() == 530.0) { //向左变道 - setMapControl(); // ToastUtils.showShort("← 向左变道"); // MogoMapUIController.getInstance().setLockMode( true ); CallerAutoPilotManager.INSTANCE.sendOperatorChangeLaneLeft(); - recoverMapControl(); - return true; } else if (event.getX() == -1096.25 && event.getY() == 132.5) { //鸣笛 - setMapControl(); // ToastUtils.showShort("↑ 鸣笛 "); CallerAutoPilotManager.INSTANCE.sendOperatorSetHorn(1); @@ -245,29 +253,20 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis } }, 500); - recoverMapControl(); - return true; } else if (event.getX() == -863.4375 && event.getY() == 690.0) { //向右变道 - setMapControl(); CallerAutoPilotManager.INSTANCE.sendOperatorChangeLaneRight(); // ToastUtils.showShort("→ 向右变道"); - recoverMapControl(); return true; } else if (event.getX() == -1096.25 && event.getY() == 1099.0) { // -1减速 - setMapControl(); sendAcc(true, -1); // ToastUtils.showShort("↓ 减速 -1 "); - recoverMapControl(); return true; } else if (event.getX() == -1096.25 && event.getY() == 690.0) { //复原 - setMapControl(); - // ToastUtils.showShort("O 复原 "); sendAcc(false, 0.0); - recoverMapControl(); return true; } @@ -340,20 +339,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis } } - private void setMapControl() { -// UiThreadHandler.removeCallbacks(delayRunnable); -// MogoMapUIController.getInstance().setScrollGesturesEnable(false); - } - - private void recoverMapControl() { -// UiThreadHandler.postDelayed(delayRunnable, 5_00L); - } - - private Runnable delayRunnable = () -> { - MogoMapUIController.getInstance().setScrollGesturesEnable(true); - }; - - /** * 初始化蓝牙广播 */ @@ -371,19 +356,31 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis registerReceiver(this.mBluetoothReceiver, intentFilter); } - + /** + * 查找蓝牙连接过的蓝牙设备 + * + * @param bluetoothAdapter + */ private void showBondedDevice(BluetoothAdapter bluetoothAdapter) { + mAreadlyConnectedList.clear(); Set 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("liyz", "isConnected:" + isConnected); - isConnected = (boolean) isConnectedMethod.invoke(device, (Object[]) null); - Log.e("liyz", "showBondedDevice Name:" + device.getName() + " Mac:" + device.getAddress() + "---isConnected = " + isConnected); +// Log.e("liyz", "showBondedDevice Name:" + device.getName() + " Mac:" + device.getAddress() + "---isConnected = " + isConnected); + mAreadlyConnectedList.add(device); + if (device.getName().equals("JX-05")) { + SharedPrefsMgr.getInstance(getContext()).putString("BT_MAC", device.getAddress()); + } + if (!isConnected) { + UiThreadHandler.postDelayed(() -> { + connectBluetooth(); //主动连接一次 + }, 4000L); + } + } catch (NoSuchMethodException e) { e.printStackTrace(); } catch (IllegalAccessException e) { @@ -394,6 +391,41 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis } } + + @Subscribe(threadMode = ThreadMode.MAIN) + public void onAutoConnection(ConnectBluetoothEvent event) { + connectBluetooth(); + } + + /** + * 主动连接最近的一次连接 + */ + private void connectBluetooth() { +// Log.d("liyz", "connectBluetooth ----> size() = " + mAreadlyConnectedList.size()); + if (mAreadlyConnectedList.size() > 0) { + try { + Method method = BluetoothDevice.class.getMethod("createBond"); + String macAddress = SharedPrefsMgr.getInstance(getContext()).getString("BT_MAC"); + int pos = -1; + for (int i = 0; i < mAreadlyConnectedList.size(); i++) { + if (macAddress.equals(mAreadlyConnectedList.get(i).getAddress())) { + pos = i; + } + } +// Log.d("liyz", "connectBluetooth macAddress = " + macAddress + "---pos = " + pos); + method.invoke(mAreadlyConnectedList.get(pos)); + + } catch (NoSuchMethodException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } + } + } + + } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/moujie/BluetoothMonitorReceiver.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/moujie/BluetoothMonitorReceiver.java index 8d520d261b..3e0652f1bb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/moujie/BluetoothMonitorReceiver.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/moujie/BluetoothMonitorReceiver.java @@ -5,10 +5,13 @@ import android.bluetooth.BluetoothDevice; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.util.Log; import android.widget.Toast; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; +import org.greenrobot.eventbus.EventBus; + /** * @author lixiaopeng * @description @@ -29,6 +32,7 @@ public class BluetoothMonitorReceiver extends BroadcastReceiver { break; case BluetoothAdapter.STATE_ON: // Toast.makeText(context, "蓝牙已经打开", Toast.LENGTH_SHORT).show(); + EventBus.getDefault().post(new ConnectBluetoothEvent()); break; case BluetoothAdapter.STATE_TURNING_OFF: // Toast.makeText(context, "蓝牙正在关闭", Toast.LENGTH_SHORT).show(); @@ -41,12 +45,15 @@ public class BluetoothMonitorReceiver extends BroadcastReceiver { case BluetoothDevice.ACTION_ACL_CONNECTED: // Toast.makeText(context, "蓝牙设备已连接", Toast.LENGTH_SHORT).show(); - SharedPrefsMgr.getInstance(context).putBoolean("BLUETOOTH", true); +// Log.d("liyz", "蓝牙设备已连接 ----> "); +// SharedPrefsMgr.getInstance(context).putBoolean("BLUETOOTH", true); break; case BluetoothDevice.ACTION_ACL_DISCONNECTED: - SharedPrefsMgr.getInstance(context).putBoolean("BLUETOOTH", false); +// SharedPrefsMgr.getInstance(context).putBoolean("BLUETOOTH", false); +// Log.d("liyz", "蓝牙设备已断开 ----> "); // Toast.makeText(context, "蓝牙设备已断开", Toast.LENGTH_SHORT).show(); + EventBus.getDefault().post(new ConnectBluetoothEvent()); break; } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/moujie/ConnectBluetoothEvent.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/moujie/ConnectBluetoothEvent.java new file mode 100644 index 0000000000..750e92e49d --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/moujie/ConnectBluetoothEvent.java @@ -0,0 +1,10 @@ +package com.mogo.eagle.core.function.main.moujie; + +/** + * @author lixiaopeng + * @description 连接蓝牙事件 + * @since 2022/8/16 + */ +public class ConnectBluetoothEvent { + +} diff --git a/libraries/mogo-adas-other/build/generated/source/buildConfig/debug/com/zhidao/support/adas/high/other/BuildConfig.java b/libraries/mogo-adas-other/build/generated/source/buildConfig/debug/com/zhidao/support/adas/high/other/BuildConfig.java deleted file mode 100644 index 1e61f001f2..0000000000 --- a/libraries/mogo-adas-other/build/generated/source/buildConfig/debug/com/zhidao/support/adas/high/other/BuildConfig.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Automatically generated file. DO NOT MODIFY - */ -package com.zhidao.support.adas.high.other; - -public final class BuildConfig { - public static final boolean DEBUG = Boolean.parseBoolean("true"); - public static final String LIBRARY_PACKAGE_NAME = "com.zhidao.support.adas.high.other"; - /** - * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME - */ - @Deprecated - public static final String APPLICATION_ID = "com.zhidao.support.adas.high.other"; - public static final String BUILD_TYPE = "debug"; - public static final String FLAVOR = ""; - public static final int VERSION_CODE = 2090000; - public static final String VERSION_NAME = "2.9.0"; -} diff --git a/libraries/mogo-adas-other/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml b/libraries/mogo-adas-other/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml deleted file mode 100644 index c4636fe59b..0000000000 --- a/libraries/mogo-adas-other/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libraries/mogo-adas-other/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json b/libraries/mogo-adas-other/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json deleted file mode 100644 index f176bcd541..0000000000 --- a/libraries/mogo-adas-other/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json +++ /dev/null @@ -1 +0,0 @@ -[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":2090000,"versionName":"2.9.0","enabled":true,"outputFile":"mogo-adas-other-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.zhidao.support.adas.high.other","split":""}}] \ No newline at end of file diff --git a/libraries/mogo-adas-other/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/libraries/mogo-adas-other/build/intermediates/annotation_processor_list/debug/annotationProcessors.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/libraries/mogo-adas-other/build/intermediates/annotation_processor_list/debug/annotationProcessors.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/libraries/mogo-adas-other/build/intermediates/compile_library_classes/debug/classes.jar b/libraries/mogo-adas-other/build/intermediates/compile_library_classes/debug/classes.jar deleted file mode 100644 index c832a64577..0000000000 Binary files a/libraries/mogo-adas-other/build/intermediates/compile_library_classes/debug/classes.jar and /dev/null differ diff --git a/libraries/mogo-adas-other/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar b/libraries/mogo-adas-other/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar deleted file mode 100644 index bf1accc18d..0000000000 Binary files a/libraries/mogo-adas-other/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar and /dev/null differ diff --git a/libraries/mogo-adas-other/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/libraries/mogo-adas-other/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml deleted file mode 100644 index 427dd39745..0000000000 --- a/libraries/mogo-adas-other/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/libraries/mogo-adas-other/build/intermediates/incremental/mergeDebugShaders/merger.xml b/libraries/mogo-adas-other/build/intermediates/incremental/mergeDebugShaders/merger.xml deleted file mode 100644 index 6a68d44e58..0000000000 --- a/libraries/mogo-adas-other/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/libraries/mogo-adas-other/build/intermediates/incremental/packageDebugAssets/merger.xml b/libraries/mogo-adas-other/build/intermediates/incremental/packageDebugAssets/merger.xml deleted file mode 100644 index 5053865c29..0000000000 --- a/libraries/mogo-adas-other/build/intermediates/incremental/packageDebugAssets/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/libraries/mogo-adas-other/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/libraries/mogo-adas-other/build/intermediates/incremental/packageDebugResources/compile-file-map.properties deleted file mode 100644 index 2379682a0a..0000000000 --- a/libraries/mogo-adas-other/build/intermediates/incremental/packageDebugResources/compile-file-map.properties +++ /dev/null @@ -1,7 +0,0 @@ -#Mon Jul 11 16:06:02 CST 2022 -/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/res/drawable/bg_adas_dialog.xml=/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/drawable/bg_adas_dialog.xml -/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/res/anim/dialog_in.xml=/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/anim/dialog_in.xml -/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/res/layout/fragment_router.xml=/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/layout/fragment_router.xml -/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/res/layout/dialog_adas_permission_long_background_running.xml=/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/layout/dialog_adas_permission_long_background_running.xml -/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/res/anim/dialog_out.xml=/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/anim/dialog_out.xml -/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/res/layout/activity_router.xml=/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/layout/activity_router.xml diff --git a/libraries/mogo-adas-other/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml b/libraries/mogo-adas-other/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml deleted file mode 100644 index 4071a15455..0000000000 --- a/libraries/mogo-adas-other/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - adas-backgrounder-permission - - - \ No newline at end of file diff --git a/libraries/mogo-adas-other/build/intermediates/incremental/packageDebugResources/merger.xml b/libraries/mogo-adas-other/build/intermediates/incremental/packageDebugResources/merger.xml deleted file mode 100644 index dc2af82caa..0000000000 --- a/libraries/mogo-adas-other/build/intermediates/incremental/packageDebugResources/merger.xml +++ /dev/null @@ -1,21 +0,0 @@ - -adas-backgrounder-permission \ No newline at end of file diff --git a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/BuildConfig.class b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/BuildConfig.class deleted file mode 100644 index c18c5bfc02..0000000000 Binary files a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/BuildConfig.class and /dev/null differ diff --git a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/permission/BackgrounderPermission.class b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/permission/BackgrounderPermission.class deleted file mode 100644 index 667c5cb1ff..0000000000 Binary files a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/permission/BackgrounderPermission.class and /dev/null differ diff --git a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/permission/OnAdasPermissionListener.class b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/permission/OnAdasPermissionListener.class deleted file mode 100644 index 36dcdddc52..0000000000 Binary files a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/permission/OnAdasPermissionListener.class and /dev/null differ diff --git a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/permission/PermissionLongBackgroundRunningDialog$1.class b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/permission/PermissionLongBackgroundRunningDialog$1.class deleted file mode 100644 index b74c14d0da..0000000000 Binary files a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/permission/PermissionLongBackgroundRunningDialog$1.class and /dev/null differ diff --git a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/permission/PermissionLongBackgroundRunningDialog.class b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/permission/PermissionLongBackgroundRunningDialog.class deleted file mode 100644 index d2e3b3ba70..0000000000 Binary files a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/permission/PermissionLongBackgroundRunningDialog.class and /dev/null differ diff --git a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/PlaceholderFragment$1.class b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/PlaceholderFragment$1.class deleted file mode 100644 index 75ad73064b..0000000000 Binary files a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/PlaceholderFragment$1.class and /dev/null differ diff --git a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/PlaceholderFragment$2.class b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/PlaceholderFragment$2.class deleted file mode 100644 index ac5ff80cfc..0000000000 Binary files a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/PlaceholderFragment$2.class and /dev/null differ diff --git a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/PlaceholderFragment.class b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/PlaceholderFragment.class deleted file mode 100644 index e7c5a7fd74..0000000000 Binary files a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/PlaceholderFragment.class and /dev/null differ diff --git a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity$1.class b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity$1.class deleted file mode 100644 index 9d5b93b57f..0000000000 Binary files a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity$1.class and /dev/null differ diff --git a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity$2.class b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity$2.class deleted file mode 100644 index 5a4acb5ce9..0000000000 Binary files a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity$2.class and /dev/null differ diff --git a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity$3.class b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity$3.class deleted file mode 100644 index af6433a248..0000000000 Binary files a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity$3.class and /dev/null differ diff --git a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity$4.class b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity$4.class deleted file mode 100644 index b33b137124..0000000000 Binary files a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity$4.class and /dev/null differ diff --git a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity.class b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity.class deleted file mode 100644 index 8870975f3b..0000000000 Binary files a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity.class and /dev/null differ diff --git a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/SectionsPagerAdapter.class b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/SectionsPagerAdapter.class deleted file mode 100644 index 699e79efd5..0000000000 Binary files a/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/SectionsPagerAdapter.class and /dev/null differ diff --git a/libraries/mogo-adas-other/build/intermediates/library_java_res/debug/res.jar b/libraries/mogo-adas-other/build/intermediates/library_java_res/debug/res.jar deleted file mode 100644 index 15cb0ecb3e..0000000000 Binary files a/libraries/mogo-adas-other/build/intermediates/library_java_res/debug/res.jar and /dev/null differ diff --git a/libraries/mogo-adas-other/build/intermediates/library_manifest/debug/AndroidManifest.xml b/libraries/mogo-adas-other/build/intermediates/library_manifest/debug/AndroidManifest.xml deleted file mode 100644 index c4636fe59b..0000000000 --- a/libraries/mogo-adas-other/build/intermediates/library_manifest/debug/AndroidManifest.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libraries/mogo-adas-other/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt b/libraries/mogo-adas-other/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt deleted file mode 100644 index 1e72ca358c..0000000000 --- a/libraries/mogo-adas-other/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt +++ /dev/null @@ -1,21 +0,0 @@ -R_DEF: Internal format may change without notice -local -anim dialog_in -anim dialog_out -drawable bg_adas_dialog -id btn_close_battery_optimizations -id close -id constraintLayout -id hint_battery -id progressbar -id refresh -id tabs -id view -id view_pager -id web_view -layout activity_router -layout dialog_adas_permission_long_background_running -layout fragment_router -string app_name -style NoActionBar -style PermissionLongBackgroundRunningDialogStyle diff --git a/libraries/mogo-adas-other/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/libraries/mogo-adas-other/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt deleted file mode 100644 index aa21903878..0000000000 --- a/libraries/mogo-adas-other/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ /dev/null @@ -1,40 +0,0 @@ -1 -2 -6 -7 /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml -9 android:targetSdkVersion="21" /> -9-->/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml -10 -11 -11-->/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:4:5-67 -11-->/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:4:22-64 -12 -12-->/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:5:5-79 -12-->/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:5:22-76 -13 -13-->/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:6:5-95 -13-->/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:6:22-92 -14 -15 -15-->/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:8:5-18:19 -15-->/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:10:9-44 -16 /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:12:9-14:81 -17 android:name="com.zhidao.support.adas.high.other.permission.PermissionLongBackgroundRunningDialog" -17-->/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:13:13-77 -18 android:theme="@style/PermissionLongBackgroundRunningDialogStyle" /> -18-->/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:14:13-78 -19 /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:15:9-17:50 -20 android:name="com.zhidao.support.adas.high.other.router.RouterActivity" -20-->/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:16:13-50 -21 android:theme="@style/NoActionBar" /> -21-->/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:17:13-47 -22 -23 -24 diff --git a/libraries/mogo-adas-other/build/intermediates/merged_manifests/debug/output.json b/libraries/mogo-adas-other/build/intermediates/merged_manifests/debug/output.json deleted file mode 100644 index d763e66d85..0000000000 --- a/libraries/mogo-adas-other/build/intermediates/merged_manifests/debug/output.json +++ /dev/null @@ -1 +0,0 @@ -[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":2090000,"versionName":"2.9.0","enabled":true,"outputFile":"mogo-adas-other-debug.aar","fullName":"debug","baseName":"debug"},"path":"../../library_manifest/debug/AndroidManifest.xml","properties":{"packageId":"com.zhidao.support.adas.high.other","split":""}}] \ No newline at end of file diff --git a/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/anim/dialog_in.xml b/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/anim/dialog_in.xml deleted file mode 100644 index f50618256d..0000000000 --- a/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/anim/dialog_in.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - diff --git a/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/anim/dialog_out.xml b/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/anim/dialog_out.xml deleted file mode 100644 index 8134cd1490..0000000000 --- a/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/anim/dialog_out.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - diff --git a/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/drawable/bg_adas_dialog.xml b/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/drawable/bg_adas_dialog.xml deleted file mode 100644 index cbfb69f454..0000000000 --- a/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/drawable/bg_adas_dialog.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/layout/activity_router.xml b/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/layout/activity_router.xml deleted file mode 100644 index 0abd4797e8..0000000000 --- a/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/layout/activity_router.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - -