diff --git a/app/build.gradle b/app/build.gradle index b70813f..a5d9ffe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,16 +9,15 @@ android { defaultConfig { applicationId "com.eanyatonic.cctvViewer" minSdk 19 - targetSdk 32 - versionCode 20 - versionName "1.7.1" - ndk{abiFilters "armeabi", "armeabi-v7a", "x86", "mips"} + targetSdk 28 + versionCode 21 + versionName "1.7.2" + ndk{abiFilters "armeabi"} multiDexEnabled true } buildTypes { release { - minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } @@ -28,6 +27,10 @@ android { targetCompatibility JavaVersion.VERSION_15 } + lintOptions { + abortOnError false // 允许构建过程中出现 lint 错误 + } + } dependencies { @@ -36,7 +39,7 @@ dependencies { implementation 'com.github.bumptech.glide:glide:4.11.0' implementation 'androidx.appcompat:appcompat:1.3.0' // api 'com.tencent.tbs:tbssdk:44286' - implementation files('libs/tbs_sdk_thirdapp_v4.3.0.253_44153_sharewithdownloadwithfile_withoutGame_obfs_20220117_105333.jar') + implementation files('libs/tbs_sdk_thirdapp_v4.3.0.386_44286_sharewithdownloadwithfile_withoutGame_obfs_20230210_114429.jar') implementation 'com.google.android.material:material:1.5.0' implementation 'androidx.preference:preference:1.2.1' implementation 'androidx.multidex:multidex:2.0.1' diff --git a/app/libs/tbs_sdk_thirdapp_v4.3.0.253_44153_sharewithdownloadwithfile_withoutGame_obfs_20220117_105333.jar b/app/libs/tbs_sdk_thirdapp_v4.3.0.253_44153_sharewithdownloadwithfile_withoutGame_obfs_20220117_105333.jar deleted file mode 100644 index 8a0e2ed..0000000 Binary files a/app/libs/tbs_sdk_thirdapp_v4.3.0.253_44153_sharewithdownloadwithfile_withoutGame_obfs_20220117_105333.jar and /dev/null differ diff --git a/app/libs/tbs_sdk_thirdapp_v4.3.0.386_44286_sharewithdownloadwithfile_withoutGame_obfs_20230210_114429.jar b/app/libs/tbs_sdk_thirdapp_v4.3.0.386_44286_sharewithdownloadwithfile_withoutGame_obfs_20230210_114429.jar new file mode 100644 index 0000000..465ea1b Binary files /dev/null and b/app/libs/tbs_sdk_thirdapp_v4.3.0.386_44286_sharewithdownloadwithfile_withoutGame_obfs_20230210_114429.jar differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 113f65e..580e221 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,6 +5,8 @@ + + + map = new HashMap<>(2); @@ -649,6 +660,10 @@ function AutoFullscreen(){ } + public static MainActivity get() { + return instance; + } + // 启动自动播放定时任务 private void startPeriodicTask() { // 使用 postDelayed 方法设置定时任务 @@ -1258,4 +1273,15 @@ protected void onDestroy() { } super.onDestroy(); } + + private boolean checkPermission() { + return ContextCompat.checkSelfPermission(this, + Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED; + } + + private void requestPermission() { + if (!checkPermission()) { + ActivityCompat.requestPermissions(this, new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE , Manifest.permission.READ_EXTERNAL_STORAGE}, 1); + } + } } diff --git a/app/src/main/res/layout/activity_loading.xml b/app/src/main/res/layout/activity_loading.xml new file mode 100644 index 0000000..8e6219c --- /dev/null +++ b/app/src/main/res/layout/activity_loading.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index e51896e..ea35cd0 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -49,7 +49,7 @@ + android:summary="Version 1.7.2" /> \ No newline at end of file