diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bf84556ba..aa0add0ac 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -131,6 +131,7 @@ diff --git a/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java b/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java index f74ecb999..3e053fb47 100644 --- a/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java +++ b/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java @@ -131,7 +131,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL mBtnSkipVideo = findViewById(R.id.btn_skip_video); mBtnSkipImage.setOnClickListener(this); mBtnSkipVideo.setOnClickListener(this); - ImgLoader.display(mContext, R.mipmap.screen, mCover); +// ImgLoader.display(mContext, R.drawable.screen, mCover); mHandler = new Handler() { @Override public void handleMessage(Message msg) { diff --git a/app/src/main/res/drawable/screen.9.png b/app/src/main/res/drawable/screen.9.png new file mode 100644 index 000000000..1dfe1c5cd Binary files /dev/null and b/app/src/main/res/drawable/screen.9.png differ diff --git a/app/src/main/res/layout/activity_launcher.xml b/app/src/main/res/layout/activity_launcher.xml index bf7eb2188..06cd78a7f 100644 --- a/app/src/main/res/layout/activity_launcher.xml +++ b/app/src/main/res/layout/activity_launcher.xml @@ -59,7 +59,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:clickable="true" - android:src="@mipmap/screen" + android:src="@drawable/screen" android:scaleType="centerCrop" /> + + + + + \ No newline at end of file diff --git a/common/src/main/java/com/yunbao/common/views/NewSudGameListViewHolder.java b/common/src/main/java/com/yunbao/common/views/NewSudGameListViewHolder.java index db994ac8f..017a44439 100644 --- a/common/src/main/java/com/yunbao/common/views/NewSudGameListViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/NewSudGameListViewHolder.java @@ -11,6 +11,7 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.alibaba.fastjson.JSON; +import com.bumptech.glide.Glide; import com.google.gson.Gson; import com.lxj.xpopup.XPopup; import com.makeramen.roundedimageview.RoundedImageView; @@ -65,9 +66,9 @@ public class NewSudGameListViewHolder extends RecyclerView.ViewHolder { playerWeAre2.setText(String.format(itemView.getContext().getString(R.string.interactive_game_player_we_are_3), model.getTotal())); goldenBeanNumber.setText(model.getGoldenBeanNumber()); if (TextUtils.equals(model.getSex(), "1")) { - ImgLoader.display(itemView.getContext(), R.mipmap.man, sex); + Glide.with(itemView.getContext()).load(R.mipmap.man).into(sex); } else if (TextUtils.equals(model.getSex(), "2")) { - ImgLoader.display(itemView.getContext(), R.mipmap.girl, sex); + Glide.with(itemView.getContext()).load(R.mipmap.girl).into(sex); } // ImgLoader.display(itemView.getContext(), R.mipmap.image, tmp_image); diff --git a/common/src/main/res/layout/item_new_game_room.xml b/common/src/main/res/layout/item_new_game_room.xml index eee4211ac..d3f9da55c 100644 --- a/common/src/main/res/layout/item_new_game_room.xml +++ b/common/src/main/res/layout/item_new_game_room.xml @@ -118,7 +118,6 @@ android:layout_height="16dp" app:layout_constraintBottom_toBottomOf="@id/avatar" app:layout_constraintEnd_toEndOf="@id/avatar" - android:src="@mipmap/girl" />