fixed conflict
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -190,6 +190,8 @@ interface IMoGoWaringProvider : IMoGoHmiViewProxy {
|
||||
|
||||
fun showMaskView()
|
||||
|
||||
fun hideMaskView()
|
||||
|
||||
/**
|
||||
* 加载全览模式图层
|
||||
*/
|
||||
|
||||
@@ -315,6 +315,10 @@ object CallerHmiManager : CallerBase() {
|
||||
waringProviderApi?.showMaskView()
|
||||
}
|
||||
|
||||
fun hideMaskView() {
|
||||
waringProviderApi?.hideMaskView()
|
||||
}
|
||||
|
||||
/**
|
||||
*注册工控机升级提示圆点View的回调
|
||||
* @param 提示圆点View
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.zhidao.support.adas.high.other"
|
||||
android:versionCode="2090000"
|
||||
android:versionName="2.9.0" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="21"
|
||||
android:targetSdkVersion="21" />
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
|
||||
|
||||
<application android:usesCleartextTraffic="true" >
|
||||
<activity
|
||||
android:name="com.zhidao.support.adas.high.other.permission.PermissionLongBackgroundRunningDialog"
|
||||
android:theme="@style/PermissionLongBackgroundRunningDialogStyle" />
|
||||
<activity
|
||||
android:name="com.zhidao.support.adas.high.other.router.RouterActivity"
|
||||
android:theme="@style/NoActionBar" />
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
@@ -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":""}}]
|
||||
@@ -0,0 +1 @@
|
||||
{}
|
||||
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoEagleEye/core/mogo-core-data/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoEagleEye/core/mogo-core-data/src/debug/jniLibs"/></dataSet></merger>
|
||||
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoEagleEye/core/function-impl/mogo-core-function-dispatch/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoEagleEye/core/function-impl/mogo-core-function-dispatch/src/debug/shaders"/></dataSet></merger>
|
||||
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoEagleEye/core/function-impl/mogo-core-function-dispatch/src/main/assets"/><source path="/Users/admin/Android/ADAS/MoGoEagleEye/core/function-impl/mogo-core-function-dispatch/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoEagleEye/core/function-impl/mogo-core-function-dispatch/src/debug/assets"/></dataSet></merger>
|
||||
@@ -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
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">adas-backgrounder-permission</string>
|
||||
<style name="NoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
</style>
|
||||
<style name="PermissionLongBackgroundRunningDialogStyle" parent="Theme.AppCompat.Dialog">
|
||||
<!--设置dialog的背景-->
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
<!--设置Dialog的windowFrame框为无-->
|
||||
<item name="android:windowFrame">@null</item>
|
||||
<!--设置无标题-->
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
<!--是否浮现在activity之上-->
|
||||
<item name="android:windowIsFloating">true</item>
|
||||
<!--是否半透明-->
|
||||
<item name="android:windowIsTranslucent">true</item>
|
||||
<!--设置窗口内容不覆盖-->
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<!--背景是否模糊显示-->
|
||||
<item name="android:backgroundDimEnabled">true</item>
|
||||
</style>
|
||||
</resources>
|
||||
@@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/res"/><source path="/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/build/generated/res/rs/debug"/><source path="/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/res"><file name="dialog_in" path="/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/res/anim/dialog_in.xml" qualifiers="" type="anim"/><file name="dialog_out" path="/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/res/anim/dialog_out.xml" qualifiers="" type="anim"/><file name="bg_adas_dialog" path="/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/res/drawable/bg_adas_dialog.xml" qualifiers="" type="drawable"/><file name="activity_router" path="/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/res/layout/activity_router.xml" qualifiers="" type="layout"/><file name="fragment_router" path="/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/res/layout/fragment_router.xml" qualifiers="" type="layout"/><file name="dialog_adas_permission_long_background_running" path="/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/res/layout/dialog_adas_permission_long_background_running.xml" qualifiers="" type="layout"/><file path="/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/res/values/styles.xml" qualifiers=""><style name="PermissionLongBackgroundRunningDialogStyle" parent="Theme.AppCompat.Dialog">
|
||||
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
|
||||
<item name="android:windowFrame">@null</item>
|
||||
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
|
||||
<item name="android:windowIsFloating">true</item>
|
||||
|
||||
<item name="android:windowIsTranslucent">true</item>
|
||||
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
|
||||
<item name="android:backgroundDimEnabled">true</item>
|
||||
</style><style name="NoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
</style></file><file path="/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/res/values/strings.xml" qualifiers=""><string name="app_name">adas-backgrounder-permission</string></file></source><source path="/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/build/generated/res/rs/debug"/><source path="/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/debug/res"/></dataSet><mergedItems/></merger>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.zhidao.support.adas.high.other"
|
||||
android:versionCode="2090000"
|
||||
android:versionName="2.9.0" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="21"
|
||||
android:targetSdkVersion="21" />
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
|
||||
|
||||
<application android:usesCleartextTraffic="true" >
|
||||
<activity
|
||||
android:name="com.zhidao.support.adas.high.other.permission.PermissionLongBackgroundRunningDialog"
|
||||
android:theme="@style/PermissionLongBackgroundRunningDialogStyle" />
|
||||
<activity
|
||||
android:name="com.zhidao.support.adas.high.other.router.RouterActivity"
|
||||
android:theme="@style/NoActionBar" />
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
@@ -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
|
||||
@@ -0,0 +1,40 @@
|
||||
1<?xml version="1.0" encoding="utf-8"?>
|
||||
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
3 package="com.zhidao.support.adas.high.other"
|
||||
4 android:versionCode="2090000"
|
||||
5 android:versionName="2.9.0" >
|
||||
6
|
||||
7 <uses-sdk
|
||||
8 android:minSdkVersion="21"
|
||||
8-->/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 <uses-permission android:name="android.permission.INTERNET" />
|
||||
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 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
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 <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
|
||||
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 <application android:usesCleartextTraffic="true" >
|
||||
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 <activity
|
||||
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 <activity
|
||||
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 </application>
|
||||
23
|
||||
24</manifest>
|
||||
@@ -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":""}}]
|
||||
@@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<translate
|
||||
android:duration="300"
|
||||
android:fromYDelta="50%"
|
||||
android:toYDelta="100%" />
|
||||
|
||||
<alpha
|
||||
android:duration="300"
|
||||
android:fromAlpha="0"
|
||||
android:toAlpha="1" />
|
||||
|
||||
</set>
|
||||
@@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<translate
|
||||
android:duration="300"
|
||||
android:fromYDelta="50%"
|
||||
android:toYDelta="0" />
|
||||
|
||||
<alpha
|
||||
android:duration="300"
|
||||
android:fromAlpha="0"
|
||||
android:toAlpha="1" />
|
||||
|
||||
</set>
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="#FAFFFFFF" />
|
||||
<stroke
|
||||
android:width="0.8dp"
|
||||
android:color="#81666666" />
|
||||
<!-- 圆角 -->
|
||||
<corners android:radius="6dp" />
|
||||
</shape>
|
||||
@@ -0,0 +1,65 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".router.RouterActivity">
|
||||
|
||||
<com.google.android.material.tabs.TabLayout
|
||||
android:id="@+id/tabs"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
|
||||
<androidx.cardview.widget.CardView
|
||||
android:id="@+id/view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent">
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
android:padding="10dp">
|
||||
|
||||
<Button
|
||||
android:id="@+id/close"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="返回" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/refresh"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="10dp"
|
||||
android:text="刷新" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="10dp"
|
||||
android:text="输入路由器用户名/密码->点击“登录”->点击“连接用户”查看当前列表中是否存在IP是“192.168.X.102”的设备"
|
||||
android:textColor="#000000"
|
||||
android:textStyle="bold" />
|
||||
</LinearLayout>
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
<androidx.viewpager2.widget.ViewPager2
|
||||
android:id="@+id/view_pager"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
app:layout_constraintBottom_toTopOf="@id/view"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/tabs" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -0,0 +1,35 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/bg_adas_dialog"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/hint_battery"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="电池优化:优化"
|
||||
android:textColor="#000000" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_close_battery_optimizations"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:text="关闭" />
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="3dp"
|
||||
android:text="开启池优化功能,会影响熄屏或休眠后网络连接"
|
||||
android:textColor="#696969" />
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,31 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/constraintLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".router.PlaceholderFragment">
|
||||
|
||||
<WebView
|
||||
android:id="@+id/web_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/constraintLayout"
|
||||
tools:layout_constraintLeft_creator="1"
|
||||
tools:layout_constraintTop_creator="1" />
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/progressbar"
|
||||
style="@android:style/Widget.ProgressBar.Horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="3dip"
|
||||
android:max="100"
|
||||
android:progress="0"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/constraintLayout"
|
||||
tools:layout_constraintLeft_creator="1"
|
||||
tools:layout_constraintTop_creator="1" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">adas-backgrounder-permission</string>
|
||||
<style name="NoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
</style>
|
||||
<style name="PermissionLongBackgroundRunningDialogStyle" parent="Theme.AppCompat.Dialog">
|
||||
<!--设置dialog的背景-->
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
<!--设置Dialog的windowFrame框为无-->
|
||||
<item name="android:windowFrame">@null</item>
|
||||
<!--设置无标题-->
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
<!--是否浮现在activity之上-->
|
||||
<item name="android:windowIsFloating">true</item>
|
||||
<!--是否半透明-->
|
||||
<item name="android:windowIsTranslucent">true</item>
|
||||
<!--设置窗口内容不覆盖-->
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<!--背景是否模糊显示-->
|
||||
<item name="android:backgroundDimEnabled">true</item>
|
||||
</style>
|
||||
</resources>
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
4723
libraries/mogo-adas-other/build/intermediates/symbols/debug/R.txt
Normal file
4723
libraries/mogo-adas-other/build/intermediates/symbols/debug/R.txt
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,65 @@
|
||||
-- Merging decision tree log ---
|
||||
manifest
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:1:1-19:12
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:1:1-19:12
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:1:1-19:12
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:1:1-19:12
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:1:1-19:12
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:1:1-19:12
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:1:1-19:12
|
||||
package
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:2:5-49
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml
|
||||
android:versionName
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:1:1-19:12
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml
|
||||
android:versionCode
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:1:1-19:12
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml
|
||||
xmlns:android
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:1:11-69
|
||||
uses-permission#android.permission.INTERNET
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:4:5-67
|
||||
android:name
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:4:22-64
|
||||
uses-permission#android.permission.ACCESS_NETWORK_STATE
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:5:5-79
|
||||
android:name
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:5:22-76
|
||||
uses-permission#android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:6:5-95
|
||||
android:name
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:6:22-92
|
||||
application
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:8:5-18:19
|
||||
android:usesCleartextTraffic
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:10:9-44
|
||||
activity#com.zhidao.support.adas.high.other.permission.PermissionLongBackgroundRunningDialog
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:12:9-14:81
|
||||
android:theme
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:14:13-78
|
||||
android:name
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:13:13-77
|
||||
activity#com.zhidao.support.adas.high.other.router.RouterActivity
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:15:9-17:50
|
||||
android:theme
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:17:13-47
|
||||
android:name
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml:16:13-50
|
||||
uses-sdk
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml reason: use-sdk injection requested
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml
|
||||
android:targetSdkVersion
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml
|
||||
android:minSdkVersion
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml
|
||||
ADDED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/admin/Android/ADAS/MoGoEagleEye/libraries/mogo-adas-other/src/main/AndroidManifest.xml
|
||||
Reference in New Issue
Block a user