李明 / ClasManage · 提交

转到一个项目

作者 朱振飞
提交 4bf4b7dffe8780dae26479bc1eceb1da26716765 1 个父辈 b2093f1b

add

内嵌 并排对比
正在显示 36 个修改的文件 包含 99 行增加 和 93 行删除
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\qrcodecore\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\qrcodecore\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\qrcodecore\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\qrcodecore\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\qrcodecore\src\main\assets"/><source path="F:\ClasManage\qrcodecore\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\qrcodecore\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\main\assets"/><source path="D:\bro\ClasManage\qrcodecore\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
... ...
#Thu Apr 02 10:40:08 CST 2020
F\:\\ClasManage\\qrcodecore\\src\\main\\res\\mipmap-xxhdpi\\qrcode_default_scan_line.png=F\:\\ClasManage\\qrcodecore\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\qrcode_default_scan_line.png
F\:\\ClasManage\\qrcodecore\\src\\main\\res\\mipmap-xxhdpi\\qrcode_default_grid_scan_line.png=F\:\\ClasManage\\qrcodecore\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\qrcode_default_grid_scan_line.png
#Thu Apr 02 19:39:10 CST 2020
D\:\\bro\\ClasManage\\qrcodecore\\src\\main\\res\\mipmap-xxhdpi\\qrcode_default_grid_scan_line.png=D\:\\bro\\ClasManage\\qrcodecore\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\qrcode_default_grid_scan_line.png
D\:\\bro\\ClasManage\\qrcodecore\\src\\main\\res\\mipmap-xxhdpi\\qrcode_default_scan_line.png=D\:\\bro\\ClasManage\\qrcodecore\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\qrcode_default_scan_line.png
... ...
<?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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\qrcodecore\src\main\res"/><source path="F:\ClasManage\qrcodecore\build\generated\res\rs\debug"/><source path="F:\ClasManage\qrcodecore\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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\qrcodecore\src\main\res"><file name="qrcode_default_grid_scan_line" path="F:\ClasManage\qrcodecore\src\main\res\mipmap-xxhdpi\qrcode_default_grid_scan_line.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="qrcode_default_scan_line" path="F:\ClasManage\qrcodecore\src\main\res\mipmap-xxhdpi\qrcode_default_scan_line.png" qualifiers="xxhdpi-v4" type="mipmap"/><file path="F:\ClasManage\qrcodecore\src\main\res\values\attrs.xml" qualifiers=""><declare-styleable name="QRCodeView">
<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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\main\res"/><source path="D:\bro\ClasManage\qrcodecore\build\generated\res\rs\debug"/><source path="D:\bro\ClasManage\qrcodecore\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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\main\res"><file name="qrcode_default_grid_scan_line" path="D:\bro\ClasManage\qrcodecore\src\main\res\mipmap-xxhdpi\qrcode_default_grid_scan_line.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="qrcode_default_scan_line" path="D:\bro\ClasManage\qrcodecore\src\main\res\mipmap-xxhdpi\qrcode_default_scan_line.png" qualifiers="xxhdpi-v4" type="mipmap"/><file path="D:\bro\ClasManage\qrcodecore\src\main\res\values\attrs.xml" qualifiers=""><declare-styleable name="QRCodeView">
<attr format="dimension|reference" name="qrcv_topOffset"/>
... ... @@ -71,7 +71,7 @@
<attr format="boolean" name="qrcv_isShowLocationPoint"/>
<attr format="boolean" name="qrcv_isAutoZoom"/>
</declare-styleable></file><file path="F:\ClasManage\qrcodecore\src\main\res\values\ids.xml" qualifiers=""><item name="bgaqrcode_camera_preview" type="id"/></file></source><source path="F:\ClasManage\qrcodecore\build\generated\res\rs\debug"/><source path="F:\ClasManage\qrcodecore\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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\qrcodecore\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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\qrcodecore\src\debug\res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="QRCodeView">
</declare-styleable></file><file path="D:\bro\ClasManage\qrcodecore\src\main\res\values\ids.xml" qualifiers=""><item name="bgaqrcode_camera_preview" type="id"/></file></source><source path="D:\bro\ClasManage\qrcodecore\build\generated\res\rs\debug"/><source path="D:\bro\ClasManage\qrcodecore\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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\debug\res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="QRCodeView">
<attr format="dimension|reference" name="qrcv_topOffset"/>
... ...
... ... @@ -6,28 +6,28 @@
6
7 <uses-sdk
8 android:minSdkVersion="21"
8-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
8-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
9 android:targetSdkVersion="28" />
9-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
9-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
10
11 <uses-permission android:name="android.permission.CAMERA" />
11-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:5-65
11-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:22-62
11-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:5-65
11-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:22-62
12 <uses-permission android:name="android.permission.FLASHLIGHT" />
12-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:5-69
12-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:22-66
12-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:5-69
12-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:22-66
13
14 <uses-feature
14-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:7:5-9:36
14-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:7:5-9:36
15 android:name="android.hardware.camera.autofocus"
15-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:8:9-57
15-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:8:9-57
16 android:required="false" />
16-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:9:9-33
16-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:9:9-33
17 <uses-feature
17-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:10:5-12:36
17-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:10:5-12:36
18 android:name="android.hardware.camera.flash"
18-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:11:9-53
18-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:11:9-53
19 android:required="false" />
19-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:12:9-33
19-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:12:9-33
20
21</manifest>
... ...
-- Merging decision tree log ---
manifest
ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
package
ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:2:5-44
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:2:5-44
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
android:versionName
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
android:versionCode
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
xmlns:android
ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:11-69
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:11-69
uses-permission#android.permission.CAMERA
ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:5-65
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:5-65
android:name
ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:22-62
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:22-62
uses-permission#android.permission.FLASHLIGHT
ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:5-69
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:5-69
android:name
ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:22-66
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:22-66
uses-feature#android.hardware.camera.autofocus
ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:7:5-9:36
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:7:5-9:36
android:required
ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:9:9-33
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:9:9-33
android:name
ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:8:9-57
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:8:9-57
uses-feature#android.hardware.camera.flash
ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:10:5-12:36
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:10:5-12:36
android:required
ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:12:9-33
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:12:9-33
android:name
ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:11:9-53
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:11:9-53
uses-sdk
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
android:targetSdkVersion
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
... ...
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\zxing\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\zxing\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\zxing\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\zxing\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\zxing\src\main\assets"/><source path="F:\ClasManage\zxing\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\zxing\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\main\assets"/><source path="D:\bro\ClasManage\zxing\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
... ...
<?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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\zxing\src\main\res"/><source path="F:\ClasManage\zxing\build\generated\res\rs\debug"/><source path="F:\ClasManage\zxing\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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\zxing\src\main\res"/><source path="F:\ClasManage\zxing\build\generated\res\rs\debug"/><source path="F:\ClasManage\zxing\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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\zxing\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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\ClasManage\zxing\src\debug\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
<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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\main\res"/><source path="D:\bro\ClasManage\zxing\build\generated\res\rs\debug"/><source path="D:\bro\ClasManage\zxing\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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\main\res"/><source path="D:\bro\ClasManage\zxing\build\generated\res\rs\debug"/><source path="D:\bro\ClasManage\zxing\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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\debug\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
... ...
... ... @@ -6,8 +6,8 @@
6
7 <uses-sdk
8 android:minSdkVersion="21"
8-->F:\ClasManage\zxing\src\main\AndroidManifest.xml
8-->D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
9 android:targetSdkVersion="28" />
9-->F:\ClasManage\zxing\src\main\AndroidManifest.xml
9-->D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
10
11</manifest>
... ...
-- Merging decision tree log ---
manifest
ADDED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
package
ADDED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:11-51
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:11-51
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
android:versionName
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
xmlns:android
ADDED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
android:versionCode
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
uses-sdk
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
android:targetSdkVersion
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from F:\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from F:\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
... ...