diff --git a/app/oss/release/siyu_v1.0.0_oss_release.apk b/app/oss/release/siyu_v1.0.0_oss_release.apk index 7bbf856..315ca1b 100644 Binary files a/app/oss/release/siyu_v1.0.0_oss_release.apk and b/app/oss/release/siyu_v1.0.0_oss_release.apk differ diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/ConstUrl.java b/app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/ConstUrl.java index 467e95b..217f499 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/ConstUrl.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/ConstUrl.java @@ -20,7 +20,7 @@ public class ConstUrl { "http://pre-api.jindashengkj.cn/"; //public static final String WEBSOCKTURL = "saws://192.168.32.106:11119/acc1"; public static final String WEBSOCKTURL = "ws://red.nndongqing.cn/acc1"; - public static final String SOCKET_USERSTATIS_DEBUG = "wss://pre.ws.ncaicai.tech?user_id="; + public static final String SOCKET_USERSTATIS_DEBUG = "wss://pre.ws.whnuanbeinikj.cn?user_id="; public static final String SOCKET_USERSTATIS = "wss://ws.whnuanbeinikj.cn?user_id="; public static final String SOCKET_SPEED_DATE = DEBUG ? (DEBUG1 ? "wss://pre.ws.whnuanbeinikj.cn/speed?token=" : "wss://ws.whnuanbeinikj.cn/speed?token=") : "wss://ws.whnuanbeinikj.cn/speed?token="; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/api/UIKitOptions.java b/app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/api/UIKitOptions.java index c1a6627..c86658c 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/api/UIKitOptions.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/api/UIKitOptions.java @@ -92,7 +92,8 @@ public class UIKitOptions { * IM 接收到的消息时，内容区域背景的drawable id */ // public int messageLeftBackground = R.drawable.nim_message_item_left_selector; - public int messageLeftBackground = R.drawable.ic_message_alice; +// public int messageLeftBackground = R.drawable.ic_message_alice; + public int messageLeftBackground = R.drawable.nim_message_item_left; public int messageLeftBackgroundVip = R.drawable.ic_message_alice_vip; public int messageLeftBackgroundVipMan = R.drawable.ic_message_alice_vip_man; @@ -101,7 +102,8 @@ public class UIKitOptions { */ // public int messageRightBackground = R.drawable.nim_message_item_right_selector; // public int messageRightBackground = R.drawable.ic_message_me; - public int messageRightBackground = R.drawable.ic_huang; +// public int messageRightBackground = R.drawable.ic_huang; + public int messageRightBackground = R.drawable.nim_message_item_right; public int messageRightBackgroundVIP = R.drawable.ic_huang_vip; public int messageRightBackgroundVIPMan = R.drawable.ic_huang_vip_man; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/business/session/fragment/MessageFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/business/session/fragment/MessageFragment.java index 171e58b..11333b0 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/business/session/fragment/MessageFragment.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/business/session/fragment/MessageFragment.java @@ -212,6 +212,7 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp private String title; private String avatar; + private RelativeLayout mRl_title_coin_tip; @Override public void onActivityCreated(Bundle savedInstanceState) { @@ -265,7 +266,6 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { rootView = inflater.inflate(R.layout.nim_message_fragment, container, false); -// getTipData(); EventBus.getDefault().register(this); rl_message_root = rootView.findViewById(R.id.rl_message_root); rl_guard = rootView.findViewById(R.id.rl_guard); @@ -296,6 +296,7 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp iv_album3 = rootView.findViewById(R.id.iv_album3); iv_album4 = rootView.findViewById(R.id.iv_album4); rv_call_list = rootView.findViewById(R.id.rv_call_list); + mRl_title_coin_tip = rootView.findViewById(R.id.rl_title_coin_tip); LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false); rv_call_list.setLayoutManager(layoutManager); @@ -316,8 +317,8 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp ic_guard_close.setOnClickListener(this); mSvgaDialog = new SvgaDialog(getContext()); iv_back.setOnClickListener(this); - tv_user_name.setOnClickListener(this); - iv_interactive.setOnClickListener(this); +// tv_user_name.setOnClickListener(this); +// iv_interactive.setOnClickListener(this); iv_user_info.setOnClickListener(this); cl_info_card.setOnClickListener(this); tv_msg_like.setOnClickListener(this); @@ -397,6 +398,7 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp NewsManager.getChatTip((BaseActivity) getActivity(), new HttpUiCallBack() { @Override public void onSuccess(BaseActivity activity, ChatTipBean result, String message) { + if (null != result) { if (!TextUtils.isEmpty(result.getTip())) { warmAnimator(result.getTip()); @@ -427,48 +429,49 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp private ObjectAnimator fadeOut; private void showUserInfoCard(boolean show, int i) { - if (show) { - if (fadeOut != null) { - fadeOut.cancel(); - } - iv_interactive.setImageResource(R.drawable.icon_arrow_down); - isInteractiveShow = true; - ObjectAnimator.ofFloat(cl_info_card, "translationY", 0F, -537F).setDuration(0).start(); - cl_info_card.setVisibility(View.VISIBLE); - ObjectAnimator fadeIn = ObjectAnimator.ofFloat(cl_info_card, "translationY", -537F, 0); - fadeIn.setDuration(1000).start(); - ObjectAnimator alphaIn = ObjectAnimator.ofFloat(cl_info_card, View.ALPHA, 1f); - alphaIn.setDuration(1000); // 设置动画持续时间为1000毫秒 - alphaIn.start(); // 启动动画 - } else { - iv_interactive.setImageResource(R.drawable.icon_arrow_up); - isInteractiveShow = false; - ObjectAnimator.ofFloat(cl_info_card, "translationY", 0F, -537F).setDuration(1000).start(); - fadeOut = ObjectAnimator.ofFloat(cl_info_card, View.ALPHA, 0f); - fadeOut.setDuration(500); // 设置动画持续时间为1000毫秒 - fadeOut.addListener(new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { - - } - - @Override - public void onAnimationEnd(Animator animation) { - cl_info_card.setVisibility(View.GONE); - } - - @Override - public void onAnimationCancel(Animator animation) { - - } - - @Override - public void onAnimationRepeat(Animator animation) { - - } - }); - fadeOut.start(); // 启动动画 - } + isInteractiveShow = false; +// if (show) { +// if (fadeOut != null) { +// fadeOut.cancel(); +// } +// iv_interactive.setImageResource(R.drawable.icon_arrow_down); +// isInteractiveShow = true; +// ObjectAnimator.ofFloat(cl_info_card, "translationY", 0F, -537F).setDuration(0).start(); +// cl_info_card.setVisibility(View.VISIBLE); +// ObjectAnimator fadeIn = ObjectAnimator.ofFloat(cl_info_card, "translationY", -537F, 0); +// fadeIn.setDuration(1000).start(); +// ObjectAnimator alphaIn = ObjectAnimator.ofFloat(cl_info_card, View.ALPHA, 1f); +// alphaIn.setDuration(1000); // 设置动画持续时间为1000毫秒 +// alphaIn.start(); // 启动动画 +// } else { +// iv_interactive.setImageResource(R.drawable.icon_arrow_up); +// isInteractiveShow = false; +// ObjectAnimator.ofFloat(cl_info_card, "translationY", 0F, -537F).setDuration(1000).start(); +// fadeOut = ObjectAnimator.ofFloat(cl_info_card, View.ALPHA, 0f); +// fadeOut.setDuration(500); // 设置动画持续时间为1000毫秒 +// fadeOut.addListener(new Animator.AnimatorListener() { +// @Override +// public void onAnimationStart(Animator animation) { +// +// } +// +// @Override +// public void onAnimationEnd(Animator animation) { +// cl_info_card.setVisibility(View.GONE); +// } +// +// @Override +// public void onAnimationCancel(Animator animation) { +// +// } +// +// @Override +// public void onAnimationRepeat(Animator animation) { +// +// } +// }); +// fadeOut.start(); // 启动动画 +// } } /** @@ -492,6 +495,28 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp ObjectAnimator fadeOut = ObjectAnimator.ofFloat(mRlTextWarm, View.ALPHA, 0f); fadeOut.setDuration(2000); // 设置动画持续时间为500毫秒 fadeOut.start(); // 启动动画 + + fadeOut.addListener(new Animator.AnimatorListener() { + @Override + public void onAnimationStart(Animator animator) { + + } + + @Override + public void onAnimationEnd(Animator animator) { + mRlTextWarm.setVisibility(View.GONE); + } + + @Override + public void onAnimationCancel(Animator animator) { + + } + + @Override + public void onAnimationRepeat(Animator animator) { + + } + }); } }, 4000); } @@ -593,22 +618,22 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp tv_user_name.setTextColor(ContextCompat.getColor(getContext(), R.color.one_text)); iv_interactive.setVisibility(View.GONE); iv_user_info.setVisibility(View.INVISIBLE); - iv_back.setImageResource(R.drawable.sand_icon_back); - if ("11".equals(sessionId)) { - rl_message_root.setBackgroundResource(R.color.white); - if (SPUtils.getInt(getContext(), ConsUser.DYNAMICS_TYPE) == 0) { - lin_msg_dynamic.setVisibility(View.VISIBLE); - } else { - if (SPUtils.getInt(getContext(), ConsUser.DYNAMICS_TYPE) == 24) { - tv_user_name.setText("新增点赞"); - } else if (SPUtils.getInt(getContext(), ConsUser.DYNAMICS_TYPE) == 26) { - tv_user_name.setText("新增评论"); - } else if (SPUtils.getInt(getContext(), ConsUser.DYNAMICS_TYPE) == 16) { - tv_user_name.setText("新增关注"); - } - lin_msg_dynamic.setVisibility(View.GONE); - } - } +// iv_back.setImageResource(R.drawable.sand_icon_back); +// if ("11".equals(sessionId)) { +// rl_message_root.setBackgroundResource(R.color.white); +// if (SPUtils.getInt(getContext(), ConsUser.DYNAMICS_TYPE) == 0) { +// lin_msg_dynamic.setVisibility(View.VISIBLE); +// } else { +// if (SPUtils.getInt(getContext(), ConsUser.DYNAMICS_TYPE) == 24) { +// tv_user_name.setText("新增点赞"); +// } else if (SPUtils.getInt(getContext(), ConsUser.DYNAMICS_TYPE) == 26) { +// tv_user_name.setText("新增评论"); +// } else if (SPUtils.getInt(getContext(), ConsUser.DYNAMICS_TYPE) == 16) { +// tv_user_name.setText("新增关注"); +// } +// lin_msg_dynamic.setVisibility(View.GONE); +// } +// } } else if ("4".equals(sessionId)) { //如果是客服，不显示礼物和视频按钮 isShowGiftAndVideo = true; getMainPageData(Integer.parseInt(sessionId)); @@ -617,8 +642,24 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp } else { getMainPageData(Integer.parseInt(sessionId)); } + + if (!"2".equals(sessionId) && !"4".equals(sessionId) && !"11".equals(sessionId) && !"3".equals(sessionId) && !"5".equals(sessionId) + && !"6".equals(sessionId) && !"7".equals(sessionId) && !"8".equals(sessionId) && !"9".equals(sessionId) && !"10".equals(sessionId)) { + + if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) { + if (SPUtils.getInt(getActivity(), ConsUser.IS_ANCHOR) == 1) { + mRl_title_coin_tip.setVisibility(View.GONE); + }else { + mRl_title_coin_tip.setVisibility(View.VISIBLE); + } + }else { + mRl_title_coin_tip.setVisibility(View.VISIBLE); + } + }else { + mRl_title_coin_tip.setVisibility(View.GONE); + } } -// getTipData(); //展示提示信息 + getTipData(); //展示提示信息 if (inputPanel == null) { inputPanel = new InputPanel(container, rootView, getActionList(), isShowEditBar, isShowGiftAndVideo, getActivity()); @@ -1080,95 +1121,95 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp * @param message */ private void imCost(final int type, String id, final String content, final IMMessage message, String is_greet) { - if (isInteractiveShow) { - showUserInfoCard(false, 2); - } +// if (isInteractiveShow) { +// showUserInfoCard(false, 2); +// } NewsManager.sendIMCost((BaseActivity) getActivity(), type, id, content, is_greet, new HttpUiCallBack() { @Override public void onSuccess(BaseActivity activity, IMCostBean result, String tips) { - final AlertDialog builder = new AlertDialog.Builder(getActivity()).create(); - - builder.setCancelable(false); - - if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 2) { //男生 - builder.setMessage("一条私信扣" + result.getCut_coin() + "金币,成为会员享免费特权！"); - - builder.setButton(DialogInterface.BUTTON_NEUTRAL, "不再提醒", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - builder.dismiss(); - StorageManager.getInstance(getActivity()) - .putInt("isDynamicNoticeCanceled", 1); - } - }); - - builder.setButton(DialogInterface.BUTTON_POSITIVE, "成为VIP", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - builder.dismiss(); - Intent intent = new Intent(getActivity(), MemberActivity.class); - getActivity().startActivity(intent); - } - }); - - builder.setButton(DialogInterface.BUTTON_NEGATIVE, "知道了", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - builder.dismiss(); - } - }); - - if (result.getChat_card() != null) { - if (TextUtils.equals("1", result.getChat_card().getIs_pop_up())) { - ChatCardRedPacketDialog dialog = new ChatCardRedPacketDialog(getContext(), result.getChat_card()); - dialog.show(); - } - } - - } else if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) { //女生 - builder.setMessage("本条消息扣除" + result.getCut_coin() - + "金币，还剩" + result.getCoin() + "金币，通过真人认证私信免费哦！"); - - builder.setButton(DialogInterface.BUTTON_NEUTRAL, "不再提醒", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - builder.dismiss(); - StorageManager.getInstance(getActivity()) - .putInt("isDynamicNoticeCanceled", 1); - } - }); - - builder.setButton(DialogInterface.BUTTON_POSITIVE, "真人认证", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - builder.dismiss(); - Intent intentApplyBigCast = new Intent(getActivity(), CertificationActivity.class); - getActivity().startActivity(intentApplyBigCast); - } - }); - builder.setButton(DialogInterface.BUTTON_NEGATIVE, "知道了", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - builder.dismiss(); - } - }); - } - - if (result.getIs_cut() == 1 - && 1 != StorageManager.getInstance(getActivity()).getInt("isDynamicNoticeCanceled") && !SPUtils.getBoolean(getActivity(), ConsUser.USER_VIP, false)) { - builder.show(); - - Button buttonNue = builder.getButton(DialogInterface.BUTTON_NEUTRAL); - buttonNue.setTextColor(getActivity().getResources().getColor(R.color.black)); - - Button buttonPos = builder.getButton(DialogInterface.BUTTON_POSITIVE); - buttonPos.setTextColor(getActivity().getResources().getColor(R.color.black)); - - Button buttonNeg = builder.getButton(DialogInterface.BUTTON_NEGATIVE); - buttonNeg.setTextColor(getActivity().getResources().getColor(R.color.black)); - } +// final AlertDialog builder = new AlertDialog.Builder(getActivity()).create(); +// +// builder.setCancelable(false); +// +// if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 2) { //男生 +// builder.setMessage("一条私信扣" + result.getCut_coin() + "金币,成为会员享免费特权！"); +// +// builder.setButton(DialogInterface.BUTTON_NEUTRAL, "不再提醒", new DialogInterface.OnClickListener() { +// @Override +// public void onClick(DialogInterface dialogInterface, int i) { +// builder.dismiss(); +// StorageManager.getInstance(getActivity()) +// .putInt("isDynamicNoticeCanceled", 1); +// } +// }); +// +// builder.setButton(DialogInterface.BUTTON_POSITIVE, "成为VIP", new DialogInterface.OnClickListener() { +// @Override +// public void onClick(DialogInterface dialogInterface, int i) { +// builder.dismiss(); +// Intent intent = new Intent(getActivity(), MemberActivity.class); +// getActivity().startActivity(intent); +// } +// }); +// +// builder.setButton(DialogInterface.BUTTON_NEGATIVE, "知道了", new DialogInterface.OnClickListener() { +// @Override +// public void onClick(DialogInterface dialogInterface, int i) { +// builder.dismiss(); +// } +// }); +// +// if (result.getChat_card() != null) { +// if (TextUtils.equals("1", result.getChat_card().getIs_pop_up())) { +// ChatCardRedPacketDialog dialog = new ChatCardRedPacketDialog(getContext(), result.getChat_card()); +// dialog.show(); +// } +// } +// +// } else if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) { //女生 +// builder.setMessage("本条消息扣除" + result.getCut_coin() +// + "金币，还剩" + result.getCoin() + "金币，通过真人认证私信免费哦！"); +// +// builder.setButton(DialogInterface.BUTTON_NEUTRAL, "不再提醒", new DialogInterface.OnClickListener() { +// @Override +// public void onClick(DialogInterface dialogInterface, int i) { +// builder.dismiss(); +// StorageManager.getInstance(getActivity()) +// .putInt("isDynamicNoticeCanceled", 1); +// } +// }); +// +// builder.setButton(DialogInterface.BUTTON_POSITIVE, "真人认证", new DialogInterface.OnClickListener() { +// @Override +// public void onClick(DialogInterface dialogInterface, int i) { +// builder.dismiss(); +// Intent intentApplyBigCast = new Intent(getActivity(), CertificationActivity.class); +// getActivity().startActivity(intentApplyBigCast); +// } +// }); +// builder.setButton(DialogInterface.BUTTON_NEGATIVE, "知道了", new DialogInterface.OnClickListener() { +// @Override +// public void onClick(DialogInterface dialogInterface, int i) { +// builder.dismiss(); +// } +// }); +// } +// +// if (result.getIs_cut() == 1 +// && 1 != StorageManager.getInstance(getActivity()).getInt("isDynamicNoticeCanceled") && !SPUtils.getBoolean(getActivity(), ConsUser.USER_VIP, false)) { +// builder.show(); +// +// Button buttonNue = builder.getButton(DialogInterface.BUTTON_NEUTRAL); +// buttonNue.setTextColor(getActivity().getResources().getColor(R.color.black)); +// +// Button buttonPos = builder.getButton(DialogInterface.BUTTON_POSITIVE); +// buttonPos.setTextColor(getActivity().getResources().getColor(R.color.black)); +// +// Button buttonNeg = builder.getButton(DialogInterface.BUTTON_NEGATIVE); +// buttonNeg.setTextColor(getActivity().getResources().getColor(R.color.black)); +// } Map data = new HashMap<>(); data.put("is_cut", result.getIs_cut()); @@ -1651,7 +1692,8 @@ public class MessageFragment extends TFragment implements ModuleProxy, SelectTyp }); } - private boolean isInteractiveShow = true; +// private boolean isInteractiveShow = true; + private boolean isInteractiveShow = false; /** * 获取文字招呼列表 diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainActivity.java index 482736d..2879f9d 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainActivity.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainActivity.java @@ -872,9 +872,9 @@ public class MainActivity extends BaseActivity implements DemoHelper.AppIdsUpdat mBottomTab.setOnTabClickListener(new BottomTab.TabClickListener() { @Override public void onClick(int position, int currentPosition) { - if ((UserManager.getUserInfo().getIs_anchor() != 1 || UserManager.getUserInfo().getIs_face_status() != 1) && UserManager.getUserInfo().isWomen()) { - new GirlAuthDialog(MainActivity.this).show(); - } +// if ((UserManager.getUserInfo().getIs_anchor() != 1 || UserManager.getUserInfo().getIs_face_status() != 1) && UserManager.getUserInfo().isWomen()) { +// new GirlAuthDialog(MainActivity.this).show(); +// } if (position == currentPosition) { //第二次点击 if (position == 0) { if (isOne) { diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainPageFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainPageFragment.java index 33a3d89..0e6a4f7 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainPageFragment.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainPageFragment.java @@ -887,8 +887,6 @@ public class MainPageFragment extends Fragment implements View.OnClickListener { } } - Log.d("nail", "initView: "); - List personal_info = mMainPageBean.getPersonal_info(); if (null != personal_info && personal_info.size() > 0) { mRl_personal_info.setVisibility(View.VISIBLE); 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 2b7830d..032d8d1 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 @@ -97,39 +97,39 @@ public class MainMessageFragment extends Fragment implements View.OnClickListene if (!hidden) { initTitle(); viewPagerChange(mIndex); - if (UserManager.getUserInfo().getGender() == 2) { - if (isSignIn) { - isSignIn = false; - signData(); - } - } else { - lin_msg_sign.setVisibility(View.INVISIBLE); - } +// if (UserManager.getUserInfo().getGender() == 2) { +// if (isSignIn) { +// isSignIn = false; +// signData(); +// } +// } else { +// lin_msg_sign.setVisibility(View.INVISIBLE); +// } - if (isFirst) { - isFirst = false; - if (UserManager.getUserInfo().getGender() == 2 && !SPUtils.getBoolean(getContext(), ConsUser.USER_VIP, false)) { - if (mVipCountDownTimer != null) { - mVipCountDownTimer.cancel(); - } - mVipCountDownTimer = new CountDownTimer(60_000 * 10, 1000) { - @Override - public void onTick(long millisUntilFinished) { - tv_msg_vip_time.setText(TimeUtils.millis2String(millisUntilFinished, "mm:ss")); - } - - @Override - public void onFinish() { - lin_msg_vip.setVisibility(View.GONE); - } - - }; - lin_msg_vip.setVisibility(View.VISIBLE); - mVipCountDownTimer.start(); - } else { - lin_msg_vip.setVisibility(View.GONE); - } - } +// if (isFirst) { +// isFirst = false; +// if (UserManager.getUserInfo().getGender() == 2 && !SPUtils.getBoolean(getContext(), ConsUser.USER_VIP, false)) { +// if (mVipCountDownTimer != null) { +// mVipCountDownTimer.cancel(); +// } +// mVipCountDownTimer = new CountDownTimer(60_000 * 10, 1000) { +// @Override +// public void onTick(long millisUntilFinished) { +// tv_msg_vip_time.setText(TimeUtils.millis2String(millisUntilFinished, "mm:ss")); +// } +// +// @Override +// public void onFinish() { +// lin_msg_vip.setVisibility(View.GONE); +// } +// +// }; +// lin_msg_vip.setVisibility(View.VISIBLE); +// mVipCountDownTimer.start(); +// } else { +// lin_msg_vip.setVisibility(View.GONE); +// } +// } } } diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment2.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment2.java index b5442ee..345cf8e 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment2.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment2.java @@ -679,10 +679,12 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { mLogo.setImageResource(R.drawable.ic_my_guide); mName.setText("用户指南"); view.setOnClickListener(view14 -> { - if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { - Intent intent = new Intent(getActivity(), UseCentreActivity.class); - startActivity(intent); - } +// if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { +// Intent intent = new Intent(getActivity(), UseCentreActivity.class); +// startActivity(intent); +// } + Intent intent = new Intent(getActivity(), UseCentreActivity.class); + startActivity(intent); }); break; @@ -694,11 +696,14 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { } mName.setText("账单明细"); view.setOnClickListener(view16 -> { - if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { - Intent intent = new Intent(getActivity(), BillActivity.class); - intent.putExtra("type", 0); - startActivity(intent); - } +// if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { +// Intent intent = new Intent(getActivity(), BillActivity.class); +// intent.putExtra("type", 0); +// startActivity(intent); +// } + Intent intent = new Intent(getActivity(), BillActivity.class); + intent.putExtra("type", 0); + startActivity(intent); }); break; case GODDESSPRIVILEGE: @@ -707,11 +712,12 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { tv_option_hint2.setVisibility(View.GONE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.mipmap.ic_my_ntequan); - mName.setText("up主认证"); + mName.setText("女神特权"); view.setOnClickListener(view19 -> { - if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { - startActivity(new Intent(getActivity(), GoddessPrivilegeActivity.class)); - } +// if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { +// startActivity(new Intent(getActivity(), GoddessPrivilegeActivity.class)); +// } + startActivity(new Intent(getActivity(), GoddessPrivilegeActivity.class)); }); break; case VIOLATION: @@ -722,11 +728,14 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { mLogo.setImageResource(R.mipmap.ic_wd_weigui); mName.setText("违规公布"); view.setOnClickListener(view110 -> { - if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { - Intent intent = new Intent(getActivity(), BaseWebViewActivity.class); - intent.putExtra("ClickUrl", ConstUrl.FORBID_LIST); - startActivity(intent); - } +// if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { +// Intent intent = new Intent(getActivity(), BaseWebViewActivity.class); +// intent.putExtra("ClickUrl", ConstUrl.FORBID_LIST); +// startActivity(intent); +// } + Intent intent = new Intent(getActivity(), BaseWebViewActivity.class); + intent.putExtra("ClickUrl", ConstUrl.FORBID_LIST); + startActivity(intent); }); break; case ADDWECHAT: @@ -737,10 +746,12 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { mLogo.setImageResource(R.mipmap.ic_wd_addwechat); mName.setText("微信设置"); view.setOnClickListener(view111 -> { - if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { - Intent intent = new Intent(getActivity(), WXAccountActivity.class); - startActivity(intent); - } +// if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { +// Intent intent = new Intent(getActivity(), WXAccountActivity.class); +// startActivity(intent); +// } + Intent intent = new Intent(getActivity(), WXAccountActivity.class); + startActivity(intent); }); break; case HELLOW: @@ -751,9 +762,10 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { mLogo.setImageResource(R.mipmap.ic_wd_hellow_set); mName.setText("招呼设置"); view.setOnClickListener(view112 -> { - if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { - startActivity(new Intent(getActivity(), GreetingSettingActivity.class)); - } +// if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { +// startActivity(new Intent(getActivity(), GreetingSettingActivity.class)); +// } + startActivity(new Intent(getActivity(), GreetingSettingActivity.class)); }); break; case ITEMS: @@ -764,9 +776,10 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { mLogo.setImageResource(R.mipmap.ic_wd_items1); mName.setText("红包卡券"); view.setOnClickListener(view113 -> { - if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { - startActivity(new Intent(getActivity(), MyItemsActivity.class)); - } +// if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { +// startActivity(new Intent(getActivity(), MyItemsActivity.class)); +// } + startActivity(new Intent(getActivity(), MyItemsActivity.class)); }); break; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/dialog/GirlAuthDialog.kt b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/dialog/GirlAuthDialog.kt index c9952b6..2c91d37 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/dialog/GirlAuthDialog.kt +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/dialog/GirlAuthDialog.kt @@ -10,6 +10,7 @@ import com.xuebiping.bolizhuzi.databinding.DialogGirlauthBinding import com.xuebiping.bolizhuzi.view.base.BaseActivity import com.xuebiping.bolizhuzi.view.base.BaseApplication import com.xuebiping.bolizhuzi.view.settings.CertificationActivity +import com.xuebiping.bolizhuzi.view.settings.UpPrivilegeActivity class GirlAuthDialog(context: Context) : Dialog(context, R.style.CommonDialog) { var owner = context as BaseActivity @@ -32,8 +33,10 @@ class GirlAuthDialog(context: Context) : Dialog(context, R.style.CommonDialog) { dismiss() BaseApplication.getInstance().topActivity.startActivity( Intent( +// BaseApplication.getInstance().topActivity, +// CertificationActivity::class.java BaseApplication.getInstance().topActivity, - CertificationActivity::class.java + UpPrivilegeActivity::class.java ) ) } diff --git a/app/src/main/res/drawable/nim_message_item_left.xml b/app/src/main/res/drawable/nim_message_item_left.xml new file mode 100644 index 0000000..80b91ec --- /dev/null +++ b/app/src/main/res/drawable/nim_message_item_left.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/nim_message_item_right.xml b/app/src/main/res/drawable/nim_message_item_right.xml new file mode 100644 index 0000000..cc85138 --- /dev/null +++ b/app/src/main/res/drawable/nim_message_item_right.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_message_view_pager.xml b/app/src/main/res/layout/fragment_message_view_pager.xml index f249937..5359160 100644 --- a/app/src/main/res/layout/fragment_message_view_pager.xml +++ b/app/src/main/res/layout/fragment_message_view_pager.xml @@ -12,6 +12,7 @@ android:layout_height="match_parent" /> + android:paddingTop="44dp" + android:paddingBottom="8dp"> + + + + + + + + + + + + + + + + + + + + + - + @@ -299,4 +339,5 @@ + \ No newline at end of file diff --git a/app/src/main/res/mipmap-xhdpi/ic_message_risk_tip.png b/app/src/main/res/mipmap-xhdpi/ic_message_risk_tip.png new file mode 100644 index 0000000..654ccd6 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_message_risk_tip.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_my_ntequan.png b/app/src/main/res/mipmap-xxhdpi/ic_my_ntequan.png deleted file mode 100644 index 2d026ac..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_my_ntequan.png and /dev/null differ diff --git a/yunxinkit/res/layout/nim_message_activity_text_layout.xml b/yunxinkit/res/layout/nim_message_activity_text_layout.xml index 941f598..a9dafcb 100644 --- a/yunxinkit/res/layout/nim_message_activity_text_layout.xml +++ b/yunxinkit/res/layout/nim_message_activity_text_layout.xml @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="16dp" - android:visibility="visible"> + android:visibility="gone">