diff --git a/.idea/.name b/.idea/.name index 1e71aa9..216df08 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -秘地 \ No newline at end of file +MY语聊 \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index f11e295..e5ac813 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -13,12 +13,6 @@ - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a19c2aa..8606a2b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -148,8 +148,9 @@ + - + diff --git a/app/src/main/java/com/jdf/myyuliao/PasswordLoginActivity.java b/app/src/main/java/com/jdf/myyuliao/PasswordLoginActivity.java index 2b17b6c..7dcf7bd 100644 --- a/app/src/main/java/com/jdf/myyuliao/PasswordLoginActivity.java +++ b/app/src/main/java/com/jdf/myyuliao/PasswordLoginActivity.java @@ -366,7 +366,7 @@ public class PasswordLoginActivity extends BaseMvpActivity extends private BroadcastReceiver mLogoutReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - if ("com.xscm.moduleutil.ACTION_USER_LOGOUT".equals(intent.getAction())) { + if ("com.jdf.moduleutil.ACTION_USER_LOGOUT".equals(intent.getAction())) { // 在这里处理用户登出后的UI更新 // 例如：隐藏需要登录才能显示的控件 // 或者跳转到登录状态的页面 @@ -131,7 +131,7 @@ public abstract class BaseAppCompatActivity extends ColorManager.getInstance().addColorChangeListener(this); // 注册登出广播接收器 - IntentFilter filter = new IntentFilter("com.xscm.moduleutil.ACTION_USER_LOGOUT"); + IntentFilter filter = new IntentFilter("com.jdf.moduleutil.ACTION_USER_LOGOUT"); registerReceiver(mLogoutReceiver, filter); // 动态判断是否包含 @Subscribe 注解的方法 diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java index f79de0f..1de881b 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java @@ -672,9 +672,9 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio SpUtil.setBooleanValue("youth_model_shown", false); // 发送广播通知所有Activity刷新状态 - Intent refreshIntent = new Intent("com.xscm.moduleutil.ACTION_USER_LOGOUT"); + Intent refreshIntent = new Intent("com.jdf.moduleutil.ACTION_USER_LOGOUT"); sendBroadcast(refreshIntent); - Intent intent = new Intent("com.xscm.action.LAUNCH_PAGE"); + Intent intent = new Intent("com.jdf.action.LAUNCH_PAGE"); intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK); getApplicationContext().startActivity(intent); } diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ColorManager.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ColorManager.java index d54f0c7..f9c5a40 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ColorManager.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ColorManager.java @@ -18,7 +18,7 @@ import java.util.Map; */ public class ColorManager { private static ColorManager instance; - private String primaryColor = "#6C49E4"; // 默认主题色 + private String primaryColor = "#FC7285"; // 默认主题色 private String buttonColor = "#FFFFFF"; // 默认按钮色 // 监听器列表，用于通知颜色变化 @@ -71,7 +71,7 @@ public class ColorManager { try { return Color.parseColor(primaryColor); } catch (Exception e) { - return Color.parseColor("#6C49E4"); // 默认颜色 + return Color.parseColor("#FC7285"); // 默认颜色 } } diff --git a/moduleUtil/src/main/res/drawable-xxxhdpi/custom.webp b/moduleUtil/src/main/res/drawable-xxxhdpi/custom.webp index a3a0d52..cccbc0d 100644 Binary files a/moduleUtil/src/main/res/drawable-xxxhdpi/custom.webp and b/moduleUtil/src/main/res/drawable-xxxhdpi/custom.webp differ diff --git a/moduleUtil/src/main/res/drawable-xxxhdpi/image_yq.webp b/moduleUtil/src/main/res/drawable-xxxhdpi/image_yq.webp index fef1571..bf724b3 100644 Binary files a/moduleUtil/src/main/res/drawable-xxxhdpi/image_yq.webp and b/moduleUtil/src/main/res/drawable-xxxhdpi/image_yq.webp differ diff --git a/moduleUtil/src/main/res/drawable/main_bottom_bar_icon_tend.xml b/moduleUtil/src/main/res/drawable/main_bottom_bar_icon_tend.xml index 69ce953..d938590 100644 --- a/moduleUtil/src/main/res/drawable/main_bottom_bar_icon_tend.xml +++ b/moduleUtil/src/main/res/drawable/main_bottom_bar_icon_tend.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/moduleUtil/src/main/res/drawable/text_color_two.xml b/moduleUtil/src/main/res/drawable/text_color_two.xml index 07750d2..2d63287 100644 --- a/moduleUtil/src/main/res/drawable/text_color_two.xml +++ b/moduleUtil/src/main/res/drawable/text_color_two.xml @@ -1,7 +1,7 @@ - - \ No newline at end of file diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/app_name_bg.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/app_name_bg.webp index 0fd5a96..bfe6d10 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/app_name_bg.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/app_name_bg.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/check_boy.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/check_boy.webp index dfb8035..928270b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/check_boy.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/check_boy.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/check_boy1.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/check_boy1.webp index bce1572..5d25f75 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/check_boy1.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/check_boy1.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/check_girl.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/check_girl.webp index e2ba2bb..1d6a8e2 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/check_girl.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/check_girl.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/check_girl1.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/check_girl1.webp index 842e888..5015923 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/check_girl1.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/check_girl1.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/ic_home_rank.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/ic_home_rank.webp index c544a85..19f7be6 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/ic_home_rank.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/ic_home_rank.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/ic_paidui_home.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/ic_paidui_home.webp index 4b67ea3..c4fc936 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/ic_paidui_home.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/ic_paidui_home.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_me_trend_select.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_me_trend_select.webp index 3c4f759..216f3d0 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_me_trend_select.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_me_trend_select.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_me_trend_unselect.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_me_trend_unselect.webp index 349e97a..5533945 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_me_trend_unselect.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_me_trend_unselect.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_my_select.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_my_select.webp index 141a6ec..703da40 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_my_select.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_my_select.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_my_un_select.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_my_un_select.webp index 5000a9e..36ec817 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_my_un_select.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_my_un_select.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_news_select.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_news_select.webp index 82a62fe..01a5be5 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_news_select.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_news_select.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_news_un_select.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_news_un_select.webp index 35f680c..52682e6 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_news_un_select.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/icon_news_un_select.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/index_level_search_o.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/index_level_search_o.webp index 9734a82..f48e676 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/index_level_search_o.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/index_level_search_o.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/me_edit.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/me_edit.webp index b79e252..aa49a38 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/me_edit.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/me_edit.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/me_my_bag.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/me_my_bag.webp index e5698b1..8bb9867 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/me_my_bag.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/me_my_bag.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/me_show_store.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/me_show_store.webp index 209a73f..95a6860 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/me_show_store.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/me_show_store.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/me_test.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/me_test.webp index 08de7ab..0707009 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/me_test.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/me_test.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/me_union_icon.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/me_union_icon.webp index 400697e..0c91da4 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/me_union_icon.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/me_union_icon.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/me_wallet.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/me_wallet.webp index 4d37de3..e65c096 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/me_wallet.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/me_wallet.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/me_wallet_icon.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/me_wallet_icon.webp index fe1f5e9..5fb6360 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/me_wallet_icon.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/me_wallet_icon.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/my_dan.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/my_dan.webp index d428212..ced407d 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/my_dan.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/my_dan.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/personality.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/personality.webp index d86ef41..a2aa68b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/personality.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/personality.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/tab_main_media_selected.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/tab_main_media_selected.webp index d1526d2..15a9e00 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/tab_main_media_selected.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/tab_main_media_selected.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/tab_main_media_unselected.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/tab_main_media_unselected.webp index 2d65556..fe6b24b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/tab_main_media_unselected.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/tab_main_media_unselected.webp differ diff --git a/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java index 2a0e819..69f36cc 100644 --- a/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java +++ b/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java @@ -326,7 +326,7 @@ public class MainActivity extends BaseMvpActivity images = data.getIcon(); // 获取图片列表 - if (images != null && !images.isEmpty()) { - - for (String url : images) { - if (url.contains("http")) { - ImageView imageView = new ImageView(getContext()); - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams( - getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_74), - getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_17) - ); - params.setMargins(0, 0, getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距 - imageView.setLayoutParams(params); - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - - // 使用 Glide 加载图片 - ImageUtils.loadHeadCC(url, imageView); - - llContainer.addView(imageView); - } - } + List images = data.getIcon(); + if (images == null || images.isEmpty()) { + return; // 提前返回，减少嵌套层级 } +// 获取尺寸资源，避免重复调用 + Resources res = getContext().getResources(); + int imageWidth = res.getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_42); + int imageHeight = res.getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_15); + int rightMargin = res.getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5); + + for (String url : images) { + if (!url.contains("http")) { + continue; // 跳过非HTTP链接 + } + + ImageView imageView = createImageView(url, imageWidth, imageHeight, rightMargin); + llContainer.addView(imageView); + } + + + } + /** + * 创建ImageView并设置相关参数 + */ + + private ImageView createImageView(String url, int width, int height, int rightMargin) { + ImageView imageView = new ImageView(getContext()); + + // 设置布局参数 + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(width, height); + params.setMargins(0, 0, rightMargin, 0); + imageView.setLayoutParams(params); + imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); + + // 加载图片 + ImageUtils.loadHeadCC(url, imageView); + + return imageView; } @Override diff --git a/modulevoice/src/main/java/com/example/modulevoice/activity/ui/main/SectionsPagerAdapter.java b/modulevoice/src/main/java/com/example/modulevoice/activity/ui/main/SectionsPagerAdapter.java index 4897f5f..9208f7b 100644 --- a/modulevoice/src/main/java/com/example/modulevoice/activity/ui/main/SectionsPagerAdapter.java +++ b/modulevoice/src/main/java/com/example/modulevoice/activity/ui/main/SectionsPagerAdapter.java @@ -15,12 +15,13 @@ import androidx.fragment.app.FragmentPagerAdapter; */ public class SectionsPagerAdapter extends FragmentPagerAdapter { -// @StringRes -// private static final int[] TAB_TITLES = new int[]{com.xscm.moduleutil.R.string.room_rank, com.xscm.moduleutil.R.string.wealth_rank, -// com.xscm.moduleutil.R.string.charm_rank, com.xscm.moduleutil.R.string.true_love_rank}; -//// com.xscm.moduleutil.R.string.guild_rank, @StringRes - private static final int[] TAB_TITLES = new int[]{com.xscm.moduleutil.R.string.room_rank, com.xscm.moduleutil.R.string.wealth_rank, - com.xscm.moduleutil.R.string.charm_rank}; + @StringRes + private static final int[] TAB_TITLES = new int[]{ + com.xscm.moduleutil.R.string.room_rank, + com.xscm.moduleutil.R.string.wealth_rank, + com.xscm.moduleutil.R.string.charm_rank, +// com.xscm.moduleutil.R.string.true_love_rank + }; // com.xscm.moduleutil.R.string.guild_rank, private final Context mContext; @@ -45,6 +46,6 @@ public class SectionsPagerAdapter extends FragmentPagerAdapter { @Override public int getCount() { // Show 2 total pages. - return 4; + return TAB_TITLES.length; } } \ No newline at end of file diff --git a/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceCategoryFragment.java b/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceCategoryFragment.java index ee005c2..9c7419f 100644 --- a/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceCategoryFragment.java +++ b/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceCategoryFragment.java @@ -8,6 +8,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.viewpager2.adapter.FragmentStateAdapter; @@ -297,11 +298,11 @@ public class VoiceCategoryFragment extends BaseMvpFragment + android:background="@mipmap/log_bj">