YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1:添加元旦主题，添加新的接口

Browse Source
This commit is contained in:
梁小江
2025-12-30 14:16:03 +08:00
parent 4f48c55cf6
commit ab556d2519
100 changed files with 511 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
MainModule/src/main/java/com/xscm/modulemain/activity/main/activity/MainActivity.java
View File

@@ -111,20 +111,34 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
private AppUpdateDialog appUpdateDialog;
private boolean isMediaSelected = false;
private String unselectedMediaUrl = ""; // 从服务器获取
private String selectedMediaUrl = ""; // 从服务器获取
private int unselectedMediaUrl ; // 从服务器获取
private int selectedMediaUrl ; // 从服务器获取
// 添加其他 tab 的图标 URL
private String unselectedTrendUrl = "";
private String selectedTrendUrl = "";
private String unselectedNewsUrl = "";
private String selectedNewsUrl = "";
private String unselectedMeUrl = "";
private String selectedMeUrl = "";
private int unselectedTrendUrl ;
private int selectedTrendUrl ;
private int unselectedNewsUrl ;
private int selectedNewsUrl ;
private int unselectedMeUrl ;
private int selectedMeUrl ;
// 添加文字颜色变量
private int selectedTextColor = 0; // 选中文字颜色 (从服务器获取)
private int unselectedTextColor = 0; // 未选中文字颜色 (从服务器获取)
// private String unselectedMediaUrl = ""; // 从服务器获取
// private String selectedMediaUrl = ""; // 从服务器获取
//
// // 添加其他 tab 的图标 URL
// private String unselectedTrendUrl = "";
// private String selectedTrendUrl = "";
// private String unselectedNewsUrl = "";
// private String selectedNewsUrl = "";
// private String unselectedMeUrl = "";
// private String selectedMeUrl = "";
//
// // 添加文字颜色变量
// private int selectedTextColor = 0; // 选中文字颜色 (从服务器获取)
// private int unselectedTextColor = 0; // 未选中文字颜色 (从服务器获取)
private InviteDialog inviteDialog;
@@ -199,7 +213,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
@Override
protected void initData() {
MvpPre.getThemeData();
// getThemeData(new ThemeBean());
fragments = new Fragment[]{
VoiceFragment.newInstance(), // 声播
CircleFragment.newInstance(), // 语圈
@@ -459,19 +473,22 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
}
private void updateMediaIcon() {
String imageUrl = (index == 0) ? selectedMediaUrl : unselectedMediaUrl;
if (!TextUtils.isEmpty(imageUrl)) {
Glide.with(this)
.load(imageUrl)
.placeholder(com.xscm.moduleutil.R.mipmap.tab_main_media_unselected) // 默认图标
.into(mBinding.imSy);
} else {
// 如果没有网络图标，使用默认的选中/未选中状态
int resId = (index == 0) ?
com.xscm.moduleutil.R.mipmap.tab_main_media_selected :
com.xscm.moduleutil.R.mipmap.tab_main_media_unselected;
mBinding.imTrend.setImageResource(resId);
}
int imageUrl = (index == 0) ? selectedMediaUrl : unselectedMediaUrl;
mBinding.imSy.setImageResource(imageUrl);
// if (!TextUtils.isEmpty(imageUrl)) {
// Glide.with(this)
// .load(imageUrl)
// .placeholder(com.xscm.moduleutil.R.mipmap.tab_main_media_unselected) // 默认图标
// .into(mBinding.imSy);
// } else {
// // 如果没有网络图标，使用默认的选中/未选中状态
// int resId = (index == 0) ?
// com.xscm.moduleutil.R.mipmap.tab_main_media_selected :
// com.xscm.moduleutil.R.mipmap.tab_main_media_unselected;
// mBinding.imTrend.setImageResource(resId);
// }
}
@@ -842,7 +859,6 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
// }
// }
}
@Override
public void getThemeData(ThemeBean themeBean) {
if (themeBean != null) {
@@ -864,23 +880,23 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
// 获取文字颜色
try {
if (themeBean.getBtn_text_color() != null && !themeBean.getBtn_text_color().isEmpty()) {
selectedTextColor = Color.parseColor(themeBean.getBtn_text_color());
selectedTextColor = Color.parseColor("#FF663B");
}
unselectedTextColor = Color.parseColor("#6D6D6D");
unselectedTextColor = Color.parseColor("#898989");
} catch (Exception e) {
// 使用默认颜色
selectedTextColor = ColorManager.getInstance().getPrimaryColorInt();
unselectedTextColor = Color.parseColor("#6D6D6D");
unselectedTextColor = Color.parseColor("#898989");
}
Map<String, String> colorMap = new HashMap<>();
colorMap.put("theme_color", themeBean.getTheme_color());
colorMap.put("btn_text_color", themeBean.getBtn_text_color());
// 更新 UI
updateAllTabUI();
if (themeBean.getApp_bg() != null) {
// if (themeBean.getApp_bg() != null) {
BackgroundManager.getInstance().setBackgroundUrl(themeBean.getApp_bg());
loadNetworkBackground();
}
// }
if (themeBean.getTheme_color() != null) {
ColorManager.getInstance().updateColors(themeBean.getTheme_color(), themeBean.getBtn_text_color());
@@ -1122,54 +1138,54 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
}
private void updateTrendIcon() {
String imageUrl = (index == 1) ? selectedTrendUrl : unselectedTrendUrl;
if (!TextUtils.isEmpty(imageUrl)) {
Glide.with(this)
.load(imageUrl)
.placeholder(com.xscm.moduleutil.R.mipmap.icon_me_trend_unselect)
.into(mBinding.imTrend);
} else {
// 如果没有网络图标，使用默认的选中/未选中状态
int resId = (index == 1) ?
com.xscm.moduleutil.R.mipmap.icon_me_trend_select :
com.xscm.moduleutil.R.mipmap.icon_me_trend_unselect;
mBinding.imTrend.setImageResource(resId);
}
int imageUrl = (index == 1) ? selectedTrendUrl : unselectedTrendUrl;
mBinding.imTrend.setImageResource(imageUrl);
// if (!TextUtils.isEmpty(imageUrl)) {
// Glide.with(this)
// .load(imageUrl)
// .placeholder(com.xscm.moduleutil.R.mipmap.icon_me_trend_unselect)
// .into(mBinding.imTrend);
// } else {
// // 如果没有网络图标，使用默认的选中/未选中状态
// int resId = (index == 1) ?
// com.xscm.moduleutil.R.mipmap.icon_me_trend_select :
// com.xscm.moduleutil.R.mipmap.icon_me_trend_unselect;
// mBinding.imTrend.setImageResource(resId);
// }
}
private void updateNewsIcon() {
String imageUrl = (index == 2) ? selectedNewsUrl : unselectedNewsUrl;
if (!TextUtils.isEmpty(imageUrl)) {
Glide.with(this)
.load(imageUrl)
.placeholder(com.xscm.moduleutil.R.mipmap.icon_news_un_select)
.into(mBinding.ivNews);
} else {
// 如果没有网络图标，使用默认的选中/未选中状态
int resId = (index == 2) ?
com.xscm.moduleutil.R.mipmap.icon_news_select :
com.xscm.moduleutil.R.mipmap.icon_news_un_select;
mBinding.ivNews.setImageResource(resId);
}
int imageUrl = (index == 2) ? selectedNewsUrl : unselectedNewsUrl;
mBinding.ivNews.setImageResource(imageUrl);
// if (!TextUtils.isEmpty(imageUrl)) {
// Glide.with(this)
// .load(imageUrl)
// .placeholder(com.xscm.moduleutil.R.mipmap.icon_news_un_select)
// .into(mBinding.ivNews);
// } else {
// // 如果没有网络图标，使用默认的选中/未选中状态
// int resId = (index == 2) ?
// com.xscm.moduleutil.R.mipmap.icon_news_select :
// com.xscm.moduleutil.R.mipmap.icon_news_un_select;
// mBinding.ivNews.setImageResource(resId);
// }
}
private void updateMeIcon() {
String imageUrl = (index == 3) ? selectedMeUrl : unselectedMeUrl;
if (!TextUtils.isEmpty(imageUrl)) {
Glide.with(this)
.load(imageUrl)
.placeholder(com.xscm.moduleutil.R.mipmap.icon_my_un_select)
.into(mBinding.imMe);
} else {
// 如果没有网络图标，使用默认的选中/未选中状态
int resId = (index == 3) ?
com.xscm.moduleutil.R.mipmap.icon_my_select :
com.xscm.moduleutil.R.mipmap.icon_my_un_select;
mBinding.imMe.setImageResource(resId);
}
int imageUrl = (index == 3) ? selectedMeUrl : unselectedMeUrl;
mBinding.imMe.setImageResource(imageUrl);
// if (!TextUtils.isEmpty(imageUrl)) {
// Glide.with(this)
// .load(imageUrl)
// .placeholder(com.xscm.moduleutil.R.mipmap.icon_my_un_select)
// .into(mBinding.imMe);
// } else {
// // 如果没有网络图标，使用默认的选中/未选中状态
// int resId = (index == 3) ?
// com.xscm.moduleutil.R.mipmap.icon_my_select :
// com.xscm.moduleutil.R.mipmap.icon_my_un_select;
// mBinding.imMe.setImageResource(resId);
// }
}

6
MainModule/src/main/java/com/xscm/modulemain/activity/msg/fragment/NewsFragment.java
View File

@@ -105,7 +105,11 @@ public class NewsFragment extends BaseMvpFragment<NewsPresenter, FragmentNewsBin
startActivity(intent);
}
});
if (CommonAppContext.getInstance().is_open == 1) {
mBinding.newsLl.setBackgroundResource(com.xscm.moduleutil.R.mipmap.theme_new_bj);
}else {
mBinding.newsLl.setBackgroundResource(com.xscm.moduleutil.R.mipmap.activity_bj);
}
}
@Override

39
MainModule/src/main/java/com/xscm/modulemain/activity/plaza/fragment/CircleFragment.java
View File

@@ -16,6 +16,7 @@ import com.xscm.modulemain.activity.plaza.contacts.CircleContacts;
import com.xscm.modulemain.activity.plaza.presenter.CirclePresenter;
import com.xscm.modulemain.databinding.FragmentCircleBinding;
import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.CircleListBean;
import com.xscm.moduleutil.bean.CommentBean;
import com.xscm.moduleutil.bean.ExpandColumnBean;
@@ -27,21 +28,21 @@ import java.util.List;
/**
*语圈
* 语圈
*/
public class CircleFragment extends BaseMvpFragment<CirclePresenter, FragmentCircleBinding> implements CircleContacts.View {
private List<MyBagBean> list;
public static final int RELEASE_CODE = 1010;
public static final int RELEASE_CODE = 1010;
private MyFragmentPagerAdapter adapter;
public static CircleFragment newInstance () {
public static CircleFragment newInstance() {
return new CircleFragment();
}
@Override
protected void initData () {
list=new ArrayList<>();
protected void initData() {
list = new ArrayList<>();
list.add(new MyBagBean("发现", "1"));
list.add(new MyBagBean("扩列", "2"));
adapter = new MyFragmentPagerAdapter(getChildFragmentManager(), list);
@@ -51,36 +52,42 @@ public class CircleFragment extends BaseMvpFragment<CirclePresenter, FragmentCir
}
@Override
protected void initView () {
protected void initView() {
mBinding.ivRelease.setOnClickListener(this::onClick);
if (CommonAppContext.getInstance().is_open == 1) {
mBinding.ll.setBackgroundResource(com.xscm.moduleutil.R.mipmap.theme_new_bj);
}else {
mBinding.ll.setBackgroundResource(com.xscm.moduleutil.R.mipmap.activity_bj);
}
}
private void onClick(View view) {
if (view.getId()==R.id.iv_release){//发布
startActivityForResult(new Intent(getContext(), ReleaseActivity.class),RELEASE_CODE);
if (view.getId() == R.id.iv_release) {//发布
startActivityForResult(new Intent(getContext(), ReleaseActivity.class), RELEASE_CODE);
}
}
@Override
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode==RELEASE_CODE){
adapter.refreshCircleCategoryData();
}
if (requestCode == RELEASE_CODE) {
adapter.refreshCircleCategoryData();
}
}
@Override
protected void initListener () {
protected void initListener() {
super.initListener();
}
@Override
protected int getLayoutId () {
protected int getLayoutId() {
return R.layout.fragment_circle;
}
@Override
protected CirclePresenter bindPresenter () {
protected CirclePresenter bindPresenter() {
return new CirclePresenter(this, getContext());
}
@@ -101,12 +108,12 @@ public class CircleFragment extends BaseMvpFragment<CirclePresenter, FragmentCir
}
@Override
public void setLikeZone(int idx,CircleListBean item,int type) {
public void setLikeZone(int idx, CircleListBean item, int type) {
}
@Override
public void getCircleDetail(int idx,CircleListBean item, CircleListBean newItem) {
public void getCircleDetail(int idx, CircleListBean item, CircleListBean newItem) {
}

16
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceCategoryFragment.java
View File

@@ -205,6 +205,22 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
Intent intent = new Intent(getActivity(), PopularRoomActivity.class);
startActivity(intent);
});
if (CommonAppContext.getInstance().is_open==1){
mBinding.rmHome.setImageResource(com.xscm.moduleutil.R.mipmap.bg_rmfj);
mBinding.rl.setBackgroundResource(com.xscm.moduleutil.R.mipmap.bg_xiaoxi);
mBinding.tvWg.setImageResource(com.xscm.moduleutil.R.mipmap.q_wg);
mBinding.myHome.setImageResource(com.xscm.moduleutil.R.mipmap.bg_wdfj);
mBinding.homePhb.setImageResource(com.xscm.moduleutil.R.mipmap.bg_phb);
mBinding.homeGg.setImageResource(com.xscm.moduleutil.R.mipmap.bg_gfgg);
}else {
mBinding.rmHome.setImageResource(com.xscm.moduleutil.R.mipmap.home_rm);
mBinding.rl.setBackgroundResource(com.xscm.moduleutil.R.mipmap.xiaox_b);
mBinding.tvWg.setImageResource(com.xscm.moduleutil.R.mipmap.wg);
mBinding.myHome.setImageResource(com.xscm.moduleutil.R.mipmap.my_home);
mBinding.homePhb.setImageResource(com.xscm.moduleutil.R.mipmap.home_phb);
mBinding.homeGg.setImageResource(com.xscm.moduleutil.R.mipmap.home_gg);
}
}
public void onEvent1() {

9
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceFragment.java
View File

@@ -20,6 +20,7 @@ import com.xscm.modulemain.activity.room.presenter.VoicePresenter;
import com.xscm.modulemain.dialog.SignInDialog;
import com.xscm.moduleutil.adapter.MyFragmentPagerAdapter;
import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.ActivitiesPermission;
import com.xscm.moduleutil.bean.FirstChargeGiftBean;
import com.xscm.moduleutil.bean.TasksSignStatus;
@@ -27,6 +28,7 @@ import com.xscm.moduleutil.dialog.FirstChargeDialog;
import com.xscm.moduleutil.dialog.RechargeDialogFragment;
import com.xscm.modulemain.dialog.YouthModelDialog;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.BackgroundManager;
import com.xscm.moduleutil.utils.SpUtil;
import java.util.ArrayList;
@@ -85,6 +87,13 @@ public class VoiceFragment extends BaseMvpFragment<VoicePresenter, FragmentVoice
if (!shouldShowYouthModelDialog()) {
showYouthModelDialog();
}
if (CommonAppContext.getInstance().is_open==1) {
mBinding.llBj.setBackgroundResource(BackgroundManager.getInstance().getBackgroundUrl());
mBinding.tvTitle.setBackgroundResource(com.xscm.moduleutil.R.mipmap.logo_shouye);
}else {
mBinding.llBj.setBackgroundResource(com.xscm.moduleutil.R.mipmap.home_bj);
mBinding.tvTitle.setBackgroundResource(com.xscm.moduleutil.R.mipmap.app_name_bg);
}
}

28
MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java
View File

@@ -49,6 +49,7 @@ import com.xscm.modulemain.dialog.UserNetWorthDialog;
import com.xscm.moduleutil.base.WebUrlConstants;
import com.xscm.moduleutil.bean.TasksMessage;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.BackgroundManager;
import com.xscm.moduleutil.widget.ShineTextView;
import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.base.CommonAppContext;
@@ -166,6 +167,33 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
// ARouter.getInstance().build(ARouteConstants.H5).withString("url", bannerModel.getUrl()).withString("title", "首页横幅").navigation();
}
});
if (CommonAppContext.getInstance().is_open==1) {
mBinding.imMeFamily.setImageResource(com.xscm.moduleutil.R.mipmap.icon_wdjz);
mBinding.imDan.setImageResource(com.xscm.moduleutil.R.mipmap.icon_dj);
mBinding.imPersonality.setImageResource(com.xscm.moduleutil.R.mipmap.icon_gxzb);
mBinding.imMyBag.setImageResource(com.xscm.moduleutil.R.mipmap.icon_wdbb);
mBinding.imMeInvitation.setImageResource(com.xscm.moduleutil.R.mipmap.icon_yq);
mBinding.imMeHelp.setImageResource(com.xscm.moduleutil.R.mipmap.icon_bzzx);
mBinding.imMeTest.setImageResource(com.xscm.moduleutil.R.mipmap.icon_rw);
mBinding.imSinger.setImageResource(com.xscm.moduleutil.R.mipmap.icon_gsrz);
mBinding.imMePlaylist.setImageResource(com.xscm.moduleutil.R.mipmap.icon_wdgd);
mBinding.imMeSetting.setImageResource(com.xscm.moduleutil.R.mipmap.icon_sz);
}else {
mBinding.imMeFamily.setImageResource(R.mipmap.icon_me_family);
mBinding.imDan.setImageResource(com.xscm.moduleutil.R.mipmap.my_dan);
mBinding.imPersonality.setImageResource(com.xscm.moduleutil.R.mipmap.personality);
mBinding.imMyBag.setImageResource(com.xscm.moduleutil.R.mipmap.me_my_bag);
mBinding.imMeHelp.setImageResource(com.xscm.moduleutil.R.mipmap.me_help);
mBinding.imMeTest.setImageResource(com.xscm.moduleutil.R.mipmap.me_test);
mBinding.imSinger.setImageResource(R.mipmap.but_singer);
mBinding.imMePlaylist.setImageResource(R.mipmap.but_me_playlist);
mBinding.imMeSetting.setImageResource(com.xscm.moduleutil.R.mipmap.me_setting);
mBinding.imMeInvitation.setImageResource(com.xscm.moduleutil.R.mipmap.me_invitation);
}
}