yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 完善资料

Browse Source
This commit is contained in:
zlzw 2024-03-20 16:11:38 +08:00
parent 938bee4fdb
commit d17f89b5c1
13 changed files with 163 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/shayu/phonelive/AppContext.java
View File

@ -111,17 +111,21 @@ public class AppContext extends CommonAppContext {
MessageSayHiNotifyManager.getInstance().stop();
return;
}
if(activity instanceof MainHomeCommunityActivity){
if (activity instanceof MainHomeCommunityActivity) {
MessageSayHiNotifyManager.getInstance().stop();
return;
}
if(activity instanceof SudGameActivity){
if (activity instanceof SudGameActivity) {
MessageSayHiNotifyManager.getInstance().stop();
return;
}
if (activity instanceof MainActivity && !MessageSayHiNotifyManager.getInstance().isInit()) {
return;
}
if (activity instanceof CompleteUserInfoActivity) {
MessageSayHiNotifyManager.getInstance().stop();
return;
}
MessageSayHiNotifyManager.getInstance().reload();
}
@ -265,9 +269,10 @@ public class AppContext extends CommonAppContext {
} else if (message.getConversationType() == Conversation.ConversationType.PRIVATE) {//私聊信息
EventBus.getDefault().post(message);
if(AppManager.getInstance().getLastActivity() instanceof CompleteUserInfoActivity){
if (AppManager.getInstance().getLastActivity() instanceof CompleteUserInfoActivity) {
return false;
}
MessageChatNotifyManager.getInstance().setShieldClass(CompleteUserInfoActivity.class);
MessageChatNotifyManager.getInstance().push(AppManager.getInstance().getLastActivity()
, message.getTargetId(),
content.getContent()

16
common/src/main/java/com/yunbao/common/bean/FirstLoginBean.java Normal file
View File

@ -0,0 +1,16 @@
package com.yunbao.common.bean;
import com.google.gson.annotations.SerializedName;
public class FirstLoginBean extends BaseModel{
@SerializedName("status")
int status;//0是第一次登陸，1是已經登錄過的
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
}

4
common/src/main/java/com/yunbao/common/http/PDLiveApi.java
View File

@ -23,6 +23,7 @@ import com.yunbao.common.bean.FaceBookUpModel;
import com.yunbao.common.bean.FansCheckRed;
import com.yunbao.common.bean.FansGroupGiftPack;
import com.yunbao.common.bean.FansGroupGiftPackInfo;
import com.yunbao.common.bean.FirstLoginBean;
import com.yunbao.common.bean.GiftAlreadyWallModel;
import com.yunbao.common.bean.GiftGuideModel;
import com.yunbao.common.bean.GiftNamingInfoModel;
@ -1288,4 +1289,7 @@ public interface PDLiveApi {
Observable<ResponseModel<List<BaseModel>>> setHobby(
@Query("labels") String labelsId
);
@GET("/api/public/?service=Pdlinfos.getIsSet")
Observable<ResponseModel<FirstLoginBean>> isFirstLogin(
);
}

20
common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
View File

@ -26,6 +26,7 @@ import com.yunbao.common.bean.EnterRoomNewModel;
import com.yunbao.common.bean.FansCheckRed;
import com.yunbao.common.bean.FansGroupGiftPack;
import com.yunbao.common.bean.FansGroupGiftPackInfo;
import com.yunbao.common.bean.FirstLoginBean;
import com.yunbao.common.bean.GiftAlreadyWallModel;
import com.yunbao.common.bean.GiftGuideModel;
import com.yunbao.common.bean.GiftNamingInfoModel;
@ -3477,6 +3478,25 @@ public class LiveNetManager {
}
}).isDisposed();
}
public void isFirstLogin(HttpCallback<FirstLoginBean> callback) {
API.get().pdLiveApi(mContext)
.isFirstLogin()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(roomMicStatusModelResponseModel -> {
if (callback != null) {
callback.onSuccess(roomMicStatusModelResponseModel.getData().getInfo());
}
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
throwable.printStackTrace();
if (callback != null) {
callback.onError(mContext.getString(R.string.net_error));
}
}
}).isDisposed();
}
private MultipartBody.Part createUploadFile(File file) {
RequestBody requestBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
return MultipartBody.Part.createFormData("file", file.getName(), requestBody);

9
common/src/main/java/com/yunbao/common/utils/MessageChatNotifyManager.java
View File

@ -13,6 +13,7 @@ import java.util.List;
public class MessageChatNotifyManager {
private static MessageChatNotifyManager instance;
private List<MessageUserInfoBean> startListNotifyList = new ArrayList<>();
Class<?> clazz;
public static MessageChatNotifyManager getInstance() {
if (instance == null) {
@ -21,6 +22,10 @@ public class MessageChatNotifyManager {
return instance;
}
public void setShieldClass(Class<?> clazz) {
this.clazz = clazz;
}
public void push(Context mContext, MessageUserInfoBean userInfo) {
if (startListNotifyList.isEmpty()) {
startListNotifyList.add(userInfo);
@ -31,6 +36,10 @@ public class MessageChatNotifyManager {
}
private void notifyLiveFlot(Context mContext) {
if (AppManager.getInstance().getLastActivity().getClass().getSimpleName().equals(clazz.getSimpleName())) {
ToastUtil.showDebug("屏蔽类，不展示");
return;
}
if (startListNotifyList.iterator().hasNext()) {
MessageUserInfoBean bean = startListNotifyList.iterator().next();
new MessageChatNotifyDialog(AppManager.getInstance().getLastActivity(), bean).setOnDismissListener(dialog -> {

14
main/src/main/java/com/yunbao/main/activity/CompleteUserInfoActivity.java
View File

@ -27,6 +27,7 @@ import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.interfaces.ImageResultCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.NoviceInstructorManager;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.L;
@ -71,6 +72,7 @@ public class CompleteUserInfoActivity extends AbsActivity {
initView();
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_ESCAPE || keyCode == KeyEvent.KEYCODE_BACK) {
@ -82,7 +84,7 @@ public class CompleteUserInfoActivity extends AbsActivity {
@Override
public void onBackPressed() {
// super.onBackPressed();
// super.onBackPressed();
}
int year;
@ -98,6 +100,9 @@ public class CompleteUserInfoActivity extends AbsActivity {
birthday = findViewById(R.id.birthday);
submit = findViewById(R.id.submit);
userName.setHint(R.string.complete_user_info_username_hint);
userName.setText(IMLoginManager.get(this).getUserInfo().getUserNicename());
initSexView();
initBirthdayView();
initAvatarView();
@ -221,6 +226,7 @@ public class CompleteUserInfoActivity extends AbsActivity {
@Override
public void onItemClick(String bean, int position) {
avatar.setTag(bean);
ImgLoader.display(mContext,bean,avatar);
loading.dismiss();
}
});
@ -231,7 +237,7 @@ public class CompleteUserInfoActivity extends AbsActivity {
void initSexView() {
ViewUtils.findViewById(man, R.id.sex_bg).setBackgroundResource(R.drawable.dialog_bg_chat_status_config_select);
ViewUtils.findViewById(man, R.id.sex_bg).setBackgroundResource(R.drawable.complete_user_info_sex_man);
ViewUtils.findViewById(man, R.id.sex_icon, ImageView.class).setImageTintList(ColorStateList.valueOf(Color.parseColor("#00A3FF")));
ViewUtils.findViewById(man, R.id.sex_top_icon, ImageView.class).setImageTintList(ColorStateList.valueOf(Color.parseColor("#00A3FF")));
ViewUtils.findViewById(woman, R.id.sex_bg).setBackgroundResource(R.drawable.dialog_bg_chat_status_config_unselect);
@ -243,7 +249,7 @@ public class CompleteUserInfoActivity extends AbsActivity {
man.setTag("man");
woman.setTag(null);
man.setOnClickListener(view -> {
ViewUtils.findViewById(man, R.id.sex_bg).setBackgroundResource(R.drawable.dialog_bg_chat_status_config_select);
ViewUtils.findViewById(man, R.id.sex_bg).setBackgroundResource(R.drawable.complete_user_info_sex_man);
ViewUtils.findViewById(woman, R.id.sex_bg).setBackgroundResource(R.drawable.dialog_bg_chat_status_config_unselect);
ViewUtils.findViewById(man, R.id.sex_icon, ImageView.class).setImageTintList(ColorStateList.valueOf(Color.parseColor("#00A3FF")));
ViewUtils.findViewById(man, R.id.sex_top_icon, ImageView.class).setImageTintList(ColorStateList.valueOf(Color.parseColor("#00A3FF")));
@ -255,7 +261,7 @@ public class CompleteUserInfoActivity extends AbsActivity {
woman.setTag(null);
});
woman.setOnClickListener(view -> {
ViewUtils.findViewById(woman, R.id.sex_bg).setBackgroundResource(R.drawable.dialog_bg_chat_status_config_select);
ViewUtils.findViewById(woman, R.id.sex_bg).setBackgroundResource(R.drawable.complete_user_info_sex_woman);
ViewUtils.findViewById(man, R.id.sex_bg).setBackgroundResource(R.drawable.dialog_bg_chat_status_config_unselect);
ViewUtils.findViewById(woman, R.id.sex_icon, ImageView.class).setImageTintList(ColorStateList.valueOf(Color.parseColor("#FF4874")));
ViewUtils.findViewById(woman, R.id.sex_top_icon, ImageView.class).setImageTintList(ColorStateList.valueOf(Color.parseColor("#FF4874")));

19
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@ -59,6 +59,7 @@ import com.yunbao.common.bean.AnchorRecommendModel;
import com.yunbao.common.bean.AnchorStartLiveBean;
import com.yunbao.common.bean.ChatRemarksBean;
import com.yunbao.common.bean.ConfigBean;
import com.yunbao.common.bean.FirstLoginBean;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.bean.LiveSvgGiftBean;
@ -82,6 +83,7 @@ import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpConsts;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.http.main.MainNetManager;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.manager.APKManager;
@ -540,6 +542,23 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
ConversationIMListManager.get(this).getUserInstructor(this);
checkVersion();
MessageSayHiNotifyManager.getInstance().start();
showFirstLogin();
}
private void showFirstLogin(){
LiveNetManager.get(mContext)
.isFirstLogin(new com.yunbao.common.http.base.HttpCallback<FirstLoginBean>() {
@Override
public void onSuccess(FirstLoginBean data) {
if(data.getStatus()==0){
mContext.startActivity(new Intent(mContext, CompleteUserInfoActivity.class));
}
}
@Override
public void onError(String error) {
}
});
}
/**

13
main/src/main/java/com/yunbao/main/adapter/MainHomeComAdapter.java
View File

@ -96,11 +96,16 @@ public class MainHomeComAdapter extends RefreshAdapter<ActiveBean> {
isVideo.setVisibility(View.VISIBLE);
}
name.setText(bean.getUser_name());
JSONObject json = JSONObject.parseObject(bean.getContent());
if (json != null) {
String content = (String) json.get("msg");
title.setText(content);
try {
JSONObject json = JSONObject.parseObject(bean.getContent());
if (json != null) {
String content = (String) json.get("msg");
title.setText(content);
}
}catch (Exception e){
e.printStackTrace();
}
likeCount.setText(bean.getLove_num());
ImgLoader.display(mContext, bean.getUser_avatar(), author);

10
main/src/main/res/drawable/complete_user_info_sex_man.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="153dp" android:height="72dp">
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="#ff00a3ff" />
<solid android:color="#fff4fcff" />
<corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
</shape>
</item>
</selector>

10
main/src/main/res/drawable/complete_user_info_sex_woman.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="153dp" android:height="72dp">
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="#ffff4874" />
<solid android:color="#fffff4f8" />
<corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
</shape>
</item>
</selector>

28
main/src/main/res/layout/activity_user_info.xml
View File

@ -38,7 +38,7 @@
android:src="@mipmap/ic_message_hi_config_image_add"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title"
app:riv_corner_radius="10dp" />
app:riv_corner_radius="25dp" />
<Button
android:id="@+id/btn_change"
@ -46,8 +46,13 @@
android:layout_height="34dp"
android:layout_marginTop="-34dp"
android:background="@drawable/bg_btn_activity_user_info_avatar_change"
android:text="更换"
android:text="@string/activity_reg_user_info_avatar_change"
android:textSize="13sp"
android:maxLines="2"
app:autoSizeMaxTextSize="13sp"
app:autoSizeMinTextSize="5sp"
app:autoSizeStepGranularity="1sp"
app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="@+id/avatar"
app:layout_constraintTop_toBottomOf="@+id/avatar" />
@ -58,7 +63,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="27dp"
android:layout_marginTop="20dp"
android:text="@string/activity_reg_user_info_sex_title"
android:text="@string/activity_reg_user_info_sex_sex"
android:textColor="#333333"
android:textSize="15sp"
app:layout_constraintStart_toStartOf="parent"
@ -82,7 +87,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="27dp"
android:layout_marginTop="25dp"
android:text="昵称"
android:text="@string/activity_reg_user_info_sex_title"
android:textColor="#333333"
android:textSize="15sp"
app:layout_constraintStart_toStartOf="parent"
@ -140,10 +145,23 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
android:text="@string/aristocrat_determine"
android:text="@string/activity_reg_user_info_submit"
android:textAllCaps="false"
android:background="@drawable/bg_msg_address_book_user_btn_fan"
android:textColor="#FFFFFF"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/textView14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:textColor="#FF4874"
android:textSize="11sp"
android:text="@string/activity_reg_user_info_sex_sex_tips"
app:layout_constraintBottom_toBottomOf="@+id/title2"
app:layout_constraintStart_toEndOf="@+id/title2"
app:layout_constraintTop_toTopOf="@+id/title2" />
</androidx.constraintlayout.widget.ConstraintLayout>

25
main/src/main/res/values-zh/strings.xml
View File

@ -23,21 +23,21 @@
<string name="delete">刪除</string>
<string name="activity_msg_title">消息</string>
<string name="activity_msg_news_notice">官方通知</string>
<string name="activity_msg_system_message">系统通知</string>
<string name="activity_msg_system_message">系統通知</string>
<string name="activity_msg_newts_interaction">互動消息</string>
<string name="activity_msg_news_online">在線客服</string>
<string name="activity_msg_search_hint">搜索昵稱或聊天記錄</string>
<string name="activity_msg_list_include">包含:</string>
<string name="activity_msg_list_title_contacts">聯繫人</string>
<string name="activity_msg_list_title_chat_records">聊天記錄</string>
<string name="activity_msg_addressbook_layout_title">通讯录</string>
<string name="activity_msg_addressbook_layout_title">通訊錄</string>
<string name="activity_msg_addressbook_search_hint">搜索昵稱</string>
<string name="activity_msg_addressbook_tab_follow">已關注</string>
<string name="activity_msg_addressbook_tab_follow2">關注</string>
<string name="activity_msg_addressbook_tab_fan">粉絲</string>
<string name="activity_msg_addressbook_tab_fan2">回關</string>
<string name="activity_msg_addressbook_tab_mutual">互相關注</string>
<string name="activity_msg_chat_top_tip1">赠送礼物陪伴TA～</string>
<string name="activity_msg_chat_top_tip1">贈送禮物陪伴TA～</string>
<string name="dialog_msg_m_config">消息設置</string>
<string name="dialog_msg_status_config">接單設置</string>
<string name="dialog_msg_status_online_config">在線</string>
@ -57,26 +57,31 @@
<string name="dialog_msg_hi_config_audio_btn_play">點擊播放</string>
<string name="dialog_msg_hi_config_audio_btn_reset">重錄</string>
<string name="dialog_msg_hi_config_audio_btn_save">保存</string>
<string name="dialog_msg_hi_config_audio_refuse_save_image">至少传一张图片</string>
<string name="dialog_msg_hi_config_audio_refuse_save_text">至少传一条文字消息</string>
<string name="dialog_msg_hi_config_audio_refuse_save_audio">至少传一条语音消息</string>
<string name="dialog_msg_hi_config_audio_refuse_save_image">至少傳一張圖片</string>
<string name="dialog_msg_hi_config_audio_refuse_save_text">至少傳一條文字消息</string>
<string name="dialog_msg_hi_config_audio_refuse_save_audio">至少傳一條語音消息</string>
<string name="activity_reg_user_info_title">完善個人信息</string>
<string name="activity_reg_user_info_sex_title">性别</string>
<string name="activity_reg_user_info_sex_title">暱稱</string>
<string name="activity_reg_user_info_sex_sex">性別</string>
<string name="activity_reg_user_info_sex_sex_tips">*只有一次選擇性別的機會，請謹慎選擇</string>
<string name="activity_reg_user_info_avatar_change">更換</string>
<string name="activity_reg_user_info_sex_man">男生</string>
<string name="activity_reg_user_info_sex_woman">女生</string>
<string name="activity_reg_user_info_birthday_title">生日</string>
<string name="activity_reg_user_info_birthday_text">选择你的生日</string>
<string name="activity_reg_user_info_birthday_text">選擇你的生日</string>
<string name="activity_reg_user_info_submit">完成</string>
<string name="dialog_user_info_album">圖庫</string>
<string name="dialog_user_info_camera">相機</string>
<string name="year">年</string>
<string name="month">月</string>
<string name="day">日</string>
<string name="activity_msg_chat_top_status_online">在线</string>
<string name="activity_msg_chat_top_status_offline">离线</string>
<string name="activity_msg_chat_top_status_online">在線</string>
<string name="activity_msg_chat_top_status_offline">離線</string>
<string name="activity_msg_chat_list_card">[名片]</string>
<string name="edit_profile_occupation">職業</string>
<string name="edit_profile_height">身高</string>
<string name="edit_profile_hobby">愛好</string>
<string name="edit_profile_hobby_save">完成</string>
<string name="edit_profile_hobby_cancel">退出</string>
<string name="complete_user_info_username_hint">請輸入暱稱</string>
</resources>

15
main/src/main/res/values/strings.xml
View File

@ -60,12 +60,16 @@
<string name="dialog_msg_hi_config_audio_refuse_save_image">至少传一张图片</string>
<string name="dialog_msg_hi_config_audio_refuse_save_text">至少传一条文字消息</string>
<string name="dialog_msg_hi_config_audio_refuse_save_audio">至少传一条语音消息</string>
<string name="activity_reg_user_info_title">完善個人信息</string>
<string name="activity_reg_user_info_sex_title">Sex</string>
<string name="activity_reg_user_info_sex_man">Man</string>
<string name="activity_reg_user_info_sex_woman">Woman</string>
<string name="activity_reg_user_info_title">Personal information</string>
<string name="activity_reg_user_info_sex_title">Nickname</string>
<string name="activity_reg_user_info_sex_sex">Sex</string>
<string name="activity_reg_user_info_sex_sex_tips">*Only one chance to choose gender, choose wisely.</string>
<string name="activity_reg_user_info_sex_man">Boys</string>
<string name="activity_reg_user_info_sex_woman">Girl</string>
<string name="activity_reg_user_info_avatar_change">Replace</string>
<string name="activity_reg_user_info_birthday_title">Birthday</string>
<string name="activity_reg_user_info_birthday_text">Select your Birthday</string>
<string name="activity_reg_user_info_birthday_text">Choose your birthday</string>
<string name="activity_reg_user_info_submit">Finish</string>
<string name="dialog_user_info_album">Album</string>
<string name="dialog_user_info_camera">Camera</string>
<string name="year">Year</string>
@ -79,4 +83,5 @@
<string name="edit_profile_hobby">Hobby</string>
<string name="edit_profile_hobby_save">Save</string>
<string name="edit_profile_hobby_cancel">Cancel</string>
<string name="complete_user_info_username_hint">Please enter a nickname</string>
</resources>