diff --git a/123test.jks b/123test.jks new file mode 100644 index 0000000..8710dfd Binary files /dev/null and b/123test.jks differ diff --git a/app/build.gradle.kts b/app/build.gradle.kts index dda2b4a..a6c6648 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,26 +1,31 @@ +import java.util.Date +import java.text.SimpleDateFormat plugins { id("com.android.application") id("org.jetbrains.kotlin.android") id("io.objectbox") } - +val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date()) android { namespace = "com.live.mylivewallpaper" compileSdk = 35 defaultConfig { - applicationId = "com.live.mylivewallpaper" + applicationId = "com.live.mylivewallpaper.test" minSdk = 23 targetSdk = 35 versionCode = 1 - versionName = "1.0" - + versionName = "1.0.0" + setProperty( + "archivesBaseName", + "Live Wallpaper_V" + versionName + "(${versionCode})_$timestamp" + ) testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { - isMinifyEnabled = false + isMinifyEnabled = true proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 481bb43..da3b351 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -18,4 +18,108 @@ # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +#-renamesourcefileattribute SourceFile + + +# 保持 Gson 和 TypeToken 不被混淆 +-keep class com.google.gson.** { *; } +-keep class com.google.gson.reflect.TypeToken { *; } + +# 保留与泛型相关的 TypeToken 使用,避免泛型信息丢失 +-keep class * extends com.google.gson.reflect.TypeToken { *; } + +# 保留自定义的类 MyClass 不被混淆 +-keep class com.live.mylivewallpaper.data.ResultData { *; } + +# 保持 Gson 序列化相关的字段不被混淆 +-keepclassmembers class * { + @com.google.gson.annotations.SerializedName ; +} + +# 保持 Gson 构造方法不被混淆 +-keepclassmembers class com.google.gson.Gson { + public (...); +} + + + + +# 保留 Retrofit 的所有类 +-keep class retrofit2.** { *; } + +# 保留 RxJava2 的所有类 +-keep class io.reactivex.** { *; } + +# 保留 CallAdapter 和 Converter 相关类 +-keep class retrofit2.adapter.** { *; } +-keep class retrofit2.converter.** { *; } + +# 保留类型 Token、类型适配器等相关类 +-keepclassmembers class * { + @retrofit2.http.* ; +} + +# 保留 Retrofit 和 OkHttp 的类和构造方法 +-keep class retrofit2.** { *; } +-keep class okhttp3.** { *; } + +# 保留 Retrofit 接口和方法 +-keep class retrofit2.Retrofit { *; } +-keep class retrofit2.Call { *; } +-keep class retrofit2.http.** { *; } + +# 保留所有使用 Retrofit 注解的字段、方法和类 +-keepclassmembers class * { + @retrofit2.http.* ; +} + +# 保留 Converter 和 CallAdapter 相关类 +-keep class retrofit2.converter.** { *; } +-keep class retrofit2.adapter.** { *; } + +# 保留 `@GET`, `@POST` 等注解 +-keepclassmembers class * { + @retrofit2.http.GET ; + @retrofit2.http.POST ; + @retrofit2.http.PUT ; + @retrofit2.http.DELETE ; + @retrofit2.http.PATCH ; + @retrofit2.http.Headers ; + @retrofit2.http.Query ; + @retrofit2.http.Body ; + @retrofit2.http.Path ; +} + +# 保留 OkHttp 相关类 +-keep class okhttp3.Request { *; } +-keep class okhttp3.Response { *; } +-keep class okhttp3.OkHttpClient { *; } + +# 保留 OkHttp 相关的拦截器 +-keep class okhttp3.Interceptor { *; } +-keep class okhttp3.logging.HttpLoggingInterceptor { *; } + +# 保留 OkHttp 的构造方法 +-keepclassmembers class okhttp3.** { + public (...); +} + +# 保留 OkHttpClient 的链式构建方式 +-keepclassmembers class okhttp3.OkHttpClient { + public okhttp3.OkHttpClient$Builder newBuilder(...); +} + +# 保留 HttpLoggingInterceptor 相关类 +-keep class okhttp3.logging.HttpLoggingInterceptor { *; } + +# 保留 Call 和 Request 方法 +-keepclassmembers class okhttp3.Call { + public *; +} +-keepclassmembers class okhttp3.Request { + public *; +} +-keepclassmembers class okhttp3.Response { + public *; +} + diff --git a/app/src/main/assets/live_wallpaper.json b/app/src/main/assets/live_wallpaper.json deleted file mode 100644 index 5f344b1..0000000 --- a/app/src/main/assets/live_wallpaper.json +++ /dev/null @@ -1,1441 +0,0 @@ -[{ - "title": "Yi_47", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191025/081307933210.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191025/024922917360.mp4", - "is_free": 1, - "category": 1, - "id": 957, - "cnt_like": 722346 -}, { - "title": "PitPig", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191122/034317827606.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191122/034318147323.mp4", - "is_free": 1, - "category": 1, - "id": 928, - "cnt_like": 722315 -}, { - "title": "RockImpactSeawater", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191119/023540414066.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191119/023540763132.mp4", - "is_free": 1, - "category": 13, - "id": 994, - "cnt_like": 722383 -}, { - "title": "Spongebob", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201224/104107541700.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201224/104108100135.mp4", - "is_free": 1, - "category": 1, - "id": 13536, - "cnt_like": 282565 -}, { - "title": "emoji", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200806/020311364184.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200806/020311595329.mp4", - "is_free": 1, - "category": 391, - "id": 10464, - "cnt_like": 481601 -}, { - "title": "AbstractArtPainting", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191118/121502686267.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191118/121503038393.mp4", - "is_free": 1, - "category": 1, - "id": 977, - "cnt_like": 722365 -}, { - "title": "Dropwater67", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201129/140138840907.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201129/140139102992.mp4", - "is_free": 1, - "category": 1, - "id": 11235, - "cnt_like": 316064 -}, { - "title": "cool", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200803/105544976103.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200803/105545206847.mp4", - "is_free": 1, - "category": 402, - "id": 10338, - "cnt_like": 485267 -}, { - "title": "Yi_60", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191029/041510289828.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191029/041510573099.mp4", - "is_free": 1, - "category": 15, - "id": 838, - "cnt_like": 722224 -}, { - "title": "Yi_76", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191029/090929370585.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191029/090929655608.mp4", - "is_free": 1, - "category": 4, - "id": 848, - "cnt_like": 722237 -}, { - "title": "dffd0c9e790a7895b0850195643eebe3.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/dffd0c9e790a7895b0850195643eebe3.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/dffd0c9e790a7895b0850195643eebe3.mp4", - "is_free": 1, - "category": 55702, - "id": 425, - "cnt_like": 98476 -}, { - "title": "1364480e863515784dc449cd064cd541.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/1364480e863515784dc449cd064cd541.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/1364480e863515784dc449cd064cd541.mp4", - "is_free": 1, - "category": 57135, - "id": 36, - "cnt_like": 94169 -}, { - "title": "emoji", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200806/020133523751.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200806/020133794779.mp4", - "is_free": 1, - "category": 391, - "id": 10462, - "cnt_like": 481601 -}, { - "title": "kpop", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210114/104925125240.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210114/104925288791.mp4", - "is_free": 1, - "category": 391, - "id": 23620, - "cnt_like": 262393 -}, { - "title": "MOV_2020", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191017/091737901782.JPG", - "preview": "http://d.c-launcher.com/wallpaper_video/20191023/041301491837.mp4", - "is_free": 1, - "category": 5, - "id": 775, - "cnt_like": 722160 -}, { - "title": "nature", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200409/145108878318.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200409/145109266448.mp4", - "is_free": 1, - "category": 391, - "id": 4834, - "cnt_like": 646565 -}, { - "title": "Special effects lion", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210331/031939783758.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210331/031940030806.mp4", - "is_free": 1, - "category": 371, - "id": 23700, - "cnt_like": 153442 -}, { - "title": "a5df8f05c867ba1f92576c8876456849.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/a5df8f05c867ba1f92576c8876456849.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/a5df8f05c867ba1f92576c8876456849.mp4", - "is_free": 1, - "category": 98157, - "id": 322, - "cnt_like": 23695 -}, { - "title": "fsdaaaa", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200525/101134341095.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200525/101134579459.mp4", - "is_free": 0, - "category": 370, - "id": 5434, - "cnt_like": 581165 -}, { - "title": "Cool", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201111/030844031241.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201111/030844271443.mp4", - "is_free": 1, - "category": 370, - "id": 11158, - "cnt_like": 342512 -}, { - "title": "BlackPanther", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191118/080257192790.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191118/080257608604.mp4", - "is_free": 1, - "category": 12, - "id": 868, - "cnt_like": 722256 -}, { - "title": "1df6302e2bd10061efce1dc4413aab1f.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/1df6302e2bd10061efce1dc4413aab1f.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/1df6302e2bd10061efce1dc4413aab1f.mp4", - "is_free": 1, - "category": 35841, - "id": 57, - "cnt_like": 63937 -}, { - "title": "emogi", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201119/062709006638.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201119/062709207912.mp4", - "is_free": 1, - "category": 386, - "id": 11178, - "cnt_like": 330814 -}, { - "title": "42d7e32b020fd8b2ee6ba19aa565ffc1.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/42d7e32b020fd8b2ee6ba19aa565ffc1.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/42d7e32b020fd8b2ee6ba19aa565ffc1.mp4", - "is_free": 1, - "category": 31586, - "id": 120, - "cnt_like": 15544 -}, { - "title": "lan_10", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191017/083614723679.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191029/023550003790.mp4", - "is_free": 1, - "category": 5, - "id": 796, - "cnt_like": 722181 -}, { - "title": "TiredBoy", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191209/091940751109.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191209/091941167919.mp4", - "is_free": 1, - "category": 49, - "id": 892, - "cnt_like": 722278 -}, { - "title": "bd708a4bdcd70f21267787a231fd183d.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/bd708a4bdcd70f21267787a231fd183d.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/bd708a4bdcd70f21267787a231fd183d.mp4", - "is_free": 1, - "category": 40443, - "id": 357, - "cnt_like": 91097 -}, { - "title": "BrownConyLove", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191209/122449290906.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191209/122449694258.mp4", - "is_free": 1, - "category": 49, - "id": 908, - "cnt_like": 722294 -}, { - "title": "Thanksgiving", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201126/033320578343.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201126/033320854443.mp4", - "is_free": 1, - "category": 394, - "id": 11209, - "cnt_like": 320978 -}, { - "title": "Clown", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191118/082201392486.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191118/082201741459.mp4", - "is_free": 1, - "category": 12, - "id": 762, - "cnt_like": 722150 -}, { - "title": "None", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201010/025612229386.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201010/025612966610.mp4", - "is_free": 1, - "category": 370, - "id": 10572, - "cnt_like": 388018 -}, { - "title": "rooster", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210518/030338172239.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210518/030338401666.mp4", - "is_free": 1, - "category": 367, - "id": 200003, - "cnt_like": 260659 -}, { - "title": "c69926a9d5cca8b428250d114039324f.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/c69926a9d5cca8b428250d114039324f.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/c69926a9d5cca8b428250d114039324f.mp4", - "is_free": 1, - "category": 87525, - "id": 370, - "cnt_like": 21884 -}, { - "title": "e33ec74ba27e4440763286c7b3a2e1f2.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/e33ec74ba27e4440763286c7b3a2e1f2.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/e33ec74ba27e4440763286c7b3a2e1f2.mp4", - "is_free": 1, - "category": 49031, - "id": 427, - "cnt_like": 88798 -}, { - "title": "FlowerRain04", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200605/101629359621.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200605/101629752869.mp4", - "is_free": 0, - "category": 374, - "id": 5529, - "cnt_like": 565416 -}, { - "title": "black ", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201105/093720327999.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201105/093720565434.mp4", - "is_free": 1, - "category": 367, - "id": 11132, - "cnt_like": 350737 -}, { - "title": "90abb7d0d35a66182b49411ae661c5e2.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/90abb7d0d35a66182b49411ae661c5e2.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/90abb7d0d35a66182b49411ae661c5e2.mp4", - "is_free": 1, - "category": 60923, - "id": 278, - "cnt_like": 6077 -}, { - "title": "1782e67a830fd24cfc633ef9110a067d.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/1782e67a830fd24cfc633ef9110a067d.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/1782e67a830fd24cfc633ef9110a067d.mp4", - "is_free": 1, - "category": 86219, - "id": 47, - "cnt_like": 44378 -}, { - "title": "Lighting2", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200310/093049652032.png", - "preview": "http://d.c-launcher.com/wallpaper_video/20200310/093050047396.mp4", - "is_free": 1, - "category": 367, - "id": 2267, - "cnt_like": 687480 -}, { - "title": "a7e23f8a46ccfee7d92e192de3c01704.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/a7e23f8a46ccfee7d92e192de3c01704.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/a7e23f8a46ccfee7d92e192de3c01704.mp4", - "is_free": 1, - "category": 65788, - "id": 327, - "cnt_like": 47258 -}, { - "title": "Naruto", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210608/022850478087.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210608/022850714853.mp4", - "is_free": 1, - "category": 0, - "id": 200100, - "cnt_like": 230582 -}, { - "title": "rain", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201204/163356195736.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201204/163356492131.mp4", - "is_free": 1, - "category": 391, - "id": 11302, - "cnt_like": 308768 -}, { - "title": "cute", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200803/110356370090.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200803/110356680630.mp4", - "is_free": 1, - "category": 403, - "id": 10350, - "cnt_like": 485270 -}, { - "title": "fc156aa774cfabb3a9abf5938935f954.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/fc156aa774cfabb3a9abf5938935f954.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/fc156aa774cfabb3a9abf5938935f954.mp4", - "is_free": 1, - "category": 60539, - "id": 468, - "cnt_like": 90413 -}, { - "title": "gott", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210125/105643192423.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210125/105643421067.mp4", - "is_free": 1, - "category": 14, - "id": 23652, - "cnt_like": 246585 -}, { - "title": "ce39e114d87c849e4e00ac3a8c93a2f3.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/ce39e114d87c849e4e00ac3a8c93a2f3.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/ce39e114d87c849e4e00ac3a8c93a2f3.mp4", - "is_free": 1, - "category": 3864, - "id": 387, - "cnt_like": 17386 -}, { - "title": "ad1921a7b2bc40e5e07ce8e275104fdd.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/ad1921a7b2bc40e5e07ce8e275104fdd.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/ad1921a7b2bc40e5e07ce8e275104fdd.mp4", - "is_free": 1, - "category": 93033, - "id": 335, - "cnt_like": 24480 -}, { - "title": "653c8ea491b6d4e0159fd37c96414dcc.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/653c8ea491b6d4e0159fd37c96414dcc.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/653c8ea491b6d4e0159fd37c96414dcc.mp4", - "is_free": 1, - "category": 81573, - "id": 198, - "cnt_like": 76134 -}, { - "title": "a2e342868d431a10e77ac1eacedab479.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/a2e342868d431a10e77ac1eacedab479.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/a2e342868d431a10e77ac1eacedab479.mp4", - "is_free": 1, - "category": 40753, - "id": 311, - "cnt_like": 92324 -}, { - "title": "341e96d256471b2f0b9299643a32ece8.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/341e96d256471b2f0b9299643a32ece8.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/341e96d256471b2f0b9299643a32ece8.mp4", - "is_free": 1, - "category": 72146, - "id": 95, - "cnt_like": 71093 -}, { - "title": "MP4_7", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191017/094104570143.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191017/081958839686.mp4", - "is_free": 1, - "category": 5, - "id": 787, - "cnt_like": 722172 -}, { - "title": "SkeletonKing", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201010/093551987065.png", - "preview": "http://d.c-launcher.com/wallpaper_video/20201010/093552213291.mp4", - "is_free": 1, - "category": 1, - "id": 10610, - "cnt_like": 387705 -}, { - "title": "f57caf07a7dfd82adfff313f8b1fcf79.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/f57caf07a7dfd82adfff313f8b1fcf79.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/f57caf07a7dfd82adfff313f8b1fcf79.mp4", - "is_free": 1, - "category": 28474, - "id": 460, - "cnt_like": 97493 -}, { - "title": "Naruto", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210621/112816137238.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210621/112816440902.mp4", - "is_free": 1, - "category": 0, - "id": 200128, - "cnt_like": 211351 -}, { - "title": "977b7f1450f1721cd0e3665d70d5aad7.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/977b7f1450f1721cd0e3665d70d5aad7.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/977b7f1450f1721cd0e3665d70d5aad7.mp4", - "is_free": 1, - "category": 72780, - "id": 293, - "cnt_like": 20719 -}, { - "title": "garden", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210625/123645451164.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210625/123645694853.mp4", - "is_free": 1, - "category": 368, - "id": 200139, - "cnt_like": 205486 -}, { - "title": "86f690f892c61238d9191132eb638bb5.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/86f690f892c61238d9191132eb638bb5.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/86f690f892c61238d9191132eb638bb5.mp4", - "is_free": 1, - "category": 11642, - "id": 260, - "cnt_like": 22698 -}, { - "title": "db5b5ae3bd5d96eafdb5a47a0cbbda75.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/db5b5ae3bd5d96eafdb5a47a0cbbda75.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/db5b5ae3bd5d96eafdb5a47a0cbbda75.mp4", - "is_free": 1, - "category": 3767, - "id": 413, - "cnt_like": 38347 -}, { - "title": "cute", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200827/092430501537.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200827/092430813833.mp4", - "is_free": 1, - "category": 391, - "id": 10509, - "cnt_like": 450968 -}, { - "title": "0bbd3edbb6fcfbf72be64031ec7f5ac1.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/0bbd3edbb6fcfbf72be64031ec7f5ac1.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/0bbd3edbb6fcfbf72be64031ec7f5ac1.mp4", - "is_free": 1, - "category": 88918, - "id": 21, - "cnt_like": 79130 -}, { - "title": "AbstractSpiderweb", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191118/095153473153.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191118/095153829550.mp4", - "is_free": 1, - "category": 15, - "id": 808, - "cnt_like": 722194 -}, { - "title": "5bc9f548f692f87c6ce88bc2ebe63c4c.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/5bc9f548f692f87c6ce88bc2ebe63c4c.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/5bc9f548f692f87c6ce88bc2ebe63c4c.mp4", - "is_free": 1, - "category": 24348, - "id": 174, - "cnt_like": 87592 -}, { - "title": "AbstractArt", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191118/100432223059.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191118/100432725043.mp4", - "is_free": 1, - "category": 15, - "id": 953, - "cnt_like": 722342 -}, { - "title": "guihi", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200525/102043540688.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200525/102043762055.mp4", - "is_free": 1, - "category": 14, - "id": 5447, - "cnt_like": 581222 -}, { - "title": "Naruto", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210607/015928659155.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210607/015928882252.mp4", - "is_free": 1, - "category": 0, - "id": 200081, - "cnt_like": 232035 -}, { - "title": "12975ade48c9f7dfc15faae1c818bedc.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/12975ade48c9f7dfc15faae1c818bedc.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/12975ade48c9f7dfc15faae1c818bedc.mp4", - "is_free": 1, - "category": 41208, - "id": 30, - "cnt_like": 54777 -}, { - "title": "FunnyPig", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191122/035633490975.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191122/035633873510.mp4", - "is_free": 1, - "category": 18, - "id": 929, - "cnt_like": 722316 -}, { - "title": "2e5c44cf17a994b150a557991d403023.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/2e5c44cf17a994b150a557991d403023.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/2e5c44cf17a994b150a557991d403023.mp4", - "is_free": 1, - "category": 55468, - "id": 85, - "cnt_like": 74772 -}, { - "title": "pubyu", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210113/095622066978.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210113/095623322742.mp4", - "is_free": 1, - "category": 4, - "id": 13581, - "cnt_like": 253855 -}, { - "title": "Yi_46", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191025/093035593828.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191025/024218123893.mp4", - "is_free": 1, - "category": 14, - "id": 824, - "cnt_like": 722210 -}, { - "title": "9e3e23be16624fafcab7cdf872291519.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/9e3e23be16624fafcab7cdf872291519.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/9e3e23be16624fafcab7cdf872291519.mp4", - "is_free": 1, - "category": 86781, - "id": 299, - "cnt_like": 55039 -}, { - "title": "067c94d17283812fa788b22657542865.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/067c94d17283812fa788b22657542865.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/067c94d17283812fa788b22657542865.mp4", - "is_free": 1, - "category": 33550, - "id": 10, - "cnt_like": 45792 -}, { - "title": "94bc14323a76ff8c0403c364d892045d.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/94bc14323a76ff8c0403c364d892045d.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/94bc14323a76ff8c0403c364d892045d.mp4", - "is_free": 1, - "category": 56003, - "id": 287, - "cnt_like": 248 -}, { - "title": "heart", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200804/024926946585.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200804/024927228402.mp4", - "is_free": 1, - "category": 373, - "id": 10365, - "cnt_like": 484298 -}, { - "title": "Rose butterfly", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201010/094243197108.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201010/094243537321.mp4", - "is_free": 1, - "category": 1, - "id": 10618, - "cnt_like": 387710 -}, { - "title": "4dfc5fcb93dcc758142b16841f0a6c88.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/4dfc5fcb93dcc758142b16841f0a6c88.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/4dfc5fcb93dcc758142b16841f0a6c88.mp4", - "is_free": 1, - "category": 38803, - "id": 137, - "cnt_like": 43424 -}, { - "title": "naruto", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210114/021953737203.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210114/021954459582.mp4", - "is_free": 1, - "category": 0, - "id": 18600, - "cnt_like": 257891 -}, { - "title": "Undertaker", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210118/113325391084.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210118/113325658424.mp4", - "is_free": 1, - "category": 1, - "id": 23645, - "cnt_like": 256622 -}, { - "title": "fsafsaf", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200525/075427176770.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200525/075427441907.mp4", - "is_free": 0, - "category": 370, - "id": 5422, - "cnt_like": 581292 -}, { - "title": "7234ff144ac3b7af58834ca229aa9235.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/7234ff144ac3b7af58834ca229aa9235.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/7234ff144ac3b7af58834ca229aa9235.mp4", - "is_free": 1, - "category": 2342, - "id": 214, - "cnt_like": 46935 -}, { - "title": "love", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201130/114040774562.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201130/114040938311.mp4", - "is_free": 1, - "category": 367, - "id": 11245, - "cnt_like": 314729 -}, { - "title": " astronaut", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200803/105304131460.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200803/105304389110.mp4", - "is_free": 1, - "category": 394, - "id": 10334, - "cnt_like": 485266 -}, { - "title": "girl", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201010/092703425113.png", - "preview": "http://d.c-launcher.com/wallpaper_video/20201010/092703766424.mp4", - "is_free": 1, - "category": 1, - "id": 10603, - "cnt_like": 387707 -}, { - "title": "frvzqw", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200525/102433052730.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200525/102433269893.mp4", - "is_free": 1, - "category": 14, - "id": 5452, - "cnt_like": 581222 -}, { - "title": "Wolverine", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191118/090449177084.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191118/090449512482.mp4", - "is_free": 1, - "category": 12, - "id": 778, - "cnt_like": 722163 -}, { - "title": "c723749550e4a334893d35dad24f5ba6.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/c723749550e4a334893d35dad24f5ba6.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/c723749550e4a334893d35dad24f5ba6.mp4", - "is_free": 1, - "category": 92026, - "id": 372, - "cnt_like": 51936 -}, { - "title": "dragon", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210625/123409020713.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210625/123409389163.mp4", - "is_free": 1, - "category": 368, - "id": 200137, - "cnt_like": 205491 -}, { - "title": "3eed5ffd230cfcf43673f58472a0bac3.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/3eed5ffd230cfcf43673f58472a0bac3.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/3eed5ffd230cfcf43673f58472a0bac3.mp4", - "is_free": 1, - "category": 36478, - "id": 117, - "cnt_like": 92329 -}, { - "title": "SmokeFluid", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191118/112958339192.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191118/112958723120.mp4", - "is_free": 1, - "category": 15, - "id": 827, - "cnt_like": 722213 -}, { - "title": "fsgfdsg", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200526/025025241992.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200526/025025541814.mp4", - "is_free": 1, - "category": 49, - "id": 5479, - "cnt_like": 580264 -}, { - "title": "DTMP", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201207/112325208607.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201207/112325369482.mp4", - "is_free": 1, - "category": 367, - "id": 11313, - "cnt_like": 304737 -}, { - "title": "91b6b71fecacd38d17f38b4898f3ddf1.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/91b6b71fecacd38d17f38b4898f3ddf1.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/91b6b71fecacd38d17f38b4898f3ddf1.mp4", - "is_free": 1, - "category": 16829, - "id": 281, - "cnt_like": 617 -}, { - "title": "Yi_40", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191024/094257667365.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191024/094359519903.mp4", - "is_free": 1, - "category": 15, - "id": 814, - "cnt_like": 722200 -}, { - "title": "83cd4c489f51907da00c66822309f342.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/83cd4c489f51907da00c66822309f342.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/83cd4c489f51907da00c66822309f342.mp4", - "is_free": 1, - "category": 71480, - "id": 253, - "cnt_like": 36648 -}, { - "title": "GlassWaterIronMan  ", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191118/084545344859.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191118/084545692730.mp4", - "is_free": 1, - "category": 12, - "id": 768, - "cnt_like": 722153 -}, { - "title": "girly", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200804/081022085348.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200804/081022360020.mp4", - "is_free": 1, - "category": 1, - "id": 10413, - "cnt_like": 484073 -}, { - "title": "StarryUniverseView  ", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191118/093358232191.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191118/093358552183.mp4", - "is_free": 1, - "category": 15, - "id": 943, - "cnt_like": 722330 -}, { - "title": "ghfdhfh", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200526/025406797409.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200526/025407069762.mp4", - "is_free": 1, - "category": 49, - "id": 5481, - "cnt_like": 580260 -}, { - "title": "GreenForestRailroadTrack", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191119/013907574549.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191119/013907941434.mp4", - "is_free": 1, - "category": 4, - "id": 979, - "cnt_like": 722367 -}, { - "title": "lighting", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200803/105150461948.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200803/105150744153.mp4", - "is_free": 1, - "category": 391, - "id": 10333, - "cnt_like": 485266 -}, { - "title": "DTMP", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201207/111557917642.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201207/111558164025.mp4", - "is_free": 1, - "category": 367, - "id": 11312, - "cnt_like": 304740 -}, { - "title": "uchiha", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210621/072027724172.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210621/072027953032.mp4", - "is_free": 1, - "category": 368, - "id": 200121, - "cnt_like": 211544 -}, { - "title": "flowers3", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210104/111242953615.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210104/111243348783.mp4", - "is_free": 1, - "category": 367, - "id": 13579, - "cnt_like": 266690 -}, { - "title": "fbea89fc001f5f8c3c29cfa83c811aca.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/fbea89fc001f5f8c3c29cfa83c811aca.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/fbea89fc001f5f8c3c29cfa83c811aca.mp4", - "is_free": 1, - "category": 46701, - "id": 467, - "cnt_like": 27550 -}, { - "title": "Sea", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200804/075308132878.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200804/075308457532.mp4", - "is_free": 1, - "category": 13, - "id": 10394, - "cnt_like": 484076 -}, { - "title": "Elephant", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200909/104516885168.png", - "preview": "http://d.c-launcher.com/wallpaper_video/20200909/104517481129.mp4", - "is_free": 1, - "category": 402, - "id": 10526, - "cnt_like": 432186 -}, { - "title": "Buttery", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200914/012033692297.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200914/012034353060.mp4", - "is_free": 0, - "category": 374, - "id": 10534, - "cnt_like": 425519 -}, { - "title": "3be129497a24855c58583d03dca35a7b.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/3be129497a24855c58583d03dca35a7b.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/3be129497a24855c58583d03dca35a7b.mp4", - "is_free": 1, - "category": 62241, - "id": 111, - "cnt_like": 94555 -}, { - "title": "emoji", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200806/020717574876.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200806/020717804055.mp4", - "is_free": 1, - "category": 1, - "id": 10466, - "cnt_like": 481612 -}, { - "title": "cdd319d741fe14904fe062bca773aead.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/cdd319d741fe14904fe062bca773aead.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/cdd319d741fe14904fe062bca773aead.mp4", - "is_free": 1, - "category": 50147, - "id": 386, - "cnt_like": 68528 -}, { - "title": "1a03dc2b974295966a49ff6133ae41bc.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/1a03dc2b974295966a49ff6133ae41bc.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/1a03dc2b974295966a49ff6133ae41bc.mp4", - "is_free": 1, - "category": 27986, - "id": 52, - "cnt_like": 92422 -}, { - "title": "SeaCuteAnimals", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191209/095441659486.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191209/095442031090.mp4", - "is_free": 1, - "category": 49, - "id": 901, - "cnt_like": 722287 -}, { - "title": "gsgsdfg", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200526/030753047830.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200526/030753262473.mp4", - "is_free": 0, - "category": 367, - "id": 5484, - "cnt_like": 580199 -}, { - "title": "6cfe90cc764f406d9b0ffa2aacaeac33.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/6cfe90cc764f406d9b0ffa2aacaeac33.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/6cfe90cc764f406d9b0ffa2aacaeac33.mp4", - "is_free": 1, - "category": 67071, - "id": 205, - "cnt_like": 93968 -}, { - "title": "RedMeteor", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191118/112638237654.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191118/112638641565.mp4", - "is_free": 1, - "category": 15, - "id": 956, - "cnt_like": 722345 -}, { - "title": "bts", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201218/104958879658.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201218/104959149603.mp4", - "is_free": 1, - "category": 14, - "id": 11368, - "cnt_like": 289031 -}, { - "title": "flash", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201125/120014583483.png", - "preview": "http://d.c-launcher.com/wallpaper_video/20201125/120014789084.mp4", - "is_free": 1, - "category": 1, - "id": 11201, - "cnt_like": 321912 -}, { - "title": "Girl66", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201201/112157093563.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201201/112157400999.mp4", - "is_free": 1, - "category": 1, - "id": 11266, - "cnt_like": 313376 -}, { - "title": "gafdfaf", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200525/102513208923.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200525/102513507705.mp4", - "is_free": 1, - "category": 14, - "id": 5453, - "cnt_like": 581223 -}, { - "title": "135ca6681d0ab422a16e7649b6892f2f.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/135ca6681d0ab422a16e7649b6892f2f.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/135ca6681d0ab422a16e7649b6892f2f.mp4", - "is_free": 1, - "category": 61911, - "id": 35, - "cnt_like": 38988 -}, { - "title": "Iron Man", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201218/105352658113.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201218/105352970587.mp4", - "is_free": 1, - "category": 15, - "id": 11370, - "cnt_like": 289028 -}, { - "title": "7833e754ba53e97db50c173a2d11e64c.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/7833e754ba53e97db50c173a2d11e64c.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/7833e754ba53e97db50c173a2d11e64c.mp4", - "is_free": 1, - "category": 82073, - "id": 232, - "cnt_like": 16112 -}, { - "title": "2eae1b1802d1c5271ab396b109fdbb7a.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/2eae1b1802d1c5271ab396b109fdbb7a.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/2eae1b1802d1c5271ab396b109fdbb7a.mp4", - "is_free": 1, - "category": 41918, - "id": 86, - "cnt_like": 91789 -}, { - "title": "59c46457e54205332b01d2494a19e1a5.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/59c46457e54205332b01d2494a19e1a5.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/59c46457e54205332b01d2494a19e1a5.mp4", - "is_free": 1, - "category": 71058, - "id": 169, - "cnt_like": 42504 -}, { - "title": "cool", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201225/101558598645.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201225/101558989358.mp4", - "is_free": 1, - "category": 367, - "id": 11172, - "cnt_like": 330817 -}, { - "title": "waterfall", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201201/103325144334.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201201/103325402854.mp4", - "is_free": 1, - "category": 1, - "id": 11263, - "cnt_like": 313420 -}, { - "title": "767d1525fe685c007d20f646ab2a43b1.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/767d1525fe685c007d20f646ab2a43b1.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/767d1525fe685c007d20f646ab2a43b1.mp4", - "is_free": 1, - "category": 29820, - "id": 223, - "cnt_like": 32165 -}, { - "title": "cute", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200826/105208630181.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200826/105208866788.mp4", - "is_free": 1, - "category": 394, - "id": 10502, - "cnt_like": 452314 -}, { - "title": "girl", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210319/102940810332.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210319/102941120109.mp4", - "is_free": 1, - "category": 0, - "id": 23694, - "cnt_like": 170326 -}, { - "title": "fsdfsdfsdf", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200525/100855093089.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200525/100855326978.mp4", - "is_free": 0, - "category": 370, - "id": 5431, - "cnt_like": 581167 -}, { - "title": "28c97b5c5238e02c77a5ed8f191471c2.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/28c97b5c5238e02c77a5ed8f191471c2.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/28c97b5c5238e02c77a5ed8f191471c2.mp4", - "is_free": 1, - "category": 63535, - "id": 79, - "cnt_like": 7959 -}, { - "title": " astronaut", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200803/110626242115.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200803/110626537395.mp4", - "is_free": 1, - "category": 391, - "id": 10353, - "cnt_like": 485270 -}, { - "title": "034b34bec07f38500644ad739037cf99.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/034b34bec07f38500644ad739037cf99.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/034b34bec07f38500644ad739037cf99.mp4", - "is_free": 1, - "category": 72172, - "id": 5, - "cnt_like": 16768 -}, { - "title": "5beaedc6e9248ac3cfa39ce3b1db33a3.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/5beaedc6e9248ac3cfa39ce3b1db33a3.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/5beaedc6e9248ac3cfa39ce3b1db33a3.mp4", - "is_free": 1, - "category": 45142, - "id": 175, - "cnt_like": 88755 -}, { - "title": "Love", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191118/114856149618.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191118/114856488007.mp4", - "is_free": 1, - "category": 5, - "id": 967, - "cnt_like": 722355 -}, { - "title": "929570d5384e5c9a24588c79d3e76869.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/929570d5384e5c9a24588c79d3e76869.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/929570d5384e5c9a24588c79d3e76869.mp4", - "is_free": 1, - "category": 19425, - "id": 283, - "cnt_like": 20352 -}, { - "title": "d72d01c6eca549ca367f293d37ffa47c.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/d72d01c6eca549ca367f293d37ffa47c.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/d72d01c6eca549ca367f293d37ffa47c.mp4", - "is_free": 1, - "category": 11584, - "id": 407, - "cnt_like": 73233 -}, { - "title": "Yi_49", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191025/031506254796.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191025/031506533421.mp4", - "is_free": 1, - "category": 5, - "id": 830, - "cnt_like": 722216 -}, { - "title": "clock", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200925/120705105400.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200925/120705654818.mp4", - "is_free": 1, - "category": 1, - "id": 10549, - "cnt_like": 409093 -}, { - "title": "Bear", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191209/121526491942.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191209/092415611793.mp4", - "is_free": 1, - "category": 49, - "id": 895, - "cnt_like": 722281 -}, { - "title": "fire", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201204/163206696342.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201204/163206919434.mp4", - "is_free": 1, - "category": 391, - "id": 11301, - "cnt_like": 308769 -}, { - "title": "fe72829bc5fbf234c8441e4a1e23c5e1.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/fe72829bc5fbf234c8441e4a1e23c5e1.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/fe72829bc5fbf234c8441e4a1e23c5e1.mp4", - "is_free": 1, - "category": 84194, - "id": 473, - "cnt_like": 91166 -}, { - "title": "coool", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210127/102919489677.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210127/102919714189.mp4", - "is_free": 1, - "category": 15, - "id": 23656, - "cnt_like": 243739 -}, { - "title": "Shake2", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200708/131257561446.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200708/131257866722.mp4", - "is_free": 1, - "category": 371, - "id": 10310, - "cnt_like": 522499 -}, { - "title": "PinkWave", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191119/085401323981.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191119/085401672840.mp4", - "is_free": 1, - "category": 13, - "id": 1000, - "cnt_like": 722389 -}, { - "title": "2382faa68e1f9ea6edd227f783a71693.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/2382faa68e1f9ea6edd227f783a71693.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/2382faa68e1f9ea6edd227f783a71693.mp4", - "is_free": 1, - "category": 41479, - "id": 69, - "cnt_like": 71251 -}, { - "title": "QUIK", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201207/112632088302.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201207/112632287282.mp4", - "is_free": 1, - "category": 370, - "id": 11315, - "cnt_like": 304736 -}, { - "title": "MOV_31", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191017/100544319939.JPG", - "preview": "http://d.c-launcher.com/wallpaper_video/20191017/100544533503.MOV", - "is_free": 1, - "category": 5, - "id": 803, - "cnt_like": 722189 -}, { - "title": "ClearSeaWater", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191119/024142961490.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191119/024143328630.mp4", - "is_free": 1, - "category": 13, - "id": 996, - "cnt_like": 722385 -}, { - "title": "bob", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210623/092238051444.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210623/092238351366.mp4", - "is_free": 1, - "category": 0, - "id": 200131, - "cnt_like": 209903 -}, { - "title": "SnowScene", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191209/092647958453.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191209/092648373084.mp4", - "is_free": 1, - "category": 49, - "id": 899, - "cnt_like": 722285 -}, { - "title": "a10b973ac7dd5265e4038d914c038abe.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/a10b973ac7dd5265e4038d914c038abe.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/a10b973ac7dd5265e4038d914c038abe.mp4", - "is_free": 1, - "category": 92980, - "id": 305, - "cnt_like": 51360 -}, { - "title": "6c86e53b6954b52b1d819d4eac34efe1.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/6c86e53b6954b52b1d819d4eac34efe1.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/6c86e53b6954b52b1d819d4eac34efe1.mp4", - "is_free": 1, - "category": 29815, - "id": 204, - "cnt_like": 96030 -}, { - "title": "bbab5fc915344ba2a5b28cce39de103f.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/bbab5fc915344ba2a5b28cce39de103f.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/bbab5fc915344ba2a5b28cce39de103f.mp4", - "is_free": 1, - "category": 20706, - "id": 354, - "cnt_like": 85458 -}, { - "title": "LazyTom", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191209/090430792993.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191209/090431136155.mp4", - "is_free": 1, - "category": 49, - "id": 781, - "cnt_like": 722166 -}, { - "title": "060497321dc25e0e0f310e1b4772e3db.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/060497321dc25e0e0f310e1b4772e3db.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/060497321dc25e0e0f310e1b4772e3db.mp4", - "is_free": 1, - "category": 11324, - "id": 9, - "cnt_like": 55078 -}, { - "title": "Clock", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200409/135848888131.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200409/135849328663.mp4", - "is_free": 1, - "category": 391, - "id": 4804, - "cnt_like": 646587 -}, { - "title": "MOV_3535", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191017/092223726603.JPG", - "preview": "http://d.c-launcher.com/wallpaper_video/20191024/095304952294.mp4", - "is_free": 1, - "category": 15, - "id": 785, - "cnt_like": 722170 -}, { - "title": "b682e0d9babc9b96429ea95330f3891d.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/b682e0d9babc9b96429ea95330f3891d.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/b682e0d9babc9b96429ea95330f3891d.mp4", - "is_free": 1, - "category": 40552, - "id": 347, - "cnt_like": 87714 -}, { - "title": "Sea", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200804/075056026992.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200804/075056297617.mp4", - "is_free": 1, - "category": 1, - "id": 10390, - "cnt_like": 484070 -}, { - "title": "AnimeBoy", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191118/120439111822.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191118/120439536260.mp4", - "is_free": 1, - "category": 1, - "id": 974, - "cnt_like": 722362 -}, { - "title": "AbstractConstellation", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191118/100941915880.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191118/100942367066.mp4", - "is_free": 1, - "category": 15, - "id": 954, - "cnt_like": 722343 -}, { - "title": "Fish", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201110/093659899969.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201110/093700162907.mp4", - "is_free": 1, - "category": 367, - "id": 11133, - "cnt_like": 343539 -}, { - "title": "Yi_55", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191029/034605534515.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191029/034606177785.mp4", - "is_free": 1, - "category": 14, - "id": 835, - "cnt_like": 722221 -}, { - "title": "xueren", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20210113/105104385225.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20210113/105104774314.mp4", - "is_free": 1, - "category": 367, - "id": 18599, - "cnt_like": 258771 -}, { - "title": "7cdd8f14e9747618012923be46343bf9.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/7cdd8f14e9747618012923be46343bf9.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/7cdd8f14e9747618012923be46343bf9.mp4", - "is_free": 1, - "category": 30358, - "id": 239, - "cnt_like": 361 -}, { - "title": "c45c9ba5ddc74a577b6589e9de063360.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/c45c9ba5ddc74a577b6589e9de063360.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/c45c9ba5ddc74a577b6589e9de063360.mp4", - "is_free": 1, - "category": 60615, - "id": 365, - "cnt_like": 23386 -}, { - "title": "fsgsgsaaaa", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200525/102640191949.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200525/102640414501.mp4", - "is_free": 1, - "category": 14, - "id": 5455, - "cnt_like": 581224 -}, { - "title": "landscape", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200804/080942231462.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200804/080942463408.mp4", - "is_free": 1, - "category": 1, - "id": 10412, - "cnt_like": 484078 -}, { - "title": "362bbb5894e9c3923d471b2efc964f05.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/362bbb5894e9c3923d471b2efc964f05.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/362bbb5894e9c3923d471b2efc964f05.mp4", - "is_free": 1, - "category": 75700, - "id": 99, - "cnt_like": 50620 -}, { - "title": "lighting", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200803/104458610127.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200803/104459008654.mp4", - "is_free": 1, - "category": 391, - "id": 10324, - "cnt_like": 485265 -}, { - "title": "4784e95aee5007e40a6a1b4c39188865.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/4784e95aee5007e40a6a1b4c39188865.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/4784e95aee5007e40a6a1b4c39188865.mp4", - "is_free": 1, - "category": 40268, - "id": 129, - "cnt_like": 15599 -}, { - "title": "93fc90fec019a419cfa4f38a520855bc.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/93fc90fec019a419cfa4f38a520855bc.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/93fc90fec019a419cfa4f38a520855bc.mp4", - "is_free": 1, - "category": 36019, - "id": 285, - "cnt_like": 68014 -}, { - "title": "fire", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20201204/163107574309.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20201204/163107814554.mp4", - "is_free": 1, - "category": 391, - "id": 11300, - "cnt_like": 308773 -}, { - "title": "dc9cd6660b9c349e5bfdfb5c4423e111.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/dc9cd6660b9c349e5bfdfb5c4423e111.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/dc9cd6660b9c349e5bfdfb5c4423e111.mp4", - "is_free": 1, - "category": 82142, - "id": 417, - "cnt_like": 91456 -}, { - "title": "ShiningCaptainAmerica  ", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20191118/091411512190.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20191118/091411855410.mp4", - "is_free": 1, - "category": 12, - "id": 940, - "cnt_like": 722327 -}, { - "title": "deabed3b964e57b9285d4cd715f0f2e3.jpg", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/deabed3b964e57b9285d4cd715f0f2e3.jpg", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/deabed3b964e57b9285d4cd715f0f2e3.mp4", - "is_free": 1, - "category": 37663, - "id": 422, - "cnt_like": 77647 -}, { - "title": "b4d771475ee51f39fbd2816021fa9501.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/b4d771475ee51f39fbd2816021fa9501.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/b4d771475ee51f39fbd2816021fa9501.mp4", - "is_free": 1, - "category": 58250, - "id": 345, - "cnt_like": 93902 -}, { - "title": "Sea", - "thumbnail": "http://d.c-launcher.com/wallpaper_video/20200803/110534554895.jpg", - "preview": "http://d.c-launcher.com/wallpaper_video/20200803/110534950027.mp4", - "is_free": 1, - "category": 391, - "id": 10352, - "cnt_like": 485270 -}, { - "title": "eb6269152c45e824d7104400e2970f4b.png", - "thumbnail": "https://cdn.webinnovationstudio.co.in/wallpaper/live_thumb/eb6269152c45e824d7104400e2970f4b.png", - "preview": "https://cdn.webinnovationstudio.co.in/wallpaper/live/eb6269152c45e824d7104400e2970f4b.mp4", - "is_free": 1, - "category": 19897, - "id": 439, - "cnt_like": 75255 -}] \ No newline at end of file diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..19011d7 Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/com/live/mylivewallpaper/App.java b/app/src/main/java/com/live/mylivewallpaper/App.java index 9b7adc4..dc7b9b4 100644 --- a/app/src/main/java/com/live/mylivewallpaper/App.java +++ b/app/src/main/java/com/live/mylivewallpaper/App.java @@ -8,6 +8,7 @@ import com.google.gson.reflect.TypeToken; import com.live.mylivewallpaper.data.ResultData; import com.live.mylivewallpaper.help.Common; import com.live.mylivewallpaper.help.Db; +import com.live.mylivewallpaper.help.Shared; import java.io.InputStream; import java.lang.reflect.Type; @@ -35,7 +36,11 @@ public class App extends Application { mApplication = this; defaultFont = Typeface.createFromAsset(getAssets(), "font.ttf"); Db.init(this); - loadData(); + String dbinit = Shared.INSTANCE.getDbinit(); + if(dbinit.equals("0")){ + loadData(); + } + } public static Typeface getDefaultFont() { @@ -50,7 +55,7 @@ public class App extends Application { cachedThreadPool.execute(new Runnable() { @Override public void run() { -// Common.logMsg("执行任务 "+task+"---开始--"+Thread.currentThread().getName()); + Common.logMsg("执行任务 "+task+"---开始--"+Thread.currentThread().getName()); Gson gson = new Gson(); InputStream open = null; try { @@ -67,7 +72,8 @@ public class App extends Application { for (ResultData datum : data) { Db.insertDb(datum); } -// Common.logMsg("执行任务 "+task+"---完成--"+Thread.currentThread().getName()); + Shared.INSTANCE.setDbinit("1"); + Common.logMsg("执行任务 "+task+"---完成--"+Thread.currentThread().getName()); } }); } diff --git a/app/src/main/java/com/live/mylivewallpaper/activity/VideoActivity.java b/app/src/main/java/com/live/mylivewallpaper/activity/VideoActivity.java index e35015f..2041578 100644 --- a/app/src/main/java/com/live/mylivewallpaper/activity/VideoActivity.java +++ b/app/src/main/java/com/live/mylivewallpaper/activity/VideoActivity.java @@ -10,6 +10,7 @@ import android.view.View; import androidx.annotation.OptIn; import androidx.media3.common.MediaItem; +import androidx.media3.common.Player; import androidx.media3.common.util.UnstableApi; import androidx.media3.datasource.DefaultDataSourceFactory; import androidx.media3.exoplayer.ExoPlayer; @@ -24,24 +25,25 @@ import com.live.mylivewallpaper.help.Db; import com.live.mylivewallpaper.help.LiveWallpaperService; import com.live.mylivewallpaper.help.Shared; import com.live.mylivewallpaper.listener.OnVideoResultListener; +import com.live.mylivewallpaper.request.ProgressResponseBody; import com.live.mylivewallpaper.request.RetrofitManager; import java.io.File; -public class VideoActivity extends BaseActivity { +import io.reactivex.disposables.Disposable; + +public class VideoActivity extends BaseActivity implements ProgressResponseBody.ProgressListener { private CountDownTimer countDownTimer; - private long time = 5000; - private SurfaceHolder mySurfaceHolder; private String filePath; private File mFile; private boolean download = false; - private SimpleExoPlayer exoPlayer; + private ExoPlayer exoPlayer; private int id; @@ -56,6 +58,9 @@ public class VideoActivity extends BaseActivity { public static String KEY_wallpaperType = "wallpaperType"; public static String KEY_thumb = "thumb"; + private boolean loadingui = false; + private Disposable disposable; + @Override protected ActivityVideoBinding getViewBinding() { return ActivityVideoBinding.inflate(getLayoutInflater()); @@ -63,47 +68,75 @@ public class VideoActivity extends BaseActivity { @Override protected void onCreateInit() { + showLoading(true, false); Intent intent = getIntent(); id = intent.getIntExtra(KEY_ID, -1); wallpaperType = intent.getIntExtra(KEY_wallpaperType, -1); image = intent.getStringExtra(KEY_image); - describe = intent.getStringExtra(KEY_image); + describe = intent.getStringExtra(KEY_describe); thumb = intent.getStringExtra(KEY_thumb); vb.tvDescribe.setText(describe); - - showLoading(true); - initFavorite(); filePath = Common.getCachePath(id); mFile = new File(filePath); initExoPlay(); - + initFavorite(); if (mFile.exists()) { - showLoading(false); + Common.logMsg("------checkPlay-"); download = true; checkPlay(); return; } - RetrofitManager.getInstance().getMp4(id, image, filePath, new OnVideoResultListener() { - @Override - public void onVideoResult(boolean success, String path) { + requestVideo(); - Common.logMsg("-------------success =" + success + "--path=" + path); - runOnUiThread(new Runnable() { - @Override - public void run() { - showLoading(false); - if (success) { - download = true; - checkPlay(); - } else { - Common.logMsg("-------------loading fail"); + + } + + private void requestVideo() { + if (wallpaperType == 2) { + //shift + disposable = RetrofitManager.getInstance(this).getShiftMp4(id, image, filePath, new OnVideoResultListener() { + @Override + public void onVideoResult(boolean success, String path) { + Common.logMsg("-------------success =" + success + "--path=" + path); + runOnUiThread(new Runnable() { + @Override + public void run() { + if (success) { + download = true; + checkPlay(); + } else { + // TODO: 2024/12/23 下载失败 +// showLoading(false,false); + showRetry(); + Common.logMsg("-------------loading fail"); + } } - } - }); + }); - } - }); + } + }); + } else { + disposable = RetrofitManager.getInstance(this).getMp4(id, image, filePath, new OnVideoResultListener() { + @Override + public void onVideoResult(boolean success, String path) { + Common.logMsg("-------------success =" + success + "--path=" + path); + runOnUiThread(new Runnable() { + @Override + public void run() { + if (success) { + download = true; + checkPlay(); + } else { + // TODO: 2024/12/23 下载失败 + showRetry(); + Common.logMsg("-------------loading fail"); + } + } + }); + } + }); + } } private void initFavorite() { @@ -113,54 +146,59 @@ public class VideoActivity extends BaseActivity { @OptIn(markerClass = UnstableApi.class) private void initExoPlay() { - exoPlayer = new SimpleExoPlayer.Builder(this) + exoPlayer = new ExoPlayer.Builder(this) .build(); exoPlayer.setRepeatMode(ExoPlayer.REPEAT_MODE_ONE); vb.playerView.setPlayer(exoPlayer); + exoPlayer.addListener(new Player.Listener() { + @Override + public void onPlaybackStateChanged(int playbackState) { + if (playbackState == Player.STATE_READY) { + showLoading(false, true); + Common.logMsg("-------onPlaybackStateChanged-----" + exoPlayer.getPlayWhenReady()); + } + } + }); } - private void checkPlay() { - if (download) { playMedia3(); } } - - - - private void showLoading(boolean loading) { + private void showLoading(boolean loading, boolean isHorizontal) { if (loading) { -// vb.topLayout.setBackgroundColor(getColor(R.color.color_white_80)); vb.relativeLoading.setVisibility(View.VISIBLE); - countDownTimer = new CountDownTimer(time, 100L) { - @Override - public void onTick(long millisUntilFinished) { - float v = 100 - (float) millisUntilFinished / time * 100; - int v1 = (int) v; - vb.progress.setProgress(v1); - } - - @Override - public void onFinish() { - - } - }; - countDownTimer.start(); + if (isHorizontal) { + vb.horizontalProgress.setVisibility(View.VISIBLE); + vb.normalProgress.setVisibility(View.GONE); + } else { + vb.normalProgress.setVisibility(View.VISIBLE); + vb.horizontalProgress.setVisibility(View.GONE); + } } else { - vb.progress.setProgress(100); -// vb.topLayout.setBackgroundColor(getColor(R.color.transparent)); + if (isHorizontal) { + vb.horizontalProgress.setProgress(100); + } vb.relativeLoading.setVisibility(View.GONE); } } + private void showRetry() { + vb.relativeLoading.setVisibility(View.VISIBLE); + vb.horizontalProgress.setVisibility(View.GONE); + vb.normalProgress.setVisibility(View.GONE); + vb.layoutRetry.setVisibility(View.VISIBLE); + } + @Override protected void onInitClick() { vb.layoutFavorite.setOnClickListener(this); vb.layoutSet.setOnClickListener(this); vb.layoutBack.setOnClickListener(this); + vb.tvRetry.setOnClickListener(this); } @Override @@ -188,6 +226,8 @@ public class VideoActivity extends BaseActivity { setLiveWallpaper(); } else if (v.equals(vb.layoutBack)) { finish(); + } else if (v.equals(vb.tvRetry)) { + requestVideo(); } @@ -200,11 +240,14 @@ public class VideoActivity extends BaseActivity { if (exoPlayer != null) { exoPlayer.release(); } - Common.logMsg("-----Video-------onDestroy"); + if (countDownTimer != null) { countDownTimer.cancel(); countDownTimer = null; } + if (disposable != null && !disposable.isDisposed()) { + disposable.dispose(); + } } @@ -255,4 +298,28 @@ public class VideoActivity extends BaseActivity { } + @Override + public void onProgress(long bytesRead, long contentLength, boolean done) { + runOnUiThread(new Runnable() { + @Override + public void run() { + Common.logMsg("------------onProgress=" + Thread.currentThread().getName()); + if (contentLength <= 0) { + } else { + if (!loadingui) { + showLoading(true, true); + loadingui = true; + } + + int progress = (int) ((100 * bytesRead) / contentLength); + Common.logMsg("Download progress: " + progress + "%"); + vb.horizontalProgress.setProgress(progress); + } + if (done) { + Common.logMsg("Download complete!"); + } + } + }); + + } } \ No newline at end of file diff --git a/app/src/main/java/com/live/mylivewallpaper/activity/WelcomeActivity.java b/app/src/main/java/com/live/mylivewallpaper/activity/WelcomeActivity.java index 851f6f1..e87f259 100644 --- a/app/src/main/java/com/live/mylivewallpaper/activity/WelcomeActivity.java +++ b/app/src/main/java/com/live/mylivewallpaper/activity/WelcomeActivity.java @@ -50,12 +50,12 @@ public class WelcomeActivity extends BaseActivity { @Override public boolean isFullScreen() { - return false; + return true; } @Override public boolean statusBarLight() { - return false; + return true; } @Override diff --git a/app/src/main/java/com/live/mylivewallpaper/fragment/LikeFragment.java b/app/src/main/java/com/live/mylivewallpaper/fragment/LikeFragment.java index 7a85507..d804771 100644 --- a/app/src/main/java/com/live/mylivewallpaper/fragment/LikeFragment.java +++ b/app/src/main/java/com/live/mylivewallpaper/fragment/LikeFragment.java @@ -1,6 +1,7 @@ package com.live.mylivewallpaper.fragment; import android.os.Bundle; +import android.view.View; import androidx.lifecycle.Observer; import androidx.paging.PagingData; @@ -12,6 +13,7 @@ import com.live.mylivewallpaper.adapter.MainAdapter; import com.live.mylivewallpaper.base.BaseFragment; import com.live.mylivewallpaper.data.LikeData; import com.live.mylivewallpaper.data.ResultData; +import com.live.mylivewallpaper.databinding.FragmentLikeBinding; import com.live.mylivewallpaper.databinding.FragmentMainBinding; import com.live.mylivewallpaper.help.Common; import com.live.mylivewallpaper.help.Db; @@ -19,13 +21,16 @@ import com.live.mylivewallpaper.help.ItemDecoration; import com.live.mylivewallpaper.listener.OnLikeUpdateListener; import com.live.mylivewallpaper.viewmode.VmLikeFragment; +import java.util.List; + import io.objectbox.reactive.DataSubscription; -public class LikeFragment extends BaseFragment { +public class LikeFragment extends BaseFragment { private DataSubscription dataSubscription; private VmLikeFragment vmLikeFragment; + public LikeFragment() { } @@ -35,16 +40,12 @@ public class LikeFragment extends BaseFragment { return fragment; } - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } @Override - protected FragmentMainBinding getFragmentVb() { - return FragmentMainBinding.inflate(getLayoutInflater()); + protected FragmentLikeBinding getFragmentVb() { + return FragmentLikeBinding.inflate(getLayoutInflater()); } @Override @@ -54,17 +55,23 @@ public class LikeFragment extends BaseFragment { Vb.recycler.setLayoutManager(new GridLayoutManager(requireContext(), 2, RecyclerView.VERTICAL, false)); Vb.recycler.addItemDecoration(new ItemDecoration(requireContext(), 5, 5, 0)); vmLikeFragment = getFragmentScopeViewModel(VmLikeFragment.class); - vmLikeFragment.getPagingData().observe(getViewLifecycleOwner(), resultDataPagingData -> { - Common.logMsg("---onChanged-------------"); - likeAdapter.submitData(requireActivity().getLifecycle(), resultDataPagingData); + + vmLikeFragment.likeLiveData.observe(getViewLifecycleOwner(), new Observer>() { + @Override + public void onChanged(PagingData data) { + Common.logMsg("---onChanged-------------"); + likeAdapter.submitData(requireActivity().getLifecycle(), data); + } }); dataSubscription = Db.setLikeUpdateListener(new OnLikeUpdateListener() { @Override - public void onLikeUpdate() { - vmLikeFragment.getPagingData().observe(getViewLifecycleOwner(), resultDataPagingData -> { - Common.logMsg("---onChanged-2------------"); - likeAdapter.submitData(requireActivity().getLifecycle(), resultDataPagingData); - }); + public void onLikeUpdate(List data) { + if(data.size() == 0){ + Vb.layoutEmpty.setVisibility(View.VISIBLE); + }else { + Vb.layoutEmpty.setVisibility(View.GONE); + } + vmLikeFragment.update(data); } }); } diff --git a/app/src/main/java/com/live/mylivewallpaper/help/Db.java b/app/src/main/java/com/live/mylivewallpaper/help/Db.java index ea416bc..c118a5b 100644 --- a/app/src/main/java/com/live/mylivewallpaper/help/Db.java +++ b/app/src/main/java/com/live/mylivewallpaper/help/Db.java @@ -63,7 +63,7 @@ public class Db { @Override public void onData(@NonNull List data) { Common.logMsg("---OnLikeUpdateListener-------------" + data.size()); - listener.onLikeUpdate(); + listener.onLikeUpdate(data); } }); diff --git a/app/src/main/java/com/live/mylivewallpaper/help/Shared.kt b/app/src/main/java/com/live/mylivewallpaper/help/Shared.kt index a5d8aae..f87cfa0 100644 --- a/app/src/main/java/com/live/mylivewallpaper/help/Shared.kt +++ b/app/src/main/java/com/live/mylivewallpaper/help/Shared.kt @@ -7,6 +7,7 @@ import com.live.mylivewallpaper.App object Shared { val KEY_CURRENT_WAPPPAPER_PATH = "wallpaper_path" + val DB_INIT_DATAT = "init_db_data" private var shared: SharedPreferences? = null @@ -18,7 +19,14 @@ object Shared { set(value) { saveString(KEY_CURRENT_WAPPPAPER_PATH, value) } - + var dbinit: String + get() = queryString( + DB_INIT_DATAT, + "0" + ) + set(value) { + saveString(DB_INIT_DATAT, value) + } private fun getShared(): SharedPreferences { if (shared == null) { @@ -29,7 +37,7 @@ object Shared { } - private const val defaultFile = "chat_mate" + fun saveString(key: String, value: String) { diff --git a/app/src/main/java/com/live/mylivewallpaper/listener/OnLikeUpdateListener.java b/app/src/main/java/com/live/mylivewallpaper/listener/OnLikeUpdateListener.java index 616b3c0..7bcbbf2 100644 --- a/app/src/main/java/com/live/mylivewallpaper/listener/OnLikeUpdateListener.java +++ b/app/src/main/java/com/live/mylivewallpaper/listener/OnLikeUpdateListener.java @@ -1,5 +1,9 @@ package com.live.mylivewallpaper.listener; +import com.live.mylivewallpaper.data.LikeData; + +import java.util.List; + public interface OnLikeUpdateListener { - void onLikeUpdate(); + void onLikeUpdate(List data); } diff --git a/app/src/main/java/com/live/mylivewallpaper/paging/MyLikeSource.java b/app/src/main/java/com/live/mylivewallpaper/paging/MyLikeSource.java index 5761967..e6dbbef 100644 --- a/app/src/main/java/com/live/mylivewallpaper/paging/MyLikeSource.java +++ b/app/src/main/java/com/live/mylivewallpaper/paging/MyLikeSource.java @@ -36,7 +36,7 @@ public class MyLikeSource extends PagingSource { int page = loadParams.getKey() != null ? loadParams.getKey() : 1; List data = Db.queryLike(page); - Common.logMsg("-----loadLIke---------page="+page+"'--data="+data.size()); + Common.logMsg("-----loadLIke---------page="+page+"--data="+data.size()); return new LoadResult.Page<>( data, page > 1 ? page - 1 : null, diff --git a/app/src/main/java/com/live/mylivewallpaper/request/MusicApi.java b/app/src/main/java/com/live/mylivewallpaper/request/MusicApi.java index ae0ae9b..4c097ed 100644 --- a/app/src/main/java/com/live/mylivewallpaper/request/MusicApi.java +++ b/app/src/main/java/com/live/mylivewallpaper/request/MusicApi.java @@ -9,7 +9,7 @@ import retrofit2.http.POST; public interface MusicApi { - //首页数据 + @POST("LiveLoop/AppData/jmywall.php") @FormUrlEncoded Observable getMP4(@Field("pi") int pi, @@ -19,4 +19,25 @@ public interface MusicApi { @Field("quality") String quality); + + //shift + @POST("LiveLoop/AppData/jshiftwall.php") + @FormUrlEncoded + Observable getShiftMP4(@Field("pi") int pi, + @Field("medium") String medium, + @Field("alpha") String alpha, + @Field("version") String version, + @Field("quality") String quality); + +// +// //Dnamic +// @POST("LiveLoop/AppData/jdaytimewall.php") +// @FormUrlEncoded +// Observable getDMP4(@Field("pi") int pi, +// @Field("medium") String medium, +// @Field("alpha") String alpha, +// @Field("version") String version, +// @Field("quality") String quality, +// @Field("filenumber") String filenumber); + } diff --git a/app/src/main/java/com/live/mylivewallpaper/request/ProgressInterceptor.java b/app/src/main/java/com/live/mylivewallpaper/request/ProgressInterceptor.java new file mode 100644 index 0000000..2121880 --- /dev/null +++ b/app/src/main/java/com/live/mylivewallpaper/request/ProgressInterceptor.java @@ -0,0 +1,28 @@ +package com.live.mylivewallpaper.request; + +import okhttp3.Interceptor; +import okhttp3.Response; + +import java.io.IOException; + +public class ProgressInterceptor implements Interceptor { + + private final ProgressResponseBody.ProgressListener progressListener; + + public ProgressInterceptor(ProgressResponseBody.ProgressListener progressListener) { + this.progressListener = progressListener; + } + + @Override + public Response intercept(Chain chain) throws IOException { + Response originalResponse = chain.proceed(chain.request()); + String fileLength = originalResponse.header("File-Length"); + if (fileLength == null) { + fileLength = "0"; + } + return originalResponse.newBuilder() + .body(new ProgressResponseBody(originalResponse.body(), fileLength, progressListener)) + .build(); + } +} + diff --git a/app/src/main/java/com/live/mylivewallpaper/request/ProgressResponseBody.java b/app/src/main/java/com/live/mylivewallpaper/request/ProgressResponseBody.java new file mode 100644 index 0000000..1b0342d --- /dev/null +++ b/app/src/main/java/com/live/mylivewallpaper/request/ProgressResponseBody.java @@ -0,0 +1,57 @@ +package com.live.mylivewallpaper.request; +import okhttp3.MediaType; +import okhttp3.ResponseBody; +import okio.Buffer; +import okio.BufferedSource; +import okio.ForwardingSource; +import okio.Okio; + +import java.io.IOException; + +public class ProgressResponseBody extends ResponseBody { + + private final ResponseBody responseBody; + private final ProgressListener progressListener; + private BufferedSource bufferedSource; + private String length; + + public ProgressResponseBody(ResponseBody responseBody, String length, ProgressListener progressListener) { + this.responseBody = responseBody; + this.progressListener = progressListener; + this.length = length; + } + + @Override + public MediaType contentType() { + return responseBody.contentType(); + } + + @Override + public long contentLength() { + return responseBody.contentLength(); + } + + @Override + public BufferedSource source() { + if (bufferedSource == null) { + bufferedSource = Okio.buffer(new ForwardingSource(responseBody.source()) { + long totalBytesRead = 0L; + + @Override + public long read(Buffer sink, long byteCount) throws IOException { + long bytesRead = super.read(sink, byteCount); + totalBytesRead += bytesRead != -1 ? bytesRead : 0; + if (progressListener != null) { + progressListener.onProgress(totalBytesRead, Long.parseLong(length), bytesRead == -1); + } + return bytesRead; + } + }); + } + return bufferedSource; + } + + public interface ProgressListener { + void onProgress(long bytesRead, long contentLength, boolean done); + } +} diff --git a/app/src/main/java/com/live/mylivewallpaper/request/RetrofitManager.java b/app/src/main/java/com/live/mylivewallpaper/request/RetrofitManager.java index 92d9947..7774cdd 100644 --- a/app/src/main/java/com/live/mylivewallpaper/request/RetrofitManager.java +++ b/app/src/main/java/com/live/mylivewallpaper/request/RetrofitManager.java @@ -1,22 +1,19 @@ package com.live.mylivewallpaper.request; -import com.google.gson.Gson; import com.live.mylivewallpaper.data.ResultData; import com.live.mylivewallpaper.help.Common; import com.live.mylivewallpaper.listener.OnVideoResultListener; - -import org.json.JSONObject; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.Observable; +import io.reactivex.disposables.Disposable; +import io.reactivex.functions.Consumer; import io.reactivex.schedulers.Schedulers; import okhttp3.MediaType; import okhttp3.OkHttpClient; -import okhttp3.RequestBody; import okhttp3.ResponseBody; import okhttp3.logging.HttpLoggingInterceptor; import retrofit2.Retrofit; @@ -35,18 +32,14 @@ public class RetrofitManager { public MediaType JSON = MediaType.get("application/json; charset=utf-8"); private MusicApi musicApi; - private List shiftList =new ArrayList<>(); - private List ExploreList =new ArrayList<>(); - private List TrendingList =new ArrayList<>(); - private List DnamicList =new ArrayList<>(); + private RetrofitManager(ProgressResponseBody.ProgressListener listener) { - - private RetrofitManager() { - - musicApi = getRetrofit().create(MusicApi.class); + musicApi = getRetrofit(listener).create(MusicApi.class); } - private synchronized Retrofit getRetrofit() { + + + private synchronized Retrofit getRetrofit(ProgressResponseBody.ProgressListener listener) { if (retrofit == null) { long DEFAULT_TIMEOUT = 5; HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor(); @@ -56,7 +49,7 @@ public class RetrofitManager { .connectTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS) .writeTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS) .readTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS) - .addInterceptor(httpLoggingInterceptor) + .addInterceptor(new ProgressInterceptor(listener)) .build(); retrofit = new Retrofit.Builder() .baseUrl(base_Host) @@ -69,11 +62,11 @@ public class RetrofitManager { return retrofit; } - public static RetrofitManager getInstance() { + public static RetrofitManager getInstance(ProgressResponseBody.ProgressListener listener) { if (REQUEST_MANAGER == null) { - synchronized (RetrofitManager.class) { //锁,防止线程问题 + synchronized (RetrofitManager.class) { if (REQUEST_MANAGER == null) { - REQUEST_MANAGER = new RetrofitManager(); + REQUEST_MANAGER = new RetrofitManager(listener); } } } @@ -81,24 +74,65 @@ public class RetrofitManager { } - public void getMp4(int id, String image,String path, OnVideoResultListener listener) { - musicApi.getMP4(id,"5eV6snEwfY7Yv6Ub",image,"DL8","ViewLive" ) + public Disposable getMp4(int id, String image, String path, OnVideoResultListener listener) { + Disposable subscribe = musicApi.getMP4(id, "5eV6snEwfY7Yv6Ub", image, "DL8", "ViewLive") .subscribeOn(Schedulers.io()) .unsubscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) - .subscribe(new ObserverWrapper<>(new OnRequestListener() { + .subscribe(new Consumer() { @Override - public void onFail(String errorMsg) { - listener.onVideoResult(false,null); + public void accept(ResponseBody body) throws Exception { + boolean b = Common.writeFile(body.byteStream(), path); + listener.onVideoResult(b, path); } - + }, new Consumer() { @Override - public void onSuccess(ResponseBody data) { - boolean b = Common.writeFile(data.byteStream(), path); - listener.onVideoResult(b,path); + public void accept(Throwable throwable) throws Exception { + listener.onVideoResult(false, throwable.getMessage()); } - - - })); + }); + return subscribe; } + + + public Disposable getShiftMp4(int id, String image, String path, OnVideoResultListener listener) { + Disposable subscribe = musicApi.getShiftMP4(id, "5eV6snEwfY7Yv6Ub", image, "DL8", "ViewShiftLive") + .subscribeOn(Schedulers.io()) + .unsubscribeOn(Schedulers.io()) + .observeOn(Schedulers.io()) + .subscribe(new Consumer() { + @Override + public void accept(ResponseBody body) throws Exception { + boolean b = Common.writeFile(body.byteStream(), path); + listener.onVideoResult(b, path); + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + listener.onVideoResult(false, throwable.getMessage()); + } + }); + return subscribe; + } + + +// public void getDnamicMp4(int id, String image,String path, OnVideoResultListener listener) { +// musicApi.getDMP4(id,"5eV6snEwfY7Yv6Ub",image,"DL8","ViewTimerLive","1" ) +// .subscribeOn(Schedulers.io()) +// .unsubscribeOn(Schedulers.io()) +// .observeOn(Schedulers.io()) +// .subscribe(new ObserverWrapper<>(new OnRequestListener() { +// @Override +// public void onFail(String errorMsg) { +// listener.onVideoResult(false,errorMsg); +// } +// +// @Override +// public void onSuccess(ResponseBody data) { +// boolean b = Common.writeFile(data.byteStream(), path); +// listener.onVideoResult(b,path); +// } +// +// })); +// } } diff --git a/app/src/main/java/com/live/mylivewallpaper/viewmode/VmLikeFragment.java b/app/src/main/java/com/live/mylivewallpaper/viewmode/VmLikeFragment.java index f11ef89..86f1a89 100644 --- a/app/src/main/java/com/live/mylivewallpaper/viewmode/VmLikeFragment.java +++ b/app/src/main/java/com/live/mylivewallpaper/viewmode/VmLikeFragment.java @@ -11,6 +11,8 @@ import androidx.paging.PagingLiveData; import com.live.mylivewallpaper.data.LikeData; import com.live.mylivewallpaper.paging.MyLikeSource; +import java.util.List; + public class VmLikeFragment extends ViewModel { @@ -18,8 +20,8 @@ public class VmLikeFragment extends ViewModel { - private MutableLiveData> _playList = new MutableLiveData<>(); - public LiveData> likeLiveData = _playList ; + private MutableLiveData> _likeLiveData = new MutableLiveData<>(); + public LiveData> likeLiveData = _likeLiveData ; public LiveData> getPagingData() { Pager integerLikeDataPager = new Pager<>( @@ -29,6 +31,10 @@ public class VmLikeFragment extends ViewModel { return PagingLiveData.getLiveData(integerLikeDataPager); } + public void update(List data){ + PagingData from = PagingData.from(data); + _likeLiveData.postValue(from); + } } diff --git a/app/src/main/res/drawable/btn_retry_bg.xml b/app/src/main/res/drawable/btn_retry_bg.xml new file mode 100644 index 0000000..7d6f94b --- /dev/null +++ b/app/src/main/res/drawable/btn_retry_bg.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/empty_favorite.xml b/app/src/main/res/drawable/empty_favorite.xml new file mode 100644 index 0000000..1ef5394 --- /dev/null +++ b/app/src/main/res/drawable/empty_favorite.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 07d5da9..ca3826a 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,170 +1,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:android="http://schemas.android.com/apk/res/android"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/welcom_pb.xml b/app/src/main/res/drawable/welcom_pb.xml index 5af9536..3529031 100644 --- a/app/src/main/res/drawable/welcom_pb.xml +++ b/app/src/main/res/drawable/welcom_pb.xml @@ -11,9 +11,9 @@ diff --git a/app/src/main/res/layout/activity_video.xml b/app/src/main/res/layout/activity_video.xml index f76546d..f07196f 100644 --- a/app/src/main/res/layout/activity_video.xml +++ b/app/src/main/res/layout/activity_video.xml @@ -5,7 +5,6 @@ android:id="@+id/top_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" tools:context=".activity.VideoActivity"> - - - + android:visibility="visible"> + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml index f26e961..dc4ce6a 100644 --- a/app/src/main/res/layout/activity_welcome.xml +++ b/app/src/main/res/layout/activity_welcome.xml @@ -36,7 +36,7 @@ android:layout_height="6dp" android:layout_marginBottom="80dp" android:max="100" - android:progress="0" + android:progress="1" android:progressDrawable="@drawable/welcom_pb" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_like.xml b/app/src/main/res/layout/fragment_like.xml new file mode 100644 index 0000000..e11158e --- /dev/null +++ b/app/src/main/res/layout/fragment_like.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 44fd9f6..c796a12 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -1,8 +1,8 @@ - @@ -12,4 +12,6 @@ android:layout_height="wrap_content" android:text="@string/hello_blank_fragment" /> - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 6f3b755..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..c4a603d 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..f648624 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp index b2dfe3d..fa8042c 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..7068d64 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp index 62b611d..16df8c7 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..b305a05 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp index 1b9a695..50d7b48 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..8a47913 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp index 9287f50..febf810 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..18cd07b Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d642..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..6432275 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp index 9126ae3..37f18fd 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 812d07e..dd1d0c9 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -4,7 +4,8 @@ #FFFFFFFF #00000000 #878080 - #DDB94D + #fea701 #80FFFFFF #BA2828 + #BFBDBD \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 140c92a..019f5e4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - MyLiveWallpaper + Live Wallpaper Hello blank fragment Trending @@ -7,4 +7,7 @@ Shift Favorites Set + Loading failed, please check the network and try again + Retry + You haven not collected any wallpapers yet! \ No newline at end of file