change app name
This commit is contained in:
@@ -572,7 +572,7 @@
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:configChanges="orientation|keyboardHidden|screenSize"
|
||||
android:label="66星球"
|
||||
android:label="音游"
|
||||
android:launchMode="singleTask"
|
||||
android:screenOrientation="portrait"
|
||||
android:windowSoftInputMode="adjustPan|stateAlwaysHidden"/>
|
||||
|
@@ -1487,8 +1487,8 @@ public class HomePartyRoomFragment extends BaseMvpFragment<IHomePartyView, HomeP
|
||||
|
||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||
public void onAntiSpamEvent(AntiSpamEvent event) {
|
||||
// Toast.makeText(getContext(), "发送失败,66星球提醒您文明用语~", Toast.LENGTH_SHORT).show();
|
||||
SingleToastUtil.showToastShort("发送失败,66星球提醒您文明用语~");
|
||||
// Toast.makeText(getContext(), "发送失败,音游提醒您文明用语~", Toast.LENGTH_SHORT).show();
|
||||
SingleToastUtil.showToastShort("发送失败,音游提醒您文明用语~");
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -415,7 +415,7 @@ public class DialogManager {
|
||||
}
|
||||
|
||||
/**
|
||||
* 1、66星球通用的dialog设置,以后尽量所有的dialog都引到这个方法,方便以后改版
|
||||
* 1、音游通用的dialog设置,以后尽量所有的dialog都引到这个方法,方便以后改版
|
||||
* 2、如果UI要求弹框是完全自定义的,再重新写过
|
||||
* @param title 标题,空则隐藏 (ui说,有些弹框带标题,有些不带,两种情况共存)
|
||||
* @param message 内容,不能为空,配合{@link com.yizhuan.erban.utils.SpannableBuilder} 变色使用
|
||||
|
@@ -657,7 +657,7 @@ public class HomeFragmentAdapter extends BaseMultiItemQuickAdapter<HomeItem, Bas
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置66星球头条数据
|
||||
* 设置音游头条数据
|
||||
*/
|
||||
private void setErbanTopMessageData(BaseViewHolder holder, HomeItem homeItem) {
|
||||
VMTopMessageInfo topMessageInfo = (VMTopMessageInfo) homeItem.getData();
|
||||
@@ -739,7 +739,7 @@ public class HomeFragmentAdapter extends BaseMultiItemQuickAdapter<HomeItem, Bas
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置66星球推荐item
|
||||
* 设置音游推荐item
|
||||
*/
|
||||
private void setErbanRecommend(BaseViewHolder holder, HomeItem homeItem) {
|
||||
RecommendInfo recommendInfo = (RecommendInfo) homeItem.getData();
|
||||
|
@@ -220,7 +220,7 @@ public class FindFragment extends BaseMvpFragment<IFindFragmentView, FindFragmen
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置66星球头条数据
|
||||
* 设置音游头条数据
|
||||
*/
|
||||
private void setTuTuTopMessageData(VMTopMessageInfo topMessageInfo) {
|
||||
ErbanTopMessageAdapter adapter = new ErbanTopMessageAdapter(mContext, topMessageInfo.getVmTopMessageList());
|
||||
|
@@ -110,7 +110,7 @@ import static com.yizhuan.xchat_android_core.certification.CertificationModel.CE
|
||||
import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_NONE;
|
||||
|
||||
/**
|
||||
* 66星球首页
|
||||
* 音游首页
|
||||
*/
|
||||
@CreatePresenter(MainFragmentPresenter.class)
|
||||
public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentPresenter>
|
||||
|
@@ -112,7 +112,7 @@ public class FindFragmentPresenter extends BaseMvpPresenter<IFindFragmentView> {
|
||||
return null;
|
||||
}
|
||||
VMTopMessageInfo topMessageInfo = new VMTopMessageInfo();
|
||||
topMessageInfo.setTitle("66星球头条");
|
||||
topMessageInfo.setTitle("音游头条");
|
||||
List<VMTopMessage> vmTopMessageList = new ArrayList<>();
|
||||
//组装成2个2个一组
|
||||
final int groupSize = 2;
|
||||
|
@@ -368,7 +368,7 @@ public class RecommendFragmentPresenter extends BaseMvpPresenter<IRecommendFragm
|
||||
}
|
||||
|
||||
} else if (homeInfo.getType() == HomeItem.TYPE_TOP_MESSAGE) {
|
||||
//66星球头条数据
|
||||
//音游头条数据
|
||||
//3.1.2开始不处理
|
||||
} else if (homeInfo.getType() == HomeItem.TYPE_RECOMMEND ||
|
||||
homeInfo.getType() == HomeItem.TYPE_CONFIG) {
|
||||
|
@@ -205,7 +205,7 @@ public class SignInActivity extends BaseMvpActivity<ISignInView, SignInPresenter
|
||||
builder.append("分享好友",
|
||||
new ForegroundColorSpan(getResources().getColor(R.color.appColor)))
|
||||
.append(" 即可获得补签机会\n")
|
||||
.append("分享后返回66星球才有效哦~",
|
||||
.append("分享后返回音游才有效哦~",
|
||||
new ForegroundColorSpan(getResources().getColor(R.color.color_999999)));
|
||||
okLabel = "分享好友";
|
||||
} else {
|
||||
|
@@ -81,10 +81,10 @@ public class TeamViewModel extends BaseViewModel {
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过66星球号搜索群聊成员
|
||||
* 通过音游号搜索群聊成员
|
||||
*
|
||||
* @param chatId 群组 ID
|
||||
* @param erbanNo 66星球号
|
||||
* @param erbanNo 音游号
|
||||
* @param page 页码
|
||||
* @return
|
||||
*/
|
||||
|
@@ -94,7 +94,7 @@ public class RegisterActivity extends BaseActivity implements View.OnClickListen
|
||||
btnRegister = findViewById(R.id.btn_register);
|
||||
tvProtocol = findViewById(R.id.tv_protocol);
|
||||
|
||||
String userAgreementTip = "《66星球用户协议》";
|
||||
String userAgreementTip = "《音游用户协议》";
|
||||
String privacyAgreementDescTip = context.getString(R.string.text_login_protocol_2, userAgreementTip);
|
||||
SpannableString ss = new SpannableString(privacyAgreementDescTip);
|
||||
int userAgreementTipIndex = privacyAgreementDescTip.indexOf(userAgreementTip);
|
||||
|
@@ -16,7 +16,7 @@ public class AboutActivity extends BaseActivity {
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_about);
|
||||
initTitleBar("关于66星球");
|
||||
initTitleBar("关于音游");
|
||||
initView();
|
||||
initData();
|
||||
}
|
||||
|
@@ -119,8 +119,8 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
|
||||
if (type != TYPE_SHARE_H5) {
|
||||
onShareDialogItemClick.onInAppSharingItemClick();
|
||||
} else {
|
||||
// Toast.makeText(context, "该内容不能分享给66星球好友", Toast.LENGTH_SHORT).show();
|
||||
SingleToastUtil.showToastShort("该内容不能分享给66星球好友");
|
||||
// Toast.makeText(context, "该内容不能分享给音游好友", Toast.LENGTH_SHORT).show();
|
||||
SingleToastUtil.showToastShort("该内容不能分享给音游好友");
|
||||
}
|
||||
}
|
||||
dismiss();
|
||||
|
@@ -23,7 +23,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:text="“66星球”隐私政策"
|
||||
android:text="“音游”隐私政策"
|
||||
android:textColor="#ff1b1b1b"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold" />
|
||||
|
@@ -56,6 +56,6 @@
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/fl_room_history_avatar_container"
|
||||
tools:text="66星球66星球" />
|
||||
tools:text="音游音游" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
@@ -37,7 +37,7 @@
|
||||
android:layout_marginBottom="27dp"
|
||||
android:textSize="@dimen/dialog_title_text_fnt"
|
||||
android:textColor="#F9E3AE"
|
||||
tools:text="66星球送你一个现金红包" />
|
||||
tools:text="音游送你一个现金红包" />
|
||||
|
||||
|
||||
</RelativeLayout>
|
||||
|
@@ -243,7 +243,7 @@
|
||||
|
||||
<!-- 提示框的背景色 -->
|
||||
|
||||
<!--66星球-->
|
||||
<!--音游-->
|
||||
|
||||
|
||||
<!-- Background color for light LeBubbleView. -->
|
||||
@@ -491,7 +491,7 @@
|
||||
<color name="design_color">@color/color_FE4C62</color>
|
||||
<color name="color_9af5ef">#9af5ef</color>
|
||||
|
||||
<!-- 66星球主题色 -->
|
||||
<!-- 音游主题色 -->
|
||||
<color name="color_7154EE">#7154EE</color>
|
||||
|
||||
<color name="color_39EBDF">#39EBDF</color>
|
||||
|
@@ -1,5 +1,5 @@
|
||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
<string name="app_name">66星球</string>
|
||||
<string name="app_name">音游</string>
|
||||
<string name="no_list_data">暂无消息</string>
|
||||
<string name="str_network_not_capable">网络不给力</string>
|
||||
<string name="network_error_reload">网络异常,加载失败</string>
|
||||
@@ -103,7 +103,7 @@
|
||||
<string name="text_chat_limit">仅%s或%s的用于可发起聊天</string>
|
||||
|
||||
<string name="room_offline">房主已下线</string>
|
||||
<string name="root_offline_notice">更多好玩的房间在66星球等您哟!去看看!</string>
|
||||
<string name="root_offline_notice">更多好玩的房间在音游等您哟!去看看!</string>
|
||||
<string name="home">主页</string>
|
||||
<string name="back">返回</string>
|
||||
<string name="fan">粉丝</string>
|
||||
@@ -115,7 +115,7 @@
|
||||
<string name="friend">好友</string>
|
||||
<string name="attention">关注</string>
|
||||
<string name="no_frenids_text">你还没有添加任何好友哦! \n快去添加好友吧!</string>
|
||||
<string name="no_fan_text">你还没有任何66星球粉丝哦!</string>
|
||||
<string name="no_fan_text">你还没有任何音游粉丝哦!</string>
|
||||
<string name="bind_your_alipay">请先绑定您的支付宝帐号</string>
|
||||
<string name="my_jewel">我的钻石余额</string>
|
||||
<string name="jewel_withdraw">钻石可以用于提现,兑换比率1元=10钻</string>
|
||||
@@ -152,7 +152,7 @@
|
||||
<string name="my_attention">我的关注</string>
|
||||
<string name="my_fan">我的粉丝</string>
|
||||
|
||||
<string name="no_attention_text">你还没有关注任何66星球好友哦! \n快去添加关注吧!</string>
|
||||
<string name="no_attention_text">你还没有关注任何音游好友哦! \n快去添加关注吧!</string>
|
||||
<string name="search_hint">搜索昵称/66号/房间名</string>
|
||||
<string name="online">在线中…</string>
|
||||
<string name="me_customer_server">客服</string>
|
||||
@@ -246,7 +246,7 @@
|
||||
|
||||
<string name="pk_opponent_result"> 查看对方战绩></string>
|
||||
<string name="pk_mine_result"> 查看我的战绩></string>
|
||||
<string name="pk_tip_do_not_give_up">别气馁,66星球永远支持你哦!</string>
|
||||
<string name="pk_tip_do_not_give_up">别气馁,音游永远支持你哦!</string>
|
||||
|
||||
|
||||
<!--密聊-->
|
||||
@@ -328,7 +328,7 @@
|
||||
<string name="car_detail_price_days2">%1$d    有效期%2$d天</string>
|
||||
<string name="car_user_info_off_shelf">该车辆已下架,无法购买</string>
|
||||
<string name="car_dialog_content_before">开着你的车,驾着你的马</string>
|
||||
<string name="car_dialog_content_after">来66星球尽情驰骋吧!</string>
|
||||
<string name="car_dialog_content_after">来音游尽情驰骋吧!</string>
|
||||
<string name="car_shop_name">座驾商城</string>
|
||||
<string name="decoration_status_wrapper">%1$s</string>
|
||||
<string name="decoration_remainder">剩余</string>
|
||||
@@ -348,7 +348,7 @@
|
||||
|
||||
5 打爆怪兽的奖励将会随着怪兽的实力(血值)增加而增加,例如:打爆一只血值1000的怪兽将获得总价不少于1000钻石的钻石或者座驾奖励\n
|
||||
|
||||
6 若有疑问,请咨询66星球客服微信:1213490\n
|
||||
6 若有疑问,请咨询音游客服微信:1213490\n
|
||||
</string>
|
||||
<string name="text_monster_hunting_introduction">·玩法介绍·</string>
|
||||
<string name="text_ok">确定</string>
|
||||
@@ -412,7 +412,7 @@
|
||||
<string name="family_exit_family">退出家族</string>
|
||||
<string name="family_exit_family_tip">退出家族后您的家族币将无法使用\n重新加入即可还原,你真的要退出吗?</string>
|
||||
<string name="family_invite_friends">邀请好友</string>
|
||||
<string name="family_invite_friends_slogan">【66星球】 用声音表达心情,用家族传承微笑。</string>
|
||||
<string name="family_invite_friends_slogan">【音游】 用声音表达心情,用家族传承微笑。</string>
|
||||
<string name="family_join">加入</string>
|
||||
<string name="family_search_member_hint">搜索成员ID/昵称 </string>
|
||||
<string name="family_manage_title">家族管理</string>
|
||||
@@ -432,7 +432,7 @@
|
||||
<string name="family_join_valid_hint">加入家族身份验证</string>
|
||||
<string name="family_disband">解散家族</string>
|
||||
<string name="common_tip">提示</string>
|
||||
<string name="family_disband_tip1">需要联系客服才能解散家族哦~\n66星球家族客服:%1$s</string>
|
||||
<string name="family_disband_tip1">需要联系客服才能解散家族哦~\n音游家族客服:%1$s</string>
|
||||
<string name="family_contact_service">联系客服</string>
|
||||
<string name="family_join_tip">确认加入"%1$s"吗?</string>
|
||||
<string name="family_join_hint">我希望加入贵家族</string>
|
||||
@@ -524,7 +524,7 @@
|
||||
<string name="tab_title_friends">好友</string>
|
||||
<string name="tab_title_attentions">关注</string>
|
||||
<string name="tab_title_fans">粉丝</string>
|
||||
<string name="title_share_dialog">每天第一次分享免费领红包(不包含分享至66星球好友)</string>
|
||||
<string name="title_share_dialog">每天第一次分享免费领红包(不包含分享至音游好友)</string>
|
||||
<string name="text_share_erban_friends">好友</string>
|
||||
<string name="text_share_wechat_friends">微信好友</string>
|
||||
<string name="text_share_qq_friends">QQ好友</string>
|
||||
@@ -551,7 +551,7 @@
|
||||
<string name="tips_bind_alipay_sms_code">验证码将发送至您绑定的手机\"{0}\",请注意查收</string>
|
||||
<string name="home_more">更多</string>
|
||||
<string name="text_qq_login_erban_member">我是兔兔老用户</string>
|
||||
<string name="text_qq_login_tutu_member">我是66星球新用户</string>
|
||||
<string name="text_qq_login_tutu_member">我是音游新用户</string>
|
||||
<string name="text_login">登录</string>
|
||||
<string name="input_text_qq_id">请输入您耳伴绑定 QQ 的 ID</string>
|
||||
<string name="input_text_hint_password">请输入您的密码</string>
|
||||
@@ -562,7 +562,7 @@
|
||||
<string name="label_recall_title">亲爱的小孩:</string>
|
||||
<string name="label_recall_content">好久不见,翻起曾经一起度过的时光,期待你再次出现在身旁,谢谢你回来!</string>
|
||||
<string name="hint_recall_input">请输入邀请码(选填)</string>
|
||||
<string name="tips_recall">输入邀请码,邀请你加入的好友和你都可以获得66星球回归计划的超级大礼哦!</string>
|
||||
<string name="tips_recall">输入邀请码,邀请你加入的好友和你都可以获得音游回归计划的超级大礼哦!</string>
|
||||
<string name="label_recall_accept">收下回归礼</string>
|
||||
|
||||
<string name="label_user_info_avatar">头像:</string>
|
||||
@@ -675,7 +675,7 @@
|
||||
<string name="text_setting_community_norms">社区规范</string>
|
||||
<string name="text_setting_contact_us">联系官方</string>
|
||||
<string name="text_setting_help">帮助</string>
|
||||
<string name="text_setting_about">关于66星球</string>
|
||||
<string name="text_setting_about">关于音游</string>
|
||||
<string name="text_setting_check_for_update">检查版本</string>
|
||||
<string name="text_setting_lab">实验室</string>
|
||||
<string name="text_setting_logout">退出当前账号</string>
|
||||
@@ -806,7 +806,7 @@
|
||||
<string name="new_user_task_content">萝卜X20</string>
|
||||
<string name="new_user_task_receive_award">领取奖励</string>
|
||||
<string name="new_user_task_hint">萝卜可用于送礼物、购买头饰座驾哦~</string>
|
||||
<string name="tip_privacy_agreement_content">欢迎您使用66星球。我们将通过《隐私政策》和《用户协议》帮助您了解我们收集、使用、存储和共享个人信息的情况,特别是我们所采集的个人信息类型与用途的对应关系。\n\n为了保障产品的正常运行,我们会收集您的部分必要信息。我们可能会收集联络方式、地理位置等个人敏感信息,您有权拒绝向我们提供这些信息。我们不会向第三方共享、提供、转让或者从第三方获取您的个人信息,除非经过您的同意。</string>
|
||||
<string name="tip_privacy_agreement_content">欢迎您使用音游。我们将通过《隐私政策》和《用户协议》帮助您了解我们收集、使用、存储和共享个人信息的情况,特别是我们所采集的个人信息类型与用途的对应关系。\n\n为了保障产品的正常运行,我们会收集您的部分必要信息。我们可能会收集联络方式、地理位置等个人敏感信息,您有权拒绝向我们提供这些信息。我们不会向第三方共享、提供、转让或者从第三方获取您的个人信息,除非经过您的同意。</string>
|
||||
<string name="tip_privacy_agreement_desc">您可以查看完整的%s和%s,如果您同意,请点击下方同意按钮开始接受我们的服务。</string>
|
||||
<string name="tip_privacy_agreement">《隐私政策》</string>
|
||||
<string name="tip_user_agreement">《用户协议》</string>
|
||||
@@ -814,7 +814,7 @@
|
||||
|
||||
<string name="label_charge_gold">我的账户</string>
|
||||
|
||||
<string name="old_app_name">66星球</string>
|
||||
<string name="old_app_name">音游</string>
|
||||
<string name="tip_login_how_login">如何登录?</string>
|
||||
<string name="tip_login_old_account">%s也可登录%s哦 %s</string>
|
||||
<string name="me_mentoring_relationship_title">收个徒弟赢钻石</string>
|
||||
@@ -823,7 +823,7 @@
|
||||
<string name="tip_login_other_login">其他方式登录</string>
|
||||
<string name="tip_login_account_login">账号登录</string>
|
||||
|
||||
<string name="text_dialog_pm_notice">为呵护青少年健康成长,66星球推出“青少年模式”,该模式下针对青少年推送精选优化的内容。</string>
|
||||
<string name="text_dialog_pm_notice">为呵护青少年健康成长,音游推出“青少年模式”,该模式下针对青少年推送精选优化的内容。</string>
|
||||
<string name="to_set_pm">设置青少年模式</string>
|
||||
<string name="text_pm_set_pwd_tips">设置青少年模式的开启和关闭的数字密码</string>
|
||||
<string name="text_pm_close_pwd">青少年模式关闭密码</string>
|
||||
@@ -831,7 +831,7 @@
|
||||
<string name="qq_login">QQ登录</string>
|
||||
<string name="hint_input_nick">请输入昵称</string>
|
||||
<string name="text_bind_phone">绑定手机号</string>
|
||||
<string name="slogan">听声音玩游戏交朋友,来66星球</string>
|
||||
<string name="slogan">听声音玩游戏交朋友,来音游</string>
|
||||
|
||||
<string name="text_agree">同意</string>
|
||||
<string name="text_disagree">不同意</string>
|
||||
@@ -852,12 +852,12 @@
|
||||
|
||||
<string name="gold_give">钻石转赠</string>
|
||||
<string name="donee">受赠人</string>
|
||||
<string name="done_hint_input_phone_or_id">请输入手机号/66星球号</string>
|
||||
<string name="done_hint_input_phone_or_id">请输入手机号/音游号</string>
|
||||
<string name="give_value">转赠金额</string>
|
||||
<string name="custom_input">自定义输入</string>
|
||||
<string name="give_immediately">立即转赠</string>
|
||||
<string name="my_give_record">我的转赠记录</string>
|
||||
<string name="send_gold_confirm_info">%1$s (66星球号: %2$s)</string>
|
||||
<string name="send_gold_confirm_info">%1$s (音游号: %2$s)</string>
|
||||
|
||||
<string name="back_login_page">返回登录页</string>
|
||||
<string name="privacy_setting">隐私设置</string>
|
||||
@@ -883,7 +883,7 @@
|
||||
<string name="collect">收藏</string>
|
||||
<string name="diamond">钻石</string>
|
||||
<string name="join">加入</string>
|
||||
<string name="pm_detail">《66星球护苗计划》</string>
|
||||
<string name="pm_detail">《音游护苗计划》</string>
|
||||
<string name="charge_agreement">已阅读并同意</string>
|
||||
<string name="agreement">《用户充值协议》</string>
|
||||
<string name="user_info">个人资料</string>
|
||||
|
@@ -101,7 +101,7 @@ public class CustomerServerModel extends BaseModel implements ICustomerServerMod
|
||||
.setIndex(1));
|
||||
|
||||
userData.add(new CustomerItemInfo("erbanNo")
|
||||
.setLabel("66星球号:")
|
||||
.setLabel("音游号:")
|
||||
.setValue(UserModel.get().getCacheLoginUserInfo().getErbanNo() + "")
|
||||
.setIndex(2));
|
||||
|
||||
|
@@ -11,7 +11,7 @@
|
||||
<string name="toast_unbind_bank_card_success">解除绑定银行卡成功</string>
|
||||
<string name="title_add_bank_card_agreement">用户服务协议及隐私政策</string>
|
||||
<string name="text_add_bank_card_agreement">
|
||||
尊敬的66星球用户:\n\u3000\u3000为了更好地保障你的合法权益,
|
||||
尊敬的音游用户:\n\u3000\u3000为了更好地保障你的合法权益,
|
||||
让你正常使用%s服务,%s公司依照国家法律法规,对支付账户进行实名制管理、
|
||||
履行反洗钱职责并采取风险防控措施。你需要向%s公司以及合作公司(汇聚支付)提交身份信息、
|
||||
联系方式、交易信息。\n\u3000\u3000%s公司将严格依据国家法律法规收集、存储、使用你的个人信息,确保信息安全。
|
||||
|
@@ -33,7 +33,7 @@ public class HallSearchActivity extends SearchHallActivity {
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
searchEdit.setHint("搜索昵称/66星球ID");
|
||||
searchEdit.setHint("搜索昵称/音游ID");
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -268,7 +268,7 @@ public class PwdCodeMgr {
|
||||
@Override
|
||||
public void onClickTutu() {
|
||||
StatisticManager.Instance().onEvent(
|
||||
StatisticsProtocol.Event.EVENT_HALL_ADDMEMBERS_USERID_CLICK, "添加成员-66星球ID");
|
||||
StatisticsProtocol.Event.EVENT_HALL_ADDMEMBERS_USERID_CLICK, "添加成员-音游ID");
|
||||
dialog.dismiss();
|
||||
HallSearchActivity.start(context, AbstractSelectFriendAction.TYPE_MODULE_HALL);
|
||||
}
|
||||
|
@@ -44,7 +44,7 @@
|
||||
android:drawableTop="@drawable/lu_ic_share_tutu"
|
||||
android:drawablePadding="9dp"
|
||||
android:gravity="center"
|
||||
android:text="66星球ID添加"
|
||||
android:text="音游ID添加"
|
||||
android:textColor="@color/color_333333"
|
||||
android:textSize="@dimen/sp_12" />
|
||||
<TextView
|
||||
|
@@ -29,7 +29,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="@color/color_333333"
|
||||
tools:text="66星球女神厅"
|
||||
tools:text="音游女神厅"
|
||||
android:layout_centerVertical="true" />
|
||||
|
||||
<com.coorchice.library.SuperTextView
|
||||
|
@@ -25,7 +25,7 @@
|
||||
app:layout_constraintStart_toEndOf="@id/riv_group_image"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:text="66星球女神"
|
||||
android:text="音游女神"
|
||||
android:textSize="15dp" />
|
||||
|
||||
<TextView
|
||||
|
@@ -20,7 +20,7 @@
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_tips"
|
||||
android:text="66星球:您收到一条收徒消息哦!"
|
||||
android:text="音游:您收到一条收徒消息哦!"
|
||||
android:textSize="@dimen/dp_13"
|
||||
android:textColor="@color/color_333333"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
@@ -99,7 +99,7 @@
|
||||
android:layout_marginStart="@dimen/dp_10"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:layout_marginEnd="@dimen/dp_10"
|
||||
android:text="小哥哥你就从了我吧,做我徒弟,以后我们一起浪迹66星球,你是风儿我是沙!"
|
||||
android:text="小哥哥你就从了我吧,做我徒弟,以后我们一起浪迹音游,你是风儿我是沙!"
|
||||
android:textColor="@color/color_1A1A1A"
|
||||
android:textSize="@dimen/dp_14"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
|
@@ -101,7 +101,7 @@
|
||||
app:layout_constraintStart_toStartOf="@+id/ll_mission_steps"
|
||||
app:layout_constraintTop_toBottomOf="@+id/ll_mission_steps"
|
||||
tools:ignore="SpUsage"
|
||||
tools:text="66星球所有问题都可以问Ta哦~" />
|
||||
tools:text="音游所有问题都可以问Ta哦~" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/btn_action"
|
||||
|
@@ -257,8 +257,8 @@ public class PublicChatHallMessageFragment extends TFragment implements ModulePr
|
||||
|
||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||
public void onAntiSpamEvent(AntiSpamEvent event) {
|
||||
// Toast.makeText(getContext(), "发送失败,66星球提醒您文明用语~", Toast.LENGTH_SHORT).show();
|
||||
SingleToastUtil.showToastShort("发送失败,66星球提醒您文明用语~");
|
||||
// Toast.makeText(getContext(), "发送失败,音游提醒您文明用语~", Toast.LENGTH_SHORT).show();
|
||||
SingleToastUtil.showToastShort("发送失败,音游提醒您文明用语~");
|
||||
}
|
||||
|
||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||
@@ -537,7 +537,7 @@ public class PublicChatHallMessageFragment extends TFragment implements ModulePr
|
||||
ImGameMode.get().setImGameInfo(imGameInfo1.setUuId(imMessage.getUuid()));
|
||||
} else {
|
||||
if (throwable.getMessage().contains("13004")) {
|
||||
SingleToastUtil.showToast("你已被禁言,剩余" + PublicChatHallDataManager.get().mOwnerMember.getTempMuteDuration() / 60 + "分钟。66星球提醒您文明用语");
|
||||
SingleToastUtil.showToast("你已被禁言,剩余" + PublicChatHallDataManager.get().mOwnerMember.getTempMuteDuration() / 60 + "分钟。音游提醒您文明用语");
|
||||
}
|
||||
throwable.printStackTrace();
|
||||
}
|
||||
@@ -606,7 +606,7 @@ public class PublicChatHallMessageFragment extends TFragment implements ModulePr
|
||||
if (throwable != null) {
|
||||
String throwableMessage = throwable.getMessage();
|
||||
if (throwable.getMessage().contains("13004")) {
|
||||
SingleToastUtil.showToast("你已被禁言,剩余" + PublicChatHallDataManager.get().mOwnerMember.getTempMuteDuration() / 60 + "分钟。66星球提醒您文明用语");
|
||||
SingleToastUtil.showToast("你已被禁言,剩余" + PublicChatHallDataManager.get().mOwnerMember.getTempMuteDuration() / 60 + "分钟。音游提醒您文明用语");
|
||||
} else {
|
||||
// Toast.makeText(NimUIKit.getContext(), throwableMessage, Toast.LENGTH_SHORT).show();
|
||||
SingleToastUtil.showToastShort(throwableMessage);
|
||||
|
@@ -76,11 +76,11 @@ public class QuickLoginUiConfig {
|
||||
.setLoginBtnBottomYOffset(BOTTOM_OFFSET)
|
||||
// 隐私栏
|
||||
.setPrivacyTextStart("登录即代表同意")
|
||||
.setProtocolText("《66星球隐私政策》")
|
||||
.setProtocolText("《音游隐私政策》")
|
||||
.setProtocolLink(UriProvider.getPrivacyAgreement())
|
||||
.setProtocol2Text("《66星球用户协议》")
|
||||
.setProtocol2Text("《音游用户协议》")
|
||||
.setProtocol2Link(UriProvider.getUserProtocolUrl())
|
||||
.setPrivacyTextEnd("并授权66星球获取本机号码")
|
||||
.setPrivacyTextEnd("并授权音游获取本机号码")
|
||||
.setPrivacyTextColor(ContextCompat.getColor(context, R.color.color_BAB0FF))
|
||||
.setPrivacyProtocolColor(ContextCompat.getColor(context, R.color.white))
|
||||
.setHidePrivacyCheckBox(false)
|
||||
|
@@ -160,7 +160,7 @@ public class XChatConstants {
|
||||
/**
|
||||
* 分享房间标题
|
||||
*/
|
||||
public static final String SHARE_ROOM_TITLE = "听声音玩游戏交朋友,来66星球";
|
||||
public static final String SHARE_ROOM_TITLE = "听声音玩游戏交朋友,来音游";
|
||||
|
||||
/**
|
||||
* 分享房间 URL
|
||||
@@ -175,7 +175,7 @@ public class XChatConstants {
|
||||
/**
|
||||
* 分享家族标题
|
||||
*/
|
||||
public static final String SHARE_FAMILY_TITLE = "hi,我想邀请您加入我的66星球家族:";
|
||||
public static final String SHARE_FAMILY_TITLE = "hi,我想邀请您加入我的音游家族:";
|
||||
|
||||
/**
|
||||
* 分享家族 URL
|
||||
@@ -190,7 +190,7 @@ public class XChatConstants {
|
||||
/**
|
||||
* 分享群组标题
|
||||
*/
|
||||
public static final String SHARE_TEAM_TITLE = "hi,我想邀请您加入我的66星球群聊:";
|
||||
public static final String SHARE_TEAM_TITLE = "hi,我想邀请您加入我的音游群聊:";
|
||||
|
||||
/**
|
||||
* 分享群组 URL
|
||||
|
@@ -230,7 +230,7 @@ public class UriProvider {
|
||||
}
|
||||
|
||||
/**
|
||||
* 66星球专属,实名认证页面
|
||||
* 音游专属,实名认证页面
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@@ -257,7 +257,7 @@ public class UriProvider {
|
||||
}
|
||||
|
||||
/**
|
||||
* 66星球专属,101技能认证页面
|
||||
* 音游专属,101技能认证页面
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
|
@@ -11,7 +11,7 @@ public class RoomTabInfo implements Serializable {
|
||||
* uid : 2
|
||||
* officeUser : 1
|
||||
* roomId : 58892673
|
||||
* title : 66星球张展伟的房间
|
||||
* title : 音游张展伟的房间
|
||||
* type : 5
|
||||
* meetingName : edc36c59bc9b449bb5bb58ac17b9c0b4
|
||||
* valid : true
|
||||
|
@@ -5,7 +5,7 @@ import java.util.List;
|
||||
public class Test {
|
||||
|
||||
/**
|
||||
* data : [{"uid":2,"officeUser":1,"roomId":58892673,"title":"66星球张展伟的房间","type":5,"meetingName":"edc36c59bc9b449bb5bb58ac17b9c0b4","valid":true,"operatorStatus":1,"avatar":"https://image.zhongjialx.com/FikxU2u59uOjPVS1Sv_zfu4icqMS?imageslim","roomDesc":"","backPic":"","openTime":1545018501000,"onlineNum":1,"abChannelType":1,"roomPwd":"","roomTag":"聊天","calcSumDataIndex":0,"tagId":8,"tagPict":"https://image.zhongjialx.com/new_tag_%E8%81%8A%E5%A4%A9@3x.png","badge":"","isPermitRoom":2,"isRecom":0,"count":0,"hasAnimationEffect":true,"audioQuality":1,"isCloseScreen":false,"hasDragonGame":true,"hasKTVPriv":true,"isOpenKTV":false,"isOpenGame":true,"roomModeType":0,"roomGame":{"roomId":58892673,"uid":2,"startUid":2,"gameId":"doushouqi1","gameName":"doushouqi1","status":5,"createTime":1548856711000,"updateTime":1548856711000},"isExceptionClose":false,"exceptionClose":false}]
|
||||
* data : [{"uid":2,"officeUser":1,"roomId":58892673,"title":"音游张展伟的房间","type":5,"meetingName":"edc36c59bc9b449bb5bb58ac17b9c0b4","valid":true,"operatorStatus":1,"avatar":"https://image.zhongjialx.com/FikxU2u59uOjPVS1Sv_zfu4icqMS?imageslim","roomDesc":"","backPic":"","openTime":1545018501000,"onlineNum":1,"abChannelType":1,"roomPwd":"","roomTag":"聊天","calcSumDataIndex":0,"tagId":8,"tagPict":"https://image.zhongjialx.com/new_tag_%E8%81%8A%E5%A4%A9@3x.png","badge":"","isPermitRoom":2,"isRecom":0,"count":0,"hasAnimationEffect":true,"audioQuality":1,"isCloseScreen":false,"hasDragonGame":true,"hasKTVPriv":true,"isOpenKTV":false,"isOpenGame":true,"roomModeType":0,"roomGame":{"roomId":58892673,"uid":2,"startUid":2,"gameId":"doushouqi1","gameName":"doushouqi1","status":5,"createTime":1548856711000,"updateTime":1548856711000},"isExceptionClose":false,"exceptionClose":false}]
|
||||
* title : 墙裂推荐
|
||||
* type : 1
|
||||
* maxNum : 3
|
||||
@@ -53,7 +53,7 @@ public class Test {
|
||||
* uid : 2
|
||||
* officeUser : 1
|
||||
* roomId : 58892673
|
||||
* title : 66星球张展伟的房间
|
||||
* title : 音游张展伟的房间
|
||||
* type : 5
|
||||
* meetingName : edc36c59bc9b449bb5bb58ac17b9c0b4
|
||||
* valid : true
|
||||
|
@@ -754,7 +754,7 @@ public class HomeModel extends BaseModel implements IHomeModel {
|
||||
/**
|
||||
* 新版首页获取导航栏列表和下拉选择列表
|
||||
*
|
||||
* @param type 1-导航栏 2-首页下方的banner 3 66星球的banner
|
||||
* @param type 1-导航栏 2-首页下方的banner 3 音游的banner
|
||||
* @return
|
||||
*/
|
||||
@GET("home/v5/getFirstPageBanner")
|
||||
|
@@ -181,7 +181,7 @@ public interface IHomeModel extends IModel {
|
||||
Single<ArrayList<BannerInfo>> getTabBanner(String tabId);
|
||||
|
||||
/**
|
||||
* 66星球顶部 banner信息
|
||||
* 音游顶部 banner信息
|
||||
* 包含3部分,顶部banner,测一测那个列表,标签页
|
||||
*/
|
||||
Single<HomeBannerInfo> getQxBannerInfo();
|
||||
|
@@ -596,7 +596,7 @@ public class AuthModel extends BaseModel implements IAuthModel {
|
||||
}
|
||||
|
||||
/**
|
||||
* 账号密码登录(耳伴老用户绑定 QQ 号登录66星球)
|
||||
* 账号密码登录(耳伴老用户绑定 QQ 号登录音游)
|
||||
*
|
||||
* @param account
|
||||
* @param password
|
||||
@@ -1475,7 +1475,7 @@ public class AuthModel extends BaseModel implements IAuthModel {
|
||||
@Query("shuMeiDeviceId") String shuMeiDeviceId);
|
||||
|
||||
/**
|
||||
* 66星球上耳伴老用户用 QQ 登录时,判断 QQ 的 open id 是否存在
|
||||
* 音游上耳伴老用户用 QQ 登录时,判断 QQ 的 open id 是否存在
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
|
@@ -257,7 +257,7 @@ public class RoomSettingModel extends BaseMvpModel {
|
||||
|
||||
/**
|
||||
* 更新房间设置信息
|
||||
* 66星球项目-打开关闭房间纯净模式-房主修改
|
||||
* 音游项目-打开关闭房间纯净模式-房主修改
|
||||
*
|
||||
* @param title
|
||||
* @param desc
|
||||
@@ -281,7 +281,7 @@ public class RoomSettingModel extends BaseMvpModel {
|
||||
|
||||
/**
|
||||
* 更新房间设置信息
|
||||
* 66星球项目-打开关闭房间纯净模式
|
||||
* 音游项目-打开关闭房间纯净模式
|
||||
*
|
||||
* @param title
|
||||
* @param desc
|
||||
|
@@ -10,7 +10,7 @@ import lombok.Data;
|
||||
@Data
|
||||
public class PKTeamMember {
|
||||
private String uid;//用户uid
|
||||
private String erbanNo;//66星球号
|
||||
private String erbanNo;//音游号
|
||||
private String nick;//昵称
|
||||
private int gender;//性别
|
||||
private String avatar;//头像
|
||||
|
@@ -182,7 +182,7 @@ public class StatisticsProtocol {
|
||||
|
||||
|
||||
//模厅暗号
|
||||
EVENT_HALL_ADDMEMBERS_USERID_CLICK("hall_addMembers_userid_click"),//添加成员-66星球ID
|
||||
EVENT_HALL_ADDMEMBERS_USERID_CLICK("hall_addMembers_userid_click"),//添加成员-音游ID
|
||||
EVENT_HALL_ADDMEMBERS_WX_CLICK("hall_addMembers_wx_click"),//添加成员-微信导入
|
||||
EVENT_HALL_ADDMEMBERS_QQ_CLICK("hall_addMembers_qq_click"),//添加成员-QQ导入
|
||||
EVENT_HALL_PASSWORD_SHARE_WX("hall_password_share_wx"),//分享暗号到微信
|
||||
@@ -511,7 +511,7 @@ public class StatisticsProtocol {
|
||||
|
||||
|
||||
/**
|
||||
* 66星球1.4.0版本埋点整理
|
||||
* 音游1.4.0版本埋点整理
|
||||
*/
|
||||
EVENT_APP_LAUNCH("app_launch"), //app启动
|
||||
|
||||
|
@@ -975,7 +975,7 @@ public final class UserModel extends BaseModel implements IUserModel {
|
||||
@Field("passwd") String password);
|
||||
|
||||
/**
|
||||
* @param erbanNo 66星球号或手机号码
|
||||
* @param erbanNo 音游号或手机号码
|
||||
* @return -
|
||||
*/
|
||||
@GET("user/getSimpleUser")
|
||||
|
@@ -32,7 +32,7 @@ public class RecommendationUserInfo implements Serializable {
|
||||
* recommendRoom : false
|
||||
* liveTag : false
|
||||
* status : 0
|
||||
* description : 她在66星球魅力四射...
|
||||
* description : 她在音游魅力四射...
|
||||
*/
|
||||
|
||||
private int uid;
|
||||
|
@@ -10,7 +10,7 @@ public class GrabApprenticesInfo {
|
||||
private Long uid;
|
||||
|
||||
/**
|
||||
* 66星球号
|
||||
* 音游号
|
||||
*/
|
||||
private Long erbanNo;
|
||||
|
||||
|
@@ -14,7 +14,7 @@ public class SimpleUserVo implements Serializable {
|
||||
*/
|
||||
private Long uid;
|
||||
/**
|
||||
* 66星球号
|
||||
* 音游号
|
||||
*/
|
||||
private Long erbanNo;
|
||||
/**
|
||||
|
@@ -451,8 +451,8 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi
|
||||
|
||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||
public void onAntiSpamEvent(AntiSpamEvent event) {
|
||||
// Toast.makeText(getContext(), "发送失败,66星球提醒您文明用语~", Toast.LENGTH_SHORT).show();
|
||||
SingleToastUtil.showToastShort("发送失败,66星球提醒您文明用语~");
|
||||
// Toast.makeText(getContext(), "发送失败,音游提醒您文明用语~", Toast.LENGTH_SHORT).show();
|
||||
SingleToastUtil.showToastShort("发送失败,音游提醒您文明用语~");
|
||||
}
|
||||
|
||||
private int moreCustomDrawable;
|
||||
|
Reference in New Issue
Block a user