diff --git a/FlycoTabLayoutZ_Lib/build.gradle b/FlycoTabLayoutZ_Lib/build.gradle index e21b40c..002590b 100644 --- a/FlycoTabLayoutZ_Lib/build.gradle +++ b/FlycoTabLayoutZ_Lib/build.gradle @@ -12,11 +12,10 @@ android { versionCode 5 versionName version } + buildTypes { - U807Debug {} - U807Release {} - iPlay50SEDebug {} - iPlay50SERelease {} + zhanRuiDebug {} + zhanRuiRelease {} debug {} release {} } diff --git a/JZVideo/build.gradle b/JZVideo/build.gradle index f0ad8f5..e8a17f6 100644 --- a/JZVideo/build.gradle +++ b/JZVideo/build.gradle @@ -20,6 +20,13 @@ android { lintOptions { abortOnError false } + + buildTypes { + zhanRuiDebug {} + zhanRuiRelease {} + debug {} + release {} + } } dependencies { diff --git a/app/build.gradle b/app/build.gradle index 56c5b87..5331162 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' static def appName() { - return "HomeVideoPlayer" + return "HaiNaOS" } static def releaseTime() { @@ -13,13 +13,13 @@ android { buildToolsVersion "30.0.3" defaultConfig { - applicationId "com.uiui.videoplayer" + applicationId "com.hainaos.vc" //There are no CERT files because If the mini sdk version is 23+, the AGP will ignore the V1 scheme signature. minSdkVersion 23 targetSdkVersion 28 - versionCode 122 - versionName "1.2.2" + versionCode 1 + versionName "1.0.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -51,6 +51,15 @@ android { //签名 signingConfigs { + zhanRui { + storeFile file("keystore/zhanxun.keystore") + storePassword "123456" + keyAlias "zhanxun" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled false + } + tuixin {// 签名文件 storeFile file("keystore/tuixin.jks") storePassword "123456" @@ -61,36 +70,23 @@ android { } } - //多版本 - productFlavors { - uiui { - flavorDimensions "default" - } - - uiuios { - flavorDimensions "default" - } - } - - sourceSets { - uiui { - java { - srcDirs += ['uiui/java'] // 5 添加 - } - aidl.srcDirs 'src/uiui/aidl' - } - - uiuios { - java { - srcDirs += ['uiuios/java'] // 5 添加 - } - aidl.srcDirs 'src/uiuios/aidl' - } - } - buildTypes { + zhanRuiDebug.initWith(debug) + zhanRuiDebug { + debuggable true + versionNameSuffix "-debug" + signingConfig signingConfigs.zhanRui + buildConfigField "String", "platform", '"展锐"' + } + + zhanRuiRelease.initWith(release) + zhanRuiRelease { + signingConfig signingConfigs.zhanRui + buildConfigField "String", "platform", '"展锐"' + } + debug { - buildConfigField "String", "platform", '"UMTK11"' + buildConfigField "String", "platform", '"tuixin"' versionNameSuffix "_debug" //Zipalign优化 zipAlignEnabled true @@ -107,7 +103,7 @@ android { } release { - buildConfigField "String", "platform", '"UMTK11"' + buildConfigField "String", "platform", '"tuixin"' //Zipalign优化 zipAlignEnabled true //混淆 diff --git a/app/keystore/zhanxun.keystore b/app/keystore/zhanxun.keystore new file mode 100644 index 0000000..7c46fbc Binary files /dev/null and b/app/keystore/zhanxun.keystore differ diff --git a/app/src/androidTest/java/com/hainaos/vc/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/hainaos/vc/ExampleInstrumentedTest.java new file mode 100644 index 0000000..3e15f38 --- /dev/null +++ b/app/src/androidTest/java/com/hainaos/vc/ExampleInstrumentedTest.java @@ -0,0 +1,27 @@ +package com.hainaos.vc; + +import android.content.Context; + +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + + assertEquals("com.hainaos.vc", appContext.getPackageName()); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b22c7bf..03af9f3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ + package="com.hainaos.vc" + android:sharedUserId="android.uid.system"> @@ -17,6 +18,7 @@ android:name=".activity.splash.SplashActivity" android:exported="true" android:launchMode="singleTask" + android:screenOrientation="portrait" android:theme="@style/AppSplashTheme"> @@ -29,7 +31,8 @@ + android:launchMode="singleTask" + android:screenOrientation="portrait"> @@ -40,29 +43,45 @@ + android:launchMode="singleTask" + android:screenOrientation="portrait" /> + android:launchMode="singleTask" + android:screenOrientation="portrait" /> + android:launchMode="singleTask" + android:screenOrientation="portrait" /> + android:configChanges="orientation|screenSize|keyboardHidden" + android:screenOrientation="portrait" /> + + + + diff --git a/app/src/main/java/com/uiui/videoplayer/CustomJzvd/JzvdStdAssert.java b/app/src/main/java/com/hainaos/vc/CustomJzvd/JzvdStdAssert.java similarity index 98% rename from app/src/main/java/com/uiui/videoplayer/CustomJzvd/JzvdStdAssert.java rename to app/src/main/java/com/hainaos/vc/CustomJzvd/JzvdStdAssert.java index ab360be..6af33ac 100644 --- a/app/src/main/java/com/uiui/videoplayer/CustomJzvd/JzvdStdAssert.java +++ b/app/src/main/java/com/hainaos/vc/CustomJzvd/JzvdStdAssert.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.CustomJzvd; +package com.hainaos.vc.CustomJzvd; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/uiui/videoplayer/CustomJzvd/JzvdStdTikTok.java b/app/src/main/java/com/hainaos/vc/CustomJzvd/JzvdStdTikTok.java similarity index 97% rename from app/src/main/java/com/uiui/videoplayer/CustomJzvd/JzvdStdTikTok.java rename to app/src/main/java/com/hainaos/vc/CustomJzvd/JzvdStdTikTok.java index 221cac2..29378a1 100644 --- a/app/src/main/java/com/uiui/videoplayer/CustomJzvd/JzvdStdTikTok.java +++ b/app/src/main/java/com/hainaos/vc/CustomJzvd/JzvdStdTikTok.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.CustomJzvd; +package com.hainaos.vc.CustomJzvd; import android.content.Context; import android.util.AttributeSet; @@ -6,7 +6,7 @@ import android.util.Log; import android.view.View; import android.widget.ImageView; -import com.uiui.videoplayer.R; +import com.hainaos.vc.R; import cn.jzvd.JzvdStd; diff --git a/app/src/main/java/com/uiui/videoplayer/CustomJzvd/MyJzvdStd.java b/app/src/main/java/com/hainaos/vc/CustomJzvd/MyJzvdStd.java similarity index 98% rename from app/src/main/java/com/uiui/videoplayer/CustomJzvd/MyJzvdStd.java rename to app/src/main/java/com/hainaos/vc/CustomJzvd/MyJzvdStd.java index 9fe6846..d0c9f81 100644 --- a/app/src/main/java/com/uiui/videoplayer/CustomJzvd/MyJzvdStd.java +++ b/app/src/main/java/com/hainaos/vc/CustomJzvd/MyJzvdStd.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.CustomJzvd; +package com.hainaos.vc.CustomJzvd; import android.content.Context; import android.util.AttributeSet; @@ -7,7 +7,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.SeekBar; -import com.uiui.videoplayer.R; +import com.hainaos.vc.R; import cn.jzvd.JzvdStd; diff --git a/app/src/main/java/com/uiui/videoplayer/activity/PlayActivity.java b/app/src/main/java/com/hainaos/vc/activity/PlayActivity.java similarity index 81% rename from app/src/main/java/com/uiui/videoplayer/activity/PlayActivity.java rename to app/src/main/java/com/hainaos/vc/activity/PlayActivity.java index 12a495d..2f95759 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/PlayActivity.java +++ b/app/src/main/java/com/hainaos/vc/activity/PlayActivity.java @@ -1,10 +1,10 @@ -package com.uiui.videoplayer.activity; - -import androidx.appcompat.app.AppCompatActivity; +package com.hainaos.vc.activity; import android.os.Bundle; -import com.uiui.videoplayer.R; +import androidx.appcompat.app.AppCompatActivity; + +import com.hainaos.vc.R; public class PlayActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/uiui/videoplayer/activity/main/MainActivity.java b/app/src/main/java/com/hainaos/vc/activity/main/MainActivity.java similarity index 93% rename from app/src/main/java/com/uiui/videoplayer/activity/main/MainActivity.java rename to app/src/main/java/com/hainaos/vc/activity/main/MainActivity.java index ef00189..b1fcb44 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/main/MainActivity.java +++ b/app/src/main/java/com/hainaos/vc/activity/main/MainActivity.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.activity.main; +package com.hainaos.vc.activity.main; import android.Manifest; import android.content.Intent; @@ -17,20 +17,20 @@ import androidx.core.app.ActivityCompat; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; +import com.hainaos.vc.BuildConfig; +import com.hainaos.vc.R; +import com.hainaos.vc.activity.vip.VipActivity; +import com.hainaos.vc.base.BaseFragmentPagerAdapter; +import com.hainaos.vc.base.mvvm.BaseMvvmActivity; +import com.hainaos.vc.databinding.ActivityMainBinding; +import com.hainaos.vc.dialog.PermissionsDialog; +import com.hainaos.vc.fragment.pic.PictureFragment; +import com.hainaos.vc.fragment.video.VideoFragment; +import com.hainaos.vc.utils.JgyUtils; +import com.hainaos.vc.utils.ToastUtil; +import com.hainaos.vc.utils.VideoUtils; import com.hjq.permissions.OnPermissionCallback; import com.hjq.permissions.XXPermissions; -import com.uiui.videoplayer.BuildConfig; -import com.uiui.videoplayer.R; -import com.uiui.videoplayer.activity.vip.VipActivity; -import com.uiui.videoplayer.base.BaseFragmentPagerAdapter; -import com.uiui.videoplayer.base.mvvm.BaseMvvmActivity; -import com.uiui.videoplayer.databinding.ActivityMainBinding; -import com.uiui.videoplayer.dialog.PermissionsDialog; -import com.uiui.videoplayer.fragment.pic.PictureFragment; -import com.uiui.videoplayer.fragment.video.VideoFragment; -import com.uiui.videoplayer.utils.JGYUtils; -import com.uiui.videoplayer.utils.ToastUtil; -import com.uiui.videoplayer.utils.VideoUtils; import java.io.File; import java.io.FileInputStream; @@ -189,7 +189,7 @@ public class MainActivity extends BaseMvvmActivity picFileList = new ArrayList<>(); List videoFileList = new ArrayList<>(); - String rootPath = JGYUtils.getInstance().getDownLoadPath() + File.separator; + String rootPath = JgyUtils.getInstance().getDownLoadPath() + File.separator; File file = new File(rootPath); if (file.exists()) { LinkedList list = new LinkedList(); diff --git a/app/src/main/java/com/uiui/videoplayer/activity/main/MainViewModel.java b/app/src/main/java/com/hainaos/vc/activity/main/MainViewModel.java similarity index 68% rename from app/src/main/java/com/uiui/videoplayer/activity/main/MainViewModel.java rename to app/src/main/java/com/hainaos/vc/activity/main/MainViewModel.java index abe5ad9..1ebb9d3 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/main/MainViewModel.java +++ b/app/src/main/java/com/hainaos/vc/activity/main/MainViewModel.java @@ -1,8 +1,8 @@ -package com.uiui.videoplayer.activity.main; +package com.hainaos.vc.activity.main; +import com.hainaos.vc.base.mvvm.BaseViewModel; +import com.hainaos.vc.databinding.ActivityMainBinding; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.uiui.videoplayer.base.mvvm.BaseViewModel; -import com.uiui.videoplayer.databinding.ActivityMainBinding; public class MainViewModel extends BaseViewModel { private static final String TAG = "MainViewModel"; diff --git a/app/src/main/java/com/uiui/videoplayer/activity/pic/GalleryActivity.java b/app/src/main/java/com/hainaos/vc/activity/pic/GalleryActivity.java similarity index 88% rename from app/src/main/java/com/uiui/videoplayer/activity/pic/GalleryActivity.java rename to app/src/main/java/com/hainaos/vc/activity/pic/GalleryActivity.java index 6d966a2..a5d9cd4 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/pic/GalleryActivity.java +++ b/app/src/main/java/com/hainaos/vc/activity/pic/GalleryActivity.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.activity.pic; +package com.hainaos.vc.activity.pic; import android.view.View; @@ -7,13 +7,13 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.uiui.videoplayer.R; -import com.uiui.videoplayer.adapter.PicAdapter; -import com.uiui.videoplayer.base.mvvm.BaseMvvmActivity; -import com.uiui.videoplayer.bean.PhotoInfo; -import com.uiui.videoplayer.databinding.ActivityGalleryBinding; -import com.uiui.videoplayer.utils.ToastUtil; -import com.uiui.videoplayer.view.BGAGridDivider; +import com.hainaos.vc.R; +import com.hainaos.vc.adapter.PicAdapter; +import com.hainaos.vc.base.mvvm.BaseMvvmActivity; +import com.hainaos.vc.bean.PhotoInfo; +import com.hainaos.vc.databinding.ActivityGalleryBinding; +import com.hainaos.vc.utils.ToastUtil; +import com.hainaos.vc.view.BGAGridDivider; import java.util.ArrayList; diff --git a/app/src/main/java/com/uiui/videoplayer/activity/pic/GalleryViewModel.java b/app/src/main/java/com/hainaos/vc/activity/pic/GalleryViewModel.java similarity index 79% rename from app/src/main/java/com/uiui/videoplayer/activity/pic/GalleryViewModel.java rename to app/src/main/java/com/hainaos/vc/activity/pic/GalleryViewModel.java index 503940c..a0c7dbe 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/pic/GalleryViewModel.java +++ b/app/src/main/java/com/hainaos/vc/activity/pic/GalleryViewModel.java @@ -1,12 +1,12 @@ -package com.uiui.videoplayer.activity.pic; +package com.hainaos.vc.activity.pic; import androidx.lifecycle.MutableLiveData; +import com.hainaos.vc.base.mvvm.BaseViewModel; +import com.hainaos.vc.bean.PhotoInfo; +import com.hainaos.vc.databinding.ActivityGalleryBinding; +import com.hainaos.vc.network.NetInterfaceManager; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.uiui.videoplayer.base.mvvm.BaseViewModel; -import com.uiui.videoplayer.bean.PhotoInfo; -import com.uiui.videoplayer.databinding.ActivityGalleryBinding; -import com.uiui.videoplayer.network.NetInterfaceManager; import java.util.ArrayList; diff --git a/app/src/main/java/com/uiui/videoplayer/activity/preview/PreviewActivity.java b/app/src/main/java/com/hainaos/vc/activity/preview/PreviewActivity.java similarity index 88% rename from app/src/main/java/com/uiui/videoplayer/activity/preview/PreviewActivity.java rename to app/src/main/java/com/hainaos/vc/activity/preview/PreviewActivity.java index 37907db..3e332af 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/preview/PreviewActivity.java +++ b/app/src/main/java/com/hainaos/vc/activity/preview/PreviewActivity.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.activity.preview; +package com.hainaos.vc.activity.preview; import android.content.Intent; import android.graphics.Color; @@ -6,12 +6,12 @@ import android.os.Bundle; import android.widget.ImageView; import com.bumptech.glide.Glide; -import com.uiui.videoplayer.R; -import com.uiui.videoplayer.adapter.PreviewAdapter; -import com.uiui.videoplayer.base.mvvm.BaseMvvmActivity; -import com.uiui.videoplayer.bean.PhotoInfo; -import com.uiui.videoplayer.databinding.ActivityPreviewBinding; -import com.uiui.videoplayer.view.ScaleCircleNavigator; +import com.hainaos.vc.R; +import com.hainaos.vc.adapter.PreviewAdapter; +import com.hainaos.vc.base.mvvm.BaseMvvmActivity; +import com.hainaos.vc.bean.PhotoInfo; +import com.hainaos.vc.databinding.ActivityPreviewBinding; +import com.hainaos.vc.view.ScaleCircleNavigator; import net.lucode.hackware.magicindicator.ViewPagerHelper; diff --git a/app/src/main/java/com/uiui/videoplayer/activity/preview/PreviewViewModel.java b/app/src/main/java/com/hainaos/vc/activity/preview/PreviewViewModel.java similarity index 64% rename from app/src/main/java/com/uiui/videoplayer/activity/preview/PreviewViewModel.java rename to app/src/main/java/com/hainaos/vc/activity/preview/PreviewViewModel.java index 4aabd65..f17bcbf 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/preview/PreviewViewModel.java +++ b/app/src/main/java/com/hainaos/vc/activity/preview/PreviewViewModel.java @@ -1,8 +1,8 @@ -package com.uiui.videoplayer.activity.preview; +package com.hainaos.vc.activity.preview; +import com.hainaos.vc.base.mvvm.BaseViewModel; +import com.hainaos.vc.databinding.ActivityPreviewBinding; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.uiui.videoplayer.base.mvvm.BaseViewModel; -import com.uiui.videoplayer.databinding.ActivityPreviewBinding; public class PreviewViewModel extends BaseViewModel { diff --git a/app/src/main/java/com/uiui/videoplayer/activity/privacy/PrivacyActivity.java b/app/src/main/java/com/hainaos/vc/activity/privacy/PrivacyActivity.java similarity index 92% rename from app/src/main/java/com/uiui/videoplayer/activity/privacy/PrivacyActivity.java rename to app/src/main/java/com/hainaos/vc/activity/privacy/PrivacyActivity.java index 7098151..fb05c85 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/privacy/PrivacyActivity.java +++ b/app/src/main/java/com/hainaos/vc/activity/privacy/PrivacyActivity.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.activity.privacy; +package com.hainaos.vc.activity.privacy; import android.content.Intent; import android.view.View; @@ -7,9 +7,9 @@ import android.webkit.WebSettings; import android.webkit.WebView; import android.webkit.WebViewClient; -import com.uiui.videoplayer.R; -import com.uiui.videoplayer.base.mvvm.BaseMvvmActivity; -import com.uiui.videoplayer.databinding.ActivityPrivacyaBinding; +import com.hainaos.vc.R; +import com.hainaos.vc.base.mvvm.BaseMvvmActivity; +import com.hainaos.vc.databinding.ActivityPrivacyaBinding; public class PrivacyActivity extends BaseMvvmActivity { private static final String TAG = "PrivacyActivity"; diff --git a/app/src/main/java/com/uiui/videoplayer/activity/privacy/PrivacyViewModel.java b/app/src/main/java/com/hainaos/vc/activity/privacy/PrivacyViewModel.java similarity index 64% rename from app/src/main/java/com/uiui/videoplayer/activity/privacy/PrivacyViewModel.java rename to app/src/main/java/com/hainaos/vc/activity/privacy/PrivacyViewModel.java index 1e235b2..97218c4 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/privacy/PrivacyViewModel.java +++ b/app/src/main/java/com/hainaos/vc/activity/privacy/PrivacyViewModel.java @@ -1,8 +1,8 @@ -package com.uiui.videoplayer.activity.privacy; +package com.hainaos.vc.activity.privacy; +import com.hainaos.vc.base.mvvm.BaseViewModel; +import com.hainaos.vc.databinding.ActivityPrivacyaBinding; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.uiui.videoplayer.base.mvvm.BaseViewModel; -import com.uiui.videoplayer.databinding.ActivityPrivacyaBinding; public class PrivacyViewModel extends BaseViewModel { diff --git a/app/src/main/java/com/uiui/videoplayer/activity/splash/SplashActivity.java b/app/src/main/java/com/hainaos/vc/activity/splash/SplashActivity.java similarity index 88% rename from app/src/main/java/com/uiui/videoplayer/activity/splash/SplashActivity.java rename to app/src/main/java/com/hainaos/vc/activity/splash/SplashActivity.java index 3932139..cf90af3 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/splash/SplashActivity.java +++ b/app/src/main/java/com/hainaos/vc/activity/splash/SplashActivity.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.activity.splash; +package com.hainaos.vc.activity.splash; import android.content.Intent; import android.os.Build; @@ -6,13 +6,13 @@ import android.util.Log; import androidx.databinding.DataBindingUtil; +import com.hainaos.vc.R; +import com.hainaos.vc.activity.main.MainActivity; +import com.hainaos.vc.base.BaseDataBindingActivity; +import com.hainaos.vc.config.CommonConfig; +import com.hainaos.vc.databinding.ActivitySplashBinding; +import com.hainaos.vc.dialog.PrivacyPolicyDialog; import com.tencent.mmkv.MMKV; -import com.uiui.videoplayer.R; -import com.uiui.videoplayer.activity.main.MainActivity; -import com.uiui.videoplayer.base.BaseDataBindingActivity; -import com.uiui.videoplayer.config.CommonConfig; -import com.uiui.videoplayer.databinding.ActivitySplashBinding; -import com.uiui.videoplayer.dialog.PrivacyPolicyDialog; public class SplashActivity extends BaseDataBindingActivity { private static final String TAG = "SplashActivity"; diff --git a/app/src/main/java/com/uiui/videoplayer/activity/tiktok/TikTokActivity.java b/app/src/main/java/com/hainaos/vc/activity/tiktok/TikTokActivity.java similarity index 93% rename from app/src/main/java/com/uiui/videoplayer/activity/tiktok/TikTokActivity.java rename to app/src/main/java/com/hainaos/vc/activity/tiktok/TikTokActivity.java index d949205..c189d28 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/tiktok/TikTokActivity.java +++ b/app/src/main/java/com/hainaos/vc/activity/tiktok/TikTokActivity.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.activity.tiktok; +package com.hainaos.vc.activity.tiktok; import android.content.Intent; import android.content.pm.ActivityInfo; @@ -14,16 +14,16 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.OrientationHelper; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.videoplayer.CustomJzvd.JzvdStdAssert; -import com.uiui.videoplayer.R; -import com.uiui.videoplayer.adapter.TikTokRecyclerViewAdapter; -import com.uiui.videoplayer.base.mvvm.BaseMvvmActivity; -import com.uiui.videoplayer.bean.LocalVideoInfo; -import com.uiui.videoplayer.databinding.ActivityTiktokBinding; -import com.uiui.videoplayer.listener.OnViewPagerListener; -import com.uiui.videoplayer.utils.SPUtils; -import com.uiui.videoplayer.utils.ToastUtil; -import com.uiui.videoplayer.view.ViewPagerLayoutManager; +import com.hainaos.vc.CustomJzvd.JzvdStdAssert; +import com.hainaos.vc.R; +import com.hainaos.vc.adapter.TikTokRecyclerViewAdapter; +import com.hainaos.vc.base.mvvm.BaseMvvmActivity; +import com.hainaos.vc.bean.LocalVideoInfo; +import com.hainaos.vc.databinding.ActivityTiktokBinding; +import com.hainaos.vc.listener.OnViewPagerListener; +import com.hainaos.vc.utils.SPUtils; +import com.hainaos.vc.utils.ToastUtil; +import com.hainaos.vc.view.ViewPagerLayoutManager; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/uiui/videoplayer/activity/tiktok/TikTokViewModel.java b/app/src/main/java/com/hainaos/vc/activity/tiktok/TikTokViewModel.java similarity index 64% rename from app/src/main/java/com/uiui/videoplayer/activity/tiktok/TikTokViewModel.java rename to app/src/main/java/com/hainaos/vc/activity/tiktok/TikTokViewModel.java index 92533eb..d2ea83e 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/tiktok/TikTokViewModel.java +++ b/app/src/main/java/com/hainaos/vc/activity/tiktok/TikTokViewModel.java @@ -1,8 +1,8 @@ -package com.uiui.videoplayer.activity.tiktok; +package com.hainaos.vc.activity.tiktok; +import com.hainaos.vc.base.mvvm.BaseViewModel; +import com.hainaos.vc.databinding.ActivityTiktokBinding; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.uiui.videoplayer.base.mvvm.BaseViewModel; -import com.uiui.videoplayer.databinding.ActivityTiktokBinding; public class TikTokViewModel extends BaseViewModel { diff --git a/app/src/main/java/com/uiui/videoplayer/activity/video/VideoActivity.java b/app/src/main/java/com/hainaos/vc/activity/video/VideoActivity.java similarity index 96% rename from app/src/main/java/com/uiui/videoplayer/activity/video/VideoActivity.java rename to app/src/main/java/com/hainaos/vc/activity/video/VideoActivity.java index 97ad5ea..bf8af6e 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/video/VideoActivity.java +++ b/app/src/main/java/com/hainaos/vc/activity/video/VideoActivity.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.activity.video; +package com.hainaos.vc.activity.video; import android.content.res.Configuration; import android.graphics.PorterDuff; @@ -25,17 +25,17 @@ import com.arialyy.annotations.Download; import com.arialyy.aria.core.Aria; import com.arialyy.aria.core.task.DownloadTask; import com.google.gson.JsonObject; -import com.uiui.videoplayer.R; -import com.uiui.videoplayer.adapter.VideoAdapter; -import com.uiui.videoplayer.base.mvvm.BaseMvvmActivity; -import com.uiui.videoplayer.bean.LocalVideoInfo; -import com.uiui.videoplayer.databinding.ActivityVideoBinding; -import com.uiui.videoplayer.gson.GsonUtils; -import com.uiui.videoplayer.utils.SPUtils; -import com.uiui.videoplayer.utils.ToastUtil; -import com.uiui.videoplayer.utils.VideoUtils; -import com.uiui.videoplayer.view.CustomDialog; -import com.uiui.videoplayer.view.RecycleGridLayoutManager; +import com.hainaos.vc.R; +import com.hainaos.vc.adapter.VideoAdapter; +import com.hainaos.vc.base.mvvm.BaseMvvmActivity; +import com.hainaos.vc.bean.LocalVideoInfo; +import com.hainaos.vc.databinding.ActivityVideoBinding; +import com.hainaos.vc.gson.GsonUtils; +import com.hainaos.vc.utils.SPUtils; +import com.hainaos.vc.utils.ToastUtil; +import com.hainaos.vc.utils.VideoUtils; +import com.hainaos.vc.view.CustomDialog; +import com.hainaos.vc.view.RecycleGridLayoutManager; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/uiui/videoplayer/activity/video/VideoViewModel.java b/app/src/main/java/com/hainaos/vc/activity/video/VideoViewModel.java similarity index 79% rename from app/src/main/java/com/uiui/videoplayer/activity/video/VideoViewModel.java rename to app/src/main/java/com/hainaos/vc/activity/video/VideoViewModel.java index cbb559c..54ca2cc 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/video/VideoViewModel.java +++ b/app/src/main/java/com/hainaos/vc/activity/video/VideoViewModel.java @@ -1,12 +1,12 @@ -package com.uiui.videoplayer.activity.video; +package com.hainaos.vc.activity.video; import androidx.lifecycle.MutableLiveData; +import com.hainaos.vc.base.mvvm.BaseViewModel; +import com.hainaos.vc.bean.LocalVideoInfo; +import com.hainaos.vc.databinding.ActivityVideoBinding; +import com.hainaos.vc.network.NetInterfaceManager; import com.trello.rxlifecycle4.android.ActivityEvent; -import com.uiui.videoplayer.base.mvvm.BaseViewModel; -import com.uiui.videoplayer.bean.LocalVideoInfo; -import com.uiui.videoplayer.databinding.ActivityVideoBinding; -import com.uiui.videoplayer.network.NetInterfaceManager; import java.util.ArrayList; diff --git a/app/src/main/java/com/uiui/videoplayer/activity/vip/VipActivity.java b/app/src/main/java/com/hainaos/vc/activity/vip/VipActivity.java similarity index 80% rename from app/src/main/java/com/uiui/videoplayer/activity/vip/VipActivity.java rename to app/src/main/java/com/hainaos/vc/activity/vip/VipActivity.java index 0f77570..c1490f7 100644 --- a/app/src/main/java/com/uiui/videoplayer/activity/vip/VipActivity.java +++ b/app/src/main/java/com/hainaos/vc/activity/vip/VipActivity.java @@ -1,17 +1,17 @@ -package com.uiui.videoplayer.activity.vip; +package com.hainaos.vc.activity.vip; import android.content.Intent; import android.view.View; import androidx.lifecycle.Observer; -import com.uiui.videoplayer.BuildConfig; -import com.uiui.videoplayer.R; -import com.uiui.videoplayer.activity.privacy.PrivacyActivity; -import com.uiui.videoplayer.base.mvvm.BaseMvvmActivity; -import com.uiui.videoplayer.bean.SpaceInfo; -import com.uiui.videoplayer.databinding.ActivityVipBinding; -import com.uiui.videoplayer.utils.Utils; +import com.hainaos.vc.BuildConfig; +import com.hainaos.vc.R; +import com.hainaos.vc.activity.privacy.PrivacyActivity; +import com.hainaos.vc.base.mvvm.BaseMvvmActivity; +import com.hainaos.vc.bean.SpaceInfo; +import com.hainaos.vc.databinding.ActivityVipBinding; +import com.hainaos.vc.utils.FileUtils; public class VipActivity extends BaseMvvmActivity { @@ -66,8 +66,8 @@ public class VipActivity extends BaseMvvmActivity { holder.tv_name.setText(fileName); } RequestOptions options = RequestOptions.bitmapTransform(new RoundedCorners(ScreenUtils.dip2px(mContext, 4F))); - if (!JGYUtils.getInstance().fileExists(photoInfo.getFile())) { + if (!JgyUtils.getInstance().fileExists(photoInfo.getFile())) { // Glide.with(mContext).load(fileUrl).into(holder.iv_pic); loadImg(fileUrl, holder.iv_pic); } else { // Glide.with(mContext).load(JGYUtils.getInstance().getUrlLocalPath(photoInfo.getFile())).into(holder.iv_pic); - loadImg(JGYUtils.getInstance().getUrlLocalPath(photoInfo.getFile()), holder.iv_pic); + loadImg(JgyUtils.getInstance().getUrlLocalPath(photoInfo.getFile()), holder.iv_pic); } holder.root.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/uiui/videoplayer/adapter/PreviewAdapter.java b/app/src/main/java/com/hainaos/vc/adapter/PreviewAdapter.java similarity index 96% rename from app/src/main/java/com/uiui/videoplayer/adapter/PreviewAdapter.java rename to app/src/main/java/com/hainaos/vc/adapter/PreviewAdapter.java index 56ecc73..d23e5ad 100644 --- a/app/src/main/java/com/uiui/videoplayer/adapter/PreviewAdapter.java +++ b/app/src/main/java/com/hainaos/vc/adapter/PreviewAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.adapter; +package com.hainaos.vc.adapter; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/uiui/videoplayer/adapter/TikTokRecyclerViewAdapter.java b/app/src/main/java/com/hainaos/vc/adapter/TikTokRecyclerViewAdapter.java similarity index 94% rename from app/src/main/java/com/uiui/videoplayer/adapter/TikTokRecyclerViewAdapter.java rename to app/src/main/java/com/hainaos/vc/adapter/TikTokRecyclerViewAdapter.java index 495238f..974aedb 100644 --- a/app/src/main/java/com/uiui/videoplayer/adapter/TikTokRecyclerViewAdapter.java +++ b/app/src/main/java/com/hainaos/vc/adapter/TikTokRecyclerViewAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.adapter; +package com.hainaos.vc.adapter; import android.annotation.SuppressLint; import android.content.Context; @@ -18,14 +18,14 @@ import com.arialyy.aria.core.task.DownloadTask; import com.bumptech.glide.Glide; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.hainaos.vc.CustomJzvd.JzvdStdAssert; +import com.hainaos.vc.R; +import com.hainaos.vc.bean.LocalVideoInfo; +import com.hainaos.vc.gson.GsonUtils; +import com.hainaos.vc.utils.JgyUtils; +import com.hainaos.vc.utils.SPUtils; +import com.hainaos.vc.utils.VideoUtils; import com.shehuan.niv.NiceImageView; -import com.uiui.videoplayer.CustomJzvd.JzvdStdAssert; -import com.uiui.videoplayer.R; -import com.uiui.videoplayer.bean.LocalVideoInfo; -import com.uiui.videoplayer.gson.GsonUtils; -import com.uiui.videoplayer.utils.JGYUtils; -import com.uiui.videoplayer.utils.SPUtils; -import com.uiui.videoplayer.utils.VideoUtils; import java.lang.reflect.Type; import java.util.List; @@ -102,7 +102,7 @@ public class TikTokRecyclerViewAdapter extends RecyclerView.Adapter } else { holder.title.setText(fileName); } - holder.duration.setText(Utils.TimeFormat(localVideoInfo.getDuration() * 1000)); + holder.duration.setText(TimeUtils.TimeFormat(localVideoInfo.getDuration() * 1000)); } } else { holder.title.setText(VideoUtils.getFileNameWithoutExtension(localPath)); @@ -103,7 +103,7 @@ public class VideoAdapter extends RecyclerView.Adapter if (file.exists()) { holder.iv_status.setVisibility(View.GONE); Glide.with(mContext).load(url + "?x-oss-process=video/snapshot,t_0,f_jpg").error(R.mipmap.ic_launcher).into(holder.video_image); - holder.duration.setText(Utils.TimeFormat(localVideoInfo.getDuration() * 1000)); + holder.duration.setText(TimeUtils.TimeFormat(localVideoInfo.getDuration() * 1000)); // Observable.create(new ObservableOnSubscribe() { // @Override // public void subscribe(ObservableEmitter emitter) throws Exception { @@ -163,13 +163,13 @@ public class VideoAdapter extends RecyclerView.Adapter @Override public void onClick(View v) { if (TextUtils.isEmpty(localPath)) { - if (JGYUtils.getInstance().fileExists(url)) { + if (JgyUtils.getInstance().fileExists(url)) { Intent intent = new Intent(mContext, TikTokActivity.class); intent.putExtra("position", position); intent.putParcelableArrayListExtra("list", mLocalVideoInfos); mContext.startActivity(intent); } else { - JGYUtils.getInstance().ariaDownload(url, GsonUtils.getJsonObject(GsonUtils.toJSONString(localVideoInfo))); + JgyUtils.getInstance().ariaDownload(url, GsonUtils.getJsonObject(GsonUtils.toJSONString(localVideoInfo))); ToastUtil.show(String.format(mContext.getString(R.string.download_now), VideoUtils.getFileNameWithoutExtension(url))); } } else { @@ -186,13 +186,13 @@ public class VideoAdapter extends RecyclerView.Adapter @Override public void onClick(View view) { if (TextUtils.isEmpty(localPath)) { - if (JGYUtils.getInstance().fileExists(url)) { + if (JgyUtils.getInstance().fileExists(url)) { Intent intent = new Intent(mContext, TikTokActivity.class); intent.putExtra("position", position); intent.putParcelableArrayListExtra("list", mLocalVideoInfos); mContext.startActivity(intent); } else { - JGYUtils.getInstance().ariaDownload(url, GsonUtils.getJsonObject(GsonUtils.toJSONString(localVideoInfo))); + JgyUtils.getInstance().ariaDownload(url, GsonUtils.getJsonObject(GsonUtils.toJSONString(localVideoInfo))); ToastUtil.show(String.format(mContext.getString(R.string.download_now), VideoUtils.getFileNameWithoutExtension(url))); } } else { diff --git a/app/src/main/java/com/uiui/videoplayer/base/BaseApplication.java b/app/src/main/java/com/hainaos/vc/base/BaseApplication.java similarity index 61% rename from app/src/main/java/com/uiui/videoplayer/base/BaseApplication.java rename to app/src/main/java/com/hainaos/vc/base/BaseApplication.java index d6f5cf2..229c862 100644 --- a/app/src/main/java/com/uiui/videoplayer/base/BaseApplication.java +++ b/app/src/main/java/com/hainaos/vc/base/BaseApplication.java @@ -1,15 +1,14 @@ -package com.uiui.videoplayer.base; +package com.hainaos.vc.base; import android.app.Application; import android.util.Log; import com.arialyy.aria.core.Aria; +import com.hainaos.vc.manager.ConnectManager; +import com.hainaos.vc.network.NetInterfaceManager; +import com.hainaos.vc.utils.JgyUtils; +import com.hainaos.vc.utils.ToastUtil; import com.tencent.mmkv.MMKV; -import com.uiui.sn.manager.RemoteManager; -import com.uiui.videoplayer.manager.ConnectManager; -import com.uiui.videoplayer.network.NetInterfaceManager; -import com.uiui.videoplayer.utils.JGYUtils; -import com.uiui.videoplayer.utils.ToastUtil; public class BaseApplication extends Application { private static final String TAG = "BaseApplication"; @@ -20,10 +19,9 @@ public class BaseApplication extends Application { String rootDir = MMKV.initialize(this); Log.i(TAG, "mmkv root: " + rootDir); - JGYUtils.init(this); + JgyUtils.init(this); Aria.init(this); ConnectManager.init(this); - RemoteManager.init(this); ToastUtil.init(this); NetInterfaceManager.init(this); diff --git a/app/src/main/java/com/uiui/videoplayer/base/BaseDataBindingActivity.java b/app/src/main/java/com/hainaos/vc/base/BaseDataBindingActivity.java similarity index 92% rename from app/src/main/java/com/uiui/videoplayer/base/BaseDataBindingActivity.java rename to app/src/main/java/com/hainaos/vc/base/BaseDataBindingActivity.java index 81478ff..303afa5 100644 --- a/app/src/main/java/com/uiui/videoplayer/base/BaseDataBindingActivity.java +++ b/app/src/main/java/com/hainaos/vc/base/BaseDataBindingActivity.java @@ -1,12 +1,12 @@ -package com.uiui.videoplayer.base; +package com.hainaos.vc.base; import android.os.Bundle; import androidx.annotation.CallSuper; import androidx.annotation.Nullable; -import com.uiui.videoplayer.R; -import com.uiui.videoplayer.base.rx.BaseRxActivity; +import com.hainaos.vc.R; +import com.hainaos.vc.base.rx.BaseRxActivity; import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX; public abstract class BaseDataBindingActivity extends BaseRxActivity { diff --git a/app/src/main/java/com/uiui/videoplayer/base/BaseFragment.java b/app/src/main/java/com/hainaos/vc/base/BaseFragment.java similarity index 92% rename from app/src/main/java/com/uiui/videoplayer/base/BaseFragment.java rename to app/src/main/java/com/hainaos/vc/base/BaseFragment.java index 1dbe784..b0383db 100644 --- a/app/src/main/java/com/uiui/videoplayer/base/BaseFragment.java +++ b/app/src/main/java/com/hainaos/vc/base/BaseFragment.java @@ -1,8 +1,8 @@ -package com.uiui.videoplayer.base; +package com.hainaos.vc.base; import android.os.Bundle; -import com.uiui.videoplayer.base.rx.BaseRxFragment; +import com.hainaos.vc.base.rx.BaseRxFragment; public abstract class BaseFragment extends BaseRxFragment { diff --git a/app/src/main/java/com/uiui/videoplayer/base/BaseFragmentPagerAdapter.java b/app/src/main/java/com/hainaos/vc/base/BaseFragmentPagerAdapter.java similarity index 99% rename from app/src/main/java/com/uiui/videoplayer/base/BaseFragmentPagerAdapter.java rename to app/src/main/java/com/hainaos/vc/base/BaseFragmentPagerAdapter.java index c727384..4087fd4 100644 --- a/app/src/main/java/com/uiui/videoplayer/base/BaseFragmentPagerAdapter.java +++ b/app/src/main/java/com/hainaos/vc/base/BaseFragmentPagerAdapter.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.base; +package com.hainaos.vc.base; import android.util.SparseArray; diff --git a/app/src/main/java/com/uiui/videoplayer/base/BaseTransparentActivity.java b/app/src/main/java/com/hainaos/vc/base/BaseTransparentActivity.java similarity index 92% rename from app/src/main/java/com/uiui/videoplayer/base/BaseTransparentActivity.java rename to app/src/main/java/com/hainaos/vc/base/BaseTransparentActivity.java index e5ba4db..85725a7 100644 --- a/app/src/main/java/com/uiui/videoplayer/base/BaseTransparentActivity.java +++ b/app/src/main/java/com/hainaos/vc/base/BaseTransparentActivity.java @@ -1,12 +1,12 @@ -package com.uiui.videoplayer.base; +package com.hainaos.vc.base; import android.os.Bundle; import androidx.annotation.CallSuper; import androidx.annotation.Nullable; -import com.uiui.videoplayer.R; -import com.uiui.videoplayer.base.rx.BaseRxActivity; +import com.hainaos.vc.R; +import com.hainaos.vc.base.rx.BaseRxActivity; import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX; public abstract class BaseTransparentActivity extends BaseRxActivity { diff --git a/app/src/main/java/com/uiui/videoplayer/base/mvp/BaseActivity.java b/app/src/main/java/com/hainaos/vc/base/mvp/BaseActivity.java similarity index 86% rename from app/src/main/java/com/uiui/videoplayer/base/mvp/BaseActivity.java rename to app/src/main/java/com/hainaos/vc/base/mvp/BaseActivity.java index fba7ad5..c148ca5 100644 --- a/app/src/main/java/com/uiui/videoplayer/base/mvp/BaseActivity.java +++ b/app/src/main/java/com/hainaos/vc/base/mvp/BaseActivity.java @@ -1,11 +1,11 @@ -package com.uiui.videoplayer.base.mvp; +package com.hainaos.vc.base.mvp; import android.os.Bundle; import androidx.annotation.CallSuper; import androidx.annotation.Nullable; -import com.uiui.videoplayer.base.BaseTransparentActivity; +import com.hainaos.vc.base.BaseTransparentActivity; @Deprecated public abstract class BaseActivity extends BaseTransparentActivity { diff --git a/app/src/main/java/com/uiui/videoplayer/base/mvp/BasePresenter.java b/app/src/main/java/com/hainaos/vc/base/mvp/BasePresenter.java similarity index 75% rename from app/src/main/java/com/uiui/videoplayer/base/mvp/BasePresenter.java rename to app/src/main/java/com/hainaos/vc/base/mvp/BasePresenter.java index e0fc978..5043283 100644 --- a/app/src/main/java/com/uiui/videoplayer/base/mvp/BasePresenter.java +++ b/app/src/main/java/com/hainaos/vc/base/mvp/BasePresenter.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.base.mvp; +package com.hainaos.vc.base.mvp; @Deprecated public interface BasePresenter { diff --git a/app/src/main/java/com/uiui/videoplayer/base/mvp/BaseView.java b/app/src/main/java/com/hainaos/vc/base/mvp/BaseView.java similarity index 52% rename from app/src/main/java/com/uiui/videoplayer/base/mvp/BaseView.java rename to app/src/main/java/com/hainaos/vc/base/mvp/BaseView.java index 0f1042b..14b1367 100644 --- a/app/src/main/java/com/uiui/videoplayer/base/mvp/BaseView.java +++ b/app/src/main/java/com/hainaos/vc/base/mvp/BaseView.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.base.mvp; +package com.hainaos.vc.base.mvp; @Deprecated public interface BaseView { diff --git a/app/src/main/java/com/uiui/videoplayer/base/mvvm/BaseMvvmActivity.java b/app/src/main/java/com/hainaos/vc/base/mvvm/BaseMvvmActivity.java similarity index 94% rename from app/src/main/java/com/uiui/videoplayer/base/mvvm/BaseMvvmActivity.java rename to app/src/main/java/com/hainaos/vc/base/mvvm/BaseMvvmActivity.java index ec33c38..75e7601 100644 --- a/app/src/main/java/com/uiui/videoplayer/base/mvvm/BaseMvvmActivity.java +++ b/app/src/main/java/com/hainaos/vc/base/mvvm/BaseMvvmActivity.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.base.mvvm; +package com.hainaos.vc.base.mvvm; import android.os.Bundle; import android.util.Log; @@ -9,7 +9,7 @@ import androidx.databinding.ViewDataBinding; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.uiui.videoplayer.base.BaseTransparentActivity; +import com.hainaos.vc.base.BaseTransparentActivity; import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType; diff --git a/app/src/main/java/com/uiui/videoplayer/base/mvvm/BaseViewModel.java b/app/src/main/java/com/hainaos/vc/base/mvvm/BaseViewModel.java similarity index 97% rename from app/src/main/java/com/uiui/videoplayer/base/mvvm/BaseViewModel.java rename to app/src/main/java/com/hainaos/vc/base/mvvm/BaseViewModel.java index e20ccfa..fba744d 100644 --- a/app/src/main/java/com/uiui/videoplayer/base/mvvm/BaseViewModel.java +++ b/app/src/main/java/com/hainaos/vc/base/mvvm/BaseViewModel.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.base.mvvm; +package com.hainaos.vc.base.mvvm; import android.content.Context; diff --git a/app/src/main/java/com/uiui/videoplayer/base/mvvm/ViewDataBindingCallback.java b/app/src/main/java/com/hainaos/vc/base/mvvm/ViewDataBindingCallback.java similarity index 93% rename from app/src/main/java/com/uiui/videoplayer/base/mvvm/ViewDataBindingCallback.java rename to app/src/main/java/com/hainaos/vc/base/mvvm/ViewDataBindingCallback.java index 80488db..887e35b 100644 --- a/app/src/main/java/com/uiui/videoplayer/base/mvvm/ViewDataBindingCallback.java +++ b/app/src/main/java/com/hainaos/vc/base/mvvm/ViewDataBindingCallback.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.base.mvvm; +package com.hainaos.vc.base.mvvm; import android.content.Context; diff --git a/app/src/main/java/com/uiui/videoplayer/base/mvvm/fragment/BaseMvvmFragment.java b/app/src/main/java/com/hainaos/vc/base/mvvm/fragment/BaseMvvmFragment.java similarity index 98% rename from app/src/main/java/com/uiui/videoplayer/base/mvvm/fragment/BaseMvvmFragment.java rename to app/src/main/java/com/hainaos/vc/base/mvvm/fragment/BaseMvvmFragment.java index 063d1e0..5bf8c81 100644 --- a/app/src/main/java/com/uiui/videoplayer/base/mvvm/fragment/BaseMvvmFragment.java +++ b/app/src/main/java/com/hainaos/vc/base/mvvm/fragment/BaseMvvmFragment.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.base.mvvm.fragment; +package com.hainaos.vc.base.mvvm.fragment; import android.app.Activity; import android.content.Context; @@ -19,7 +19,7 @@ import androidx.databinding.ViewDataBinding; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.uiui.videoplayer.base.BaseFragment; +import com.hainaos.vc.base.BaseFragment; import java.lang.ref.WeakReference; import java.lang.reflect.ParameterizedType; diff --git a/app/src/main/java/com/uiui/videoplayer/base/rx/BaseRxActivity.java b/app/src/main/java/com/hainaos/vc/base/rx/BaseRxActivity.java similarity index 98% rename from app/src/main/java/com/uiui/videoplayer/base/rx/BaseRxActivity.java rename to app/src/main/java/com/hainaos/vc/base/rx/BaseRxActivity.java index 1f684fc..bbbd471 100644 --- a/app/src/main/java/com/uiui/videoplayer/base/rx/BaseRxActivity.java +++ b/app/src/main/java/com/hainaos/vc/base/rx/BaseRxActivity.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.base.rx; +package com.hainaos.vc.base.rx; import android.os.Bundle; diff --git a/app/src/main/java/com/uiui/videoplayer/base/rx/BaseRxFragment.java b/app/src/main/java/com/hainaos/vc/base/rx/BaseRxFragment.java similarity index 98% rename from app/src/main/java/com/uiui/videoplayer/base/rx/BaseRxFragment.java rename to app/src/main/java/com/hainaos/vc/base/rx/BaseRxFragment.java index 5f3de79..a229a7e 100644 --- a/app/src/main/java/com/uiui/videoplayer/base/rx/BaseRxFragment.java +++ b/app/src/main/java/com/hainaos/vc/base/rx/BaseRxFragment.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.base.rx; +package com.hainaos.vc.base.rx; import android.os.Bundle; import android.view.View; diff --git a/app/src/main/java/com/uiui/videoplayer/base/rx/BaseRxService.java b/app/src/main/java/com/hainaos/vc/base/rx/BaseRxService.java similarity index 97% rename from app/src/main/java/com/uiui/videoplayer/base/rx/BaseRxService.java rename to app/src/main/java/com/hainaos/vc/base/rx/BaseRxService.java index c9ebf15..e0af208 100644 --- a/app/src/main/java/com/uiui/videoplayer/base/rx/BaseRxService.java +++ b/app/src/main/java/com/hainaos/vc/base/rx/BaseRxService.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.base.rx; +package com.hainaos.vc.base.rx; import android.app.Service; import android.content.Intent; diff --git a/app/src/main/java/com/uiui/videoplayer/bean/ActivationInfo.java b/app/src/main/java/com/hainaos/vc/bean/ActivationInfo.java similarity index 96% rename from app/src/main/java/com/uiui/videoplayer/bean/ActivationInfo.java rename to app/src/main/java/com/hainaos/vc/bean/ActivationInfo.java index 0b559e4..3a432d1 100644 --- a/app/src/main/java/com/uiui/videoplayer/bean/ActivationInfo.java +++ b/app/src/main/java/com/hainaos/vc/bean/ActivationInfo.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.bean; +package com.hainaos.vc.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/videoplayer/bean/BaseResponse.java b/app/src/main/java/com/hainaos/vc/bean/BaseResponse.java similarity index 93% rename from app/src/main/java/com/uiui/videoplayer/bean/BaseResponse.java rename to app/src/main/java/com/hainaos/vc/bean/BaseResponse.java index 7f76324..8125135 100644 --- a/app/src/main/java/com/uiui/videoplayer/bean/BaseResponse.java +++ b/app/src/main/java/com/hainaos/vc/bean/BaseResponse.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.bean; +package com.hainaos.vc.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/uiui/videoplayer/bean/LocalVideoInfo.java b/app/src/main/java/com/hainaos/vc/bean/LocalVideoInfo.java similarity index 97% rename from app/src/main/java/com/uiui/videoplayer/bean/LocalVideoInfo.java rename to app/src/main/java/com/hainaos/vc/bean/LocalVideoInfo.java index 6038ac1..7c215a2 100644 --- a/app/src/main/java/com/uiui/videoplayer/bean/LocalVideoInfo.java +++ b/app/src/main/java/com/hainaos/vc/bean/LocalVideoInfo.java @@ -1,6 +1,5 @@ -package com.uiui.videoplayer.bean; +package com.hainaos.vc.bean; -import android.graphics.Bitmap; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/uiui/videoplayer/bean/PhotoInfo.java b/app/src/main/java/com/hainaos/vc/bean/PhotoInfo.java similarity index 98% rename from app/src/main/java/com/uiui/videoplayer/bean/PhotoInfo.java rename to app/src/main/java/com/hainaos/vc/bean/PhotoInfo.java index 77bc914..661f9c0 100644 --- a/app/src/main/java/com/uiui/videoplayer/bean/PhotoInfo.java +++ b/app/src/main/java/com/hainaos/vc/bean/PhotoInfo.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.bean; +package com.hainaos.vc.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/uiui/videoplayer/bean/SpaceInfo.java b/app/src/main/java/com/hainaos/vc/bean/SpaceInfo.java similarity index 95% rename from app/src/main/java/com/uiui/videoplayer/bean/SpaceInfo.java rename to app/src/main/java/com/hainaos/vc/bean/SpaceInfo.java index dabdbbb..7912ed6 100644 --- a/app/src/main/java/com/uiui/videoplayer/bean/SpaceInfo.java +++ b/app/src/main/java/com/hainaos/vc/bean/SpaceInfo.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.bean; +package com.hainaos.vc.bean; import java.io.Serializable; diff --git a/app/src/main/java/com/uiui/videoplayer/bean/VideoInfo.java b/app/src/main/java/com/hainaos/vc/bean/VideoInfo.java similarity index 97% rename from app/src/main/java/com/uiui/videoplayer/bean/VideoInfo.java rename to app/src/main/java/com/hainaos/vc/bean/VideoInfo.java index 2c36f88..e6be0b9 100644 --- a/app/src/main/java/com/uiui/videoplayer/bean/VideoInfo.java +++ b/app/src/main/java/com/hainaos/vc/bean/VideoInfo.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.bean; +package com.hainaos.vc.bean; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/uiui/videoplayer/config/CommonConfig.java b/app/src/main/java/com/hainaos/vc/config/CommonConfig.java similarity index 89% rename from app/src/main/java/com/uiui/videoplayer/config/CommonConfig.java rename to app/src/main/java/com/hainaos/vc/config/CommonConfig.java index 667ce77..2b7360d 100644 --- a/app/src/main/java/com/uiui/videoplayer/config/CommonConfig.java +++ b/app/src/main/java/com/hainaos/vc/config/CommonConfig.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.config; +package com.hainaos.vc.config; public class CommonConfig { public static final String MMKV_ID = "InterProcessKV"; diff --git a/app/src/main/java/com/uiui/videoplayer/dialog/PermissionsDialog.java b/app/src/main/java/com/hainaos/vc/dialog/PermissionsDialog.java similarity index 97% rename from app/src/main/java/com/uiui/videoplayer/dialog/PermissionsDialog.java rename to app/src/main/java/com/hainaos/vc/dialog/PermissionsDialog.java index ccab561..1a5edba 100644 --- a/app/src/main/java/com/uiui/videoplayer/dialog/PermissionsDialog.java +++ b/app/src/main/java/com/hainaos/vc/dialog/PermissionsDialog.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.dialog; +package com.hainaos.vc.dialog; import android.content.Context; import android.os.Bundle; @@ -10,7 +10,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; -import com.uiui.videoplayer.R; +import com.hainaos.vc.R; public class PermissionsDialog extends AlertDialog { diff --git a/app/src/main/java/com/uiui/videoplayer/dialog/PrivacyPolicyDialog.java b/app/src/main/java/com/hainaos/vc/dialog/PrivacyPolicyDialog.java similarity index 95% rename from app/src/main/java/com/uiui/videoplayer/dialog/PrivacyPolicyDialog.java rename to app/src/main/java/com/hainaos/vc/dialog/PrivacyPolicyDialog.java index dc50dc3..1863565 100644 --- a/app/src/main/java/com/uiui/videoplayer/dialog/PrivacyPolicyDialog.java +++ b/app/src/main/java/com/hainaos/vc/dialog/PrivacyPolicyDialog.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.dialog; +package com.hainaos.vc.dialog; import android.content.Context; import android.content.Intent; @@ -17,8 +17,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; -import com.uiui.videoplayer.R; -import com.uiui.videoplayer.activity.privacy.PrivacyActivity; +import com.hainaos.vc.R; +import com.hainaos.vc.activity.privacy.PrivacyActivity; public class PrivacyPolicyDialog extends AlertDialog { private Context mContext; diff --git a/app/src/main/java/com/uiui/videoplayer/disklrucache/CacheHelper.java b/app/src/main/java/com/hainaos/vc/disklrucache/CacheHelper.java similarity index 99% rename from app/src/main/java/com/uiui/videoplayer/disklrucache/CacheHelper.java rename to app/src/main/java/com/hainaos/vc/disklrucache/CacheHelper.java index 36a79c8..3318fb4 100644 --- a/app/src/main/java/com/uiui/videoplayer/disklrucache/CacheHelper.java +++ b/app/src/main/java/com/hainaos/vc/disklrucache/CacheHelper.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.disklrucache; +package com.hainaos.vc.disklrucache; import android.content.Context; import android.graphics.Bitmap; @@ -6,9 +6,9 @@ import android.graphics.drawable.Drawable; import android.os.Environment; import android.util.Log; +import com.hainaos.vc.config.CommonConfig; import com.jakewharton.disklrucache.DiskLruCache; import com.tencent.mmkv.MMKV; -import com.uiui.videoplayer.config.CommonConfig; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/com/uiui/videoplayer/disklrucache/DiskLruCacheHelper.java b/app/src/main/java/com/hainaos/vc/disklrucache/DiskLruCacheHelper.java similarity index 99% rename from app/src/main/java/com/uiui/videoplayer/disklrucache/DiskLruCacheHelper.java rename to app/src/main/java/com/hainaos/vc/disklrucache/DiskLruCacheHelper.java index e18baff..c2720a8 100644 --- a/app/src/main/java/com/uiui/videoplayer/disklrucache/DiskLruCacheHelper.java +++ b/app/src/main/java/com/hainaos/vc/disklrucache/DiskLruCacheHelper.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.disklrucache; +package com.hainaos.vc.disklrucache; import android.content.Context; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/uiui/videoplayer/disklrucache/Utils.java b/app/src/main/java/com/hainaos/vc/disklrucache/Utils.java similarity index 98% rename from app/src/main/java/com/uiui/videoplayer/disklrucache/Utils.java rename to app/src/main/java/com/hainaos/vc/disklrucache/Utils.java index c9f9769..273ef93 100644 --- a/app/src/main/java/com/uiui/videoplayer/disklrucache/Utils.java +++ b/app/src/main/java/com/hainaos/vc/disklrucache/Utils.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.disklrucache; +package com.hainaos.vc.disklrucache; import android.content.Context; import android.content.pm.PackageInfo; diff --git a/app/src/main/java/com/uiui/videoplayer/fragment/doc/DocFragment.java b/app/src/main/java/com/hainaos/vc/fragment/doc/DocFragment.java similarity index 92% rename from app/src/main/java/com/uiui/videoplayer/fragment/doc/DocFragment.java rename to app/src/main/java/com/hainaos/vc/fragment/doc/DocFragment.java index 13823fd..7f8599d 100644 --- a/app/src/main/java/com/uiui/videoplayer/fragment/doc/DocFragment.java +++ b/app/src/main/java/com/hainaos/vc/fragment/doc/DocFragment.java @@ -1,13 +1,13 @@ -package com.uiui.videoplayer.fragment.doc; +package com.hainaos.vc.fragment.doc; import android.app.Activity; import android.os.Bundle; import androidx.fragment.app.Fragment; -import com.uiui.videoplayer.R; -import com.uiui.videoplayer.base.mvvm.fragment.BaseMvvmFragment; -import com.uiui.videoplayer.databinding.FragmentDocBinding; +import com.hainaos.vc.R; +import com.hainaos.vc.base.mvvm.fragment.BaseMvvmFragment; +import com.hainaos.vc.databinding.FragmentDocBinding; /** * A simple {@link Fragment} subclass. diff --git a/app/src/main/java/com/uiui/videoplayer/fragment/doc/DocViewModel.java b/app/src/main/java/com/hainaos/vc/fragment/doc/DocViewModel.java similarity index 64% rename from app/src/main/java/com/uiui/videoplayer/fragment/doc/DocViewModel.java rename to app/src/main/java/com/hainaos/vc/fragment/doc/DocViewModel.java index f770269..0e45df2 100644 --- a/app/src/main/java/com/uiui/videoplayer/fragment/doc/DocViewModel.java +++ b/app/src/main/java/com/hainaos/vc/fragment/doc/DocViewModel.java @@ -1,8 +1,8 @@ -package com.uiui.videoplayer.fragment.doc; +package com.hainaos.vc.fragment.doc; +import com.hainaos.vc.base.mvvm.BaseViewModel; +import com.hainaos.vc.databinding.FragmentDocBinding; import com.trello.rxlifecycle4.android.FragmentEvent; -import com.uiui.videoplayer.base.mvvm.BaseViewModel; -import com.uiui.videoplayer.databinding.FragmentDocBinding; public class DocViewModel extends BaseViewModel { diff --git a/app/src/main/java/com/uiui/videoplayer/fragment/pic/PictureFragment.java b/app/src/main/java/com/hainaos/vc/fragment/pic/PictureFragment.java similarity index 91% rename from app/src/main/java/com/uiui/videoplayer/fragment/pic/PictureFragment.java rename to app/src/main/java/com/hainaos/vc/fragment/pic/PictureFragment.java index 3187c35..597a707 100644 --- a/app/src/main/java/com/uiui/videoplayer/fragment/pic/PictureFragment.java +++ b/app/src/main/java/com/hainaos/vc/fragment/pic/PictureFragment.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.fragment.pic; +package com.hainaos.vc.fragment.pic; import android.app.Activity; import android.os.Bundle; @@ -11,14 +11,14 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.uiui.videoplayer.R; -import com.uiui.videoplayer.adapter.PicAdapter; -import com.uiui.videoplayer.base.mvvm.fragment.BaseMvvmFragment; -import com.uiui.videoplayer.bean.PhotoInfo; -import com.uiui.videoplayer.databinding.FragmentPictureBinding; -import com.uiui.videoplayer.utils.ScreenUtils; -import com.uiui.videoplayer.utils.ToastUtil; -import com.uiui.videoplayer.view.EquallyDividedItemDecoration; +import com.hainaos.vc.R; +import com.hainaos.vc.adapter.PicAdapter; +import com.hainaos.vc.base.mvvm.fragment.BaseMvvmFragment; +import com.hainaos.vc.bean.PhotoInfo; +import com.hainaos.vc.databinding.FragmentPictureBinding; +import com.hainaos.vc.utils.ScreenUtils; +import com.hainaos.vc.utils.ToastUtil; +import com.hainaos.vc.view.EquallyDividedItemDecoration; import java.util.ArrayList; diff --git a/app/src/main/java/com/uiui/videoplayer/fragment/pic/PictureViewModel.java b/app/src/main/java/com/hainaos/vc/fragment/pic/PictureViewModel.java similarity index 79% rename from app/src/main/java/com/uiui/videoplayer/fragment/pic/PictureViewModel.java rename to app/src/main/java/com/hainaos/vc/fragment/pic/PictureViewModel.java index 1e2313d..b3b2f69 100644 --- a/app/src/main/java/com/uiui/videoplayer/fragment/pic/PictureViewModel.java +++ b/app/src/main/java/com/hainaos/vc/fragment/pic/PictureViewModel.java @@ -1,12 +1,12 @@ -package com.uiui.videoplayer.fragment.pic; +package com.hainaos.vc.fragment.pic; import androidx.lifecycle.MutableLiveData; +import com.hainaos.vc.base.mvvm.BaseViewModel; +import com.hainaos.vc.bean.PhotoInfo; +import com.hainaos.vc.databinding.FragmentPictureBinding; +import com.hainaos.vc.network.NetInterfaceManager; import com.trello.rxlifecycle4.android.FragmentEvent; -import com.uiui.videoplayer.base.mvvm.BaseViewModel; -import com.uiui.videoplayer.bean.PhotoInfo; -import com.uiui.videoplayer.databinding.FragmentPictureBinding; -import com.uiui.videoplayer.network.NetInterfaceManager; import java.util.ArrayList; diff --git a/app/src/main/java/com/uiui/videoplayer/fragment/video/VideoFragment.java b/app/src/main/java/com/hainaos/vc/fragment/video/VideoFragment.java similarity index 92% rename from app/src/main/java/com/uiui/videoplayer/fragment/video/VideoFragment.java rename to app/src/main/java/com/hainaos/vc/fragment/video/VideoFragment.java index 5f39e0b..3287c3b 100644 --- a/app/src/main/java/com/uiui/videoplayer/fragment/video/VideoFragment.java +++ b/app/src/main/java/com/hainaos/vc/fragment/video/VideoFragment.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.fragment.video; +package com.hainaos.vc.fragment.video; import android.app.Activity; import android.os.Bundle; @@ -14,18 +14,18 @@ import com.arialyy.annotations.Download; import com.arialyy.aria.core.Aria; import com.arialyy.aria.core.task.DownloadTask; import com.google.gson.JsonObject; -import com.uiui.videoplayer.R; -import com.uiui.videoplayer.adapter.VideoAdapter; -import com.uiui.videoplayer.base.mvvm.fragment.BaseMvvmFragment; -import com.uiui.videoplayer.bean.LocalVideoInfo; -import com.uiui.videoplayer.databinding.FragmentVideoBinding; -import com.uiui.videoplayer.gson.GsonUtils; -import com.uiui.videoplayer.utils.ScreenUtils; -import com.uiui.videoplayer.utils.ToastUtil; -import com.uiui.videoplayer.utils.VideoUtils; -import com.uiui.videoplayer.view.CustomDialog; -import com.uiui.videoplayer.view.EquallyDividedItemDecoration; -import com.uiui.videoplayer.view.RecycleGridLayoutManager; +import com.hainaos.vc.R; +import com.hainaos.vc.adapter.VideoAdapter; +import com.hainaos.vc.base.mvvm.fragment.BaseMvvmFragment; +import com.hainaos.vc.bean.LocalVideoInfo; +import com.hainaos.vc.databinding.FragmentVideoBinding; +import com.hainaos.vc.gson.GsonUtils; +import com.hainaos.vc.utils.ScreenUtils; +import com.hainaos.vc.utils.ToastUtil; +import com.hainaos.vc.utils.VideoUtils; +import com.hainaos.vc.view.CustomDialog; +import com.hainaos.vc.view.EquallyDividedItemDecoration; +import com.hainaos.vc.view.RecycleGridLayoutManager; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/uiui/videoplayer/fragment/video/VideoViewModel.java b/app/src/main/java/com/hainaos/vc/fragment/video/VideoViewModel.java similarity index 79% rename from app/src/main/java/com/uiui/videoplayer/fragment/video/VideoViewModel.java rename to app/src/main/java/com/hainaos/vc/fragment/video/VideoViewModel.java index c3d4af4..7e9dfb3 100644 --- a/app/src/main/java/com/uiui/videoplayer/fragment/video/VideoViewModel.java +++ b/app/src/main/java/com/hainaos/vc/fragment/video/VideoViewModel.java @@ -1,12 +1,12 @@ -package com.uiui.videoplayer.fragment.video; +package com.hainaos.vc.fragment.video; import androidx.lifecycle.MutableLiveData; +import com.hainaos.vc.base.mvvm.BaseViewModel; +import com.hainaos.vc.bean.LocalVideoInfo; +import com.hainaos.vc.databinding.FragmentVideoBinding; +import com.hainaos.vc.network.NetInterfaceManager; import com.trello.rxlifecycle4.android.FragmentEvent; -import com.uiui.videoplayer.base.mvvm.BaseViewModel; -import com.uiui.videoplayer.bean.LocalVideoInfo; -import com.uiui.videoplayer.databinding.FragmentVideoBinding; -import com.uiui.videoplayer.network.NetInterfaceManager; import java.util.ArrayList; diff --git a/app/src/main/java/com/uiui/videoplayer/gson/GsonUtils.java b/app/src/main/java/com/hainaos/vc/gson/GsonUtils.java similarity index 99% rename from app/src/main/java/com/uiui/videoplayer/gson/GsonUtils.java rename to app/src/main/java/com/hainaos/vc/gson/GsonUtils.java index b17533e..3156737 100644 --- a/app/src/main/java/com/uiui/videoplayer/gson/GsonUtils.java +++ b/app/src/main/java/com/hainaos/vc/gson/GsonUtils.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.gson; +package com.hainaos.vc.gson; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/app/src/main/java/com/uiui/videoplayer/gson/IntegerDefault0Adapter.java b/app/src/main/java/com/hainaos/vc/gson/IntegerDefault0Adapter.java similarity index 96% rename from app/src/main/java/com/uiui/videoplayer/gson/IntegerDefault0Adapter.java rename to app/src/main/java/com/hainaos/vc/gson/IntegerDefault0Adapter.java index ec202e3..f4ce58d 100644 --- a/app/src/main/java/com/uiui/videoplayer/gson/IntegerDefault0Adapter.java +++ b/app/src/main/java/com/hainaos/vc/gson/IntegerDefault0Adapter.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.gson; +package com.hainaos.vc.gson; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; diff --git a/app/src/main/java/com/uiui/videoplayer/gson/NullStringToEmptyAdapterFactory.java b/app/src/main/java/com/hainaos/vc/gson/NullStringToEmptyAdapterFactory.java similarity index 97% rename from app/src/main/java/com/uiui/videoplayer/gson/NullStringToEmptyAdapterFactory.java rename to app/src/main/java/com/hainaos/vc/gson/NullStringToEmptyAdapterFactory.java index 3461df9..eb42ba5 100644 --- a/app/src/main/java/com/uiui/videoplayer/gson/NullStringToEmptyAdapterFactory.java +++ b/app/src/main/java/com/hainaos/vc/gson/NullStringToEmptyAdapterFactory.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.gson; +package com.hainaos.vc.gson; import com.google.gson.Gson; import com.google.gson.TypeAdapter; diff --git a/app/src/main/java/com/uiui/videoplayer/listener/OnViewPagerListener.java b/app/src/main/java/com/hainaos/vc/listener/OnViewPagerListener.java similarity index 91% rename from app/src/main/java/com/uiui/videoplayer/listener/OnViewPagerListener.java rename to app/src/main/java/com/hainaos/vc/listener/OnViewPagerListener.java index d0a5823..15bb677 100644 --- a/app/src/main/java/com/uiui/videoplayer/listener/OnViewPagerListener.java +++ b/app/src/main/java/com/hainaos/vc/listener/OnViewPagerListener.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.listener; +package com.hainaos.vc.listener; /** * Created by 钉某人 diff --git a/app/src/main/java/com/uiui/videoplayer/manager/ConnectManager.java b/app/src/main/java/com/hainaos/vc/manager/ConnectManager.java similarity index 97% rename from app/src/main/java/com/uiui/videoplayer/manager/ConnectManager.java rename to app/src/main/java/com/hainaos/vc/manager/ConnectManager.java index d6e6f59..c4cdc42 100644 --- a/app/src/main/java/com/uiui/videoplayer/manager/ConnectManager.java +++ b/app/src/main/java/com/hainaos/vc/manager/ConnectManager.java @@ -1,11 +1,11 @@ -package com.uiui.videoplayer.manager; +package com.hainaos.vc.manager; import android.annotation.SuppressLint; import android.content.Context; import android.util.Log; +import com.hainaos.vc.config.CommonConfig; import com.tencent.mmkv.MMKV; -import com.uiui.videoplayer.config.CommonConfig; public class ConnectManager { private static final String TAG = "ConnectManager"; diff --git a/app/src/main/java/com/uiui/videoplayer/manager/ConnectMode.java b/app/src/main/java/com/hainaos/vc/manager/ConnectMode.java similarity index 79% rename from app/src/main/java/com/uiui/videoplayer/manager/ConnectMode.java rename to app/src/main/java/com/hainaos/vc/manager/ConnectMode.java index 7de0ac7..905796a 100644 --- a/app/src/main/java/com/uiui/videoplayer/manager/ConnectMode.java +++ b/app/src/main/java/com/hainaos/vc/manager/ConnectMode.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.manager; +package com.hainaos.vc.manager; public enum ConnectMode { DEFAULT, diff --git a/app/src/main/java/com/uiui/videoplayer/network/MD5Util.java b/app/src/main/java/com/hainaos/vc/network/MD5Util.java similarity index 98% rename from app/src/main/java/com/uiui/videoplayer/network/MD5Util.java rename to app/src/main/java/com/hainaos/vc/network/MD5Util.java index 20f2baa..167c28c 100644 --- a/app/src/main/java/com/uiui/videoplayer/network/MD5Util.java +++ b/app/src/main/java/com/hainaos/vc/network/MD5Util.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.network; +package com.hainaos.vc.network; import android.annotation.SuppressLint; diff --git a/app/src/main/java/com/uiui/videoplayer/network/NetInterfaceManager.java b/app/src/main/java/com/hainaos/vc/network/NetInterfaceManager.java similarity index 92% rename from app/src/main/java/com/uiui/videoplayer/network/NetInterfaceManager.java rename to app/src/main/java/com/hainaos/vc/network/NetInterfaceManager.java index 709a60c..b8442d1 100644 --- a/app/src/main/java/com/uiui/videoplayer/network/NetInterfaceManager.java +++ b/app/src/main/java/com/hainaos/vc/network/NetInterfaceManager.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.network; +package com.hainaos.vc.network; import android.annotation.SuppressLint; import android.content.ContentResolver; @@ -8,28 +8,28 @@ import android.util.Log; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.hainaos.vc.bean.ActivationInfo; +import com.hainaos.vc.bean.BaseResponse; +import com.hainaos.vc.bean.LocalVideoInfo; +import com.hainaos.vc.bean.PhotoInfo; +import com.hainaos.vc.bean.SpaceInfo; +import com.hainaos.vc.bean.VideoInfo; +import com.hainaos.vc.config.CommonConfig; +import com.hainaos.vc.disklrucache.CacheHelper; +import com.hainaos.vc.gson.GsonUtils; +import com.hainaos.vc.manager.ConnectManager; +import com.hainaos.vc.manager.ConnectMode; +import com.hainaos.vc.network.api.ActivationApi; +import com.hainaos.vc.network.api.FileApi; +import com.hainaos.vc.network.interceptor.RepeatRequestInterceptor; +import com.hainaos.vc.utils.JgyUtils; +import com.hainaos.vc.utils.ToastUtil; +import com.hainaos.vc.utils.Utils; +import com.hainaos.vc.utils.VideoUtils; import com.tencent.mmkv.MMKV; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; import com.trello.rxlifecycle4.android.FragmentEvent; -import com.uiui.sn.manager.RemoteManager; -import com.uiui.videoplayer.bean.ActivationInfo; -import com.uiui.videoplayer.bean.BaseResponse; -import com.uiui.videoplayer.bean.LocalVideoInfo; -import com.uiui.videoplayer.bean.PhotoInfo; -import com.uiui.videoplayer.bean.SpaceInfo; -import com.uiui.videoplayer.bean.VideoInfo; -import com.uiui.videoplayer.config.CommonConfig; -import com.uiui.videoplayer.disklrucache.CacheHelper; -import com.uiui.videoplayer.gson.GsonUtils; -import com.uiui.videoplayer.manager.ConnectManager; -import com.uiui.videoplayer.manager.ConnectMode; -import com.uiui.videoplayer.network.api.ActivationApi; -import com.uiui.videoplayer.network.api.FileApi; -import com.uiui.videoplayer.network.interceptor.RepeatRequestInterceptor; -import com.uiui.videoplayer.utils.JGYUtils; -import com.uiui.videoplayer.utils.ToastUtil; -import com.uiui.videoplayer.utils.VideoUtils; import java.io.File; import java.lang.reflect.Type; @@ -154,28 +154,28 @@ public class NetInterfaceManager { public Observable>> getHomeVideoControl() { return mRetrofit.create(FileApi.class) - .getHomeVideo(RemoteManager.getInstance().getSerial()) + .getHomeVideo(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable>> getHomePhotoControl() { return mRetrofit.create(FileApi.class) - .getHomePhoto(RemoteManager.getInstance().getSerial()) + .getHomePhoto(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getHomeSpaceInfoControl() { return mRetrofit.create(FileApi.class) - .getHomeSpaceInfo(RemoteManager.getInstance().getSerial()) + .getHomeSpaceInfo(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } public Observable> getActivationControl() { return mRetrofit.create(ActivationApi.class) - .getActivation(RemoteManager.getInstance().getSerial()) + .getActivation(Utils.getSerial()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } @@ -217,8 +217,8 @@ public class NetInterfaceManager { localVideoInfo.setFile_name(videoInfo.getFile_name()); localVideoInfo.setFile_md5(videoInfo.getFile_md5()); localVideoInfo.setDuration(videoInfo.getDuration()); - if (JGYUtils.getInstance().fileExists(videoInfo.getFile())) { - localVideoInfo.setLocalPath(JGYUtils.getInstance().getUrlLocalPath(videoInfo.getFile())); + if (JgyUtils.getInstance().fileExists(videoInfo.getFile())) { + localVideoInfo.setLocalPath(JgyUtils.getInstance().getUrlLocalPath(videoInfo.getFile())); } LocalVideoInfos.add(localVideoInfo); } @@ -272,8 +272,8 @@ public class NetInterfaceManager { localVideoInfo.setFile_name(videoInfo.getFile_name()); localVideoInfo.setFile_md5(videoInfo.getFile_md5()); localVideoInfo.setDuration(videoInfo.getDuration()); - if (JGYUtils.getInstance().fileExists(videoInfo.getFile())) { - localVideoInfo.setLocalPath(JGYUtils.getInstance().getUrlLocalPath(videoInfo.getFile())); + if (JgyUtils.getInstance().fileExists(videoInfo.getFile())) { + localVideoInfo.setLocalPath(JgyUtils.getInstance().getUrlLocalPath(videoInfo.getFile())); } LocalVideoInfos.add(localVideoInfo); } @@ -371,8 +371,8 @@ public class NetInterfaceManager { localVideoInfo.setFile(videoInfo.getFile()); localVideoInfo.setFile_md5(videoInfo.getFile_md5()); localVideoInfo.setDuration(videoInfo.getDuration()); - if (JGYUtils.getInstance().fileExists(videoInfo.getFile())) { - localVideoInfo.setLocalPath(JGYUtils.getInstance().getUrlLocalPath(videoInfo.getFile())); + if (JgyUtils.getInstance().fileExists(videoInfo.getFile())) { + localVideoInfo.setLocalPath(JgyUtils.getInstance().getUrlLocalPath(videoInfo.getFile())); } LocalVideoInfos.add(localVideoInfo); } @@ -497,8 +497,8 @@ public class NetInterfaceManager { if (code == 200) { ArrayList photoInfoList = listBaseResponse.data; for (PhotoInfo photoInfo : photoInfoList) { - if (!JGYUtils.getInstance().fileExists(photoInfo.getFile())) { - JGYUtils.getInstance().ariaDownload(photoInfo.getFile(), GsonUtils.getJsonObject(GsonUtils.toJSONString(photoInfo))); + if (!JgyUtils.getInstance().fileExists(photoInfo.getFile())) { + JgyUtils.getInstance().ariaDownload(photoInfo.getFile(), GsonUtils.getJsonObject(GsonUtils.toJSONString(photoInfo))); } } mCacheHelper.put(UrlAddress.HOME_PHOTO, GsonUtils.toJSONString(photoInfoList)); diff --git a/app/src/main/java/com/uiui/videoplayer/network/UrlAddress.java b/app/src/main/java/com/hainaos/vc/network/UrlAddress.java similarity index 93% rename from app/src/main/java/com/uiui/videoplayer/network/UrlAddress.java rename to app/src/main/java/com/hainaos/vc/network/UrlAddress.java index ca701e0..45fb048 100644 --- a/app/src/main/java/com/uiui/videoplayer/network/UrlAddress.java +++ b/app/src/main/java/com/hainaos/vc/network/UrlAddress.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.network; +package com.hainaos.vc.network; public class UrlAddress { /*主页接口*/ @@ -10,6 +10,7 @@ public class UrlAddress { public static final String HOME_PHOTO ="File/getHomePhoto"; /*获取家庭空间信息*/ public static final String GET_HOME_SPACE_INFO ="File/getHomeSpaceInfo"; + /*获取设备激活支付信息*/ public static final String ACTIVATION_INFO = "sn/act-info"; diff --git a/app/src/main/java/com/uiui/videoplayer/network/api/ActivationApi.java b/app/src/main/java/com/hainaos/vc/network/api/ActivationApi.java similarity index 59% rename from app/src/main/java/com/uiui/videoplayer/network/api/ActivationApi.java rename to app/src/main/java/com/hainaos/vc/network/api/ActivationApi.java index af1d2d7..c2b74a4 100644 --- a/app/src/main/java/com/uiui/videoplayer/network/api/ActivationApi.java +++ b/app/src/main/java/com/hainaos/vc/network/api/ActivationApi.java @@ -1,8 +1,8 @@ -package com.uiui.videoplayer.network.api; +package com.hainaos.vc.network.api; -import com.uiui.videoplayer.bean.ActivationInfo; -import com.uiui.videoplayer.bean.BaseResponse; -import com.uiui.videoplayer.network.UrlAddress; +import com.hainaos.vc.bean.ActivationInfo; +import com.hainaos.vc.bean.BaseResponse; +import com.hainaos.vc.network.UrlAddress; import io.reactivex.rxjava3.core.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/uiui/videoplayer/network/api/FileApi.java b/app/src/main/java/com/hainaos/vc/network/api/FileApi.java similarity index 69% rename from app/src/main/java/com/uiui/videoplayer/network/api/FileApi.java rename to app/src/main/java/com/hainaos/vc/network/api/FileApi.java index 348637b..b54121d 100644 --- a/app/src/main/java/com/uiui/videoplayer/network/api/FileApi.java +++ b/app/src/main/java/com/hainaos/vc/network/api/FileApi.java @@ -1,10 +1,10 @@ -package com.uiui.videoplayer.network.api; +package com.hainaos.vc.network.api; -import com.uiui.videoplayer.bean.BaseResponse; -import com.uiui.videoplayer.bean.PhotoInfo; -import com.uiui.videoplayer.bean.SpaceInfo; -import com.uiui.videoplayer.bean.VideoInfo; -import com.uiui.videoplayer.network.UrlAddress; +import com.hainaos.vc.bean.BaseResponse; +import com.hainaos.vc.bean.PhotoInfo; +import com.hainaos.vc.bean.SpaceInfo; +import com.hainaos.vc.bean.VideoInfo; +import com.hainaos.vc.network.UrlAddress; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/uiui/videoplayer/network/interceptor/RepeatRequestInterceptor.java b/app/src/main/java/com/hainaos/vc/network/interceptor/RepeatRequestInterceptor.java similarity index 96% rename from app/src/main/java/com/uiui/videoplayer/network/interceptor/RepeatRequestInterceptor.java rename to app/src/main/java/com/hainaos/vc/network/interceptor/RepeatRequestInterceptor.java index a8d11cb..8ace569 100644 --- a/app/src/main/java/com/uiui/videoplayer/network/interceptor/RepeatRequestInterceptor.java +++ b/app/src/main/java/com/hainaos/vc/network/interceptor/RepeatRequestInterceptor.java @@ -1,9 +1,9 @@ -package com.uiui.videoplayer.network.interceptor; +package com.hainaos.vc.network.interceptor; import android.util.Log; -import com.uiui.videoplayer.BuildConfig; -import com.uiui.videoplayer.network.MD5Util; +import com.hainaos.vc.BuildConfig; +import com.hainaos.vc.network.MD5Util; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/uiui/videoplayer/utils/FFmpegUtils.java b/app/src/main/java/com/hainaos/vc/utils/FFmpegUtils.java similarity index 98% rename from app/src/main/java/com/uiui/videoplayer/utils/FFmpegUtils.java rename to app/src/main/java/com/hainaos/vc/utils/FFmpegUtils.java index 9cf6239..2365498 100644 --- a/app/src/main/java/com/uiui/videoplayer/utils/FFmpegUtils.java +++ b/app/src/main/java/com/hainaos/vc/utils/FFmpegUtils.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.utils; +package com.hainaos.vc.utils; import android.graphics.Bitmap; import android.util.Log; diff --git a/app/src/main/java/com/hainaos/vc/utils/FileUtils.java b/app/src/main/java/com/hainaos/vc/utils/FileUtils.java new file mode 100644 index 0000000..943ef36 --- /dev/null +++ b/app/src/main/java/com/hainaos/vc/utils/FileUtils.java @@ -0,0 +1,25 @@ +package com.hainaos.vc.utils; + +import java.text.DecimalFormat; + +public class FileUtils { + /** + * 转换文件大小 MB + */ + public static String formatFileSize(long fileS) { + DecimalFormat df = new DecimalFormat("#"); + String fileSizeString; + String wrongSize = "0GB"; + if (fileS == 0) { + return wrongSize; + } + if (fileS < 1024) { + fileSizeString = df.format((double) fileS) + "MB"; + } else if (fileS < 1048576) { + fileSizeString = df.format((double) fileS / 1024) + "GB"; + } else { + fileSizeString = df.format((double) fileS / 1048576) + "TB"; + } + return fileSizeString; + } +} diff --git a/app/src/main/java/com/uiui/videoplayer/utils/JGYUtils.java b/app/src/main/java/com/hainaos/vc/utils/JgyUtils.java similarity index 87% rename from app/src/main/java/com/uiui/videoplayer/utils/JGYUtils.java rename to app/src/main/java/com/hainaos/vc/utils/JgyUtils.java index 4f12a40..29657f9 100644 --- a/app/src/main/java/com/uiui/videoplayer/utils/JGYUtils.java +++ b/app/src/main/java/com/hainaos/vc/utils/JgyUtils.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.utils; +package com.hainaos.vc.utils; import android.annotation.SuppressLint; import android.content.Context; @@ -13,14 +13,14 @@ import com.google.gson.JsonObject; import java.io.File; -public class JGYUtils { +public class JgyUtils { private static final String TAG = "JGYUtils"; @SuppressLint("StaticFieldLeak") - private static JGYUtils sInstance; + private static JgyUtils sInstance; private Context mContext; - private JGYUtils(Context context) { + private JgyUtils(Context context) { if (context == null) { throw new RuntimeException("Context is NULL"); } @@ -29,11 +29,11 @@ public class JGYUtils { public static void init(Context context) { if (sInstance == null) { - sInstance = new JGYUtils(context); + sInstance = new JgyUtils(context); } } - public static JGYUtils getInstance() { + public static JgyUtils getInstance() { if (sInstance == null) { throw new IllegalStateException("You must be init JGYUtils first"); } @@ -78,7 +78,7 @@ public class JGYUtils { } Log.e("ariaDownload", "urlMd5=" + urlMd5); - File file = new File(JGYUtils.getInstance().getDownLoadPath() + fileName); + File file = new File(JgyUtils.getInstance().getDownLoadPath() + fileName); if (file.exists() && !file.isDirectory()) { String fileMD5 = VideoUtils.getFileMD5s(file); Log.e("ariaDownload", "fileMD5=" + fileMD5); @@ -88,14 +88,14 @@ public class JGYUtils { } else { Aria.download(mContext) .load(url) //读取下载地址 - .setFilePath(JGYUtils.getInstance().getDownLoadPath() + fileName) + .setFilePath(JgyUtils.getInstance().getDownLoadPath() + fileName) .setExtendField(jsonObject.toString()) .create(); //启动下载} } } else { Aria.download(mContext) .load(url) //读取下载地址 - .setFilePath(JGYUtils.getInstance().getDownLoadPath() + fileName) + .setFilePath(JgyUtils.getInstance().getDownLoadPath() + fileName) .setExtendField(jsonObject.toString()) .create(); //启动下载} } diff --git a/app/src/main/java/com/uiui/videoplayer/utils/SPUtils.java b/app/src/main/java/com/hainaos/vc/utils/SPUtils.java similarity index 99% rename from app/src/main/java/com/uiui/videoplayer/utils/SPUtils.java rename to app/src/main/java/com/hainaos/vc/utils/SPUtils.java index cb2626c..f92c39c 100644 --- a/app/src/main/java/com/uiui/videoplayer/utils/SPUtils.java +++ b/app/src/main/java/com/hainaos/vc/utils/SPUtils.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.utils; +package com.hainaos.vc.utils; import android.content.Context; import android.content.SharedPreferences; diff --git a/app/src/main/java/com/uiui/videoplayer/utils/ScreenUtils.java b/app/src/main/java/com/hainaos/vc/utils/ScreenUtils.java similarity index 96% rename from app/src/main/java/com/uiui/videoplayer/utils/ScreenUtils.java rename to app/src/main/java/com/hainaos/vc/utils/ScreenUtils.java index facea62..6a1af85 100644 --- a/app/src/main/java/com/uiui/videoplayer/utils/ScreenUtils.java +++ b/app/src/main/java/com/hainaos/vc/utils/ScreenUtils.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.utils; +package com.hainaos.vc.utils; import android.content.Context; import android.content.res.Resources; diff --git a/app/src/main/java/com/hainaos/vc/utils/TimeUtils.java b/app/src/main/java/com/hainaos/vc/utils/TimeUtils.java new file mode 100644 index 0000000..f973d5c --- /dev/null +++ b/app/src/main/java/com/hainaos/vc/utils/TimeUtils.java @@ -0,0 +1,24 @@ +package com.hainaos.vc.utils; + +public class TimeUtils { + + public static String TimeFormat(long millisecond) { + int ss = 1000; + int mi = ss * 60; + int hh = mi * 60; + + long hour = (millisecond) / hh; + long minute = (millisecond - hour * hh) / mi; + long second = (millisecond - hour * hh - minute * mi) / ss; + + String strHour = hour < 10 ? "0" + hour : "" + hour; + String strMinute = minute < 10 ? "0" + minute : "" + minute; + String strSecond = second < 10 ? "0" + second : "" + second; + if (hour > 0) { + return strHour + ":" + strMinute + ":" + strSecond; + } else { + return strMinute + ":" + strSecond; + } + } + +} diff --git a/app/src/main/java/com/uiui/videoplayer/utils/ToastUtil.java b/app/src/main/java/com/hainaos/vc/utils/ToastUtil.java similarity index 96% rename from app/src/main/java/com/uiui/videoplayer/utils/ToastUtil.java rename to app/src/main/java/com/hainaos/vc/utils/ToastUtil.java index 66252af..195814f 100644 --- a/app/src/main/java/com/uiui/videoplayer/utils/ToastUtil.java +++ b/app/src/main/java/com/hainaos/vc/utils/ToastUtil.java @@ -1,14 +1,13 @@ -package com.uiui.videoplayer.utils; +package com.hainaos.vc.utils; import android.annotation.SuppressLint; import android.content.Context; import android.os.Build; import android.os.Handler; import android.os.Looper; -import android.util.Log; import android.widget.Toast; -import com.uiui.videoplayer.BuildConfig; +import com.hainaos.vc.BuildConfig; /** diff --git a/app/src/main/java/com/hainaos/vc/utils/Utils.java b/app/src/main/java/com/hainaos/vc/utils/Utils.java new file mode 100644 index 0000000..90906a8 --- /dev/null +++ b/app/src/main/java/com/hainaos/vc/utils/Utils.java @@ -0,0 +1,30 @@ +package com.hainaos.vc.utils; + +import android.annotation.SuppressLint; +import android.os.Build; +import android.util.Log; + +import java.lang.reflect.Method; + +public class Utils { + + @SuppressLint({"MissingPermission", "HardwareIds"}) + public static String getSerial() { + String serial = "unknow"; + try { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {//9.0+ + serial = Build.getSerial(); + } else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {//8.0+ + serial = Build.SERIAL; + } else {//8.0- + Class c = Class.forName("android.os.SystemProperties"); + Method get = c.getMethod("get", String.class); + serial = (String) get.invoke(c, "ro.serialno"); + } + } catch (Exception e) { + e.printStackTrace(); + Log.e("getSerial", "读取设备序列号异常：" + e.toString()); + } + return serial; + } +} diff --git a/app/src/main/java/com/uiui/videoplayer/utils/VideoUtils.java b/app/src/main/java/com/hainaos/vc/utils/VideoUtils.java similarity index 98% rename from app/src/main/java/com/uiui/videoplayer/utils/VideoUtils.java rename to app/src/main/java/com/hainaos/vc/utils/VideoUtils.java index 32f561c..79eaab6 100644 --- a/app/src/main/java/com/uiui/videoplayer/utils/VideoUtils.java +++ b/app/src/main/java/com/hainaos/vc/utils/VideoUtils.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.utils; +package com.hainaos.vc.utils; import android.util.Log; diff --git a/app/src/main/java/com/uiui/videoplayer/view/BGABaseAdapterUtil.java b/app/src/main/java/com/hainaos/vc/view/BGABaseAdapterUtil.java similarity index 98% rename from app/src/main/java/com/uiui/videoplayer/view/BGABaseAdapterUtil.java rename to app/src/main/java/com/hainaos/vc/view/BGABaseAdapterUtil.java index aba62bb..b7162f0 100644 --- a/app/src/main/java/com/uiui/videoplayer/view/BGABaseAdapterUtil.java +++ b/app/src/main/java/com/hainaos/vc/view/BGABaseAdapterUtil.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.view; +package com.hainaos.vc.view; import android.app.Application; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/uiui/videoplayer/view/BGAGridDivider.java b/app/src/main/java/com/hainaos/vc/view/BGAGridDivider.java similarity index 97% rename from app/src/main/java/com/uiui/videoplayer/view/BGAGridDivider.java rename to app/src/main/java/com/hainaos/vc/view/BGAGridDivider.java index cf40a44..60b0bd9 100644 --- a/app/src/main/java/com/uiui/videoplayer/view/BGAGridDivider.java +++ b/app/src/main/java/com/hainaos/vc/view/BGAGridDivider.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.view; +package com.hainaos.vc.view; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/uiui/videoplayer/view/CustomDialog.java b/app/src/main/java/com/hainaos/vc/view/CustomDialog.java similarity index 98% rename from app/src/main/java/com/uiui/videoplayer/view/CustomDialog.java rename to app/src/main/java/com/hainaos/vc/view/CustomDialog.java index 5dfa705..6238be4 100644 --- a/app/src/main/java/com/uiui/videoplayer/view/CustomDialog.java +++ b/app/src/main/java/com/hainaos/vc/view/CustomDialog.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.view; +package com.hainaos.vc.view; import android.app.Dialog; @@ -9,7 +9,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.uiui.videoplayer.R; +import com.hainaos.vc.R; /** diff --git a/app/src/main/java/com/uiui/videoplayer/view/EquallyDividedItemDecoration.java b/app/src/main/java/com/hainaos/vc/view/EquallyDividedItemDecoration.java similarity index 98% rename from app/src/main/java/com/uiui/videoplayer/view/EquallyDividedItemDecoration.java rename to app/src/main/java/com/hainaos/vc/view/EquallyDividedItemDecoration.java index f6eb4ed..3ad0a88 100644 --- a/app/src/main/java/com/uiui/videoplayer/view/EquallyDividedItemDecoration.java +++ b/app/src/main/java/com/hainaos/vc/view/EquallyDividedItemDecoration.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.view; +package com.hainaos.vc.view; import android.graphics.Rect; import android.util.Log; diff --git a/app/src/main/java/com/uiui/videoplayer/view/GridSpaceItemDecoration.java b/app/src/main/java/com/hainaos/vc/view/GridSpaceItemDecoration.java similarity index 98% rename from app/src/main/java/com/uiui/videoplayer/view/GridSpaceItemDecoration.java rename to app/src/main/java/com/hainaos/vc/view/GridSpaceItemDecoration.java index e76f1d2..4ea3ccc 100644 --- a/app/src/main/java/com/uiui/videoplayer/view/GridSpaceItemDecoration.java +++ b/app/src/main/java/com/hainaos/vc/view/GridSpaceItemDecoration.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.view; +package com.hainaos.vc.view; import android.graphics.Rect; import android.util.Log; diff --git a/app/src/main/java/com/uiui/videoplayer/view/RecycleGridLayoutManager.java b/app/src/main/java/com/hainaos/vc/view/RecycleGridLayoutManager.java similarity index 99% rename from app/src/main/java/com/uiui/videoplayer/view/RecycleGridLayoutManager.java rename to app/src/main/java/com/hainaos/vc/view/RecycleGridLayoutManager.java index 837c6df..b497d2c 100644 --- a/app/src/main/java/com/uiui/videoplayer/view/RecycleGridLayoutManager.java +++ b/app/src/main/java/com/hainaos/vc/view/RecycleGridLayoutManager.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.view; +package com.hainaos.vc.view; import android.content.Context; import android.view.View; diff --git a/app/src/main/java/com/uiui/videoplayer/view/ScaleCircleNavigator.java b/app/src/main/java/com/hainaos/vc/view/ScaleCircleNavigator.java similarity index 99% rename from app/src/main/java/com/uiui/videoplayer/view/ScaleCircleNavigator.java rename to app/src/main/java/com/hainaos/vc/view/ScaleCircleNavigator.java index 98322d2..244e900 100644 --- a/app/src/main/java/com/uiui/videoplayer/view/ScaleCircleNavigator.java +++ b/app/src/main/java/com/hainaos/vc/view/ScaleCircleNavigator.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.view; +package com.hainaos.vc.view; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/uiui/videoplayer/view/SpacesItemDecoration.java b/app/src/main/java/com/hainaos/vc/view/SpacesItemDecoration.java similarity index 97% rename from app/src/main/java/com/uiui/videoplayer/view/SpacesItemDecoration.java rename to app/src/main/java/com/hainaos/vc/view/SpacesItemDecoration.java index 5afae0c..83277f6 100644 --- a/app/src/main/java/com/uiui/videoplayer/view/SpacesItemDecoration.java +++ b/app/src/main/java/com/hainaos/vc/view/SpacesItemDecoration.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.view; +package com.hainaos.vc.view; import android.graphics.Rect; import android.view.View; diff --git a/app/src/main/java/com/uiui/videoplayer/view/ViewPagerLayoutManager.java b/app/src/main/java/com/hainaos/vc/view/ViewPagerLayoutManager.java similarity index 97% rename from app/src/main/java/com/uiui/videoplayer/view/ViewPagerLayoutManager.java rename to app/src/main/java/com/hainaos/vc/view/ViewPagerLayoutManager.java index 0fa6d83..a7e4a61 100644 --- a/app/src/main/java/com/uiui/videoplayer/view/ViewPagerLayoutManager.java +++ b/app/src/main/java/com/hainaos/vc/view/ViewPagerLayoutManager.java @@ -1,4 +1,4 @@ -package com.uiui.videoplayer.view; +package com.hainaos.vc.view; import android.content.Context; import android.view.View; @@ -7,7 +7,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.PagerSnapHelper; import androidx.recyclerview.widget.RecyclerView; -import com.uiui.videoplayer.listener.OnViewPagerListener; +import com.hainaos.vc.listener.OnViewPagerListener; /** * Created by 钉某人 diff --git a/app/src/main/java/com/uiui/videoplayer/utils/Utils.java b/app/src/main/java/com/uiui/videoplayer/utils/Utils.java deleted file mode 100644 index 4e82883..0000000 --- a/app/src/main/java/com/uiui/videoplayer/utils/Utils.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.uiui.videoplayer.utils; - -import java.text.DecimalFormat; - -public class Utils { - public static String TimeFormat(long millisecond) { - int ss = 1000; - int mi = ss * 60; - int hh = mi * 60; - - long hour = (millisecond) / hh; - long minute = (millisecond - hour * hh) / mi; - long second = (millisecond - hour * hh - minute * mi) / ss; - - String strHour = hour < 10 ? "0" + hour : "" + hour; - String strMinute = minute < 10 ? "0" + minute : "" + minute; - String strSecond = second < 10 ? "0" + second : "" + second; - if (hour > 0) { - return strHour + ":" + strMinute + ":" + strSecond; - } else { - return strMinute + ":" + strSecond; - } - } - - - /** - * 转换文件大小 MB - */ - public static String formatFileSize(long fileS) { - DecimalFormat df = new DecimalFormat("#"); - String fileSizeString; - String wrongSize = "0GB"; - if (fileS == 0) { - return wrongSize; - } - if (fileS < 1024) { - fileSizeString = df.format((double) fileS) + "MB"; - } else if (fileS < 1048576) { - fileSizeString = df.format((double) fileS / 1024) + "GB"; - } else { - fileSizeString = df.format((double) fileS / 1048576) + "TB"; - } - return fileSizeString; - } -} diff --git a/app/src/main/res/layout/activity_gallery.xml b/app/src/main/res/layout/activity_gallery.xml index 07aa3a0..2b23b85 100644 --- a/app/src/main/res/layout/activity_gallery.xml +++ b/app/src/main/res/layout/activity_gallery.xml @@ -8,7 +8,7 @@ + type="com.hainaos.vc.activity.pic.GalleryActivity.BtnClick" /> + type="com.hainaos.vc.activity.main.MainActivity.Click" /> + type="com.hainaos.vc.activity.privacy.PrivacyActivity.BtnClick" /> + type="com.hainaos.vc.activity.splash.SplashActivity.BtnClick" /> + type="com.hainaos.vc.activity.video.VideoActivity.BtnClick" /> + type="com.hainaos.vc.activity.vip.VipActivity.Click" /> diff --git a/app/src/main/res/layout/fragment_picture.xml b/app/src/main/res/layout/fragment_picture.xml index c03d62d..8ea8e3c 100644 --- a/app/src/main/res/layout/fragment_picture.xml +++ b/app/src/main/res/layout/fragment_picture.xml @@ -8,7 +8,7 @@ + type="com.hainaos.vc.fragment.pic.PictureFragment.BtnClick" /> - diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index cb7bb6b..2b9b6ee 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index cb7bb6b..2b9b6ee 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index cb7bb6b..2b9b6ee 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index cb7bb6b..2b9b6ee 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index cb7bb6b..2b9b6ee 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 92c1bb2..ab59e37 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - 家庭空间 + 海纳美业学习机 正在下载%s diff --git a/app/src/main/res/xml/file_paths.xml b/app/src/main/res/xml/file_paths.xml new file mode 100644 index 0000000..8131b84 --- /dev/null +++ b/app/src/main/res/xml/file_paths.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/com/hainaos/vc/ExampleUnitTest.java b/app/src/test/java/com/hainaos/vc/ExampleUnitTest.java new file mode 100644 index 0000000..eb84fd6 --- /dev/null +++ b/app/src/test/java/com/hainaos/vc/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.hainaos.vc; + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/app/src/uiui/aidl/com/uiui/sn/IUiUiSnInterface.aidl b/app/src/uiui/aidl/com/uiui/sn/IUiUiSnInterface.aidl deleted file mode 100644 index d171504..0000000 --- a/app/src/uiui/aidl/com/uiui/sn/IUiUiSnInterface.aidl +++ /dev/null @@ -1,24 +0,0 @@ -// IUiUiSnInterface.aidl -package com.uiui.sn; - -// Declare any non-default types here with import statements - -interface IUiUiSnInterface { - /** - * Demonstrates some basic types that you can use as parameters - * and return values in AIDL. - */ - void basicTypes(int anInt, long aLong, boolean aBoolean, float aFloat, - double aDouble, String aString); - - //获取sn - String getSerial(); - //模拟返回键 - void keyBack(); - //设置为默认桌面 - void setDefaultLauncher(String pkg, String className); - //退出桌面 - void exitDesktop(); - //获取激活码 - String getActivationCode(); -} diff --git a/app/src/uiui/java/com/uiui/sn/manager/RemoteManager.java b/app/src/uiui/java/com/uiui/sn/manager/RemoteManager.java deleted file mode 100644 index 1df6f7d..0000000 --- a/app/src/uiui/java/com/uiui/sn/manager/RemoteManager.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.uiui.sn.manager; - -import android.annotation.SuppressLint; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.ServiceConnection; -import android.os.IBinder; -import android.os.RemoteException; -import android.text.TextUtils; -import android.util.Log; - -import com.tencent.mmkv.MMKV; -import com.uiui.sn.IUiUiSnInterface; -import com.uiui.videoplayer.BuildConfig; -import com.uiui.videoplayer.config.CommonConfig; - -import java.util.HashSet; -import java.util.Set; - -public class RemoteManager { - private static final String TAG = "RemoteManager"; - - public static final String serialKey = "SERIAL_KEY"; - public static final String hidePackageKey = "HIDE_PACKAGE_NAME"; - public static final String disablePackageKey = "DISABLE_PACKAGE_NAME"; - - private static boolean mServiceConnected = false; - - @SuppressLint("StaticFieldLeak") - private static RemoteManager sInstance; - private Context mContext; - private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); - private IUiUiSnInterface mIUiUiSnInterface; - private ServiceConnection mServiceConnection; - - private RemoteManager(Context context) { - if (context == null) { - throw new RuntimeException("Context is NULL"); - } - this.mContext = context; - this.mServiceConnection = new ServiceConnection() { - @Override - public void onServiceConnected(ComponentName name, IBinder service) { - Log.e(TAG, "onServiceConnected: " + name); - mServiceConnected = true; - for (ConnectedListener listener : mListeners) { - listener.onConnected(); - } - mIUiUiSnInterface = IUiUiSnInterface.Stub.asInterface(service); - try { - String sn = mIUiUiSnInterface.getSerial(); - if (!TextUtils.isEmpty(sn)) { - mMMKV.encode(serialKey, sn); - Log.e(TAG, "onServiceConnected: sn = " + sn); - } - } catch (RemoteException e) { - e.printStackTrace(); - Log.e(TAG, "onServiceConnected: " + e.getMessage()); - } - } - - @Override - public void onServiceDisconnected(ComponentName name) { - Log.e(TAG, "onServiceDisconnected: " + name); - mServiceConnected = false; - mIUiUiSnInterface = null; - bindinfoService(); - } - }; - if (mIUiUiSnInterface == null) { - bindinfoService(); - } - } - - public static void init(Context context) { - if (sInstance == null) { - Log.e(TAG, "init: "); - sInstance = new RemoteManager(context); - } - } - - public static RemoteManager getInstance() { - if (sInstance == null) { - throw new IllegalStateException("You must be init RemoteManager first"); - } - return sInstance; - } - - - private static final String AOLEYUNINFO_PACKAGE_NAME = "com.uiui.sn"; - private static final String AOLEYUNINFO_CLASS_NAME = "com.uiui.sn.service.RemoteService"; - private static final String AOLEYUNINFO_ACTION = "com.uiui.sn.IUiUiSnInterface"; - - public void checkAvailable() { - if (mIUiUiSnInterface == null) { - bindinfoService(); - } - } - - public interface ConnectedListener { - void onConnected(); - } - - private Set mListeners = new HashSet<>(); - - public void setListener(ConnectedListener listener) { - mListeners.add(listener); - if (mServiceConnected) { - listener.onConnected(); - } - } - - public void removeListener(ConnectedListener listener) { - mListeners.remove(listener); - } - - private void bindinfoService() { - //这是连接aidl服务的代码 - Intent intent = new Intent(); - intent.setAction(AOLEYUNINFO_ACTION); - intent.setPackage(AOLEYUNINFO_PACKAGE_NAME); - intent.setComponent(new ComponentName(AOLEYUNINFO_PACKAGE_NAME, AOLEYUNINFO_CLASS_NAME)); - mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE); - } - - public String getSerial() { - if (BuildConfig.DEBUG) { - return "AKFDCP4927400140"; - } - String sn = mMMKV.decodeString(serialKey, ""); - Log.e(TAG, "sn: " + sn); - if (mIUiUiSnInterface == null) { - bindinfoService(); - return sn; - } - try { - String serial = mIUiUiSnInterface.getSerial(); - Log.e(TAG, "getSerial: " + serial); - return serial; - } catch (RemoteException e) { - e.printStackTrace(); - return sn; - } - } - - -} diff --git a/app/src/uiuios/aidl/com/uiuios/sn/IGetInfoInterface.aidl b/app/src/uiuios/aidl/com/uiuios/sn/IGetInfoInterface.aidl deleted file mode 100644 index 685c726..0000000 --- a/app/src/uiuios/aidl/com/uiuios/sn/IGetInfoInterface.aidl +++ /dev/null @@ -1,30 +0,0 @@ -// IGetInfoInterface.aidl -package com.uiuios.sn; - -// Declare any non-default types here with import statements - -interface IGetInfoInterface { - /** - * Demonstrates some basic types that you can use as parameters - * and return values in AIDL. - */ - void basicTypes(int anInt, long aLong, boolean aBoolean, float aFloat, - double aDouble, String aString); - - /*获取sn*/ - String getSerial(); - /*获取定位结果*/ - String getMapResult(); - /*获取WiFi名*/ - String getWifiSsid(); - /*获取蓝牙名*/ - String getBluetoothSsid(); - /*写入系统数据库*/ - boolean SystemPutInt(String name, int value); - /*结束进程*/ - void killBackgroundProcesses(String pkg); - /*设置launcher3为默认*/ - void openLauncher3(); - /*设置默认桌面*/ - void setDefaultDesktop(String pkgName, String className); -} \ No newline at end of file diff --git a/app/src/uiuios/java/com/uiui/sn/manager/RemoteManager.java b/app/src/uiuios/java/com/uiui/sn/manager/RemoteManager.java deleted file mode 100644 index 2baf22e..0000000 --- a/app/src/uiuios/java/com/uiui/sn/manager/RemoteManager.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.uiui.sn.manager; - -import android.annotation.SuppressLint; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.ServiceConnection; -import android.os.IBinder; -import android.os.RemoteException; -import android.text.TextUtils; -import android.util.Log; - -import com.tencent.mmkv.MMKV; -import com.uiui.videoplayer.config.CommonConfig; -import com.uiuios.sn.IGetInfoInterface; - -import java.util.HashSet; -import java.util.Set; - -public class RemoteManager { - private static final String TAG = "RemoteManager"; - - public static final String serialKey = "SERIAL_KEY"; - public static final String hidePackageKey = "HIDE_PACKAGE_NAME"; - public static final String disablePackageKey = "DISABLE_PACKAGE_NAME"; - - @SuppressLint("StaticFieldLeak") - private static RemoteManager sInstance; - private Context mContext; - private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); - private IGetInfoInterface mIGetInfoInterface; - private ServiceConnection mServiceConnection; - - private RemoteManager(Context context) { - if (context == null) { - throw new RuntimeException("Context is NULL"); - } - this.mContext = context; - this.mServiceConnection = new ServiceConnection() { - @Override - public void onServiceConnected(ComponentName name, IBinder service) { - Log.e(TAG, "onServiceConnected: " + name); - mIGetInfoInterface = IGetInfoInterface.Stub.asInterface(service); - try { - for (ConnectedListener listener : mListeners) { - listener.onConnected(); - } - String sn = mIGetInfoInterface.getSerial(); - if (!TextUtils.isEmpty(sn)) { - mMMKV.encode(serialKey, sn); - Log.e(TAG, "onServiceConnected: sn = " + sn); - } - } catch (RemoteException e) { - e.printStackTrace(); - Log.e(TAG, "onServiceConnected: " + e.getMessage()); - } - } - - @Override - public void onServiceDisconnected(ComponentName name) { - Log.e(TAG, "onServiceDisconnected: " + name); - mIGetInfoInterface = null; - bindInfoService(); - } - }; - if (mIGetInfoInterface == null) { - bindInfoService(); - } - } - - public static void init(Context context) { - if (sInstance == null) { - Log.e(TAG, "init: "); - sInstance = new RemoteManager(context); - } - } - - public static RemoteManager getInstance() { - if (sInstance == null) { - throw new IllegalStateException("You must be init RemoteManager first"); - } - return sInstance; - } - - - private static final String AOLEYUNINFO_PACKAGE_NAME = "com.uiuios.sn"; - private static final String AOLEYUNINFO_CLASS_NAME = "com.uiuios.sn.service.RemoteService"; - private static final String AOLEYUNINFO_ACTION = "com.uiuios.sn.IGetInfoInterface"; - - public void checkAvailable() { - if (mIGetInfoInterface == null) { - bindInfoService(); - } - } - - public interface ConnectedListener { - void onConnected(); - } - - private Set mListeners = new HashSet<>(); - - public void setListener(ConnectedListener listener) { - mListeners.add(listener); - } - - public void removeListener(ConnectedListener listener) { - mListeners.remove(listener); - } - - private void bindInfoService() { - //这是连接aidl服务的代码 - Intent intent = new Intent(); - intent.setAction(AOLEYUNINFO_ACTION); - intent.setPackage(AOLEYUNINFO_PACKAGE_NAME); - intent.setComponent(new ComponentName(AOLEYUNINFO_PACKAGE_NAME, AOLEYUNINFO_CLASS_NAME)); - mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE); - } - - public String getSerial() { -// if (BuildConfig.DEBUG) { -// return "ah01201058819872"; -// } - String sn = mMMKV.decodeString(serialKey, ""); - Log.e(TAG, "sn: " + sn); - if (mIGetInfoInterface == null) { - bindInfoService(); - return sn; - } - try { - String serial = mIGetInfoInterface.getSerial(); - Log.e(TAG, "getSerial: " + serial); - return serial; - } catch (RemoteException e) { - e.printStackTrace(); - return sn; - } - } - -} diff --git a/niceimageview/build.gradle b/niceimageview/build.gradle index 84becfb..83fa785 100644 --- a/niceimageview/build.gradle +++ b/niceimageview/build.gradle @@ -11,10 +11,10 @@ android { } buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } + zhanRuiDebug {} + zhanRuiRelease {} + debug {} + release {} } } diff --git a/settings.gradle b/settings.gradle index abac977..086f9c1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -rootProject.name='UIUI家庭空间' +rootProject.name='海纳美业学习机' include ':app', ':JZVideo', ':niceimageview', ':FlycoTabLayoutZ_Lib'