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 311698c583..019aafe514 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 @@ -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 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 e70c983ad2..0109894c47 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 @@ -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 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) { 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 5677f6a4c9..5921a99347 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 @@ -190,6 +190,8 @@ interface IMoGoWaringProvider : IMoGoHmiViewProxy { fun showMaskView() + fun hideMaskView() + /** * 加载全览模式图层 */ 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 2bd6171500..2bd70f548c 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 @@ -315,6 +315,10 @@ object CallerHmiManager : CallerBase() { waringProviderApi?.showMaskView() } + fun hideMaskView() { + waringProviderApi?.hideMaskView() + } + /** *注册工控机升级提示圆点View的回调 * @param 提示圆点View 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 new file mode 100644 index 0000000000..1e61f001f2 --- /dev/null +++ b/libraries/mogo-adas-other/build/generated/source/buildConfig/debug/com/zhidao/support/adas/high/other/BuildConfig.java @@ -0,0 +1,18 @@ +/** + * 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 new file mode 100644 index 0000000000..c4636fe59b --- /dev/null +++ b/libraries/mogo-adas-other/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000000..f176bcd541 --- /dev/null +++ b/libraries/mogo-adas-other/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json @@ -0,0 +1 @@ +[{"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 new file mode 100644 index 0000000000..9e26dfeeb6 --- /dev/null +++ b/libraries/mogo-adas-other/build/intermediates/annotation_processor_list/debug/annotationProcessors.json @@ -0,0 +1 @@ +{} \ 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 new file mode 100644 index 0000000000..c832a64577 Binary files /dev/null and b/libraries/mogo-adas-other/build/intermediates/compile_library_classes/debug/classes.jar 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 new file mode 100644 index 0000000000..bf1accc18d Binary files /dev/null and b/libraries/mogo-adas-other/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar 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 new file mode 100644 index 0000000000..427dd39745 --- /dev/null +++ b/libraries/mogo-adas-other/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -0,0 +1,2 @@ + + \ 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 new file mode 100644 index 0000000000..6a68d44e58 --- /dev/null +++ b/libraries/mogo-adas-other/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -0,0 +1,2 @@ + + \ 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 new file mode 100644 index 0000000000..5053865c29 --- /dev/null +++ b/libraries/mogo-adas-other/build/intermediates/incremental/packageDebugAssets/merger.xml @@ -0,0 +1,2 @@ + + \ 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 new file mode 100644 index 0000000000..2379682a0a --- /dev/null +++ b/libraries/mogo-adas-other/build/intermediates/incremental/packageDebugResources/compile-file-map.properties @@ -0,0 +1,7 @@ +#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 new file mode 100644 index 0000000000..4071a15455 --- /dev/null +++ b/libraries/mogo-adas-other/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml @@ -0,0 +1,25 @@ + + + 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 new file mode 100644 index 0000000000..dc2af82caa --- /dev/null +++ b/libraries/mogo-adas-other/build/intermediates/incremental/packageDebugResources/merger.xml @@ -0,0 +1,21 @@ + +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 new file mode 100644 index 0000000000..c18c5bfc02 Binary files /dev/null and b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/BuildConfig.class 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 new file mode 100644 index 0000000000..667c5cb1ff Binary files /dev/null and b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/permission/BackgrounderPermission.class 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 new file mode 100644 index 0000000000..36dcdddc52 Binary files /dev/null and b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/permission/OnAdasPermissionListener.class 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 new file mode 100644 index 0000000000..b74c14d0da Binary files /dev/null and b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/permission/PermissionLongBackgroundRunningDialog$1.class 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 new file mode 100644 index 0000000000..d2e3b3ba70 Binary files /dev/null and b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/permission/PermissionLongBackgroundRunningDialog.class 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 new file mode 100644 index 0000000000..75ad73064b Binary files /dev/null and b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/PlaceholderFragment$1.class 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 new file mode 100644 index 0000000000..ac5ff80cfc Binary files /dev/null and b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/PlaceholderFragment$2.class 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 new file mode 100644 index 0000000000..e7c5a7fd74 Binary files /dev/null and b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/PlaceholderFragment.class 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 new file mode 100644 index 0000000000..9d5b93b57f Binary files /dev/null and b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity$1.class 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 new file mode 100644 index 0000000000..5a4acb5ce9 Binary files /dev/null and b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity$2.class 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 new file mode 100644 index 0000000000..af6433a248 Binary files /dev/null and b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity$3.class 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 new file mode 100644 index 0000000000..b33b137124 Binary files /dev/null and b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity$4.class 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 new file mode 100644 index 0000000000..8870975f3b Binary files /dev/null and b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/RouterActivity.class 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 new file mode 100644 index 0000000000..699e79efd5 Binary files /dev/null and b/libraries/mogo-adas-other/build/intermediates/javac/debug/classes/com/zhidao/support/adas/high/other/router/SectionsPagerAdapter.class 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 new file mode 100644 index 0000000000..15cb0ecb3e Binary files /dev/null and b/libraries/mogo-adas-other/build/intermediates/library_java_res/debug/res.jar 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 new file mode 100644 index 0000000000..c4636fe59b --- /dev/null +++ b/libraries/mogo-adas-other/build/intermediates/library_manifest/debug/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000000..1e72ca358c --- /dev/null +++ b/libraries/mogo-adas-other/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt @@ -0,0 +1,21 @@ +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 new file mode 100644 index 0000000000..aa21903878 --- /dev/null +++ b/libraries/mogo-adas-other/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -0,0 +1,40 @@ +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 new file mode 100644 index 0000000000..d763e66d85 --- /dev/null +++ b/libraries/mogo-adas-other/build/intermediates/merged_manifests/debug/output.json @@ -0,0 +1 @@ +[{"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 new file mode 100644 index 0000000000..f50618256d --- /dev/null +++ b/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/anim/dialog_in.xml @@ -0,0 +1,14 @@ + + + + + + + + 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 new file mode 100644 index 0000000000..8134cd1490 --- /dev/null +++ b/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/anim/dialog_out.xml @@ -0,0 +1,14 @@ + + + + + + + + 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 new file mode 100644 index 0000000000..cbfb69f454 --- /dev/null +++ b/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/drawable/bg_adas_dialog.xml @@ -0,0 +1,9 @@ + + + + + + + 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 new file mode 100644 index 0000000000..0abd4797e8 --- /dev/null +++ b/libraries/mogo-adas-other/build/intermediates/packaged_res/debug/layout/activity_router.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + +