From 1cd703628b9bb7d3edea8269132a774993e57f17 Mon Sep 17 00:00:00 2001
From: Super <986386695@qq.com>
Date: Mon, 2 Aug 2021 23:24:32 +0800
Subject: [PATCH] =?UTF-8?q?DEMO=E7=BC=96=E8=AF=91=E8=BF=90=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  2 +-
 app/build.gradle                              | 22 +++++------
 app/src/main/AndroidManifest.xml              |  4 --
 .../rxffmpeg/app/utils/UmengHelper.java       | 37 +++++++++----------
 build.gradle                                  |  4 +-
 5 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index a0766d7..3abea90 100644
--- a/README.md
+++ b/README.md
@@ -97,7 +97,7 @@ dependencies {
     //极速版 (预计占用 4M 左右空间)，主要移除了一些不常用的编解码器
     implementation 'com.github.microshow:RxFFmpeg:4.9.0-lite'
     
-     //定制版，如果觉得库太占空间，不需要太多功能，需要对APK瘦身，可以压缩到1.5M左右，可联系作者
+    //迷你版 (预计占用 1.5M 左右空间)，主打压缩裁剪等基础通用功能，属于付费定制版，可联系作者
     implementation 'xxx.xxx.xxx'
     
 }
diff --git a/app/build.gradle b/app/build.gradle
index 41b52b5..9f56301 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,8 +51,10 @@ android {
         }
     }
 
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding = true
+        // for view binding :
+//        viewBinding = true
     }
 
     compileOptions {
@@ -70,7 +72,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.cardview:cardview:1.0.0'
 
     //动态权限
@@ -80,19 +82,17 @@ dependencies {
     implementation 'com.baidu.mobstat:mtj-sdk-circle:3.9.3.9'
 
     //友盟统计
-    api  'com.umeng.umsdk:analytics:8.1.6'
-    api  'com.umeng.umsdk:common:2.1.0'
-    api  'com.umeng.umsdk:utdid:1.1.5.3'
-    //友盟 PushSDK
-    api 'com.umeng.umsdk:push:6.0.1'
+    implementation  'com.umeng.umsdk:common:9.4.0'// 必选
+    implementation  'com.umeng.umsdk:asms:1.2.3'// 必选
+    implementation 'com.umeng.umsdk:apm:1.4.0' // 错误分析升级为独立SDK，看crash数据请一定集成，可选
 
     //lottie
     implementation 'com.airbnb.android:lottie:3.4.0'
 
     //agentweb
-    implementation 'com.just.agentweb:agentweb:4.1.2'// (必选)
-    implementation 'com.just.agentweb:filechooser:4.1.2'// (可选)
-    implementation 'com.download.library:Downloader:4.1.2'// (可选)
+    implementation 'com.github.Justson.AgentWeb:agentweb-core:v4.1.9-androidx' // (必选)
+    implementation 'com.github.Justson.AgentWeb:agentweb-filechooser:v4.1.9-androidx' // (可选)
+    implementation 'com.github.Justson:Downloader:v4.1.9-androidx' // (可选)
 
     //leakcanary 内存泄露检测
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.2'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3ce1d76..513d940 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,10 +11,6 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
         android:name=".App"
diff --git a/app/src/main/java/io/microshow/rxffmpeg/app/utils/UmengHelper.java b/app/src/main/java/io/microshow/rxffmpeg/app/utils/UmengHelper.java
index ac8e892..f7f743e 100644
--- a/app/src/main/java/io/microshow/rxffmpeg/app/utils/UmengHelper.java
+++ b/app/src/main/java/io/microshow/rxffmpeg/app/utils/UmengHelper.java
@@ -1,12 +1,11 @@
 package io.microshow.rxffmpeg.app.utils;
 
 import android.content.Context;
-import android.util.Log;
 
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;
-import com.umeng.message.IUmengRegisterCallback;
-import com.umeng.message.PushAgent;
+//import com.umeng.message.IUmengRegisterCallback;
+//import com.umeng.message.PushAgent;
 
 /**
  * UmengHelper 友盟
@@ -28,22 +27,22 @@ public static void initUMConfigure(Context context) {
          */
         UMConfigure.setLogEnabled(false);
         UMConfigure.init(context, UMENG_APP_KEY, "", UMConfigure.DEVICE_TYPE_PHONE, UMENG_MESSAGE_SECRET);
-        //友盟push
-        PushAgent mPushAgent = PushAgent.getInstance(context);
-        mPushAgent.setDisplayNotificationNumber(0);
-        // 注册推送服务，每次调用register方法都会回调该接口
-        mPushAgent.register(new IUmengRegisterCallback() {
-            @Override
-            public void onSuccess(String deviceToken) {
-                //注册成功会返回device token
-                Log.e(TAG, "mPushAgent.register onSuccess ======deviceToken======" + deviceToken);
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.e(TAG, "mPushAgent.register onFailure " + s + s1);
-            }
-        });
+//        //友盟push
+//        PushAgent mPushAgent = PushAgent.getInstance(context);
+//        mPushAgent.setDisplayNotificationNumber(0);
+//        // 注册推送服务，每次调用register方法都会回调该接口
+//        mPushAgent.register(new IUmengRegisterCallback() {
+//            @Override
+//            public void onSuccess(String deviceToken) {
+//                //注册成功会返回device token
+//                Log.e(TAG, "mPushAgent.register onSuccess ======deviceToken======" + deviceToken);
+//            }
+//
+//            @Override
+//            public void onFailure(String s, String s1) {
+//                Log.e(TAG, "mPushAgent.register onFailure " + s + s1);
+//            }
+//        });
     }
 
     public static void onResume(Context context) {
diff --git a/build.gradle b/build.gradle
index 53cfbac..60bfe74 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     repositories {
         google()
         jcenter()
-        maven { url 'https://dl.bintray.com/umsdk/release' }
+        maven { url 'https://repo1.maven.org/maven2/' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.0.0'
@@ -21,7 +21,7 @@ allprojects {
     repositories {
         google()
         jcenter()
-        maven { url 'https://dl.bintray.com/umsdk/release' }
+        maven { url 'https://repo1.maven.org/maven2/' }
         maven { url "https://jitpack.io" }
     }
 }