From d842022ad5013b3ee2bd6a9ade4dbba7b5bf17fc Mon Sep 17 00:00:00 2001 From: litingting Date: Tue, 24 Dec 2024 11:23:15 +0800 Subject: [PATCH] V1.0.1(2) --- app/build.gradle.kts | 4 +- app/src/main/assets/experimental.json | 46 ------------------- .../hd/wallpaper/free/walls/MyWallpaper.java | 14 +----- .../free/walls/adapter/AdapterPreView.java | 11 ----- .../wallpaper/free/walls/ui/ActivityMain.java | 2 +- .../free/walls/ui/ActivityWelcome.java | 2 +- .../free/walls/ui/FragmentChild.java | 3 +- 7 files changed, 8 insertions(+), 74 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 58bf553..c897365 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -18,8 +18,8 @@ android { applicationId = "com.hd.wallpaper.free" minSdk = 23 targetSdk = 34 - versionCode = 1 - versionName = "1.0.0" + versionCode = 2 + versionName = "1.0.1" setProperty("archivesBaseName", "HD Wallpaper_V" + versionName + "(${versionCode})_$timestamp") testInstrumentationRunner = "androidx.live.runner.AndroidJUnitRunner" diff --git a/app/src/main/assets/experimental.json b/app/src/main/assets/experimental.json index 9363387..8d467dc 100644 --- a/app/src/main/assets/experimental.json +++ b/app/src/main/assets/experimental.json @@ -1839,29 +1839,6 @@ "portfolio_url": "null" } }, - { - "alt_description": "null", - "links": { - "download": "https://unsplash.com/photos/064Cnj9BjEQ/download?ixid=M3wxMTYzMHwwfDF8dG9waWN8fHFQWXNEenZKT1ljfHx8fHwyfHwxNzIwNDMwNjQwfA", - "download_location": "https://api.unsplash.com/photos/064Cnj9BjEQ/download?ixid=M3wxMTYzMHwwfDF8dG9waWN8fHFQWXNEenZKT1ljfHx8fHwyfHwxNzIwNDMwNjQwfA", - "html": "https://unsplash.com/photos/064Cnj9BjEQ" - }, - "urls": { - "full": "https://images.unsplash.com/photo-1647206194634-faad30a1f16e?crop=entropy&cs=srgb&fm=jpg&ixid=M3wxMTYzMHwwfDF8dG9waWN8fHFQWXNEenZKT1ljfHx8fHwyfHwxNzIwNDMwNjQwfA&ixlib=rb-4.0.3&q=85", - "raw": "https://images.unsplash.com/photo-1647206194634-faad30a1f16e?ixid=M3wxMTYzMHwwfDF8dG9waWN8fHFQWXNEenZKT1ljfHx8fHwyfHwxNzIwNDMwNjQwfA&ixlib=rb-4.0.3", - "regular": "https://images.unsplash.com/photo-1647206194634-faad30a1f16e?crop=entropy&cs=tinysrgb&fit=max&fm=jpg&ixid=M3wxMTYzMHwwfDF8dG9waWN8fHFQWXNEenZKT1ljfHx8fHwyfHwxNzIwNDMwNjQwfA&ixlib=rb-4.0.3&q=80&w=1080", - "small": "https://images.unsplash.com/photo-1647206194634-faad30a1f16e?crop=entropy&cs=tinysrgb&fit=max&fm=jpg&ixid=M3wxMTYzMHwwfDF8dG9waWN8fHFQWXNEenZKT1ljfHx8fHwyfHwxNzIwNDMwNjQwfA&ixlib=rb-4.0.3&q=80&w=400", - "thumb": "https://images.unsplash.com/photo-1647206194634-faad30a1f16e?crop=entropy&cs=tinysrgb&fit=max&fm=jpg&ixid=M3wxMTYzMHwwfDF8dG9waWN8fHFQWXNEenZKT1ljfHx8fHwyfHwxNzIwNDMwNjQwfA&ixlib=rb-4.0.3&q=80&w=200" - }, - "user": { - "authorHtml": "https://unsplash.com/@arnosenoner", - "header_large": "https://images.unsplash.com/profile-1574617745209-42d2e8da884dimage?ixlib=rb-4.0.3&crop=faces&fit=crop&w=128&h=128", - "header_medium": "https://images.unsplash.com/profile-1574617745209-42d2e8da884dimage?ixlib=rb-4.0.3&crop=faces&fit=crop&w=64&h=64", - "header_small": "https://images.unsplash.com/profile-1574617745209-42d2e8da884dimage?ixlib=rb-4.0.3&crop=faces&fit=crop&w=32&h=32", - "name": "Arno Senoner", - "portfolio_url": "https://www.decidea.com" - } - }, { "alt_description": "a woman standing under a tree with her hands in the air", "links": { @@ -3058,29 +3035,6 @@ "portfolio_url": "null" } }, - { - "alt_description": "text", - "links": { - "download": "https://unsplash.com/photos/goUlVjeETd0/download?ixid=M3wxMTYzMHwwfDF8dG9waWN8fHFQWXNEenZKT1ljfHx8fHwyfHwxNzIwNDMwNjQwfA", - "download_location": "https://api.unsplash.com/photos/goUlVjeETd0/download?ixid=M3wxMTYzMHwwfDF8dG9waWN8fHFQWXNEenZKT1ljfHx8fHwyfHwxNzIwNDMwNjQwfA", - "html": "https://unsplash.com/photos/text-goUlVjeETd0" - }, - "urls": { - "full": "https://images.unsplash.com/photo-1607600199512-7cb91ff17f46?crop=entropy&cs=srgb&fm=jpg&ixid=M3wxMTYzMHwwfDF8dG9waWN8fHFQWXNEenZKT1ljfHx8fHwyfHwxNzIwNDMwNjQwfA&ixlib=rb-4.0.3&q=85", - "raw": "https://images.unsplash.com/photo-1607600199512-7cb91ff17f46?ixid=M3wxMTYzMHwwfDF8dG9waWN8fHFQWXNEenZKT1ljfHx8fHwyfHwxNzIwNDMwNjQwfA&ixlib=rb-4.0.3", - "regular": "https://images.unsplash.com/photo-1607600199512-7cb91ff17f46?crop=entropy&cs=tinysrgb&fit=max&fm=jpg&ixid=M3wxMTYzMHwwfDF8dG9waWN8fHFQWXNEenZKT1ljfHx8fHwyfHwxNzIwNDMwNjQwfA&ixlib=rb-4.0.3&q=80&w=1080", - "small": "https://images.unsplash.com/photo-1607600199512-7cb91ff17f46?crop=entropy&cs=tinysrgb&fit=max&fm=jpg&ixid=M3wxMTYzMHwwfDF8dG9waWN8fHFQWXNEenZKT1ljfHx8fHwyfHwxNzIwNDMwNjQwfA&ixlib=rb-4.0.3&q=80&w=400", - "thumb": "https://images.unsplash.com/photo-1607600199512-7cb91ff17f46?crop=entropy&cs=tinysrgb&fit=max&fm=jpg&ixid=M3wxMTYzMHwwfDF8dG9waWN8fHFQWXNEenZKT1ljfHx8fHwyfHwxNzIwNDMwNjQwfA&ixlib=rb-4.0.3&q=80&w=200" - }, - "user": { - "authorHtml": "https://unsplash.com/@majesticlukas", - "header_large": "https://images.unsplash.com/profile-1606050171836-0d97efe6b835image?ixlib=rb-4.0.3&crop=faces&fit=crop&w=128&h=128", - "header_medium": "https://images.unsplash.com/profile-1606050171836-0d97efe6b835image?ixlib=rb-4.0.3&crop=faces&fit=crop&w=64&h=64", - "header_small": "https://images.unsplash.com/profile-1606050171836-0d97efe6b835image?ixlib=rb-4.0.3&crop=faces&fit=crop&w=32&h=32", - "name": "Majestic Lukas", - "portfolio_url": "https://www.instagram.com/majesticlukas/" - } - }, { "alt_description": "brown leather sling bag hanged on green and red clothes hanger", "links": { diff --git a/app/src/main/java/com/hd/wallpaper/free/walls/MyWallpaper.java b/app/src/main/java/com/hd/wallpaper/free/walls/MyWallpaper.java index 61e84bc..b20bf84 100644 --- a/app/src/main/java/com/hd/wallpaper/free/walls/MyWallpaper.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/MyWallpaper.java @@ -20,15 +20,7 @@ import java.util.List; public class MyWallpaper extends Application { public static Context mAppContext; - private static List natureList; - private static List animalsList; - private static List experimentalList; - private static List filmList; - private static List patternsList; - private static List streetList; - - private static List travelList; public static String TAG = "-------MyApp---------"; public static Typeface defaultFont; @@ -63,11 +55,9 @@ public class MyWallpaper extends Application { Category category = new Category(); String realName = name.substring(0, name.indexOf(".")); category.setClassName(realName); - List data2 = data1.subList(0, 200); - Collections.shuffle(data2); + List data2 = data1.subList(10, 200); category.setDataList(data2); data.add(category); - } } Log.d(MyWallpaper.TAG,"------------data complete"); @@ -79,7 +69,7 @@ public class MyWallpaper extends Application { } public static List getData() { -// Collections.shuffle(data); + return data; } diff --git a/app/src/main/java/com/hd/wallpaper/free/walls/adapter/AdapterPreView.java b/app/src/main/java/com/hd/wallpaper/free/walls/adapter/AdapterPreView.java index be8a69f..eccfce7 100644 --- a/app/src/main/java/com/hd/wallpaper/free/walls/adapter/AdapterPreView.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/adapter/AdapterPreView.java @@ -83,18 +83,7 @@ public class AdapterPreView extends RecyclerView.Adapter { String previewUrl200 = info.getPreviewUrl200(); RelativeLayout item = holder.getLayout(); String imId = info.getImId(); - int curheight; -// if (position <= 1) { -// curheight = CommonUtils.dp2Px(200); -// } else if (position % 3 == 0) { -// curheight = CommonUtils.dp2Px(240); -// } else { -// curheight = CommonUtils.dp2Px(180); -// } -// ViewGroup.LayoutParams layoutParams = imageView.getLayoutParams(); -// layoutParams.height = curheight; -// imageView.setLayoutParams(layoutParams); MultiTransformation multiTransformation = new MultiTransformation<>( diff --git a/app/src/main/java/com/hd/wallpaper/free/walls/ui/ActivityMain.java b/app/src/main/java/com/hd/wallpaper/free/walls/ui/ActivityMain.java index 44d3511..01c7e89 100644 --- a/app/src/main/java/com/hd/wallpaper/free/walls/ui/ActivityMain.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/ui/ActivityMain.java @@ -34,7 +34,7 @@ public class ActivityMain extends AppCompatActivity { List list = new ArrayList<>(); list.add(FragmentHome.newInstance(0)); list.add(FragmentLike.newInstance()); -// list.add(FragmentDownload.newInstance()); + int[] ints = {R.drawable.selector_tab_home, R.drawable.selector_tab_like,R.drawable.selector_tab_download}; vb.viewpager2.setAdapter(new FragmentStateAdapter(this) { diff --git a/app/src/main/java/com/hd/wallpaper/free/walls/ui/ActivityWelcome.java b/app/src/main/java/com/hd/wallpaper/free/walls/ui/ActivityWelcome.java index 8769c1d..2492869 100644 --- a/app/src/main/java/com/hd/wallpaper/free/walls/ui/ActivityWelcome.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/ui/ActivityWelcome.java @@ -16,7 +16,7 @@ public class ActivityWelcome extends AppCompatActivity { private CountDownTimer countDownTimer; private ActivityWelcomeBinding vb; - private long totalTime = 1000; + private long totalTime = 2000; @SuppressLint("MissingInflatedId") @Override diff --git a/app/src/main/java/com/hd/wallpaper/free/walls/ui/FragmentChild.java b/app/src/main/java/com/hd/wallpaper/free/walls/ui/FragmentChild.java index c9ed3df..8c2405f 100644 --- a/app/src/main/java/com/hd/wallpaper/free/walls/ui/FragmentChild.java +++ b/app/src/main/java/com/hd/wallpaper/free/walls/ui/FragmentChild.java @@ -98,6 +98,7 @@ public class FragmentChild extends Fragment implements ItemClickListener { @Override public void onItemClickAction(Data info) { + Log.d(MyWallpaper.TAG, "--info=" + info.getImId()); Intent intent = new Intent(requireContext(), ActivitySet.class); intent.putExtra(CommonUtils.key_info, info); startActivity(intent); @@ -107,6 +108,6 @@ public class FragmentChild extends Fragment implements ItemClickListener { public void onDestroy() { super.onDestroy(); Glide.get(requireContext()).clearMemory(); - Log.d(MyWallpaper.TAG, "--onDestroy-mIndex=" + mIndex); + } } \ No newline at end of file