李明 / ClasManage · 提交

转到一个项目

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

add

内嵌 并排对比
正在显示 36 个修改的文件 包含 99 行增加 和 93 行删除
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<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>  
  2 +<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>
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<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>  
  2 +<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>
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<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>  
  2 +<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>
1 -#Thu Apr 02 10:40:08 CST 2020  
2 -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  
3 -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 1 +#Thu Apr 02 19:39:10 CST 2020
  2 +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
  3 +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
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<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"> 2 +<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">
3 3
4 <attr format="dimension|reference" name="qrcv_topOffset"/> 4 <attr format="dimension|reference" name="qrcv_topOffset"/>
5 5
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
71 <attr format="boolean" name="qrcv_isShowLocationPoint"/> 71 <attr format="boolean" name="qrcv_isShowLocationPoint"/>
72 72
73 <attr format="boolean" name="qrcv_isAutoZoom"/> 73 <attr format="boolean" name="qrcv_isAutoZoom"/>
74 - </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"> 74 + </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">
75 75
76 <attr format="dimension|reference" name="qrcv_topOffset"/> 76 <attr format="dimension|reference" name="qrcv_topOffset"/>
77 77
@@ -6,28 +6,28 @@ @@ -6,28 +6,28 @@
6 6 6 6
7 7 <uses-sdk 7 7 <uses-sdk
8 8 android:minSdkVersion="21" 8 8 android:minSdkVersion="21"
9 -8-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml 9 +8-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
10 9 android:targetSdkVersion="28" /> 10 9 android:targetSdkVersion="28" />
11 -9-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml 11 +9-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
12 10 12 10
13 11 <uses-permission android:name="android.permission.CAMERA" /> 13 11 <uses-permission android:name="android.permission.CAMERA" />
14 -11-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:5-65  
15 -11-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:22-62 14 +11-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:5-65
  15 +11-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:22-62
16 12 <uses-permission android:name="android.permission.FLASHLIGHT" /> 16 12 <uses-permission android:name="android.permission.FLASHLIGHT" />
17 -12-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:5-69  
18 -12-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:22-66 17 +12-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:5-69
  18 +12-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:22-66
19 13 19 13
20 14 <uses-feature 20 14 <uses-feature
21 -14-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:7:5-9:36 21 +14-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:7:5-9:36
22 15 android:name="android.hardware.camera.autofocus" 22 15 android:name="android.hardware.camera.autofocus"
23 -15-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:8:9-57 23 +15-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:8:9-57
24 16 android:required="false" /> 24 16 android:required="false" />
25 -16-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:9:9-33 25 +16-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:9:9-33
26 17 <uses-feature 26 17 <uses-feature
27 -17-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:10:5-12:36 27 +17-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:10:5-12:36
28 18 android:name="android.hardware.camera.flash" 28 18 android:name="android.hardware.camera.flash"
29 -18-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:11:9-53 29 +18-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:11:9-53
30 19 android:required="false" /> 30 19 android:required="false" />
31 -19-->F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:12:9-33 31 +19-->D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:12:9-33
32 20 32 20
33 21</manifest> 33 21</manifest>
1 -- Merging decision tree log --- 1 -- Merging decision tree log ---
2 manifest 2 manifest
3 -ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12  
4 -INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12  
5 -INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12  
6 -INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12  
7 -INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12  
8 -INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12  
9 -INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12 3 +ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
  4 +INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
  5 +INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
  6 +INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
  7 +INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
  8 +INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
  9 +INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
10 package 10 package
11 - ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:2:5-44  
12 - INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml  
13 - INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml 11 + ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:2:5-44
  12 + INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
  13 + INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
14 android:versionName 14 android:versionName
15 - INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml  
16 - ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12  
17 - INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml 15 + INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
  16 + ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
  17 + INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
18 android:versionCode 18 android:versionCode
19 - INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml  
20 - ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12  
21 - INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml 19 + INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
  20 + ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
  21 + INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
22 xmlns:android 22 xmlns:android
23 - ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:11-69 23 + ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:11-69
24 uses-permission#android.permission.CAMERA 24 uses-permission#android.permission.CAMERA
25 -ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:5-65 25 +ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:5-65
26 android:name 26 android:name
27 - ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:22-62 27 + ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:22-62
28 uses-permission#android.permission.FLASHLIGHT 28 uses-permission#android.permission.FLASHLIGHT
29 -ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:5-69 29 +ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:5-69
30 android:name 30 android:name
31 - ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:22-66 31 + ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:22-66
32 uses-feature#android.hardware.camera.autofocus 32 uses-feature#android.hardware.camera.autofocus
33 -ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:7:5-9:36 33 +ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:7:5-9:36
34 android:required 34 android:required
35 - ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:9:9-33 35 + ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:9:9-33
36 android:name 36 android:name
37 - ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:8:9-57 37 + ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:8:9-57
38 uses-feature#android.hardware.camera.flash 38 uses-feature#android.hardware.camera.flash
39 -ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:10:5-12:36 39 +ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:10:5-12:36
40 android:required 40 android:required
41 - ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:12:9-33 41 + ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:12:9-33
42 android:name 42 android:name
43 - ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml:11:9-53 43 + ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:11:9-53
44 uses-sdk 44 uses-sdk
45 -INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml reason: use-sdk injection requested  
46 -INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml  
47 -INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml  
48 -INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml  
49 -INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml 45 +INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml reason: use-sdk injection requested
  46 +INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
  47 +INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
  48 +INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
  49 +INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
50 android:targetSdkVersion 50 android:targetSdkVersion
51 - INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml  
52 - ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml  
53 - INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml 51 + INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
  52 + ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
  53 + INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
54 android:minSdkVersion 54 android:minSdkVersion
55 - INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml  
56 - ADDED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml  
57 - INJECTED from F:\ClasManage\qrcodecore\src\main\AndroidManifest.xml 55 + INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
  56 + ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
  57 + INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<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>  
  2 +<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>
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<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>  
  2 +<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>
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<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>  
  2 +<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>
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<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>  
  2 +<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>
@@ -6,8 +6,8 @@ @@ -6,8 +6,8 @@
6 6 6 6
7 7 <uses-sdk 7 7 <uses-sdk
8 8 android:minSdkVersion="21" 8 8 android:minSdkVersion="21"
9 -8-->F:\ClasManage\zxing\src\main\AndroidManifest.xml 9 +8-->D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
10 9 android:targetSdkVersion="28" /> 10 9 android:targetSdkVersion="28" />
11 -9-->F:\ClasManage\zxing\src\main\AndroidManifest.xml 11 +9-->D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
12 10 12 10
13 11</manifest> 13 11</manifest>
1 -- Merging decision tree log --- 1 -- Merging decision tree log ---
2 manifest 2 manifest
3 -ADDED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53  
4 -INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53  
5 -INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53  
6 -INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53  
7 -INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53  
8 -INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53  
9 -INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53 3 +ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
  4 +INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
  5 +INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
  6 +INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
  7 +INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
  8 +INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
  9 +INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
10 package 10 package
11 - ADDED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:11-51  
12 - INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml  
13 - INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml 11 + ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:11-51
  12 + INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
  13 + INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
14 android:versionName 14 android:versionName
15 - INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml  
16 - ADDED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53  
17 - INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml 15 + INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
  16 + ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
  17 + INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
18 xmlns:android 18 xmlns:android
19 - ADDED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53 19 + ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
20 android:versionCode 20 android:versionCode
21 - INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml  
22 - ADDED from F:\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53  
23 - INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml 21 + INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
  22 + ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
  23 + INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
24 uses-sdk 24 uses-sdk
25 -INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml reason: use-sdk injection requested  
26 -INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml  
27 -INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml  
28 -INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml  
29 -INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml 25 +INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml reason: use-sdk injection requested
  26 +INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
  27 +INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
  28 +INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
  29 +INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
30 android:targetSdkVersion 30 android:targetSdkVersion
31 - INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml  
32 - ADDED from F:\ClasManage\zxing\src\main\AndroidManifest.xml  
33 - INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml 31 + INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
  32 + ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
  33 + INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
34 android:minSdkVersion 34 android:minSdkVersion
35 - INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml  
36 - ADDED from F:\ClasManage\zxing\src\main\AndroidManifest.xml  
37 - INJECTED from F:\ClasManage\zxing\src\main\AndroidManifest.xml 35 + INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
  36 + ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
  37 + INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml