From 659eef7e29c1808aca608e5c33cf0c17d729d9ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A2=AB=E6=B7=B9=E6=AD=BB=E7=9A=84=E9=B1=BC?=
<13423737683@163.com>
Date: Wed, 18 Mar 2026 17:29:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9CUI=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/AndroidManifest.xml | 5 +-
.../controller/constant/Constant.java | 2 +-
.../dynamics/adapter/DynamicsAdapter.java | 45 ++-
.../dynamics/adapter/DynamicsAdapter1.java | 36 +-
.../adapter/DynamicsTopicAdapter.java | 32 +-
.../main/adapter/MainChannelAdapter1.kt | 5 +-
.../adapter/constant/SettingOptions.java | 1 +
.../bolizhuzi/im/uikit/common/Constans.java | 1 -
.../bolizhuzi/model/dynamics/CommentBean.java | 4 +-
.../model/dynamics/DynamicImage.java | 4 +-
.../model/dynamics/DynamicsItemBean.java | 3 +-
.../fragment/DynamicViewPagerFragment.java | 50 +--
.../bolizhuzi/view/login/LoginActivity.java | 4 +
.../bolizhuzi/view/luck/LuckFragment.java | 28 +-
.../bolizhuzi/view/luck/LuckListFragment.java | 45 ++-
.../bolizhuzi/view/main/CoverActivity.java | 3 +-
.../view/main/MainRecommendFragment.java | 142 ++-----
.../view/main/VideoFriendActivity.java | 4 +-
.../news/fragment/MainMessageFragment.java | 4 +-
.../view/settings/InfoEditActivity.java | 8 +-
.../view/settings/SettingFragment.java | 27 +-
.../view/settings/SystemSettingActivity.java | 2 +-
.../view/settings/WalletActivity.java | 21 +-
app/src/main/res/drawable-xhdpi/bg_dibu.png | Bin 47259 -> 49053 bytes
app/src/main/res/drawable-xhdpi/ic_rank1.png | Bin 2549 -> 4382 bytes
app/src/main/res/drawable-xhdpi/ic_rank2.png | Bin 2764 -> 4333 bytes
app/src/main/res/drawable-xhdpi/ic_rank3.png | Bin 2614 -> 4737 bytes
.../main/res/drawable-xhdpi/ic_sign_bg.png | Bin 84280 -> 0 bytes
app/src/main/res/drawable-xxhdpi/bg_dibu.png | Bin 142257 -> 0 bytes
app/src/main/res/drawable-xxhdpi/ic_rank1.png | Bin 3870 -> 0 bytes
app/src/main/res/drawable-xxhdpi/ic_rank2.png | Bin 4560 -> 0 bytes
app/src/main/res/drawable-xxhdpi/ic_rank3.png | Bin 3967 -> 0 bytes
.../main/res/drawable-xxhdpi/ic_sign_bg.png | Bin 182089 -> 0 bytes
app/src/main/res/drawable-xxxhdpi/bg_dibu.png | Bin 250284 -> 0 bytes
app/src/main/res/drawable/bg_rank.xml | 8 +
.../res/drawable/shape_daka_rank_frame.xml | 2 +-
app/src/main/res/drawable/switch_thumb_on.xml | 5 +-
app/src/main/res/drawable/top_corner_bg.xml | 3 +-
.../main/res/layout/activity_dynamic_post.xml | 1 +
app/src/main/res/layout/activity_mission.xml | 233 +++++------
.../res/layout/activity_system_setting.xml | 8 +-
app/src/main/res/layout/activity_wallet.xml | 347 ++++++++++++-----
app/src/main/res/layout/activity_withdraw.xml | 20 +-
app/src/main/res/layout/activity_zhi_rank.xml | 3 +-
.../main/res/layout/fragment_charm_rank.xml | 21 +-
.../layout/fragment_dynamic_view_pager.xml | 1 +
app/src/main/res/layout/fragment_luck.xml | 182 +++++++--
.../res/layout/fragment_main_recommend.xml | 364 +++++++++---------
.../layout/fragment_main_recommend_active.xml | 3 +-
.../layout/fragment_main_recommend_city.xml | 3 +-
.../fragment_main_recommend_recommend.xml | 3 +-
.../layout/fragment_personal_main_page.xml | 34 +-
.../main/res/layout/fragment_recommend1.xml | 3 +-
app/src/main/res/layout/fragment_setting.xml | 1 +
.../main/res/layout/item_dynamic_list1.xml | 37 +-
.../main/res/layout/item_dynamic_title.xml | 5 +-
app/src/main/res/layout/item_luck_list.xml | 55 ++-
.../res/layout/item_main_home_page_layout.xml | 1 -
.../layout/item_main_home_page_layout_1.xml | 2 +-
.../res/layout/item_main_message_title.xml | 2 +-
.../main/res/layout/item_setting_option.xml | 2 +-
app/src/main/res/layout/item_social_list.xml | 1 +
.../main/res/layout/layout_main_top_view.xml | 163 ++++----
.../main/res/mipmap-xhdpi/ic_main_luck_hi.png | Bin 2277 -> 0 bytes
.../res/mipmap-xhdpi/ic_main_luck_msg.png | Bin 2359 -> 0 bytes
.../main/res/mipmap-xhdpi/ic_task_mine.png | Bin 0 -> 608 bytes
.../main/res/mipmap-xhdpi/ic_wallet_bg.png | Bin 0 -> 56139 bytes
.../main/res/mipmap-xhdpi/ic_wallet_bill.png | Bin 0 -> 1219 bytes
.../main/res/mipmap-xhdpi/ic_wallet_cash.png | Bin 0 -> 1374 bytes
.../res/mipmap-xhdpi/ic_wallet_exchange.png | Bin 0 -> 1442 bytes
.../res/mipmap-xhdpi/ic_wallet_recharge.png | Bin 0 -> 949 bytes
.../icon_main_video_speed_man.png | Bin 18768 -> 0 bytes
.../icon_main_video_speed_women.png | Bin 19337 -> 0 bytes
.../mipmap-xhdpi/icon_main_voice_speed.png | Bin 21370 -> 0 bytes
.../res/mipmap-xxhdpi/ic_main_luck_hi.png | Bin 3517 -> 0 bytes
.../res/mipmap-xxhdpi/ic_main_luck_msg.png | Bin 3645 -> 0 bytes
.../icon_main_video_speed_man.png | Bin 39776 -> 0 bytes
.../icon_main_video_speed_women.png | Bin 41147 -> 0 bytes
.../mipmap-xxhdpi/icon_main_voice_speed.png | Bin 40150 -> 0 bytes
app/src/main/res/values/colors.xml | 10 +-
.../httprequest/OkHttp/OkHttpRequestImpl.java | 8 +-
uikit/src/main/res/layout/bottom_tab1.xml | 2 +-
uikit/src/main/res/layout/title.xml | 2 +-
uikit/src/main/res/values/color.xml | 1 +
84 files changed, 1164 insertions(+), 848 deletions(-)
delete mode 100644 app/src/main/res/drawable-xhdpi/ic_sign_bg.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/bg_dibu.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_rank1.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_rank2.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_rank3.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_sign_bg.png
delete mode 100644 app/src/main/res/drawable-xxxhdpi/bg_dibu.png
create mode 100644 app/src/main/res/drawable/bg_rank.xml
delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_main_luck_hi.png
delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_main_luck_msg.png
create mode 100644 app/src/main/res/mipmap-xhdpi/ic_task_mine.png
create mode 100644 app/src/main/res/mipmap-xhdpi/ic_wallet_bg.png
create mode 100644 app/src/main/res/mipmap-xhdpi/ic_wallet_bill.png
create mode 100644 app/src/main/res/mipmap-xhdpi/ic_wallet_cash.png
create mode 100644 app/src/main/res/mipmap-xhdpi/ic_wallet_exchange.png
create mode 100644 app/src/main/res/mipmap-xhdpi/ic_wallet_recharge.png
delete mode 100644 app/src/main/res/mipmap-xhdpi/icon_main_video_speed_man.png
delete mode 100644 app/src/main/res/mipmap-xhdpi/icon_main_video_speed_women.png
delete mode 100644 app/src/main/res/mipmap-xhdpi/icon_main_voice_speed.png
delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_main_luck_hi.png
delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_main_luck_msg.png
delete mode 100644 app/src/main/res/mipmap-xxhdpi/icon_main_video_speed_man.png
delete mode 100644 app/src/main/res/mipmap-xxhdpi/icon_main_video_speed_women.png
delete mode 100644 app/src/main/res/mipmap-xxhdpi/icon_main_voice_speed.png
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f69bab5..665daf0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -115,7 +115,6 @@
android:usesCleartextTraffic="true"
tools:replace="android:label,android:allowBackup"
tools:targetApi="r">
-
+
@@ -527,7 +528,7 @@
+ android:value="7c66fa0f782771bc2b2829158b6c6aac" />
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/Constant.java b/app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/Constant.java
index e6e0f33..c8e8798 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/Constant.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/Constant.java
@@ -63,7 +63,7 @@ public class Constant {
//飘屏通知
public final static String FLUTTER_NOTICE = "flutter_notice";
- public final static String AES_PASSWORD = "KBqTS1K3qj0flRE9";
+ public final static String AES_PASSWORD = "!qianyan20260315";
public static boolean IS_LOGIN_AGREEMENT_CHECK = false;
}
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter.java b/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter.java
index 45efd8c..b063384 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter.java
@@ -136,7 +136,7 @@ public class DynamicsAdapter extends BaseAdapter {
public View getView(int i, View view, ViewGroup viewGroup) {
Holder holder = null;
if (null == view) {
- view = View.inflate(mContext, R.layout.item_dynamic_list, null);
+ view = View.inflate(mContext, R.layout.item_dynamic_list1, null);
holder = initView(view);
} else {
holder = (Holder) view.getTag(R.id.tag_second);
@@ -147,14 +147,16 @@ public class DynamicsAdapter extends BaseAdapter {
} else {
holder.msgBtn.setVisibility(View.VISIBLE);
}
- holder.likeCountLabel.setText(bean.getLike_count() + "");
- holder.commentCountLabel.setText(bean.getComment_count() + "");
+ //holder.likeCountLabel.setText(bean.getLike_count() + "");
+ //holder.commentCountLabel.setText(bean.getComment_count() + "");
final int index = i;
holder.name.setText(bean.getNickname());
holder.head.setImageURI(ConstUrl.IMAGE_URL + bean.getAvatar());
holder.newPeopleImageView.setVisibility(View.GONE);
holder.realPeopleImageView.setVisibility(View.GONE);
+ holder.tv_see_count.setText("已有"+bean.getLike_count()+"次浏览");
+
if (bean.getGender() == 1) {
holder.realPeopleImageView.setVisibility(View.VISIBLE);
if (bean.getMark() == 2) {
@@ -194,7 +196,7 @@ public class DynamicsAdapter extends BaseAdapter {
NimUIKit.startChat(bean.getUser_id(), mContext);
}
});
- holder.commentImageView.setOnClickListener(new View.OnClickListener() {
+ /*holder.commentImageView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (dynamicCommentCallback != null) {
@@ -205,7 +207,7 @@ public class DynamicsAdapter extends BaseAdapter {
mContext.startActivity(intent);
}
}
- });
+ });*/
if (String.valueOf(SPUtils.getInt(mContext, ConsUser.USER_ID)).equals(mDynamicsItemList.get(index).getUser_id())) {
holder.getMenu.setImageResource(R.mipmap.feed_del);
} else {
@@ -241,11 +243,11 @@ public class DynamicsAdapter extends BaseAdapter {
addImageView(holder, bean.getImages());
- if (bean.getIs_like() == 1) {
+ /*if (bean.getIs_like() == 1) {
holder.likeImageView.setImageResource(R.mipmap.feed_heart_);
} else {
holder.likeImageView.setImageResource(R.mipmap.feed_heart);
- }
+ }*/
holder.head.setOnClickListener(new View.OnClickListener() {
@Override
@@ -255,13 +257,22 @@ public class DynamicsAdapter extends BaseAdapter {
mContext.startActivity(intent);
}
});
- holder.likeImageView.setOnClickListener(new View.OnClickListener() {
+ /* holder.likeImageView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (likeDynamicCallback != null) {
likeDynamicCallback.likeDynamic(bean);
}
}
+ });*/
+
+ holder.giftLayout.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (mGiftListener != null) {
+ mGiftListener.onSend(bean,bean.getReward_count());
+ }
+ }
});
view.setTag(R.id.tag_second, holder);
@@ -439,13 +450,14 @@ public class DynamicsAdapter extends BaseAdapter {
holder.imageListView2 = v.findViewById(R.id.dynamic_list_image_list_2);
holder.imageListView3 = v.findViewById(R.id.dynamic_list_image_list_3);
holder.msgBtn = v.findViewById(R.id.msgBtn);
- holder.commentCountLabel = v.findViewById(R.id.commentCountLabel);
- holder.likeCountLabel = v.findViewById(R.id.likeCountLabel);
- holder.likeImageView = v.findViewById(R.id.likeImageView);
- holder.commentImageView = v.findViewById(R.id.commentImageView);
+ //holder.commentCountLabel = v.findViewById(R.id.commentCountLabel);
+ //holder.likeCountLabel = v.findViewById(R.id.likeCountLabel);
+ //holder.likeImageView = v.findViewById(R.id.likeImageView);
+ //holder.commentImageView = v.findViewById(R.id.commentImageView);
holder.realPeopleImageView = v.findViewById(R.id.realPeopleImageView);
holder.newPeopleImageView = v.findViewById(R.id.newPeopleImageView);
holder.rl_dynamic_item = v.findViewById(R.id.rl_dynamic_item);
+ holder.tv_see_count = v.findViewById(R.id.tv_see_count);
return holder;
}
@@ -456,19 +468,20 @@ public class DynamicsAdapter extends BaseAdapter {
TextView years;
ImageView iv_sex;
ExpandLayout info;
- TextView commentCountLabel;
- TextView likeCountLabel;
+ //TextView commentCountLabel;
+ //TextView likeCountLabel;
LinearLayout imageListView1;
LinearLayout imageListView2;
LinearLayout imageListView3;
View giftLayout;
ImageView getMenu;
ImageView msgBtn;
- ImageView likeImageView;
- ImageView commentImageView;
+ //ImageView likeImageView;
+ //ImageView commentImageView;
ImageView realPeopleImageView;
ImageView newPeopleImageView;
RelativeLayout rl_dynamic_item;
+ TextView tv_see_count;
}
public void delete(int index) {
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter1.java b/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter1.java
index 7e479b1..0938e67 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter1.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter1.java
@@ -193,10 +193,10 @@ public class DynamicsAdapter1 extends BaseAdapter {
if (bean.getUser_id().equals(String.valueOf(selfID))) {
holder.msgBtn.setVisibility(View.INVISIBLE);
} else {
- holder.msgBtn.setVisibility(View.VISIBLE);
+ holder.msgBtn.setVisibility(View.INVISIBLE);
}
- holder.likeCountLabel.setText(bean.getLike_count() + "");
- holder.commentCountLabel.setText(bean.getComment_count() + "");
+ //holder.likeCountLabel.setText(bean.getLike_count() + "");
+ // holder.commentCountLabel.setText(bean.getComment_count() + "");
final int index = i;
holder.name.setText(bean.getNickname());
holder.head.setImageURI(StrU.getResourcePath(bean.getAvatar(), mContext));
@@ -230,7 +230,7 @@ public class DynamicsAdapter1 extends BaseAdapter {
// holder.info.setText(bean.getContent());
//TODO 显示浏览次数
- holder.tv_see_count.setText("已有0次浏览");
+ holder.tv_see_count.setText("已有"+bean.getLike_count()+"次浏览");
//TODO 显示话题
holder.tv_topic.setText("# 只想发个自拍");
@@ -248,7 +248,7 @@ public class DynamicsAdapter1 extends BaseAdapter {
NimUIKit.startChat(bean.getUser_id(), mContext);
}
});
- holder.commentImageView.setOnClickListener(new View.OnClickListener() {
+ /*holder.commentImageView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (dynamicCommentCallback != null) {
@@ -259,7 +259,7 @@ public class DynamicsAdapter1 extends BaseAdapter {
mContext.startActivity(intent);
}
}
- });
+ });*/
holder.getMenu.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -295,11 +295,11 @@ public class DynamicsAdapter1 extends BaseAdapter {
addImageView(holder, bean.getImages());
- if (bean.getIs_like() == 1) {
+ /* if (bean.getIs_like() == 1) {
holder.likeImageView.setImageResource(R.mipmap.feed_heart_);
} else {
holder.likeImageView.setImageResource(R.mipmap.feed_heart);
- }
+ }*/
holder.head.setOnClickListener(new View.OnClickListener() {
@Override
@@ -309,7 +309,7 @@ public class DynamicsAdapter1 extends BaseAdapter {
mContext.startActivity(intent);
}
});
- holder.likeImageView.setOnClickListener(new View.OnClickListener() {
+ /* holder.likeImageView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (likeDynamicCallback != null) {
@@ -317,7 +317,7 @@ public class DynamicsAdapter1 extends BaseAdapter {
}
}
- });
+ });*/
view.setTag(R.id.tag_second, holder);
return view;
@@ -539,10 +539,10 @@ public class DynamicsAdapter1 extends BaseAdapter {
holder.dynamic_image_num = v.findViewById(R.id.dynamic_image_num);
holder.imageListView3 = v.findViewById(R.id.dynamic_list_image_list_3);
holder.msgBtn = v.findViewById(R.id.msgBtn);
- holder.commentCountLabel = v.findViewById(R.id.commentCountLabel);
- holder.likeCountLabel = v.findViewById(R.id.likeCountLabel);
- holder.likeImageView = v.findViewById(R.id.likeImageView);
- holder.commentImageView = v.findViewById(R.id.commentImageView);
+ // holder.commentCountLabel = v.findViewById(R.id.commentCountLabel);
+ //holder.likeCountLabel = v.findViewById(R.id.likeCountLabel);
+ // holder.likeImageView = v.findViewById(R.id.likeImageView);
+ // holder.commentImageView = v.findViewById(R.id.commentImageView);
holder.realPeopleImageView = v.findViewById(R.id.realPeopleImageView);
holder.newPeopleImageView = v.findViewById(R.id.newPeopleImageView);
holder.rl_dynamic_item = v.findViewById(R.id.rl_dynamic_item);
@@ -558,8 +558,8 @@ public class DynamicsAdapter1 extends BaseAdapter {
TextView years;
ImageView iv_sex;
ExpandLayout info;
- TextView commentCountLabel;
- TextView likeCountLabel;
+ // TextView commentCountLabel;
+ // TextView likeCountLabel;
LinearLayout imageListView1;
ConstraintLayout imageListView2;
SimpleDraweeView dynamic_image1;
@@ -571,8 +571,8 @@ public class DynamicsAdapter1 extends BaseAdapter {
TextView tv_see_count;
ImageView getMenu;
ImageView msgBtn;
- ImageView likeImageView;
- ImageView commentImageView;
+ //ImageView likeImageView;
+ // ImageView commentImageView;
ImageView realPeopleImageView;
ImageView newPeopleImageView;
RelativeLayout rl_dynamic_item;
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsTopicAdapter.java b/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsTopicAdapter.java
index 735c5ca..28947b3 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsTopicAdapter.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsTopicAdapter.java
@@ -195,8 +195,8 @@ public class DynamicsTopicAdapter extends BaseAdapter {
} else {
holder.msgBtn.setVisibility(View.VISIBLE);
}
- holder.likeCountLabel.setText(bean.getLike_count() + "");
- holder.commentCountLabel.setText(bean.getComment_count() + "");
+ //holder.likeCountLabel.setText(bean.getLike_count() + "");
+ //holder.commentCountLabel.setText(bean.getComment_count() + "");
final int index = i;
holder.name.setText(bean.getNickname());
holder.head.setImageURI(StrU.getResourcePath(bean.getAvatar(), mContext));
@@ -245,7 +245,7 @@ public class DynamicsTopicAdapter extends BaseAdapter {
NimUIKit.startChat(bean.getUser_id(), mContext);
}
});
- holder.commentImageView.setOnClickListener(new View.OnClickListener() {
+ /* holder.commentImageView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (dynamicCommentCallback != null) {
@@ -256,7 +256,7 @@ public class DynamicsTopicAdapter extends BaseAdapter {
mContext.startActivity(intent);
}
}
- });
+ });*/
holder.getMenu.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -292,11 +292,11 @@ public class DynamicsTopicAdapter extends BaseAdapter {
addImageView(holder, bean.getImages());
- if (bean.getIs_like() == 1) {
+ /*if (bean.getIs_like() == 1) {
holder.likeImageView.setImageResource(R.mipmap.feed_heart_);
} else {
holder.likeImageView.setImageResource(R.mipmap.feed_heart);
- }
+ }*/
holder.head.setOnClickListener(new View.OnClickListener() {
@Override
@@ -306,7 +306,7 @@ public class DynamicsTopicAdapter extends BaseAdapter {
mContext.startActivity(intent);
}
});
- holder.likeImageView.setOnClickListener(new View.OnClickListener() {
+ /*holder.likeImageView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (likeDynamicCallback != null) {
@@ -314,7 +314,7 @@ public class DynamicsTopicAdapter extends BaseAdapter {
}
}
- });
+ });*/
view.setTag(R.id.tag_second, holder);
return view;
@@ -536,10 +536,10 @@ public class DynamicsTopicAdapter extends BaseAdapter {
holder.dynamic_image_num = v.findViewById(R.id.dynamic_image_num);
holder.imageListView3 = v.findViewById(R.id.dynamic_list_image_list_3);
holder.msgBtn = v.findViewById(R.id.msgBtn);
- holder.commentCountLabel = v.findViewById(R.id.commentCountLabel);
- holder.likeCountLabel = v.findViewById(R.id.likeCountLabel);
- holder.likeImageView = v.findViewById(R.id.likeImageView);
- holder.commentImageView = v.findViewById(R.id.commentImageView);
+ //holder.commentCountLabel = v.findViewById(R.id.commentCountLabel);
+ //holder.likeCountLabel = v.findViewById(R.id.likeCountLabel);
+ //holder.likeImageView = v.findViewById(R.id.likeImageView);
+ // holder.commentImageView = v.findViewById(R.id.commentImageView);
holder.realPeopleImageView = v.findViewById(R.id.realPeopleImageView);
holder.newPeopleImageView = v.findViewById(R.id.newPeopleImageView);
holder.rl_dynamic_item = v.findViewById(R.id.rl_dynamic_item);
@@ -554,8 +554,8 @@ public class DynamicsTopicAdapter extends BaseAdapter {
TextView years;
ImageView iv_sex;
ExpandLayout info;
- TextView commentCountLabel;
- TextView likeCountLabel;
+ //TextView commentCountLabel;
+ // TextView likeCountLabel;
LinearLayout imageListView1;
ConstraintLayout imageListView2;
SimpleDraweeView dynamic_image1;
@@ -567,8 +567,8 @@ public class DynamicsTopicAdapter extends BaseAdapter {
TextView tv_see_count;
ImageView getMenu;
ImageView msgBtn;
- ImageView likeImageView;
- ImageView commentImageView;
+ //ImageView likeImageView;
+ // ImageView commentImageView;
ImageView realPeopleImageView;
ImageView newPeopleImageView;
RelativeLayout rl_dynamic_item;
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainChannelAdapter1.kt b/app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainChannelAdapter1.kt
index b7aa6cf..48bedba 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainChannelAdapter1.kt
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainChannelAdapter1.kt
@@ -7,6 +7,7 @@ import android.os.CountDownTimer
import android.text.TextUtils
import android.view.View
import android.widget.ImageView
+import android.widget.LinearLayout
import android.widget.TextView
import com.chad.library.adapter.base.BaseDelegateMultiAdapter
import com.chad.library.adapter.base.delegate.BaseMultiTypeDelegate
@@ -61,8 +62,8 @@ class MainChannelAdapter1(private val mContext: Context, val key: String) :
val mPhoto = holder.getView(R.id.channel_anchor_id_photo_1)
val mCost = holder.getView(R.id.channel_anchor_id_cost_1)
val mScore = holder.getView(R.id.channel_anchor_id_score_1)
- val nmpp = holder.getView(R.id.iv_anchor_nm_img)
- val online = holder.getView(R.id.iv_anchor_online)
+ val nmpp = holder.getView(R.id.iv_anchor_nm_img)
+ val online = holder.getView(R.id.iv_anchor_online)
val mLocation = holder.getView(R.id.channel_anchor_location_1)
val newPeopleImageView = holder.getView(R.id.newPeopleImageView)
val iv_anchor_tag = holder.getView(R.id.iv_anchor_tag)
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/constant/SettingOptions.java b/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/constant/SettingOptions.java
index ba5df74..3f017af 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/constant/SettingOptions.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/constant/SettingOptions.java
@@ -18,5 +18,6 @@ public enum SettingOptions {
HELLOW,//招呼设置
ITEMS,//我的道具
VIDEO, //视频聊天
+ TASK, //每日任务
DETAIL//账单明细
}
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/common/Constans.java b/app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/common/Constans.java
index 5e188c2..c219640 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/common/Constans.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/common/Constans.java
@@ -17,5 +17,4 @@ public class Constans {
public final static String CUSTOMER_TAG_STICKY = "CUSTOMER_TAG_STICKY";//取消默认客服置顶
public final static String USER_MOBILE = "USER_MOBILE";
public final static String IS_FIRST_RECHARGE = "IS_FIRST_RECHARGE";
- public final static String IS_SET_HOME_ACTIVITY = "IS_SET_HOME_ACTIVITY";
}
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/CommentBean.java b/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/CommentBean.java
index 52c2a4f..2622470 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/CommentBean.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/CommentBean.java
@@ -1,6 +1,8 @@
package com.xuebiping.bolizhuzi.model.dynamics;
-public class CommentBean {
+import java.io.Serializable;
+
+public class CommentBean implements Serializable {
private int id;
private int dynamic_id;
private int uid;
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicImage.java b/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicImage.java
index 5e17ae5..49e69fd 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicImage.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicImage.java
@@ -1,6 +1,8 @@
package com.xuebiping.bolizhuzi.model.dynamics;
-public class DynamicImage {
+import java.io.Serializable;
+
+public class DynamicImage implements Serializable {
private String url;
private int width;
private int height;
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicsItemBean.java b/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicsItemBean.java
index 5192c09..dcfa087 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicsItemBean.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicsItemBean.java
@@ -1,8 +1,9 @@
package com.xuebiping.bolizhuzi.model.dynamics;
+import java.io.Serializable;
import java.util.List;
-public class DynamicsItemBean {
+public class DynamicsItemBean implements Serializable {
private String avatar;
private String nickname;
private int age;
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/dynamics/fragment/DynamicViewPagerFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/dynamics/fragment/DynamicViewPagerFragment.java
index 78436de..9243432 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/view/dynamics/fragment/DynamicViewPagerFragment.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/dynamics/fragment/DynamicViewPagerFragment.java
@@ -132,38 +132,38 @@ public class DynamicViewPagerFragment extends Fragment implements View.OnClickLi
mCityFragment = new SameCityDynamicFragment();
mRecent = new RecentDynamicFragment();
mFocusFragment = new FollowUsersDynamicFragment();
- dynamicTopicFragment = new DynamicTopicFragment();
+ // dynamicTopicFragment = new DynamicTopicFragment();
mDynamicFragments.add(mRecent);
mDynamicFragments.add(mFocusFragment);
if (NoClearSPUtils.getInt(getContext(), Constans.MARKET_STATUS) != 0 && SPUtils.getInt(getContext(), ConsUser.TYPE) != 2) {
mDynamicFragments.add(mCityFragment);
}
- mDynamicFragments.add(dynamicTopicFragment);
+ //mDynamicFragments.add(dynamicTopicFragment);
mDynamicViewPager.setAdapter(mViewPagerAdapter);
mDynamicViewPager.setCurrentItem(0, false);
- mDynamicViewPager.setOffscreenPageLimit(3);
+ mDynamicViewPager.setOffscreenPageLimit(2);
mTitleText1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mTitleText1.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));//加粗
mTitleBottom1.setVisibility(View.VISIBLE);
mTitleText1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
- mTitleText2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mTitleText2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mTitleText2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mTitleBottom2.setVisibility(View.GONE);
mTitleText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
- mTitleText3.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mTitleText3.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mTitleText3.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mTitleBottom3.setVisibility(View.GONE);
mTitleText3.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
- mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ /* mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
mTitleText4.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mTitleText4.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
- mTitleBottom4.setVisibility(View.GONE);
+ mTitleBottom4.setVisibility(View.GONE);*/
if (!TextUtils.isEmpty(SPUtils.getString(getActivity(), ConsUser.DYNAMIC_CITY))) {
mTitleText3.setText(SPUtils.getString(getActivity(), ConsUser.DYNAMIC_CITY));
@@ -187,17 +187,17 @@ public class DynamicViewPagerFragment extends Fragment implements View.OnClickLi
mTitleText1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
mTitleBottom1.setVisibility(View.VISIBLE);
- mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ /* mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
mTitleText4.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mTitleText4.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
- mTitleBottom4.setVisibility(View.GONE);
+ mTitleBottom4.setVisibility(View.GONE);*/
- mTitleText2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mTitleText2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mTitleText2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
mTitleText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mTitleBottom2.setVisibility(View.GONE);
- mTitleText3.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mTitleText3.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mTitleText3.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
mTitleText3.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mTitleBottom3.setVisibility(View.GONE);
@@ -211,17 +211,17 @@ public class DynamicViewPagerFragment extends Fragment implements View.OnClickLi
mTitleText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
mTitleBottom2.setVisibility(View.VISIBLE);
- mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ /* mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
mTitleText4.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mTitleText4.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
- mTitleBottom4.setVisibility(View.GONE);
+ mTitleBottom4.setVisibility(View.GONE);*/
- mTitleText1.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mTitleText1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mTitleText1.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mTitleText1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mTitleBottom1.setVisibility(View.GONE);
- mTitleText3.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mTitleText3.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mTitleText3.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mTitleText3.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mTitleBottom3.setVisibility(View.GONE);
@@ -235,17 +235,17 @@ public class DynamicViewPagerFragment extends Fragment implements View.OnClickLi
mTitleText3.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
mTitleBottom3.setVisibility(View.VISIBLE);
- mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ /*mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
mTitleText4.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mTitleText4.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
- mTitleBottom4.setVisibility(View.GONE);
+ mTitleBottom4.setVisibility(View.GONE);*/
- mTitleText2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mTitleText2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mTitleText2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mTitleText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mTitleBottom2.setVisibility(View.GONE);
- mTitleText1.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mTitleText1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mTitleText1.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mTitleText1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mTitleBottom1.setVisibility(View.GONE);
@@ -253,7 +253,7 @@ public class DynamicViewPagerFragment extends Fragment implements View.OnClickLi
mIvMoreCity.setImageResource(R.drawable.ic_bou_mo2);
isReClick = true;
break;
- case 4:
+ /* case 4:
mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mTitleText4.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));//加粗
mTitleText4.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
@@ -276,7 +276,7 @@ public class DynamicViewPagerFragment extends Fragment implements View.OnClickLi
mIvMoreCity.setImageResource(R.drawable.ic_bou_mo1);
isReClick = false;
- break;
+ break;*/
}
}
@@ -294,22 +294,22 @@ public class DynamicViewPagerFragment extends Fragment implements View.OnClickLi
mTitleTag1 = mTitleView.findViewById(R.id.dynamic_title_view_1);
mTitleTag2 = mTitleView.findViewById(R.id.dynamic_title_view_2);
mTitleTag3 = mTitleView.findViewById(R.id.dynamic_title_view_3);
- mTitleTag4 = mTitleView.findViewById(R.id.dynamic_title_view_4);
+ // mTitleTag4 = mTitleView.findViewById(R.id.dynamic_title_view_4);
mTitleText1 = mTitleView.findViewById(R.id.dynamic_title_name_1);
mTitleText2 = mTitleView.findViewById(R.id.dynamic_title_name_2);
mTitleText3 = mTitleView.findViewById(R.id.dynamic_title_name_3);
- mTitleText4 = mTitleView.findViewById(R.id.dynamic_title_name_4);
+ //mTitleText4 = mTitleView.findViewById(R.id.dynamic_title_name_4);
mTitleBottom1 = mTitleView.findViewById(R.id.dynamic_title_bottom_line_1);
mTitleBottom2 = mTitleView.findViewById(R.id.dynamic_title_bottom_line_2);
mTitleBottom3 = mTitleView.findViewById(R.id.dynamic_title_bottom_line_3);
- mTitleBottom4 = mTitleView.findViewById(R.id.dynamic_title_bottom_line_4);
+ //mTitleBottom4 = mTitleView.findViewById(R.id.dynamic_title_bottom_line_4);
mIvMoreCity = mTitleView.findViewById(R.id.iv_more_city);
mTitlePost = mTitleView.findViewById(R.id.dynamic_title_post);
mTitleTextMydynamic.setOnClickListener(this);
mTitleTag1.setOnClickListener(this);
mTitleTag2.setOnClickListener(this);
mTitleTag3.setOnClickListener(this);
- mTitleTag4.setOnClickListener(this);
+ // mTitleTag4.setOnClickListener(this);
mTitlePost.setOnClickListener(this);
if (NoClearSPUtils.getInt(getContext(), Constans.MARKET_STATUS) == 0 || SPUtils.getInt(getContext(), ConsUser.TYPE) == 2) {
iv_address.setVisibility(View.INVISIBLE);
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/login/LoginActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/login/LoginActivity.java
index 04e18bf..7fad2fd 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/view/login/LoginActivity.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/login/LoginActivity.java
@@ -21,6 +21,7 @@ import android.widget.TextView;
import androidx.core.content.ContextCompat;
import com.blankj.utilcode.util.ActivityUtils;
+import com.fengliyan.device.DeviceManager;
import com.hjq.permissions.OnPermissionCallback;
import com.hjq.permissions.XXPermissions;
import com.fengliyan.http.httprequest.HttpCallback;
@@ -52,6 +53,7 @@ import com.xuebiping.bolizhuzi.view.config.BaseUIConfig;
import com.xuebiping.bolizhuzi.view.config.CustomXmlConfig;
import com.xuebiping.bolizhuzi.view.config.OnOneKeyCustomClickListener;
import com.xuebiping.bolizhuzi.view.login.utils.LoginUtils;
+import com.xuebiping.bolizhuzi.view.main.MainActivity;
import com.xuebiping.bolizhuzi.view.main.dialog.PermissionDialog;
import com.xuebiping.bolizhuzi.view.main.dialog.UpdateDialog;
import com.xuebiping.bolizhuzi.view.register.RegisterActivity;
@@ -473,6 +475,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener,
public void onSuccess(BaseActivity activity, LoginBean result, String message) {
LoginUtils.checkLoginStatus(LoginActivity.this, result, 0);
NoClearSPUtils.saveString(activity, Constans.USER_MOBILE, userName);
+
}
@Override
@@ -499,6 +502,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener,
public void onSuccess(BaseActivity activity, LoginBean result, String tips) {
LoginUtils.checkLoginStatus(LoginActivity.this, result, 0);
NoClearSPUtils.saveString(activity, Constans.USER_MOBILE, userName);
+
}
@Override
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckFragment.java
index 93bfe4c..bb0aa84 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckFragment.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckFragment.java
@@ -66,12 +66,12 @@ public class LuckFragment extends Fragment implements View.OnClickListener, Luck
// private AppBarLayout app_bar_layout;
private LinearLayout rl_main_title;
private RelativeLayout title_view_0, title_view_1;
- private ConstraintLayout title_view_2;
+ private RelativeLayout title_view_2;
private TextView tv_0, tv_1, tv_2;
private View title_bottom_line_0, title_bottom_line_1, title_bottom_line_2;
private ImageView iv_luck_rank, iv_luck_hi, iv_luck_search;
- // private ConstraintLayout lin_video_speed;
-// private ConstraintLayout lin_voice_speed;
+ private RelativeLayout lin_video_speed;
+ private RelativeLayout lin_voice_speed;
// private CoverFlowView cf_luck_img;
private RelativeLayout main_yaoqing_layout;
private ImageView main_yaoqing, main_yaoqing_end;
@@ -144,8 +144,8 @@ public class LuckFragment extends Fragment implements View.OnClickListener, Luck
iv_luck_hi = view.findViewById(R.id.iv_luck_hi);
iv_luck_search = view.findViewById(R.id.iv_luck_search);
// cf_luck_img = view.findViewById(R.id.cf_luck_img);
-// lin_video_speed = view.findViewById(R.id.lin_video_speed);
-// lin_voice_speed = view.findViewById(R.id.lin_voice_speed);
+ lin_video_speed = view.findViewById(R.id.lin_video_speed);
+ lin_voice_speed = view.findViewById(R.id.lin_voice_speed);
main_yaoqing_layout = view.findViewById(R.id.main_yaoqing_layout);
main_yaoqing = view.findViewById(R.id.main_yaoqing);
main_yaoqing_end = view.findViewById(R.id.main_yaoqing_end);
@@ -163,8 +163,8 @@ public class LuckFragment extends Fragment implements View.OnClickListener, Luck
}
private void initListener() {
-// lin_video_speed.setOnClickListener(this);
-// lin_voice_speed.setOnClickListener(this);
+ lin_video_speed.setOnClickListener(this);
+ lin_voice_speed.setOnClickListener(this);
title_view_0.setOnClickListener(this);
title_view_1.setOnClickListener(this);
title_view_2.setOnClickListener(this);
@@ -315,10 +315,10 @@ public class LuckFragment extends Fragment implements View.OnClickListener, Luck
tv_0.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
tv_0.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
tv_0.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
- tv_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ tv_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
tv_1.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
tv_1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
- tv_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ tv_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
tv_2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
tv_2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
title_bottom_line_0.setVisibility(View.VISIBLE);
@@ -326,13 +326,13 @@ public class LuckFragment extends Fragment implements View.OnClickListener, Luck
title_bottom_line_2.setVisibility(View.GONE);
break;
case 1:
- tv_0.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ tv_0.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
tv_0.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
tv_0.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
tv_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
tv_1.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
tv_1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
- tv_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ tv_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
tv_2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
tv_2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
title_bottom_line_0.setVisibility(View.GONE);
@@ -340,10 +340,10 @@ public class LuckFragment extends Fragment implements View.OnClickListener, Luck
title_bottom_line_2.setVisibility(View.GONE);
break;
case 2:
- tv_0.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ tv_0.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
tv_0.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
tv_0.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
- tv_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ tv_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
tv_1.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
tv_1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
tv_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
@@ -506,7 +506,7 @@ public class LuckFragment extends Fragment implements View.OnClickListener, Luck
show_alipay_pay_type = result.getShow_alipay_pay_type();
// 1=已经首充过、0=没有首充过
if (UserManager.getUserInfo().getGender() == 2 && result.getIs_first_recharge() == 0) {
- main_yaoqing.setImageResource(R.drawable.ic_lqhl);
+ main_yaoqing.setImageResource(R.drawable.iv_first_chong);
is_first_recharge = true;
main_yaoqing_layout.setVisibility(View.VISIBLE);
} else {
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckListFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckListFragment.java
index adc7174..97daa13 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckListFragment.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckListFragment.java
@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
+import android.widget.RelativeLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -47,10 +48,10 @@ public class LuckListFragment extends Fragment implements LuckListAdapter.OnClic
private int mItemCount;
private LuckListAdapter mAdapter;
private SwipeRefreshLayout mRefresh;
- private View headerView;
- private ConstraintLayout lin_video_speed;
- private ConstraintLayout lin_voice_speed;
- private ImageView iv_luck_video_speed_bg;
+ // private View headerView;
+ // private RelativeLayout lin_video_speed;
+ // private RelativeLayout lin_voice_speed;
+ //private ImageView iv_luck_video_speed_bg;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -106,18 +107,18 @@ public class LuckListFragment extends Fragment implements LuckListAdapter.OnClic
}
});
- headerView = getLayoutInflater().inflate(R.layout.layout_main_top_view, null);
- lin_video_speed = headerView.findViewById(R.id.lin_video_speed);
- lin_voice_speed = headerView.findViewById(R.id.lin_voice_speed);
- iv_luck_video_speed_bg = headerView.findViewById(R.id.iv_luck_video_speed_bg);
- lin_video_speed.setOnClickListener(this);
- lin_voice_speed.setOnClickListener(this);
- if (UserManager.getUserInfo().isWomen()) {
+ // headerView = getLayoutInflater().inflate(R.layout.layout_main_top_view, null);
+ //lin_video_speed = headerView.findViewById(R.id.lin_video_speed);
+ // lin_voice_speed = headerView.findViewById(R.id.lin_voice_speed);
+ //iv_luck_video_speed_bg = headerView.findViewById(R.id.iv_luck_video_speed_bg);
+ // lin_video_speed.setOnClickListener(this);
+ // lin_voice_speed.setOnClickListener(this);
+ /*if (UserManager.getUserInfo().isWomen()) {
iv_luck_video_speed_bg.setImageResource(R.mipmap.icon_main_video_speed_man);
} else {
iv_luck_video_speed_bg.setImageResource(R.mipmap.icon_main_video_speed_women);
- }
- mAdapter.addHeaderView(headerView);
+ }*/
+ // mAdapter.addHeaderView(headerView);
mRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
@@ -238,7 +239,7 @@ public class LuckListFragment extends Fragment implements LuckListAdapter.OnClic
@Override
public void onClick(View v) {
switch (v.getId()) {
- case R.id.lin_video_speed://视频速配
+ /* case R.id.lin_video_speed://视频速配
if (StrU.isFastClick()) {
Intent videoSpeedIntent = new Intent(getActivity(), SpeedDatingActivity.class);
videoSpeedIntent.putExtra(SpeedDatingActivity.SPEED_TYPE, 0);
@@ -253,7 +254,21 @@ public class LuckListFragment extends Fragment implements LuckListAdapter.OnClic
voiceSpeedIntent.putStringArrayListExtra(SpeedDatingActivity.IMAGE_LIST, imageList);
startActivity(voiceSpeedIntent);
}
- break;
+
+ *//*niMingPiPeiDialog = new NiMingPiPeiDialog(getActivity(), R.style.SelectiveDialog);
+ niMingPiPeiDialog.show();
+ niMingPiPeiDialog.setOnDialogClickListener(new NiMingPiPeiDialog.OnDialogLeftClickListener() {
+ @Override
+ public void leftClick() {
+ ToastHelper.showToast(getActivity(),"语音匿名匹配");
+ }
+ }, new NiMingPiPeiDialog.OnDialogRightClickListener() {
+ @Override
+ public void rightClick() {
+ ToastHelper.showToast(getActivity(),"视频匿名匹配");
+ }
+ });*//*
+ break;*/
}
}
}
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/CoverActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/CoverActivity.java
index ef954ba..96478c4 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/CoverActivity.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/CoverActivity.java
@@ -80,7 +80,7 @@ public class CoverActivity extends BaseActivity {
if (!SPUtils.getBoolean(CoverActivity.this, ConsUser.IS_LOGIN_AGREEMENT_CHECK, false)) {
showLoginDialog();
} else {
-// oneKeyLoginInit();
+ // oneKeyLoginInit();
checkUpdate();
}
}
@@ -402,6 +402,7 @@ public class CoverActivity extends BaseActivity {
showLoginDialog();
} else {
getMarketStatus();
+ // startTimer();
}
SPUtils.saveInt(this, ConsUser.DYNAMICS_TYPE, 0);
}
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainRecommendFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainRecommendFragment.java
index c460cd7..0bea63f 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainRecommendFragment.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainRecommendFragment.java
@@ -81,43 +81,37 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
private ImageView mIvTitleSearch;
private View mVyaoqingLayout;
private LinearLayout main_turntable;
- private LinearLayout main_first_chong_layout;
private ImageView main_turntable_end, iv_main_turntable;
- private ImageView main_first_chong_end, main_first_chong;
- private LinearLayout ll_main_home_title;
- private RelativeLayout rl_video_pp;
- private RelativeLayout rl_audio_pp;
- private NiMingPiPeiDialog niMingPiPeiDialog;
- private TextView tv_suaixuan;
+
private DefaultRecommendFragment defaultRecommendFragment;
- private ShaiXuanDialog shaiXuanDialog;
+ private View v;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- View v = inflater.inflate(R.layout.fragment_main_recommend, container, false);
- ll_main_home_title = v.findViewById(R.id.ll_main_home_title);
- initTitle();
+ v = inflater.inflate(R.layout.fragment_main_recommend, container, false);
+ initTitle(v);
initView(v);
EventBus.getDefault().register(this);
// getIndexStuff();
return v;
}
- private View mSearchView;
+ // private View mSearchView;
private ImageView mGenderView;
private ImageView iv_title_rank;
- private void initTitle() {
+ private void initTitle(View mSearchView) {
/*Title title = ((BaseActivity) getActivity()).getCustomTitle();
title.setVisibility(View.VISIBLE);
- title.findViewById(R.id.title_bg).setBackgroundColor(Color.WHITE);
+ title.setTitleBackground(Color.TRANSPARENT);
+ //title.findViewById(R.id.title_bg).setBackgroundColor(Color.TRANSPARENT);
title.dismissBottomLine();
title.dimissRight();
title.dismissLeft();
title.setTitle("");*/
- int isSetHome = StorageManager.getInstance(getActivity()).getInt(Constans.IS_SET_HOME_ACTIVITY);
+ /*int isSetHome = StorageManager.getInstance(getActivity()).getInt(Constans.IS_SET_HOME_ACTIVITY);
if(isSetHome == 0){//未设置成为主页
mSearchView = View.inflate(getActivity(), R.layout.item_main_home_page_layout_1, null);
tv_suaixuan = mSearchView.findViewById(R.id.tv_suaixuan);
@@ -135,8 +129,8 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
});
}
});
- } else { //设置成为主页
- mSearchView = View.inflate(getActivity(), R.layout.item_main_home_page_layout, null);
+ } else { */ //设置成为主页
+ // mSearchView = View.inflate(getActivity(), R.layout.item_main_home_page_layout, null);
mRecommend_recommend = mSearchView.findViewById(R.id.title_view_1);
mRecommend_active = mSearchView.findViewById(R.id.title_view_2);
mRecommend_people = mSearchView.findViewById(R.id.title_view_3);
@@ -172,7 +166,7 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
mRecommend_recommend.setOnClickListener(this);
mRecommend_active.setOnClickListener(this);
mRecommend_people.setOnClickListener(this);
- }
+ //}
mIvTitleSearch = mSearchView.findViewById(R.id.iv_title_search);
mGenderView = mSearchView.findViewById(R.id.iv_title_gender);
@@ -184,8 +178,8 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
// mGenderView.setText("男生");
// }
- //title.addViewTo(mSearchView, POSTION_CENTER);
- ll_main_home_title.addView(mSearchView);
+ // title.addViewTo(mSearchView, POSTION_CENTER);
+
iv_title_rank.setOnClickListener(new View.OnClickListener() {
@Override
@@ -266,23 +260,13 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
mIvAd.setOnClickListener(this);
v.findViewById(R.id.main_yaoqing_end).setOnClickListener(this);
- rl_video_pp = v.findViewById(R.id.rl_video_pp);
- rl_audio_pp = v.findViewById(R.id.rl_audio_pp);
-
mMainViewPager = v.findViewById(R.id.main_view_pager);
-
main_turntable = v.findViewById(R.id.main_turntable);
- main_first_chong_layout = v.findViewById(R.id.main_first_chong_layout);
main_turntable_end = v.findViewById(R.id.main_turntable_end);
- main_first_chong_end = v.findViewById(R.id.main_first_chong_end);
iv_main_turntable = v.findViewById(R.id.iv_main_turntable);
- main_first_chong = v.findViewById(R.id.main_first_chong);
main_turntable.setOnClickListener(this);
- main_first_chong_layout.setOnClickListener(this);
+
main_turntable_end.setOnClickListener(this);
- main_first_chong_end.setOnClickListener(this);
- rl_video_pp.setOnClickListener(this);
- rl_audio_pp.setOnClickListener(this);
if (NoClearSPUtils.getInt(getContext(), Constans.MARKET_STATUS) == 0 || SPUtils.getInt(getContext(), ConsUser.TYPE) == 2) {
main_turntable.setVisibility(View.GONE);
@@ -296,12 +280,7 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
mMainRecommendPeopleFragment = new MainRecommendPeopleFragment();
mMainRecommendCityFragment = new MainRecommendCityFragment();
- int isSetHome = StorageManager.getInstance(getActivity()).getInt(Constans.IS_SET_HOME_ACTIVITY);
- if(isSetHome == 0){ //未设置成为主页
- mChannelFragments.add(defaultRecommendFragment);
- }else {
- mChannelFragments.add(mRecommendFragment1);
- }
+ mChannelFragments.add(mRecommendFragment1);
mChannelFragments.add(mMainRecommendActiveFragment);
mChannelFragments.add(mMainRecommendPeopleFragment);
@@ -315,9 +294,9 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
mMainViewPager.setAdapter(mViewPagerAdapter);
mMainViewPager.setOffscreenPageLimit(3);
- if(isSetHome != 0) { //未设置成为主页
- viewPagerChange(1);
- }
+
+ viewPagerChange(1);
+
mMainViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override
@@ -332,11 +311,7 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
} else {
isReClick = false;
}
-
- int isSetHome = StorageManager.getInstance(getActivity()).getInt(Constans.IS_SET_HOME_ACTIVITY);
- if(isSetHome != 0) {
- viewPagerChange(position);
- }
+ viewPagerChange(position);
}
@Override
@@ -351,12 +326,8 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
public void RefreshFragment(){
mChannelFragments.clear();
- int isSetHome = StorageManager.getInstance(getActivity()).getInt(Constans.IS_SET_HOME_ACTIVITY);
- if(isSetHome == 0){ //未设置成为主页
- mChannelFragments.add(defaultRecommendFragment);
- }else {
- mChannelFragments.add(mRecommendFragment1);
- }
+
+ mChannelFragments.add(mRecommendFragment1);
mChannelFragments.add(mMainRecommendActiveFragment);
mChannelFragments.add(mMainRecommendPeopleFragment);
@@ -370,9 +341,7 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
mMainViewPager.setAdapter(mViewPagerAdapter);
mMainViewPager.setOffscreenPageLimit(3);
- if(isSetHome != 0) { //未设置成为主页
- viewPagerChange(1);
- }
+ viewPagerChange(1);
mMainViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override
@@ -387,11 +356,7 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
} else {
isReClick = false;
}
-
- int isSetHome = StorageManager.getInstance(getActivity()).getInt(Constans.IS_SET_HOME_ACTIVITY);
- if(isSetHome != 0) {
- viewPagerChange(position);
- }
+ viewPagerChange(position);
}
@Override
@@ -407,11 +372,11 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
@Override
public void onHiddenChanged(boolean hidden) {
if (!hidden) {
- initTitle();
- int isSetHome = StorageManager.getInstance(getActivity()).getInt(Constans.IS_SET_HOME_ACTIVITY);
- if(isSetHome != 0) {
- viewPagerChange(mIndex);
- }
+ ((BaseActivity) getActivity()).hideTitleBar();
+ initTitle(v);
+
+ viewPagerChange(mIndex);
+
// if (UserManager.getUserInfo().getGender() == 2) {
// getRechargeInfo();
// }
@@ -446,17 +411,17 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
mRecommend_title_name_1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
mRecommend_title_bottom_line_1.setVisibility(View.VISIBLE);
- mRecommend_title_name_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mRecommend_title_name_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mRecommend_title_name_2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mRecommend_title_name_2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mRecommend_title_bottom_line_2.setVisibility(View.GONE);
- mRecommend_title_name_3.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mRecommend_title_name_3.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mRecommend_title_name_3.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mRecommend_title_name_3.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mRecommend_title_bottom_line_3.setVisibility(View.GONE);
- mRecommend_title_name_4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mRecommend_title_name_4.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mRecommend_title_name_4.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mRecommend_title_name_4.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mRecommend_title_bottom_line_4.setVisibility(View.GONE);
@@ -464,7 +429,7 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
mIvMoreCity.setImageResource(R.drawable.ic_bou_mo1);
break;
case 1:
- mRecommend_title_name_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mRecommend_title_name_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mRecommend_title_name_1.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mRecommend_title_name_1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mRecommend_title_bottom_line_1.setVisibility(View.GONE);
@@ -474,12 +439,12 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
mRecommend_title_name_2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
mRecommend_title_bottom_line_2.setVisibility(View.VISIBLE);
- mRecommend_title_name_3.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mRecommend_title_name_3.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mRecommend_title_name_3.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mRecommend_title_name_3.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mRecommend_title_bottom_line_3.setVisibility(View.GONE);
- mRecommend_title_name_4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mRecommend_title_name_4.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mRecommend_title_name_4.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mRecommend_title_name_4.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mRecommend_title_bottom_line_4.setVisibility(View.GONE);
@@ -487,12 +452,12 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
mIvMoreCity.setImageResource(R.drawable.ic_bou_mo1);
break;
case 2:
- mRecommend_title_name_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mRecommend_title_name_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mRecommend_title_name_1.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mRecommend_title_name_1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mRecommend_title_bottom_line_1.setVisibility(View.GONE);
- mRecommend_title_name_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mRecommend_title_name_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mRecommend_title_name_2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mRecommend_title_name_2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mRecommend_title_bottom_line_2.setVisibility(View.GONE);
@@ -502,7 +467,7 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
mRecommend_title_name_3.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
mRecommend_title_bottom_line_3.setVisibility(View.VISIBLE);
- mRecommend_title_name_4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mRecommend_title_name_4.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mRecommend_title_name_4.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mRecommend_title_name_4.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mRecommend_title_bottom_line_4.setVisibility(View.GONE);
@@ -510,17 +475,17 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
mIvMoreCity.setImageResource(R.drawable.ic_bou_mo1);
break;
case 3:
- mRecommend_title_name_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mRecommend_title_name_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mRecommend_title_name_1.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mRecommend_title_name_1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mRecommend_title_bottom_line_1.setVisibility(View.GONE);
- mRecommend_title_name_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mRecommend_title_name_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mRecommend_title_name_2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mRecommend_title_name_2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mRecommend_title_bottom_line_2.setVisibility(View.GONE);
- mRecommend_title_name_3.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mRecommend_title_name_3.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mRecommend_title_name_3.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mRecommend_title_name_3.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mRecommend_title_bottom_line_3.setVisibility(View.GONE);
@@ -587,29 +552,6 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
dialog.show();
} else if (view.getId() == R.id.main_turntable_end) {
main_turntable.setVisibility(View.GONE);
- } else if (view.getId() == R.id.main_first_chong_layout) {
- //TODO 首充特惠
- } else if (view.getId() == R.id.main_first_chong_end) {
- main_first_chong_layout.setVisibility(View.GONE);
- }else if (view.getId() == R.id.rl_video_pp) {
- //TODO 视频交友
- startActivity(new Intent(getActivity(),VideoFriendActivity.class));
- }else if (view.getId() == R.id.rl_audio_pp) {
- //TODO 匿名匹配
- niMingPiPeiDialog = new NiMingPiPeiDialog(getActivity(), R.style.SelectiveDialog);
- niMingPiPeiDialog.show();
- niMingPiPeiDialog.setOnDialogClickListener(new NiMingPiPeiDialog.OnDialogLeftClickListener() {
- @Override
- public void leftClick() {
- ToastHelper.showToast(getActivity(),"语音匿名匹配");
- }
- }, new NiMingPiPeiDialog.OnDialogRightClickListener() {
- @Override
- public void rightClick() {
- ToastHelper.showToast(getActivity(),"视频匿名匹配");
- }
- });
-
}
}
@@ -671,7 +613,7 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe
StorageManager.getInstance(activity).putInt(Constans.IS_FIRST_RECHARGE, result.getIs_first_recharge());
// 1=已经首充过、0=没有首充过
if (UserManager.getUserInfo().getGender() == 2 && result.getIs_first_recharge() == 0) {
- mIvAd.setImageResource(R.drawable.ic_lqhl);
+ mIvAd.setImageResource(R.drawable.iv_first_chong);
is_first_recharge = true;
mVyaoqingLayout.setVisibility(View.VISIBLE);
} else {
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/VideoFriendActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/VideoFriendActivity.java
index 65dd0e1..735ec65 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/VideoFriendActivity.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/VideoFriendActivity.java
@@ -41,13 +41,13 @@ public class VideoFriendActivity extends BaseActivity {
tv_set_home.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- if(StorageManager.getInstance(VideoFriendActivity.this).getInt(Constans.IS_SET_HOME_ACTIVITY) == 0) {
+ /*if(StorageManager.getInstance(VideoFriendActivity.this).getInt(Constans.IS_SET_HOME_ACTIVITY) == 0) {
StorageManager.getInstance(VideoFriendActivity.this).putInt(Constans.IS_SET_HOME_ACTIVITY, 1);
tv_set_home.setText("取消首页");
}else {
StorageManager.getInstance(VideoFriendActivity.this).putInt(Constans.IS_SET_HOME_ACTIVITY, 0);
tv_set_home.setText("设为首页");
- }
+ }*/
}
});
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/news/fragment/MainMessageFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/news/fragment/MainMessageFragment.java
index 9b65b8a..15c4c2c 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/view/news/fragment/MainMessageFragment.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/news/fragment/MainMessageFragment.java
@@ -235,7 +235,7 @@ public class MainMessageFragment extends Fragment implements View.OnClickListene
mTitleText1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
mTitleBottom1.setVisibility(View.VISIBLE);
- mTitleText2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mTitleText2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mTitleText2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
mTitleText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mTitleBottom2.setVisibility(View.GONE);
@@ -246,7 +246,7 @@ public class MainMessageFragment extends Fragment implements View.OnClickListene
mTitleText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
mTitleBottom2.setVisibility(View.VISIBLE);
- mTitleText1.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text));
+ mTitleText1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text));
mTitleText1.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规
mTitleText1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
mTitleBottom1.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InfoEditActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InfoEditActivity.java
index 31536a3..0306125 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InfoEditActivity.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InfoEditActivity.java
@@ -1120,9 +1120,11 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen
String s = SysSPUtils.getString(this, ConsUser.PROFILE);
Gson gson = new Gson();
GlobalConfigBean.ProfileBean bean = gson.fromJson(s, GlobalConfigBean.ProfileBean.class);
- for (int i = 0; i < bean.getJob_list().size(); i++) {
- options1Items.add(bean.getJob_list().get(i).getName());
- options2Items.add(bean.getJob_list().get(i).getMenu());
+ if(bean != null && bean.getJob_list().size() > 0) {
+ for (int i = 0; i < bean.getJob_list().size(); i++) {
+ options1Items.add(bean.getJob_list().get(i).getName());
+ options2Items.add(bean.getJob_list().get(i).getMenu());
+ }
}
/**
* 注意 ：如果是三级联动的数据(省市区等)，请参照 JsonDataActivity 类里面的写法。
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment.java
index d1cec7c..b52d857 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment.java
@@ -110,7 +110,7 @@ public class SettingFragment extends Fragment implements View.OnClickListener {
private Banner image_banner;
//男女生内容互换
- private ConstraintLayout cl_income;
+ private LinearLayout cl_income;
private LinearLayout ll_income;
private TextView tv_income;
// private TextView tv_income_hint;
@@ -368,6 +368,7 @@ public class SettingFragment extends Fragment implements View.OnClickListener {
mOptions1.add(SettingOptions.CUSTOMER);
mOptions1.add(SettingOptions.MEMBER);
mOptions1.add(SettingOptions.DETAIL);
+ mOptions1.add(SettingOptions.TASK);
if (NoClearSPUtils.getInt(getContext(), ConsUser.TURNTABLE_COUPON_SWITCH) == 1) {
mOptions1.add(SettingOptions.ITEMS);
}
@@ -432,12 +433,12 @@ public class SettingFragment extends Fragment implements View.OnClickListener {
&& StrU.equals("1", NoClearSPUtils.getString(getActivity(), ConsUser.WECHAT_STATUS))) {
mOptions1.add(SettingOptions.ADDWECHAT);
}
+ mOptions1.add(SettingOptions.TASK);
mOptions1.add(SettingOptions.HELLOW);
mOptions1.add(SettingOptions.BEAUTY);
mOptions1.add(SettingOptions.DETAIL);
addOption(mOptions1, lin_my_list1);
mOptions2.add(SettingOptions.GODDESSPRIVILEGE);
- mOptions2.add(SettingOptions.MEMBER);
if (NoClearSPUtils.getInt(getContext(), Constans.MARKET_STATUS) == 1 && SPUtils.getInt(getContext(), ConsUser.TYPE) != 2) {
mOptions2.add(SettingOptions.GUIDE);
}
@@ -817,6 +818,20 @@ public class SettingFragment extends Fragment implements View.OnClickListener {
}
});
break;
+ case TASK:
+ /* if (gender == 2) {
+ mLogo.setImageResource(R.mipmap.ic_task_mine);
+ } else {*/
+ mLogo.setImageResource(R.mipmap.ic_task_mine);
+ //}
+ mName.setText("每日任务");
+ view.setOnClickListener(view16 -> {
+ if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) {
+ Intent intent = new Intent(getActivity(), MissionActivity.class);
+ startActivity(intent);
+ }
+ });
+ break;
case BEAUTY:
mSwitch.setVisibility(View.GONE);
mHint.setVisibility(View.GONE);
@@ -844,13 +859,17 @@ public class SettingFragment extends Fragment implements View.OnClickListener {
mLogo.setImageResource(R.mipmap.ic_my_vip);
mHint.setVisibility(View.GONE);
}
- mName.setText("会员特权");
+ mName.setText("会员权限");
view.setOnClickListener(v -> {
if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) {
// LotteryNineDialog dialog = new LotteryNineDialog(ActivityUtils.getTopActivity(), null);
// dialog.show();
- Intent intent = new Intent(getActivity(), MemberActivity.class);
+ /* Intent intent = new Intent(getActivity(), MemberActivity.class);
intent.putExtra("index", 0);
+ startActivity(intent);*/
+
+ Intent intent = new Intent(getActivity(), PrivilegeSettingActivity.class);
+ intent.putExtra("isVip", isVip);
startActivity(intent);
}
});
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SystemSettingActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SystemSettingActivity.java
index fe815bb..f0ae587 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SystemSettingActivity.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SystemSettingActivity.java
@@ -72,7 +72,7 @@ public class SystemSettingActivity extends BaseActivity implements View.OnClickL
}
if (!UserManager.getUserInfo().isWomen()) {
- system_setting_vip.setVisibility(View.VISIBLE);
+ system_setting_vip.setVisibility(View.GONE);
} else {
system_setting_vip.setVisibility(View.GONE);
}
diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/WalletActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/WalletActivity.java
index 3756ac6..363199d 100644
--- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/WalletActivity.java
+++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/WalletActivity.java
@@ -1,10 +1,12 @@
package com.xuebiping.bolizhuzi.view.settings;
import android.content.Intent;
+import android.graphics.Color;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
+import android.widget.LinearLayout;
import android.widget.TextView;
import com.xuebiping.bolizhuzi.R;
@@ -18,9 +20,10 @@ public class WalletActivity extends BaseActivity implements View.OnClickListener
public static final int REQUEST_RECHARGE = 110;
private TextView mWalletRecharge;
private TextView mWalletIncoming;
- private Button mRechargeButton;
- private Button mExchangeButton;
- private Button mWithdrawButton;
+ private LinearLayout mRechargeButton;
+ private LinearLayout mExchangeButton;
+ private LinearLayout mWithdrawButton;
+ private LinearLayout wallet_bill_button;
private TextView mCaiBeiRecharge;
private TextView mCaiBeiImcome;
private View mCaiBeiRechargeButton;
@@ -29,12 +32,12 @@ public class WalletActivity extends BaseActivity implements View.OnClickListener
super.onCreate(onSavedInstance);
setContentView(R.layout.activity_wallet);
Title title = getCustomTitle();
- title.setTitleBackgroundResource(R.drawable.shape_backgound);
+ title.setTitleBackground(Color.TRANSPARENT);
title.dismissBottomLine();
title.findViewById(R.id.title_bg).getBackground().setAlpha(255);
ImageView left = findViewById(R.id.left_image);
- left.setImageResource(R.drawable.ic_return_white);
- title.setTitleWhite("芊颜钱包", "账单明细", null, new Title.OnFunctionalAreaClickListener() {
+ left.setImageResource(R.mipmap.ic_back_white);
+ title.setTitleWhite("我的钱包", null, null, new Title.OnFunctionalAreaClickListener() {
@Override
public void onLeftClick(View v) {
finish();
@@ -57,6 +60,7 @@ public class WalletActivity extends BaseActivity implements View.OnClickListener
mWalletIncoming = findViewById(R.id.wallet_income_amount);
mRechargeButton = findViewById(R.id.wallet_recharge_button);
mExchangeButton = findViewById(R.id.wallet_exchange_button);
+ wallet_bill_button = findViewById(R.id.wallet_bill_button);
mWithdrawButton = findViewById(R.id.wallet_cash_button);
mCaiBeiRecharge = findViewById(R.id.wallet_caibei_recharge);
mCaiBeiImcome = findViewById(R.id.wallet_caibei_income);
@@ -64,6 +68,7 @@ public class WalletActivity extends BaseActivity implements View.OnClickListener
mRechargeButton.setOnClickListener(this);
mExchangeButton.setOnClickListener(this);
mWithdrawButton.setOnClickListener(this);
+ wallet_bill_button.setOnClickListener(this);
mCaiBeiRechargeButton.setOnClickListener(this);
}
@@ -103,6 +108,10 @@ public class WalletActivity extends BaseActivity implements View.OnClickListener
}else if(view == mExchangeButton){
Intent intent = new Intent(this, ExchangeActivity.class);
startActivityForResult(intent, REQUEST_RECHARGE);
+ }else if(view == wallet_bill_button){
+ Intent intent = new Intent(WalletActivity.this, BillActivity.class);
+ intent.putExtra("type", 0);
+ startActivity(intent);
}
}
diff --git a/app/src/main/res/drawable-xhdpi/bg_dibu.png b/app/src/main/res/drawable-xhdpi/bg_dibu.png
index 28608c626e980214070bb7e681979552b0f36aa0..b7981aa796d7a50c7b8c13cc709350a746f4151b 100644
GIT binary patch
literal 49053
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