Merge branch 'dev_xixijuchangjisuban_0817' of...

Merge branch 'dev_xixijuchangjisuban_0817' of http://gitlab.mints-id.com/android/android_vedio into dev_xixijuchangjisuban_0817

video/alipay/build/.transforms/6c026d997e127f76192d6fec91fb62bd/results.bin

-o/debug

video/alipay/build/.transforms/9e0e815008cd1b3592b5bfab10999eba/results.bin

-i/

video/alipay/build/generated/source/buildConfig/debug/com/jobo/alipay/BuildConfig.java

-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.jobo.alipay;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String LIBRARY_PACKAGE_NAME = "com.jobo.alipay";
-  public static final String BUILD_TYPE = "debug";
-}

video/alipay/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.jobo.alipay" >
-
-    <uses-sdk
-        android:minSdkVersion="21"
-        android:targetSdkVersion="31" />
-
-</manifest>
\ No newline at end of file

video/alipay/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json

-{
-  "version": 3,
-  "artifactType": {
-    "type": "AAPT_FRIENDLY_MERGED_MANIFESTS",
-    "kind": "Directory"
-  },
-  "applicationId": "com.jobo.alipay",
-  "variantName": "debug",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "outputFile": "AndroidManifest.xml"
-    }
-  ],
-  "elementType": "File"
-}
\ No newline at end of file

video/alipay/build/intermediates/aar_metadata/debug/aar-metadata.properties

-aarFormatVersion=1.0
-aarMetadataVersion=1.0
-minCompileSdk=1
-minAndroidGradlePluginVersion=1.0.0

video/alipay/build/intermediates/annotation_processor_list/debug/annotationProcessors.json

-{}
\ No newline at end of file

video/alipay/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="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/debug/jniLibs"/></dataSet></merger>
\ No newline at end of file

video/alipay/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="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/debug/shaders"/></dataSet></merger>
\ No newline at end of file

video/alipay/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="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/assets"/><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/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="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/debug/assets"/></dataSet></merger>
\ No newline at end of file

video/alipay/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

-#Thu Aug 10 14:08:03 CST 2023

video/alipay/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="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/res"/><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/build/generated/res/rs/debug"/><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/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="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/res"/><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/build/generated/res/rs/debug"/><source path="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/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="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/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="/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/debug/res"/></dataSet><mergedItems/></merger>
\ No newline at end of file

video/alipay/build/intermediates/local_only_symbol_list/debug/R-def.txt

-R_DEF: Internal format may change without notice
-local

video/alipay/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.jobo.alipay" >
-4
-5    <uses-sdk
-6        android:minSdkVersion="21"
-6-->/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
-7        android:targetSdkVersion="31" />
-7-->/Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
-8
-9</manifest>

video/alipay/build/intermediates/merged_manifest/debug/AndroidManifest.xml

-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.jobo.alipay" >
-
-    <uses-sdk
-        android:minSdkVersion="21"
-        android:targetSdkVersion="31" />
-
-</manifest>
\ No newline at end of file

video/alipay/build/intermediates/navigation_json/debug/navigation.json

-[]
\ No newline at end of file

video/alipay/build/intermediates/packaged_manifests/debug/output-metadata.json

-{
-  "version": 3,
-  "artifactType": {
-    "type": "PACKAGED_MANIFESTS",
-    "kind": "Directory"
-  },
-  "applicationId": "com.jobo.alipay",
-  "variantName": "debug",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "outputFile": "../../merged_manifest/debug/AndroidManifest.xml"
-    }
-  ],
-  "elementType": "File"
-}
\ No newline at end of file

video/alipay/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt

-com.jobo.alipay

video/alipay/build/outputs/logs/manifest-merger-debug-report.txt

--- Merging decision tree log ---
-manifest
-ADDED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml:2:1-5:12
-INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml:2:1-5:12
-INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml:2:1-5:12
-	package
-		ADDED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml:3:5-30
-		INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
-		INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
-	xmlns:android
-		ADDED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml:2:11-69
-uses-sdk
-INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
-INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
-INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
-INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
-	android:targetSdkVersion
-		INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
-		ADDED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
-		INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
-	android:minSdkVersion
-		INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
-		ADDED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml
-		INJECTED from /Users/mcg/Documents/worker/androidspace/MyShortVedio/video/alipay/src/main/AndroidManifest.xml

video/app/src/main/AndroidManifest.xml

@@ -64,11 +64,6 @@
             android:name="Mob-AppSecret"
             android:value="${SHARE_SECRET}" />
 
-        <!-- 友盟 -->
-        <meta-data
-            android:name="UMENG_KEY"
-            android:value="${UMENG_KEY}" />
-
         <!-- 渠道名称 -->
         <meta-data
             android:name="CHANNEL_NAME"

video/tmpmob/ShareSDK/assets/ShareSDK.xml

@@ -16,8 +16,8 @@
 <Tumblr Enable="false" />
 <Email Enable="false" />
 <ShortMessage Enable="false" />
-<Wechat AppId="wx10e29b733b8c71c7" AppSecret="93add1e49825bd4992ba8b6792630a7d" userName="gh_afb25ac019c9" path="pages/index/index.html?id=1" WithShareTicket="true" MiniprogramType="0" />
-<WechatMoments AppId="wx10e29b733b8c71c7" AppSecret="93add1e49825bd4992ba8b6792630a7d" />
+<Wechat AppId="wx4fe06dc52b1fed8e" AppSecret="d07a6b2194ef2fb125abe325aa174dcf" userName="gh_afb25ac019c9" path="pages/index/index.html?id=1" WithShareTicket="true" MiniprogramType="0" />
+<WechatMoments AppId="wx4fe06dc52b1fed8e" AppSecret="d07a6b2194ef2fb125abe325aa174dcf" />
 <QQ Enable="false" />
 <Instapaper Enable="false" />
 <Pocket Enable="false" />