修改git

.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_5_16_25_[Default_Changelist]/shelved.patch

+Index: library_ad/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>#Mon Jul 05 15:26:09 CST 2021\r\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>GBK
+===================================================================
+--- library_ad/build/intermediates/incremental/packageDebugResources/compile-file-map.properties	(revision 0888c86ea247aa4d7fc74e3a518e89577e8a270d)
++++ library_ad/build/intermediates/incremental/packageDebugResources/compile-file-map.properties	(date 1625473083314)
+@@ -1,1 +1,1 @@
+-#Mon Jul 05 15:26:09 CST 2021
++#Mon Jul 05 16:18:03 CST 2021
+diff --git library_ad/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json library_ad/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json
+diff --git library_ad/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml library_ad/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml
+diff --git library_ad/build/intermediates/incremental/packageDebugAssets/merger.xml library_ad/build/intermediates/incremental/packageDebugAssets/merger.xml
+diff --git library_ad/build/intermediates/incremental/mergeDebugShaders/merger.xml library_ad/build/intermediates/incremental/mergeDebugShaders/merger.xml
+diff --git library_ad/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml library_ad/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+diff --git library_ad/build/intermediates/library_manifest/debug/AndroidManifest.xml library_ad/build/intermediates/library_manifest/debug/AndroidManifest.xml
+diff --git library_ad/build/intermediates/local_only_symbol_list/debug/R-def.txt library_ad/build/intermediates/local_only_symbol_list/debug/R-def.txt
+diff --git library_ad/build/intermediates/packaged_manifests/debug/output-metadata.json library_ad/build/intermediates/packaged_manifests/debug/output-metadata.json
+diff --git library_ad/build/generated/source/buildConfig/debug/com/mints/library_ad/BuildConfig.java library_ad/build/generated/source/buildConfig/debug/com/mints/library_ad/BuildConfig.java
+diff --git library_ad/build/outputs/logs/manifest-merger-debug-report.txt library_ad/build/outputs/logs/manifest-merger-debug-report.txt
+diff --git library_ad/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt library_ad/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
+diff --git library_ad/build/intermediates/incremental/packageDebugResources/merger.xml library_ad/build/intermediates/incremental/packageDebugResources/merger.xml
+diff --git library_ad/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt library_ad/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+diff --git library_ad/build/intermediates/compile_symbol_list/debug/R.txt library_ad/build/intermediates/compile_symbol_list/debug/R.txt

.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_5_16_25__Default_Changelist_.xml

+<changelist name="Uncommitted_changes_before_Update_at_2021_7_5_16_25_[Default_Changelist]" date="1625473609539" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_5_16_25_[Default_Changelist]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Update at 2021/7/5 16:25 [Default Changelist]" />
+</changelist>
\ No newline at end of file

app/src/main/res/values/styles.xml

@@ -25,12 +25,7 @@
         <item name="android:windowExitAnimation">@anim/slide_out_to_right</item>-->
     </style>
 
-    <!--浅灰色line-->
-    <style name="view_line_E6E6E6">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
-        <item name="android:background">@color/color_E6E6E6</item>
-    </style>
+
     <style name="line_3">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">1px</item>

library_ad/build/.transforms/e0b013e440631452d053c86e2eef75bd.bin

+o/classes

library_ad/build/generated/data_binding_trigger/debug/com/mints/library_ad/DataBindingTriggerClass.java

+package com.mints.library_ad;
+
+@androidx.databinding.BindingBuildInfo
+public class DataBindingTriggerClass {}
\ No newline at end of file

library_ad/build/generated/source/buildConfig/debug/com/mints/library_ad/BuildConfig.java

+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.mints.library_ad;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String LIBRARY_PACKAGE_NAME = "com.mints.library_ad";
+  public static final String BUILD_TYPE = "debug";
+  // Field from default config.
+  public static final String AppKeyPre = "abcd";
+  // Field from build type: debug
+  public static final String DEBUG_URL = "http://test.mints-id.com/camera-api/";
+  // Field from build type: debug
+  public static final boolean IS_DEV = true;
+  // Field from default config.
+  public static final String VERSION_CODE = "1";
+  // Field from default config.
+  public static final String VERSION_NAME = "1.0.0";
+}

library_ad/build/generated/source/kapt/debug/androidx/databinding/DataBindingComponent.java

+package androidx.databinding;
+
+public interface DataBindingComponent {
+}

library_ad/build/generated/source/kapt/debug/androidx/databinding/library/baseAdapters/BR.java

+package androidx.databinding.library.baseAdapters;
+
+public class BR {
+  public static int _all = 0;
+}

library_ad/build/generated/source/kapt/debug/com/mints/library_ad/BR.java

+package com.mints.library_ad;
+
+public class BR {
+  public static int _all = 0;
+}

library_ad/build/generated/source/kapt/debug/com/mints/library_ad/DataBinderMapperImpl.java

+package com.mints.library_ad;
+
+import android.util.SparseArray;
+import android.util.SparseIntArray;
+import android.view.View;
+import androidx.databinding.DataBinderMapper;
+import androidx.databinding.DataBindingComponent;
+import androidx.databinding.ViewDataBinding;
+import java.lang.Integer;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.RuntimeException;
+import java.lang.String;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class DataBinderMapperImpl extends DataBinderMapper {
+  private static final SparseIntArray INTERNAL_LAYOUT_ID_LOOKUP = new SparseIntArray(0);
+
+  @Override
+  public ViewDataBinding getDataBinder(DataBindingComponent component, View view, int layoutId) {
+    int localizedLayoutId = INTERNAL_LAYOUT_ID_LOOKUP.get(layoutId);
+    if(localizedLayoutId > 0) {
+      final Object tag = view.getTag();
+      if(tag == null) {
+        throw new RuntimeException("view must have a tag");
+      }
+    }
+    return null;
+  }
+
+  @Override
+  public ViewDataBinding getDataBinder(DataBindingComponent component, View[] views, int layoutId) {
+    if(views == null || views.length == 0) {
+      return null;
+    }
+    int localizedLayoutId = INTERNAL_LAYOUT_ID_LOOKUP.get(layoutId);
+    if(localizedLayoutId > 0) {
+      final Object tag = views[0].getTag();
+      if(tag == null) {
+        throw new RuntimeException("view must have a tag");
+      }
+      switch(localizedLayoutId) {
+      }
+    }
+    return null;
+  }
+
+  @Override
+  public int getLayoutId(String tag) {
+    if (tag == null) {
+      return 0;
+    }
+    Integer tmpVal = InnerLayoutIdLookup.sKeys.get(tag);
+    return tmpVal == null ? 0 : tmpVal;
+  }
+
+  @Override
+  public String convertBrIdToString(int localId) {
+    String tmpVal = InnerBrLookup.sKeys.get(localId);
+    return tmpVal;
+  }
+
+  @Override
+  public List<DataBinderMapper> collectDependencies() {
+    ArrayList<DataBinderMapper> result = new ArrayList<DataBinderMapper>(1);
+    result.add(new androidx.databinding.library.baseAdapters.DataBinderMapperImpl());
+    return result;
+  }
+
+  private static class InnerBrLookup {
+    static final SparseArray<String> sKeys = new SparseArray<String>(1);
+
+    static {
+      sKeys.put(0, "_all");
+    }
+  }
+
+  private static class InnerLayoutIdLookup {
+    static final HashMap<String, Integer> sKeys = new HashMap<String, Integer>(0);
+  }
+}

library_ad/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mints.library_ad"
+    android:versionCode="1"
+    android:versionName="1.0.0" >
+
+    <uses-sdk
+        android:minSdkVersion="21"
+        android:targetSdkVersion="30" />
+
+</manifest>
\ No newline at end of file

library_ad/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json

+{
+  "version": 2,
+  "artifactType": {
+    "type": "AAPT_FRIENDLY_MERGED_MANIFESTS",
+    "kind": "Directory"
+  },
+  "applicationId": "com.mints.library_ad",
+  "variantName": "debug",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "outputFile": "AndroidManifest.xml"
+    }
+  ]
+}
\ No newline at end of file

library_ad/build/intermediates/aar_metadata/debug/aar-metadata.properties

+aarFormatVersion=1.0
+aarMetadataVersion=1.0

library_ad/build/intermediates/annotation_processor_list/debug/annotationProcessors.json

+{"databinding-compiler-4.1.1.jar (androidx.databinding:databinding-compiler:4.1.1)":true}
\ No newline at end of file

library_ad/build/intermediates/data_binding_artifact/debug/kaptDebugKotlin/com.mints.library_ad-setter_store.json

+{"version":5,"adapterMethods":{},"renamedMethods":{},"conversionMethods":{},"untaggableTypes":{},"multiValueAdapters":{},"inverseAdapters":{},"inverseMethods":{},"twoWayMethods":{},"useAndroidX":true}
\ No newline at end of file

library_ad/build/intermediates/data_binding_base_class_log_artifact/debug/out/com.mints.library_ad-binding_classes.json

 {

library_ad/build/intermediates/data_binding_base_class_logs_dependency_artifacts/debug/androidx.databinding.library.baseAdapters-binding_classes.json

 {

library_ad/build/intermediates/data_binding_export_class_list/debug/kaptDebugKotlin

+androidx.databinding.DataBindingComponent
\ No newline at end of file

library_ad/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json

 {

library_ad/build/intermediates/incremental/mergeDebugJniLibFolders/merger.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="D:\Androidproject\android_goodnews_best\library_ad\libs"><file name="GDTSDK.unionNormal.4.351.1221.aar" path="D:\Androidproject\android_goodnews_best\library_ad\libs\GDTSDK.unionNormal.4.351.1221.aar"/><file name="gdt_adapter_4.351.1221.3.aar" path="D:\Androidproject\android_goodnews_best\library_ad\libs\gdt_adapter_4.351.1221.3.aar"/><file name="kssdk-ad-3.3.9.aar" path="D:\Androidproject\android_goodnews_best\library_ad\libs\kssdk-ad-3.3.9.aar"/><file name="ks_adapter_3.3.9.2.aar" path="D:\Androidproject\android_goodnews_best\library_ad\libs\ks_adapter_3.3.9.2.aar"/><file name="mediation_ad_sdk_2.8.0.2.aar" path="D:\Androidproject\android_goodnews_best\library_ad\libs\mediation_ad_sdk_2.8.0.2.aar"/><file name="Oneway-2.4.9-release.jar" path="D:\Androidproject\android_goodnews_best\library_ad\libs\Oneway-2.4.9-release.jar"/><file name="oneway-common-core-1.0.10.aar" path="D:\Androidproject\android_goodnews_best\library_ad\libs\oneway-common-core-1.0.10.aar"/><file name="open_ad_sdk_3.6.1.3.aar" path="D:\Androidproject\android_goodnews_best\library_ad\libs\open_ad_sdk_3.6.1.3.aar"/><file name="wannuosili_ad_2.2.0.aar" path="D:\Androidproject\android_goodnews_best\library_ad\libs\wannuosili_ad_2.2.0.aar"/></source></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Androidproject\android_goodnews_best\library_ad\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file

library_ad/build/intermediates/incremental/mergeDebugShaders/merger.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="D:\Androidproject\android_goodnews_best\library_ad\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Androidproject\android_goodnews_best\library_ad\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file

library_ad/build/intermediates/incremental/packageDebugAssets/merger.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="D:\Androidproject\android_goodnews_best\library_ad\src\main\assets"/><source path="D:\Androidproject\android_goodnews_best\library_ad\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Androidproject\android_goodnews_best\library_ad\src\debug\assets"/></dataSet></merger>
\ No newline at end of file

library_ad/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

+#Mon Jul 05 16:50:11 CST 2021

library_ad/build/intermediates/incremental/packageDebugResources/merger.xml

+<?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="D:\Androidproject\android_goodnews_best\library_ad\src\main\res"/><source path="D:\Androidproject\android_goodnews_best\library_ad\build\generated\res\rs\debug"/><source path="D:\Androidproject\android_goodnews_best\library_ad\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:\Androidproject\android_goodnews_best\library_ad\src\main\res"/><source path="D:\Androidproject\android_goodnews_best\library_ad\build\generated\res\rs\debug"/><source path="D:\Androidproject\android_goodnews_best\library_ad\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:\Androidproject\android_goodnews_best\library_ad\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:\Androidproject\android_goodnews_best\library_ad\src\debug\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file

library_ad/build/intermediates/library_manifest/debug/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mints.library_ad"
+    android:versionCode="1"
+    android:versionName="1.0.0" >
+
+    <uses-sdk
+        android:minSdkVersion="21"
+        android:targetSdkVersion="30" />
+
+</manifest>
\ No newline at end of file

library_ad/build/intermediates/local_only_symbol_list/debug/R-def.txt

+R_DEF: Internal format may change without notice
+local

library_ad/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

+1<?xml version="1.0" encoding="utf-8"?>
+2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+3    package="com.mints.library_ad"
+4    android:versionCode="1"
+5    android:versionName="1.0.0" >
+6
+7    <uses-sdk
+8        android:minSdkVersion="21"
+8-->D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
+9        android:targetSdkVersion="30" />
+9-->D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
+10
+11</manifest>

library_ad/build/intermediates/navigation_json/debug/navigation.json

+[]
\ No newline at end of file

library_ad/build/intermediates/packaged_manifests/debug/output-metadata.json

+{
+  "version": 2,
+  "artifactType": {
+    "type": "PACKAGED_MANIFESTS",
+    "kind": "Directory"
+  },
+  "applicationId": "com.mints.library_ad",
+  "variantName": "debug",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "outputFile": "../../library_manifest/debug/AndroidManifest.xml"
+    }
+  ]
+}
\ No newline at end of file

library_ad/build/outputs/logs/manifest-merger-debug-report.txt

+-- Merging decision tree log ---
+manifest
+ADDED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
+INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
+INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
+INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
+INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
+INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
+INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
+	package
+		ADDED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:3:5-35
+		INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
+		INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
+	android:versionName
+		INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
+		ADDED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
+		INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
+	android:versionCode
+		INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
+		ADDED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:1-5:12
+		INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
+	xmlns:android
+		ADDED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml:2:11-69
+uses-sdk
+INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
+INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
+INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
+INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
+	android:targetSdkVersion
+		INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
+		ADDED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
+		INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
+	android:minSdkVersion
+		INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
+		ADDED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml
+		INJECTED from D:\Androidproject\android_goodnews_best\library_ad\src\main\AndroidManifest.xml

library_ad/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt

+com/mints/library_ad/DataBindingTriggerClass.java
+ com.mints.library_ad.DataBindingTriggerClass
+com/mints/library_ad/DataBinderMapperImpl.java
+ com.mints.library_ad.DataBinderMapperImpl
+ com.mints.library_ad.DataBinderMapperImpl$InnerBrLookup
+ com.mints.library_ad.DataBinderMapperImpl$InnerLayoutIdLookup
+androidx/databinding/library/baseAdapters/BR.java
+ androidx.databinding.library.baseAdapters.BR
+androidx/databinding/DataBindingComponent.java
+ androidx.databinding.DataBindingComponent
+com/mints/library_ad/BR.java
+ com.mints.library_ad.BR
+com/mints/library_ad/BuildConfig.java
+ com.mints.library_ad.BuildConfig

library_base/version.properties

-#Mon Jul 05 16:26:55 CST 2021
-VERSION_BUILD=2499
+#Mon Jul 05 16:51:48 CST 2021
+VERSION_BUILD=2502