diff --git a/app/agconnect-services.json b/app/agconnect-services.json index efd89caf7..226314887 100644 --- a/app/agconnect-services.json +++ b/app/agconnect-services.json @@ -23,7 +23,7 @@ "project_id":"736430079245711652", "app_id":"104321113", "api_key":"CwEAAAAAZgS4/Nw1+/PybMG5CZXzJmlHHHnj0Tp2FOXQG3RtKUdpAsiQiXttqCXlHWA8GdUzGjtnq6oQh2Ogfe8JOs8ihePgJLg=", - "package_name":"com.mango.xiaoyouplay" + "package_name":"com.voice.magic" }, "oauth_client":{ "client_id":"104321113", @@ -31,7 +31,7 @@ }, "app_info":{ "app_id":"104321113", - "package_name":"com.mango.xiaoyouplay" + "package_name":"com.voice.magic" }, "service":{ "analytics":{ @@ -53,12 +53,12 @@ "configuration_version":"3.0", "appInfos":[ { - "package_name":"com.mango.xiaoyouplay", + "package_name":"com.voice.magic", "client":{ "app_id":"104321113" }, "app_info":{ - "package_name":"com.mango.xiaoyouplay", + "package_name":"com.voice.magic", "app_id":"104321113" }, "oauth_client":{ diff --git a/app/aliyun-libs/arm64-v8a/libc++_shared.so b/app/aliyun-libs/arm64-v8a/libc++_shared.so index ca0d05063..b8c2386ce 100644 Binary files a/app/aliyun-libs/arm64-v8a/libc++_shared.so and b/app/aliyun-libs/arm64-v8a/libc++_shared.so differ diff --git a/app/aliyun-libs/armeabi-v7a/libc++_shared.so b/app/aliyun-libs/armeabi-v7a/libc++_shared.so index b5dc9caf6..8e5bb2b53 100644 Binary files a/app/aliyun-libs/armeabi-v7a/libc++_shared.so and b/app/aliyun-libs/armeabi-v7a/libc++_shared.so differ diff --git a/app/aliyun-libs/rpsdk-4.14.3-open.aar b/app/aliyun-libs/rpsdk-4.14.3-open.aar index 1ac67b1b7..c7b337aff 100644 Binary files a/app/aliyun-libs/rpsdk-4.14.3-open.aar and b/app/aliyun-libs/rpsdk-4.14.3-open.aar differ diff --git a/app/build.gradle b/app/build.gradle index 471622f4e..5cc81021f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,7 +14,7 @@ android { compileSdkVersion 30 defaultConfig { - applicationId "com.mango.xiaoyouplay" + applicationId "com.voice.magic" minSdkVersion 21 targetSdkVersion 29 versionCode Integer.valueOf(version_code) @@ -66,19 +66,19 @@ android { signingConfigs { v2 { - storeFile file('../yinbao.jks') - storePassword "yinbao2020" - keyAlias "yinbao" - keyPassword "yinbao2020" + storeFile file('../magic.jks') + storePassword "magic2020" + keyAlias "magic" + keyPassword "magic2020" v2SigningEnabled true v1SigningEnabled true } v1 { - storeFile file('../yinbao.jks') - storePassword "yinbao2020" - keyAlias "yinbao" - keyPassword "yinbao2020" + storeFile file('../magic.jks') + storePassword "magic2020" + keyAlias "magic" + keyPassword "magic2020" v2SigningEnabled false v1SigningEnabled true } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 430bdef2f..0f99eadea 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -496,7 +496,7 @@ diff --git a/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKCreateActivity.kt b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKCreateActivity.kt index d2ea4fbc5..562dfc740 100644 --- a/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKCreateActivity.kt +++ b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKCreateActivity.kt @@ -127,7 +127,7 @@ class RoomPKCreateActivity : BaseViewBindingActivity?> : @Subscribe(threadMode = ThreadMode.MAIN) fun onAntiSpamEvent(event: AntiSpamEvent?) { - SingleToastUtil.showToast("发送失败,音游提醒您文明用语~") + SingleToastUtil.showToast("发送失败,魔力提醒您文明用语~") } /** diff --git a/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKCreateActivity.kt b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKCreateActivity.kt index 7d4a26ea0..3b253f31a 100644 --- a/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKCreateActivity.kt +++ b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKCreateActivity.kt @@ -127,7 +127,7 @@ class SingleRoomPKCreateActivity : BaseViewBindingActivity(R.id.tv_select) diff --git a/app/src/main/java/com/mango/moshen/common/widget/dialog/DialogManager.java b/app/src/main/java/com/mango/moshen/common/widget/dialog/DialogManager.java index b44645de2..a3cc80142 100644 --- a/app/src/main/java/com/mango/moshen/common/widget/dialog/DialogManager.java +++ b/app/src/main/java/com/mango/moshen/common/widget/dialog/DialogManager.java @@ -556,7 +556,7 @@ public class DialogManager { } /** - * 1、音游通用的dialog设置,以后尽量所有的dialog都引到这个方法,方便以后改版 + * 1、魔力通用的dialog设置,以后尽量所有的dialog都引到这个方法,方便以后改版 * 2、如果UI要求弹框是完全自定义的,再重新写过 * * @param title 标题,空则隐藏 (ui说,有些弹框带标题,有些不带,两种情况共存) diff --git a/app/src/main/java/com/mango/moshen/home/adapter/VisitorListAdapter.java b/app/src/main/java/com/mango/moshen/home/adapter/VisitorListAdapter.java index e4e3c7ec4..ab01b9c75 100644 --- a/app/src/main/java/com/mango/moshen/home/adapter/VisitorListAdapter.java +++ b/app/src/main/java/com/mango/moshen/home/adapter/VisitorListAdapter.java @@ -33,7 +33,7 @@ public class VisitorListAdapter extends BaseQuickAdapter(), MainMagicIndicatorAdapter.OnItemSelectListener, diff --git a/app/src/main/java/com/mango/moshen/home/fragment/PartyFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/PartyFragment.kt index fac7e8b3f..cf104f604 100644 --- a/app/src/main/java/com/mango/moshen/home/fragment/PartyFragment.kt +++ b/app/src/main/java/com/mango/moshen/home/fragment/PartyFragment.kt @@ -23,7 +23,7 @@ import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode /** - * 音游首页 + * 魔力首页 */ class PartyFragment : BaseFragment(), PartyMagicIndicatorAdapter.OnItemSelectListener { private lateinit var mBinding: FragmentPartyBinding diff --git a/app/src/main/java/com/mango/moshen/home/fragment/RecommendFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/RecommendFragment.kt index cd7adf42f..4c37d1e67 100644 --- a/app/src/main/java/com/mango/moshen/home/fragment/RecommendFragment.kt +++ b/app/src/main/java/com/mango/moshen/home/fragment/RecommendFragment.kt @@ -35,7 +35,7 @@ import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode /** - * 音游首页 + * 魔力首页 */ class RecommendFragment : BaseFragment(), MainMagicIndicatorAdapter.OnItemSelectListener { diff --git a/app/src/main/java/com/mango/moshen/radish/signin/SignInActivity.java b/app/src/main/java/com/mango/moshen/radish/signin/SignInActivity.java index e018dc348..f99d49e22 100644 --- a/app/src/main/java/com/mango/moshen/radish/signin/SignInActivity.java +++ b/app/src/main/java/com/mango/moshen/radish/signin/SignInActivity.java @@ -205,7 +205,7 @@ public class SignInActivity extends BaseMvpActivity(), { val chargeInfo = it.list.getOrNull(0) chargeInfo?.let { chargeBean -> - binding.tvOpenVip.text = "${chargeBean.getMoney()}立刻成为音游贵族" + binding.tvOpenVip.text = "${chargeBean.getMoney()}立刻成为魔力贵族" binding.tvOpenVip.setOnClickListener { StatisticManager.Instance() .onEvent(StatisticsProtocol.EVENT_VIP_OPEN_CLICK, "开通贵族点击事件") diff --git a/app/src/main/res/drawable-xhdpi/about_logo.png b/app/src/main/res/drawable-xhdpi/about_logo.png index 7ea388feb..05272d470 100644 Binary files a/app/src/main/res/drawable-xhdpi/about_logo.png and b/app/src/main/res/drawable-xhdpi/about_logo.png differ diff --git a/app/src/main/res/drawable-xhdpi/default_avatar.png b/app/src/main/res/drawable-xhdpi/default_avatar.png index c1b64c090..4b2aacc51 100644 Binary files a/app/src/main/res/drawable-xhdpi/default_avatar.png and b/app/src/main/res/drawable-xhdpi/default_avatar.png differ diff --git a/app/src/main/res/drawable-xhdpi/default_banner.png b/app/src/main/res/drawable-xhdpi/default_banner.png index ff59876ad..fee4cde12 100644 Binary files a/app/src/main/res/drawable-xhdpi/default_banner.png and b/app/src/main/res/drawable-xhdpi/default_banner.png differ diff --git a/app/src/main/res/drawable-xhdpi/default_cover.png b/app/src/main/res/drawable-xhdpi/default_cover.png index ae4930146..4a0dc74cc 100644 Binary files a/app/src/main/res/drawable-xhdpi/default_cover.png and b/app/src/main/res/drawable-xhdpi/default_cover.png differ diff --git a/app/src/main/res/layout/activity_charge.xml b/app/src/main/res/layout/activity_charge.xml index e85cca19f..b45faa5d0 100644 --- a/app/src/main/res/layout/activity_charge.xml +++ b/app/src/main/res/layout/activity_charge.xml @@ -278,7 +278,7 @@ + tools:text="魔力号:1234" /> + tools:text="魔力号:1234" /> diff --git a/app/src/main/res/layout/dialog_new_user_hello.xml b/app/src/main/res/layout/dialog_new_user_hello.xml index 125cce27c..548eab1b1 100644 --- a/app/src/main/res/layout/dialog_new_user_hello.xml +++ b/app/src/main/res/layout/dialog_new_user_hello.xml @@ -56,7 +56,7 @@ android:gravity="center" android:textColor="@color/white" android:textSize="14sp" - tools:text="音游可可鸭音游可..." /> + tools:text="魔力可可鸭魔力可..." /> diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index f49ab3250..2dca37a7b 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -144,7 +144,7 @@ android:textColor="@color/text_secondary_4f516a" android:textSize="@dimen/dp_13" tools:ignore="SpUsage" - tools:text="音游号:123456" /> + tools:text="魔力号:123456" /> diff --git a/app/src/main/res/layout/fragment_userinfo_info.xml b/app/src/main/res/layout/fragment_userinfo_info.xml index ef4a58d5c..df915c4f2 100644 --- a/app/src/main/res/layout/fragment_userinfo_info.xml +++ b/app/src/main/res/layout/fragment_userinfo_info.xml @@ -218,7 +218,7 @@ android:lines="1" android:textColor="@color/text_normal_c6c6e9" android:textSize="@dimen/dp_11" - tools:text="音游号:1234567" /> + tools:text="魔力号:1234567" /> + tools:text="魔力号:1234567" /> + tools:text="魔力魔力" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_visitor_list.xml b/app/src/main/res/layout/item_home_visitor_list.xml index 8248aacb4..a5effad4f 100644 --- a/app/src/main/res/layout/item_home_visitor_list.xml +++ b/app/src/main/res/layout/item_home_visitor_list.xml @@ -49,7 +49,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="@id/tv_nickname" app:layout_constraintTop_toBottomOf="@id/tv_nickname" - tools:text="音游号:1234567" /> + tools:text="魔力号:1234567" /> + tools:text="魔力号:1234" /> + tools:text="魔力号:1234" /> + tools:text="魔力号:666666" /> diff --git a/app/src/main/res/layout/red_packet_dialog.xml b/app/src/main/res/layout/red_packet_dialog.xml index ff677e0cb..c3bccd84f 100644 --- a/app/src/main/res/layout/red_packet_dialog.xml +++ b/app/src/main/res/layout/red_packet_dialog.xml @@ -37,7 +37,7 @@ android:layout_marginBottom="27dp" android:textSize="@dimen/dialog_title_text_fnt" android:textColor="#F9E3AE" - tools:text="音游送你一个现金红包" /> + tools:text="魔力送你一个现金红包" /> diff --git a/app/src/main/res/mipmap-hdpi/app_logo.png b/app/src/main/res/mipmap-hdpi/app_logo.png index c49f03c45..d70169f56 100644 Binary files a/app/src/main/res/mipmap-hdpi/app_logo.png and b/app/src/main/res/mipmap-hdpi/app_logo.png differ diff --git a/app/src/main/res/mipmap-xhdpi/app_logo.png b/app/src/main/res/mipmap-xhdpi/app_logo.png index c49f03c45..05272d470 100644 Binary files a/app/src/main/res/mipmap-xhdpi/app_logo.png and b/app/src/main/res/mipmap-xhdpi/app_logo.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_logo_main.png b/app/src/main/res/mipmap-xhdpi/ic_logo_main.png index 6c7e9aae1..621897679 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_logo_main.png and b/app/src/main/res/mipmap-xhdpi/ic_logo_main.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/app_logo.png b/app/src/main/res/mipmap-xxhdpi/app_logo.png index c49f03c45..539539503 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/app_logo.png and b/app/src/main/res/mipmap-xxhdpi/app_logo.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/app_logo.png b/app/src/main/res/mipmap-xxxhdpi/app_logo.png index c49f03c45..c8c5d953f 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/app_logo.png and b/app/src/main/res/mipmap-xxxhdpi/app_logo.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 5d68a9d09..d4baa2c01 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -242,7 +242,7 @@ - + @@ -493,7 +493,7 @@ @color/color_FE4C62 #9af5ef - + #FFA936 #39EBDF @@ -553,7 +553,7 @@ #2D93FF - + #5FCCE4 @@ -591,7 +591,7 @@ #8A8CAB - + #99FFFFFF diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e0e12afa9..05ada6bcf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ -]> +]> &app_name; 暂无消息 @@ -106,7 +106,7 @@ 仅%s或%s的用于可发起聊天 房主已下线 - 更多好玩的房间在音游等您哟!去看看! + 更多好玩的房间在魔力等您哟!去看看! 主页 返回 粉丝 @@ -118,7 +118,7 @@ 好友 关注 你还没有添加任何好友哦! \n快去添加好友吧! - 你还没有任何音游粉丝哦! + 你还没有任何魔力粉丝哦! 请先绑定您的支付宝帐号 我的钻石余额 钻石可以用于提现,兑换比率1元=10钻 @@ -151,11 +151,11 @@ - 音游号:%d + 魔力号:%d 我的关注 我的粉丝 - 你还没有关注任何音游好友哦! \n快去添加关注吧! + 你还没有关注任何魔力好友哦! \n快去添加关注吧! 搜索昵称或ID 在线中… 客服 @@ -249,7 +249,7 @@ 查看对方战绩> 查看我的战绩> - 别气馁,音游永远支持你哦! + 别气馁,魔力永远支持你哦! @@ -331,7 +331,7 @@ %1$d    有效期%2$d天 该车辆已下架,无法购买 开着你的车,驾着你的马 - 来音游尽情驰骋吧! + 来魔力尽情驰骋吧! 座驾商城 %1$s 剩余 @@ -351,7 +351,7 @@ 5 打爆怪兽的奖励将会随着怪兽的实力(血值)增加而增加,例如:打爆一只血值1000的怪兽将获得总价不少于1000钻石的钻石或者座驾奖励\n - 6 若有疑问,请咨询音游客服微信:1213490\n + 6 若有疑问,请咨询魔力客服微信:1213490\n ·玩法介绍· 确定 @@ -360,7 +360,7 @@ 查看伤害排行榜 获得奖励(%s) 钻石 - 音游号:%s + 魔力号:%s 伤害 %s 点/次 (%s钻石) 钻石可以兑换钻石,兑换比率:1钻石=%s钻石;\n @@ -415,7 +415,7 @@ 退出家族 退出家族后您的家族币将无法使用\n重新加入即可还原,你真的要退出吗? 邀请好友 - 【音游】 用声音表达心情,用家族传承微笑。 + 【魔力】 用声音表达心情,用家族传承微笑。 加入 搜索成员ID/昵称 家族管理 @@ -435,7 +435,7 @@ 加入家族身份验证 解散家族 提示 - 需要联系客服才能解散家族哦~\n音游家族客服:%1$s + 需要联系客服才能解散家族哦~\n魔力家族客服:%1$s 联系客服 确认加入"%1$s"吗? 我希望加入贵家族 @@ -527,7 +527,7 @@ 好友 关注 粉丝 - 每天第一次分享免费领红包(不包含分享至音游好友) + 每天第一次分享免费领红包(不包含分享至魔力好友) 好友 微信好友 QQ好友 @@ -554,7 +554,7 @@ 验证码将发送至您绑定的手机\"{0}\",请注意查收 更多 我是兔兔老用户 - 我是音游新用户 + 我是魔力新用户 登录 请输入您耳伴绑定 QQ 的 ID 请输入您的密码 @@ -565,7 +565,7 @@ 亲爱的小孩: 好久不见,翻起曾经一起度过的时光,期待你再次出现在身旁,谢谢你回来! 请输入邀请码(选填) - 输入邀请码,邀请你加入的好友和你都可以获得音游回归计划的超级大礼哦! + 输入邀请码,邀请你加入的好友和你都可以获得魔力回归计划的超级大礼哦! 收下回归礼 头像: @@ -819,7 +819,7 @@ 我的账户 - 音游 + 魔力 如何登录? %s也可登录%s哦 %s 收个徒弟赢钻石 @@ -857,12 +857,12 @@ 钻石转赠 受赠人 - 请输入手机号/音游号 + 请输入手机号/魔力号 转赠金额 自定义输入 立即转赠 我的转赠记录 - %1$s (音游号: %2$s) + %1$s (魔力号: %2$s) 返回登录页 隐私设置 diff --git a/app/src/module_bank_card/res/values/strings.xml b/app/src/module_bank_card/res/values/strings.xml index 33dc576cb..e6b1f5e1c 100644 --- a/app/src/module_bank_card/res/values/strings.xml +++ b/app/src/module_bank_card/res/values/strings.xml @@ -11,7 +11,7 @@ 解除绑定银行卡成功 用户服务协议及隐私政策 - 尊敬的音游用户:\n\u3000\u3000为了更好地保障你的合法权益, + 尊敬的魔力用户:\n\u3000\u3000为了更好地保障你的合法权益, 让你正常使用%s服务,%s公司依照国家法律法规,对支付账户进行实名制管理、 履行反洗钱职责并采取风险防控措施。你需要向%s公司以及合作公司(汇聚支付)提交身份信息、 联系方式、交易信息。\n\u3000\u3000%s公司将严格依据国家法律法规收集、存储、使用你的个人信息,确保信息安全。 diff --git a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/HallSearchActivity.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/HallSearchActivity.java index f807df6e9..dbdee02fa 100644 --- a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/HallSearchActivity.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/HallSearchActivity.java @@ -24,7 +24,7 @@ public class HallSearchActivity extends SearchHallActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - searchEdit.setHint("搜索昵称/音游ID"); + searchEdit.setHint("搜索昵称/魔力ID"); } } diff --git a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/ModuleClanActivity.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/ModuleClanActivity.java index a0debc569..0a5b605e9 100644 --- a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/ModuleClanActivity.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/ModuleClanActivity.java @@ -131,7 +131,7 @@ public class ModuleClanActivity extends BaseActivity implements View.OnClickList if (clanInfo != null && clanInfo.getId() != 0) { binding.clClan.setVisibility(View.VISIBLE); binding.clClan.setOnClickListener(v -> UserInfoActivity.Companion.start(context, clanInfo.getElderUid())); - binding.tvClanOwnerId.setText("音游号:" + clanInfo.getElderErbanNo()); + binding.tvClanOwnerId.setText("魔力号:" + clanInfo.getElderErbanNo()); binding.tvClanOwnerName.setText(clanInfo.getElderName()); binding.tvTitle.setText(clanInfo.getName()); ImageLoadUtils.loadRectImage(context, clanInfo.getAvatar(), binding.ivClanAvatar, R.drawable.default_avatar, ScreenUtil.dip2px(8)); diff --git a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/SuperAdminAddActivity.kt b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/SuperAdminAddActivity.kt index e9daf97c2..c8e38c727 100644 --- a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/SuperAdminAddActivity.kt +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/SuperAdminAddActivity.kt @@ -44,7 +44,7 @@ class SuperAdminAddActivity : BaseViewBindingActivity(R.id.rv_room) diff --git a/app/src/module_labour_union/java/com/mango/moshen/module_hall/secretcode/PwdCodeMgr.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/secretcode/PwdCodeMgr.java index e71540a2c..21dd4710c 100644 --- a/app/src/module_labour_union/java/com/mango/moshen/module_hall/secretcode/PwdCodeMgr.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/secretcode/PwdCodeMgr.java @@ -267,7 +267,7 @@ public class PwdCodeMgr { @Override public void onClickTutu() { StatisticManager.Instance().onEvent( - StatisticsProtocol.EVENT_HALL_ADDMEMBERS_USERID_CLICK, "添加成员-音游ID"); + StatisticsProtocol.EVENT_HALL_ADDMEMBERS_USERID_CLICK, "添加成员-魔力ID"); dialog.dismiss(); HallSearchActivity.start(context, HallModel.get().getHallId(), AbstractSelectFriendAction.TYPE_MODULE_HALL); } diff --git a/app/src/module_labour_union/res/layout/activity_add_member.xml b/app/src/module_labour_union/res/layout/activity_add_member.xml index 663a334c0..f881b5de6 100644 --- a/app/src/module_labour_union/res/layout/activity_add_member.xml +++ b/app/src/module_labour_union/res/layout/activity_add_member.xml @@ -36,7 +36,7 @@ + tools:text="¥6立刻成为魔力贵族" /> + tools:text="魔力号:886887" /> + tools:text="魔力所有问题都可以问Ta哦~" /> { if (onItemClickListener != null) { onItemClickListener.onAttentionBtnClick(newbieInfo); diff --git a/core/src/diff_src_erban/java/com/mango/core/UriProvider.java b/core/src/diff_src_erban/java/com/mango/core/UriProvider.java index 0fc5d9757..54654b0f4 100644 --- a/core/src/diff_src_erban/java/com/mango/core/UriProvider.java +++ b/core/src/diff_src_erban/java/com/mango/core/UriProvider.java @@ -190,7 +190,7 @@ public class UriProvider { } /** - * 音游专属,实名认证页面 + * 魔力专属,实名认证页面 * * @return */ diff --git a/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java index 9c3646987..5273cf356 100644 --- a/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java +++ b/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java @@ -133,7 +133,7 @@ public class XChatConstants { /** * 分享房间标题 */ - public static final String SHARE_ROOM_TITLE = "来音游,开黑交友玩游戏"; + public static final String SHARE_ROOM_TITLE = "来魔力,开黑交友玩游戏"; /** * 分享房间 URL @@ -148,7 +148,7 @@ public class XChatConstants { /** * 分享家族标题 */ - public static final String SHARE_FAMILY_TITLE = "hi,我想邀请您加入我的音游家族:"; + public static final String SHARE_FAMILY_TITLE = "hi,我想邀请您加入我的魔力家族:"; /** * 分享家族 URL @@ -163,7 +163,7 @@ public class XChatConstants { /** * 分享群组标题 */ - public static final String SHARE_TEAM_TITLE = "hi,我想邀请您加入我的音游群聊:"; + public static final String SHARE_TEAM_TITLE = "hi,我想邀请您加入我的魔力群聊:"; /** * 分享群组 URL diff --git a/core/src/main/java/com/mango/core/auth/AuthModel.java b/core/src/main/java/com/mango/core/auth/AuthModel.java index 30930b440..ad9818e31 100644 --- a/core/src/main/java/com/mango/core/auth/AuthModel.java +++ b/core/src/main/java/com/mango/core/auth/AuthModel.java @@ -1263,7 +1263,7 @@ public class AuthModel extends BaseModel implements IAuthModel { @Field("shuMeiDeviceId") String shuMeiDeviceId); /** - * 音游上耳伴老用户用 QQ 登录时,判断 QQ 的 open id 是否存在 + * 魔力上耳伴老用户用 QQ 登录时,判断 QQ 的 open id 是否存在 * * @return */ diff --git a/core/src/main/java/com/mango/core/room/model/RoomSettingModel.java b/core/src/main/java/com/mango/core/room/model/RoomSettingModel.java index 6b4e2fccb..b26e0df43 100644 --- a/core/src/main/java/com/mango/core/room/model/RoomSettingModel.java +++ b/core/src/main/java/com/mango/core/room/model/RoomSettingModel.java @@ -310,7 +310,7 @@ public class RoomSettingModel extends BaseMvpModel { /** * 更新房间设置信息 - * 音游项目-打开关闭房间纯净模式-房主修改 + * 魔力项目-打开关闭房间纯净模式-房主修改 * * @param title * @param desc @@ -334,7 +334,7 @@ public class RoomSettingModel extends BaseMvpModel { /** * 更新房间设置信息 - * 音游项目-打开关闭房间纯净模式 + * 魔力项目-打开关闭房间纯净模式 * * @param title * @param desc diff --git a/core/src/main/java/com/mango/core/room/pk/bean/PKTeamMember.java b/core/src/main/java/com/mango/core/room/pk/bean/PKTeamMember.java index 5b96e4f98..10614493d 100644 --- a/core/src/main/java/com/mango/core/room/pk/bean/PKTeamMember.java +++ b/core/src/main/java/com/mango/core/room/pk/bean/PKTeamMember.java @@ -10,7 +10,7 @@ import lombok.Data; @Data public class PKTeamMember { private String uid;//用户uid - private String erbanNo;//音游号 + private String erbanNo;//魔力号 private String nick;//昵称 private int gender;//性别 private String avatar;//头像 diff --git a/core/src/main/java/com/mango/core/statistic/protocol/StatisticsProtocol.java b/core/src/main/java/com/mango/core/statistic/protocol/StatisticsProtocol.java index a03646715..2418d1f58 100644 --- a/core/src/main/java/com/mango/core/statistic/protocol/StatisticsProtocol.java +++ b/core/src/main/java/com/mango/core/statistic/protocol/StatisticsProtocol.java @@ -179,7 +179,7 @@ public interface StatisticsProtocol { //模厅暗号 - String EVENT_HALL_ADDMEMBERS_USERID_CLICK = "hall_addMembers_userid_click";//添加成员-音游ID + String EVENT_HALL_ADDMEMBERS_USERID_CLICK = "hall_addMembers_userid_click";//添加成员-魔力ID String EVENT_HALL_ADDMEMBERS_WX_CLICK = "hall_addMembers_wx_click";//添加成员-微信导入 String EVENT_HALL_ADDMEMBERS_QQ_CLICK = "hall_addMembers_qq_click";//添加成员-QQ导入 String EVENT_HALL_PASSWORD_SHARE_WX = "hall_password_share_wx";//分享暗号到微信 @@ -507,7 +507,7 @@ public interface StatisticsProtocol { /** - * 音游1.4.0版本埋点整理 + * 魔力1.4.0版本埋点整理 */ String EVENT_APP_LAUNCH = "app_launch"; //app启动 diff --git a/core/src/main/java/com/mango/core/user/UserModel.java b/core/src/main/java/com/mango/core/user/UserModel.java index 8b8cfe6b4..f803b25f2 100644 --- a/core/src/main/java/com/mango/core/user/UserModel.java +++ b/core/src/main/java/com/mango/core/user/UserModel.java @@ -995,7 +995,7 @@ public final class UserModel extends BaseModel implements IUserModel { @Field("passwd") String password); /** - * @param erbanNo 音游号或手机号码 + * @param erbanNo 魔力号或手机号码 * @return - */ @GET("user/getSimpleUser") diff --git a/core/src/main/java/com/mango/core/utils/OldHttpErrorHandleUtil.java b/core/src/main/java/com/mango/core/utils/OldHttpErrorHandleUtil.java index 562e8f273..cf79c9dd6 100644 --- a/core/src/main/java/com/mango/core/utils/OldHttpErrorHandleUtil.java +++ b/core/src/main/java/com/mango/core/utils/OldHttpErrorHandleUtil.java @@ -24,7 +24,7 @@ public class OldHttpErrorHandleUtil { try { result = new Gson().fromJson(new String(bodyByte, Charset.forName("UTF-8")), ServiceResult.class); } catch (Exception e) { - return "音游开小差中~请稍后再试"; + return "魔力开小差中~请稍后再试"; } return result.getMessage(); } else { diff --git a/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/GrabApprenticesInfo.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/GrabApprenticesInfo.java index 133b43df6..27ca249d7 100644 --- a/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/GrabApprenticesInfo.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/GrabApprenticesInfo.java @@ -10,7 +10,7 @@ public class GrabApprenticesInfo { private Long uid; /** - * 音游号 + * 魔力号 */ private Long erbanNo; diff --git a/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/SimpleUserVo.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/SimpleUserVo.java index 4f8212a59..5b17e108a 100644 --- a/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/SimpleUserVo.java +++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/SimpleUserVo.java @@ -14,7 +14,7 @@ public class SimpleUserVo implements Serializable { */ private Long uid; /** - * 音游号 + * 魔力号 */ private Long erbanNo; /** diff --git a/magic.jks b/magic.jks new file mode 100644 index 000000000..077c72d38 Binary files /dev/null and b/magic.jks differ diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/fragment/MessageFragment.java b/nim_uikit/src/com/netease/nim/uikit/business/session/fragment/MessageFragment.java index 903e0544d..fb6dbcb8f 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/fragment/MessageFragment.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/fragment/MessageFragment.java @@ -451,8 +451,8 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi @Subscribe(threadMode = ThreadMode.MAIN) public void onAntiSpamEvent(AntiSpamEvent event) { -// Toast.makeText(getContext(), "发送失败,音游提醒您文明用语~", Toast.LENGTH_SHORT).show(); - SingleToastUtil.showToastShort("发送失败,音游提醒您文明用语~"); +// Toast.makeText(getContext(), "发送失败,魔力提醒您文明用语~", Toast.LENGTH_SHORT).show(); + SingleToastUtil.showToastShort("发送失败,魔力提醒您文明用语~"); } private int moreCustomDrawable; diff --git a/yinbao.jks b/yinbao.jks deleted file mode 100644 index ff0f3df67..000000000 Binary files a/yinbao.jks and /dev/null differ