diff --git a/app/build.gradle b/app/build.gradle index c0fb5d6..ec696ca 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -48,9 +48,9 @@ dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation 'com.android.support:multidex:1.0.3' - implementation rootProject.ext.dependencies.androidAppCompat + implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.crashSdk - implementation rootProject.ext.dependencies.androidConstraintLayout + implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid // 从车机获取视频流 diff --git a/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java b/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java index b5f3bf5..8083210 100644 --- a/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java +++ b/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java @@ -1,7 +1,6 @@ package com.mogo.cloud; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.SurfaceHolder; import android.view.SurfaceView; @@ -10,6 +9,8 @@ import android.widget.TextView; import android.widget.Toast; import android.widget.ToggleButton; +import androidx.appcompat.app.AppCompatActivity; + import com.mogo.cloud.util.YuvToolUtils; import com.zhidao.manager.camera.FrameBufferCallBack; import com.zhidao.manager.camera.ZDCameraManager; diff --git a/app/src/main/java/com/mogo/cloud/ConfigInfoActivity.java b/app/src/main/java/com/mogo/cloud/ConfigInfoActivity.java index 6d69f5b..bfa3f58 100644 --- a/app/src/main/java/com/mogo/cloud/ConfigInfoActivity.java +++ b/app/src/main/java/com/mogo/cloud/ConfigInfoActivity.java @@ -1,11 +1,12 @@ package com.mogo.cloud; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + import com.mogo.cloud.passport.MoGoAiCloudClientConfig; /** diff --git a/app/src/main/java/com/mogo/cloud/LivePlayActivity.java b/app/src/main/java/com/mogo/cloud/LivePlayActivity.java index 018e2f7..53cec07 100644 --- a/app/src/main/java/com/mogo/cloud/LivePlayActivity.java +++ b/app/src/main/java/com/mogo/cloud/LivePlayActivity.java @@ -2,7 +2,6 @@ package com.mogo.cloud; import android.net.wifi.WifiInfo; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.SurfaceView; import android.widget.EditText; @@ -10,6 +9,8 @@ import android.widget.TextView; import android.widget.Toast; import android.widget.ToggleButton; +import androidx.appcompat.app.AppCompatActivity; + import com.mogo.cloud.live.manager.LiveStreamManagerImpl; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.cloud.trafficlive.api.ITrafficCarLiveCallBack; diff --git a/app/src/main/java/com/mogo/cloud/MainActivity.java b/app/src/main/java/com/mogo/cloud/MainActivity.java index 04e349f..4f3a92e 100644 --- a/app/src/main/java/com/mogo/cloud/MainActivity.java +++ b/app/src/main/java/com/mogo/cloud/MainActivity.java @@ -2,11 +2,12 @@ package com.mogo.cloud; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.text.TextUtils; import android.widget.Button; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; + import com.mogo.cloud.network.NetworkActivity; import com.mogo.cloud.passport.IMoGoTokenCallback; import com.mogo.cloud.passport.MoGoAiCloudClient; diff --git a/app/src/main/java/com/mogo/cloud/MoGoApplication.java b/app/src/main/java/com/mogo/cloud/MoGoApplication.java index c1814fa..e165b13 100644 --- a/app/src/main/java/com/mogo/cloud/MoGoApplication.java +++ b/app/src/main/java/com/mogo/cloud/MoGoApplication.java @@ -1,10 +1,11 @@ package com.mogo.cloud; -import android.support.annotation.Nullable; -import android.support.multidex.MultiDexApplication; import android.util.Log; +import androidx.annotation.Nullable; +import androidx.multidex.MultiDexApplication; + import com.auto.zhidao.logsdk.CrashSystem; import com.mogo.cloud.httpdns.MogoHttpDnsClient; import com.mogo.cloud.httpdns.MogoHttpDnsConfig; diff --git a/app/src/main/java/com/mogo/cloud/RealTimeActivity.java b/app/src/main/java/com/mogo/cloud/RealTimeActivity.java index ea6b625..86cd2bb 100644 --- a/app/src/main/java/com/mogo/cloud/RealTimeActivity.java +++ b/app/src/main/java/com/mogo/cloud/RealTimeActivity.java @@ -1,10 +1,11 @@ package com.mogo.cloud; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; import android.widget.Button; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.cloud.socket.entity.SocketDownData; import com.mogo.realtime.api.MoGoAiCloudRealTime; diff --git a/app/src/main/java/com/mogo/cloud/RoadConditionActivity.java b/app/src/main/java/com/mogo/cloud/RoadConditionActivity.java index 372d496..6bb96df 100644 --- a/app/src/main/java/com/mogo/cloud/RoadConditionActivity.java +++ b/app/src/main/java/com/mogo/cloud/RoadConditionActivity.java @@ -1,11 +1,12 @@ package com.mogo.cloud; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; import android.widget.Button; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + import com.google.gson.Gson; import com.mogo.cloud.network.BaseData; import com.mogo.cloud.tanlu.api.MogoRoadSearchManager; diff --git a/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java b/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java index 0d4cc30..cd0ea7a 100644 --- a/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java +++ b/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java @@ -1,7 +1,6 @@ package com.mogo.cloud.network; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; import android.widget.TextView; @@ -20,6 +19,8 @@ import io.reactivex.schedulers.Schedulers; import static com.mogo.cloud.network.NetConstants.GEOFENCE_HOST; import static com.mogo.cloud.network.NetConstants.REALTIME_LOCATION_HOST; +import androidx.appcompat.app.AppCompatActivity; + /** * created by wujifei on 2021/1/21 12:26 * describe: diff --git a/build.gradle b/build.gradle index c5facce..9fe9103 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply from: "config.gradle" buildscript { - ext.kotlin_version = "1.3.72" + ext.kotlin_version = '1.4.20' repositories { maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' @@ -17,7 +17,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' + classpath "com.android.tools.build:gradle:3.5.3" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version" // 对kotlin生成doc diff --git a/config.gradle b/config.gradle index c15491b..0e07503 100644 --- a/config.gradle +++ b/config.gradle @@ -1,16 +1,16 @@ ext { time = "" - kotlin_version = "1.3.41" + kotlin_version = "1.4.20" android = [ - compileSdkVersion: 28, - buildToolsVersion: "28.0.3", + compileSdkVersion: 29, + buildToolsVersion: "29.0.2", minSdkVersion : 19, targetSdkVersion : 22, ] dependencies = [ // android - androidAppCompat : "com.android.support:support-compat:28.0.0", - androidConstraintLayout : "com.android.support.constraint:constraint-layout:2.0.4", + androidxappcompat : "androidx.appcompat:appcompat:1.3.1", + androidxconstraintlayout : "androidx.constraintlayout:constraintlayout:2.1.0", boostmultidex : "com.bytedance.boost_multidex:boost_multidex:1.0.1", // flexbox flexbox : 'com.google.android:flexbox:2.0.1', diff --git a/foudations/mogo-live/build.gradle b/foudations/mogo-live/build.gradle index 74eb63a..bcf8535 100644 --- a/foudations/mogo-live/build.gradle +++ b/foudations/mogo-live/build.gradle @@ -41,7 +41,7 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation rootProject.ext.dependencies.androidAppCompat + implementation rootProject.ext.dependencies.androidxappcompat // implementation rootProject.ext.dependencies.live_sdk_zego implementation files('libs/ZegoExpressEngine.jar') diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java index a17b86e..314dc88 100644 --- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java +++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java @@ -1,10 +1,11 @@ package com.mogo.cloud.passport; import android.content.Context; -import android.support.annotation.Keep; import android.util.Log; import android.widget.Toast; +import androidx.annotation.Keep; + import com.mogo.cloud.httpdns.MogoHttpDnsClient; import com.mogo.cloud.httpdns.MogoHttpDnsConfig; import com.mogo.cloud.utils.logger.LogLevel; diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java index ae94596..7ca6d50 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java @@ -2,7 +2,6 @@ package com.mogo.cloud.socket; import android.content.Context; -import android.support.annotation.NonNull; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; @@ -25,6 +24,8 @@ import java.util.concurrent.ConcurrentHashMap; import static com.mogo.cloud.socket.SocketServicesConstants.TAG; +import androidx.annotation.NonNull; + /** * Socket 长链核心服务 diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketServicesConstants.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketServicesConstants.java index 57b6496..847f173 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketServicesConstants.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketServicesConstants.java @@ -1,7 +1,6 @@ package com.mogo.cloud.socket; -import android.support.annotation.Keep; import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; @@ -12,6 +11,8 @@ import static com.mogo.cloud.httpdns.MogoHttpDnsConfig.HTTP_DNS_ENV_DEV; import static com.mogo.cloud.httpdns.MogoHttpDnsConfig.HTTP_DNS_ENV_QA; import static com.mogo.cloud.httpdns.MogoHttpDnsConfig.HTTP_DNS_ENV_RELEASE; +import androidx.annotation.Keep; + public class SocketServicesConstants { public static final String TAG = "MoGoAiCloud_Socket"; diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java index 1e37856..575b3d2 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java @@ -1,7 +1,6 @@ package com.mogo.cloud.socket.third; import android.content.Context; -import android.support.annotation.NonNull; import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; @@ -20,6 +19,8 @@ import static com.mogo.cloud.socket.SocketServicesConstants.SOCKET_CHANNEL_ID; import static com.mogo.cloud.socket.SocketServicesConstants.TAG; import static com.mogo.cloud.socket.SocketServicesConstants.getEnvironment; +import androidx.annotation.NonNull; + public class ThirdSocketManager implements Callback { private static volatile ThirdSocketManager mInstance; diff --git a/gradle.properties b/gradle.properties index 2b3a411..2042394 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,8 +19,14 @@ org.gradle.parallel=true # Only relevant projects are configured which results in faster builds for large multi-projects. # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:configuration_on_demand org.gradle.configureondemand=true + +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official + + ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ @@ -30,22 +36,22 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.1.42 +MOGO_UTILS_VERSION=1.1.44 # 网络请求 -MOGO_NETWORK_VERSION=1.1.42 +MOGO_NETWORK_VERSION=1.1.44 # 网络DNS -MOGO_HTTPDNS_VERSION=1.1.42 +MOGO_HTTPDNS_VERSION=1.1.44 # 鉴权 -MOGO_PASSPORT_VERSION=1.1.42 +MOGO_PASSPORT_VERSION=1.1.44 # 常链接 -MOGO_SOCKET_VERSION=1.1.42 +MOGO_SOCKET_VERSION=1.1.44 # 数据采集 -MOGO_REALTIME_VERSION=1.1.42 +MOGO_REALTIME_VERSION=1.1.44 # 探路,道路事件发布,获取 -MOGO_TANLU_VERSION=1.1.42 +MOGO_TANLU_VERSION=1.1.44 # 直播推流 -MOGO_LIVE_VERSION=1.1.42 +MOGO_LIVE_VERSION=1.1.44 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.1.42 +MOGO_TRAFFICLIVE_VERSION=1.1.44 # 定位服务 -MOGO_LOCATION_VERSION=1.1.42 +MOGO_LOCATION_VERSION=1.1.44 diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java index 71814bd..fe8ef2c 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/core/UploadInTimeHandler.java @@ -3,12 +3,13 @@ package com.mogo.realtime.core; import android.os.Handler; import android.os.HandlerThread; import android.os.Message; -import android.support.annotation.Keep; import com.mogo.cloud.utils.logger.Logger; import static com.mogo.realtime.constant.RealTimeConstant.TAG; +import androidx.annotation.Keep; + /** * AI云 实时上报数据频率处理类 */ diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/util/MogoLatLng.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/util/MogoLatLng.java index df38fdb..99ccc37 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/util/MogoLatLng.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/util/MogoLatLng.java @@ -3,7 +3,8 @@ package com.mogo.realtime.util; import android.os.Build; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.RequiresApi; + +import androidx.annotation.RequiresApi; import java.util.Objects; diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/utils/FileUtil.kt b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/utils/FileUtil.kt index 09db220..2490e50 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/utils/FileUtil.kt +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/utils/FileUtil.kt @@ -3,7 +3,7 @@ package com.mogo.cloud.tanlu.utils import android.graphics.Bitmap import android.media.MediaMetadataRetriever import android.os.Environment -import android.support.annotation.Keep +import androidx.annotation.Keep import java.io.* import java.text.SimpleDateFormat import java.util.* diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/utils/TanluUtils.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/utils/TanluUtils.java index 2eef7e2..ed098b5 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/utils/TanluUtils.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/utils/TanluUtils.java @@ -1,7 +1,8 @@ package com.mogo.cloud.tanlu.utils; -import android.support.annotation.Keep; + +import androidx.annotation.Keep; import java.util.regex.Pattern;