V1.0.1(2)

This commit is contained in:
litingting 2024-12-24 11:23:15 +08:00
parent 2f1ae2d5b8
commit d842022ad5
7 changed files with 8 additions and 74 deletions

View File

@ -18,8 +18,8 @@ android {
applicationId = "com.hd.wallpaper.free" applicationId = "com.hd.wallpaper.free"
minSdk = 23 minSdk = 23
targetSdk = 34 targetSdk = 34
versionCode = 1 versionCode = 2
versionName = "1.0.0" versionName = "1.0.1"
setProperty("archivesBaseName", "HD Wallpaper_V" + versionName + "(${versionCode})_$timestamp") setProperty("archivesBaseName", "HD Wallpaper_V" + versionName + "(${versionCode})_$timestamp")
testInstrumentationRunner = "androidx.live.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.live.runner.AndroidJUnitRunner"

View File

@ -1839,29 +1839,6 @@
"portfolio_url": "null" "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", "alt_description": "a woman standing under a tree with her hands in the air",
"links": { "links": {
@ -3058,29 +3035,6 @@
"portfolio_url": "null" "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", "alt_description": "brown leather sling bag hanged on green and red clothes hanger",
"links": { "links": {

View File

@ -20,15 +20,7 @@ import java.util.List;
public class MyWallpaper extends Application { public class MyWallpaper extends Application {
public static Context mAppContext; public static Context mAppContext;
private static List<Data> natureList;
private static List<Data> animalsList;
private static List<Data> experimentalList;
private static List<Data> filmList;
private static List<Data> patternsList;
private static List<Data> streetList;
private static List<Data> travelList;
public static String TAG = "-------MyApp---------"; public static String TAG = "-------MyApp---------";
public static Typeface defaultFont; public static Typeface defaultFont;
@ -63,11 +55,9 @@ public class MyWallpaper extends Application {
Category category = new Category(); Category category = new Category();
String realName = name.substring(0, name.indexOf(".")); String realName = name.substring(0, name.indexOf("."));
category.setClassName(realName); category.setClassName(realName);
List<Data> data2 = data1.subList(0, 200); List<Data> data2 = data1.subList(10, 200);
Collections.shuffle(data2);
category.setDataList(data2); category.setDataList(data2);
data.add(category); data.add(category);
} }
} }
Log.d(MyWallpaper.TAG,"------------data complete"); Log.d(MyWallpaper.TAG,"------------data complete");
@ -79,7 +69,7 @@ public class MyWallpaper extends Application {
} }
public static List<Category> getData() { public static List<Category> getData() {
// Collections.shuffle(data);
return data; return data;
} }

View File

@ -83,18 +83,7 @@ public class AdapterPreView extends RecyclerView.Adapter<MyViewHolder> {
String previewUrl200 = info.getPreviewUrl200(); String previewUrl200 = info.getPreviewUrl200();
RelativeLayout item = holder.getLayout(); RelativeLayout item = holder.getLayout();
String imId = info.getImId(); 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<Bitmap> multiTransformation = new MultiTransformation<>( MultiTransformation<Bitmap> multiTransformation = new MultiTransformation<>(

View File

@ -34,7 +34,7 @@ public class ActivityMain extends AppCompatActivity {
List<Fragment> list = new ArrayList<>(); List<Fragment> list = new ArrayList<>();
list.add(FragmentHome.newInstance(0)); list.add(FragmentHome.newInstance(0));
list.add(FragmentLike.newInstance()); 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}; int[] ints = {R.drawable.selector_tab_home, R.drawable.selector_tab_like,R.drawable.selector_tab_download};
vb.viewpager2.setAdapter(new FragmentStateAdapter(this) { vb.viewpager2.setAdapter(new FragmentStateAdapter(this) {

View File

@ -16,7 +16,7 @@ public class ActivityWelcome extends AppCompatActivity {
private CountDownTimer countDownTimer; private CountDownTimer countDownTimer;
private ActivityWelcomeBinding vb; private ActivityWelcomeBinding vb;
private long totalTime = 1000; private long totalTime = 2000;
@SuppressLint("MissingInflatedId") @SuppressLint("MissingInflatedId")
@Override @Override

View File

@ -98,6 +98,7 @@ public class FragmentChild extends Fragment implements ItemClickListener {
@Override @Override
public void onItemClickAction(Data info) { public void onItemClickAction(Data info) {
Log.d(MyWallpaper.TAG, "--info=" + info.getImId());
Intent intent = new Intent(requireContext(), ActivitySet.class); Intent intent = new Intent(requireContext(), ActivitySet.class);
intent.putExtra(CommonUtils.key_info, info); intent.putExtra(CommonUtils.key_info, info);
startActivity(intent); startActivity(intent);
@ -107,6 +108,6 @@ public class FragmentChild extends Fragment implements ItemClickListener {
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
Glide.get(requireContext()).clearMemory(); Glide.get(requireContext()).clearMemory();
Log.d(MyWallpaper.TAG, "--onDestroy-mIndex=" + mIndex);
} }
} }