change app logo and name

This commit is contained in:
huangjian
2022-09-26 11:13:06 +08:00
parent 869c2d7ffc
commit 975b50b205
73 changed files with 116 additions and 126 deletions

View File

@@ -307,7 +307,7 @@
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:label="大鹅开黑" android:label="Peko"
android:launchMode="singleTask" android:launchMode="singleTask"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />

View File

@@ -129,7 +129,7 @@ class RoomPKCreateActivity : BaseViewBindingActivity<ActivityRoomPkCreateBinding
binding.llPkRoom.isVisible = true binding.llPkRoom.isVisible = true
ImageLoadUtils.loadImage(this, it.avatar, binding.ivAvatar) ImageLoadUtils.loadImage(this, it.avatar, binding.ivAvatar)
binding.tvRoomTitle.text = it.title.subAndReplaceDot(7) binding.tvRoomTitle.text = it.title.subAndReplaceDot(7)
binding.tvRoomId.text = "大鹅号:${it.erbanNo}" binding.tvRoomId.text = "Peko号:${it.erbanNo}"
checkCommitEnable() checkCommitEnable()
} }
} }

View File

@@ -12,7 +12,7 @@ class RoomPKSearchAdapter :
override fun convert(helper: BaseViewHolder, item: SimpleRoomInfo) { override fun convert(helper: BaseViewHolder, item: SimpleRoomInfo) {
helper.setText(R.id.tv_room_title,item.title.subAndReplaceDot(7)) helper.setText(R.id.tv_room_title,item.title.subAndReplaceDot(7))
.setText(R.id.tv_room_id,"大鹅号:${item.erbanNo}") .setText(R.id.tv_room_id,"Peko号:${item.erbanNo}")
.setChecked(R.id.check_box,item.checked) .setChecked(R.id.check_box,item.checked)
ImageLoadUtils.loadImage(mContext,item.avatar,helper.getView(R.id.iv_avatar)) ImageLoadUtils.loadImage(mContext,item.avatar,helper.getView(R.id.iv_avatar))
helper.addOnClickListener(R.id.iv_avatar,R.id.check_box) helper.addOnClickListener(R.id.iv_avatar,R.id.check_box)

View File

@@ -614,7 +614,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
fun onAntiSpamEvent(event: AntiSpamEvent?) { fun onAntiSpamEvent(event: AntiSpamEvent?) {
SingleToastUtil.showToast("发送失败,大鹅开黑提醒您文明用语~") SingleToastUtil.showToast("发送失败,Peko提醒您文明用语~")
} }
/** /**

View File

@@ -127,7 +127,7 @@ class SingleRoomPKCreateActivity : BaseViewBindingActivity<ActivitySingleRoomPkC
binding.llPkRoom.isVisible = true binding.llPkRoom.isVisible = true
ImageLoadUtils.loadImage(this, it.avatar, binding.ivAvatar) ImageLoadUtils.loadImage(this, it.avatar, binding.ivAvatar)
binding.tvRoomTitle.text = it.title.subAndReplaceDot(7) binding.tvRoomTitle.text = it.title.subAndReplaceDot(7)
binding.tvRoomId.text = "大鹅号:${it.erbanNo}" binding.tvRoomId.text = "Peko号:${it.erbanNo}"
checkCommitEnable() checkCommitEnable()
} }
} }

View File

@@ -15,7 +15,7 @@ class SingleRoomPKSearchAdapter :
override fun convert(helper: BaseViewHolder, item: SimpleRoomInfo) { override fun convert(helper: BaseViewHolder, item: SimpleRoomInfo) {
helper.setText(R.id.tv_room_title, item.nick.subAndReplaceDot(7)) helper.setText(R.id.tv_room_title, item.nick.subAndReplaceDot(7))
.setText(R.id.tv_room_id, "大鹅号:${item.erbanNo}") .setText(R.id.tv_room_id, "Peko号:${item.erbanNo}")
ImageLoadUtils.loadImage(mContext, item.avatar, helper.getView(R.id.iv_avatar)) ImageLoadUtils.loadImage(mContext, item.avatar, helper.getView(R.id.iv_avatar))
helper.addOnClickListener(R.id.iv_avatar, R.id.tv_select) helper.addOnClickListener(R.id.iv_avatar, R.id.tv_select)
val tvSelect = helper.getView<TextView>(R.id.tv_select) val tvSelect = helper.getView<TextView>(R.id.tv_select)

View File

@@ -556,7 +556,7 @@ public class DialogManager {
} }
/** /**
* 1、大鹅开黑通用的dialog设置以后尽量所有的dialog都引到这个方法方便以后改版 * 1、Peko通用的dialog设置以后尽量所有的dialog都引到这个方法方便以后改版
* 2、如果UI要求弹框是完全自定义的再重新写过 * 2、如果UI要求弹框是完全自定义的再重新写过
* *
* @param title 标题,空则隐藏 (ui说有些弹框带标题有些不带两种情况共存) * @param title 标题,空则隐藏 (ui说有些弹框带标题有些不带两种情况共存)

View File

@@ -33,7 +33,7 @@ public class VisitorListAdapter extends BaseQuickAdapter<VisitorInfo, BaseViewHo
helper.getView(R.id.iv_avatar) helper.getView(R.id.iv_avatar)
); );
helper.setText(R.id.tv_nickname, item.getNick()) helper.setText(R.id.tv_nickname, item.getNick())
.setText(R.id.tv_id, "大鹅号:" + item.getErbanNo()) .setText(R.id.tv_id, "Peko号:" + item.getErbanNo())
.setText(R.id.tv_time, item.getVisitTimeDesc()) .setText(R.id.tv_time, item.getVisitTimeDesc())
.setImageResource(R.id.iv_gender, item.getGender() == 1 ? R.drawable.ic_gender_male : R.drawable.ic_gender_female); .setImageResource(R.id.iv_gender, item.getGender() == 1 ? R.drawable.ic_gender_male : R.drawable.ic_gender_female);

View File

@@ -23,7 +23,7 @@ import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol
import java.util.* import java.util.*
/** /**
* 大鹅开黑首页 * Peko首页
*/ */
class HomeFragment : BaseFragment(), View.OnClickListener, class HomeFragment : BaseFragment(), View.OnClickListener,
MainMagicIndicatorAdapter.OnItemSelectListener { MainMagicIndicatorAdapter.OnItemSelectListener {

View File

@@ -33,7 +33,7 @@ import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode import org.greenrobot.eventbus.ThreadMode
/** /**
* 大鹅开黑首页 * Peko首页
*/ */
class LiveFragment : BaseViewBindingFragment<FragmentLiveBinding>(), class LiveFragment : BaseViewBindingFragment<FragmentLiveBinding>(),
MainMagicIndicatorAdapter.OnItemSelectListener, MainMagicIndicatorAdapter.OnItemSelectListener,

View File

@@ -23,7 +23,7 @@ import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode import org.greenrobot.eventbus.ThreadMode
/** /**
* 大鹅开黑首页 * Peko首页
*/ */
class PartyFragment : BaseFragment(), PartyMagicIndicatorAdapter.OnItemSelectListener { class PartyFragment : BaseFragment(), PartyMagicIndicatorAdapter.OnItemSelectListener {
private lateinit var mBinding: FragmentPartyBinding private lateinit var mBinding: FragmentPartyBinding

View File

@@ -35,7 +35,7 @@ import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode import org.greenrobot.eventbus.ThreadMode
/** /**
* 大鹅开黑首页 * Peko首页
*/ */
class RecommendFragment : BaseFragment(), class RecommendFragment : BaseFragment(),
MainMagicIndicatorAdapter.OnItemSelectListener { MainMagicIndicatorAdapter.OnItemSelectListener {

View File

@@ -205,7 +205,7 @@ public class SignInActivity extends BaseMvpActivity<ISignInView, SignInPresenter
builder.append("分享好友", builder.append("分享好友",
new ForegroundColorSpan(getResources().getColor(R.color.appColor))) new ForegroundColorSpan(getResources().getColor(R.color.appColor)))
.append(" 即可获得补签机会\n") .append(" 即可获得补签机会\n")
.append("分享后返回大鹅开黑才有效哦~", .append("分享后返回Peko才有效哦~",
new ForegroundColorSpan(getResources().getColor(R.color.color_999999))); new ForegroundColorSpan(getResources().getColor(R.color.color_999999)));
okLabel = "分享好友"; okLabel = "分享好友";
} else { } else {

View File

@@ -81,10 +81,10 @@ public class TeamVM extends BaseVM {
} }
/** /**
* 通过大鹅号搜索群聊成员 * 通过Peko号搜索群聊成员
* *
* @param chatId 群组 ID * @param chatId 群组 ID
* @param erbanNo 大鹅 * @param erbanNo Peko
* @param page 页码 * @param page 页码
* @return * @return
*/ */

View File

@@ -162,7 +162,7 @@ public class FriendListAdapter extends BaseQuickAdapter<UserInfo, BaseViewHolder
} }
}); });
TextView tvDesc = helper.getView(R.id.tv_user_desc); TextView tvDesc = helper.getView(R.id.tv_user_desc);
tvDesc.setText("大鹅号:" + item.getErbanNo()); tvDesc.setText("Peko号:" + item.getErbanNo());
tvDesc.setTextColor(ContextCompat.getColor(context, R.color.color_999999)); tvDesc.setTextColor(ContextCompat.getColor(context, R.color.color_999999));
tvDesc.setTextSize(12f); tvDesc.setTextSize(12f);
break; break;

View File

@@ -69,7 +69,7 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
binding.tvHallId.text = "房间ID:" + hallInfo.hallId.toString() binding.tvHallId.text = "房间ID:" + hallInfo.hallId.toString()
binding.tvHallName.text = hallInfo.hallName binding.tvHallName.text = hallInfo.hallName
binding.tvHallMemberNum.text = "房间人数:" + hallInfo.memberCount binding.tvHallMemberNum.text = "房间人数:" + hallInfo.memberCount
binding.tvHallErbanId.text = "大鹅号:" + hallInfo.ownerErbanNo binding.tvHallErbanId.text = "Peko号:" + hallInfo.ownerErbanNo
GlideApp.with(this) GlideApp.with(this)
.load(hallInfo.ownerAvatar) .load(hallInfo.ownerAvatar)
.placeholder(R.drawable.default_avatar) .placeholder(R.drawable.default_avatar)

View File

@@ -2,6 +2,7 @@ package com.yizhuan.erban.ui.widget;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.bottomsheet.BottomSheetDialog; import com.google.android.material.bottomsheet.BottomSheetDialog;
@@ -12,17 +13,16 @@ import android.view.WindowManager;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.TextView; import android.widget.TextView;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.marqueeview.Utils;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil; import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import com.yizhuan.xchat_android_library.utils.StringUtils; import com.yizhuan.xchat_android_library.utils.StringUtils;
import cn.sharesdk.facebook.Facebook;
import cn.sharesdk.framework.Platform; import cn.sharesdk.framework.Platform;
import cn.sharesdk.framework.ShareSDK; import cn.sharesdk.framework.ShareSDK;
import cn.sharesdk.tencent.qq.QQ; import cn.sharesdk.google.GooglePlus;
import cn.sharesdk.tencent.qzone.QZone; import cn.sharesdk.line.Line;
import cn.sharesdk.wechat.friends.Wechat;
import cn.sharesdk.wechat.moments.WechatMoments; import com.yizhuan.erban.R;
/** /**
* @author xiaoyu * @author xiaoyu
@@ -36,7 +36,7 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
public static final int TYPE_SHARE_FAMILY = 2; public static final int TYPE_SHARE_FAMILY = 2;
public static final int TYPE_SHARE_TEAM = 3; public static final int TYPE_SHARE_TEAM = 3;
public static final int TYPE_SHARE_H5 = 4; public static final int TYPE_SHARE_H5 = 4;
private static final String TAG = "ShareDialog";
private Context context; private Context context;
private WindowManager windowManager; private WindowManager windowManager;
private int width; private int width;
@@ -47,7 +47,6 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
private TextView tvQq; private TextView tvQq;
private TextView tvQqZone; private TextView tvQqZone;
private TextView tvCancel; private TextView tvCancel;
private static final String TAG = "ShareDialog";
private OnShareDialogItemClick onShareDialogItemClick; private OnShareDialogItemClick onShareDialogItemClick;
private int type = TYPE_SHARE_NORMAL; private int type = TYPE_SHARE_NORMAL;
@@ -95,7 +94,7 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
params.height = WindowManager.LayoutParams.MATCH_PARENT; params.height = WindowManager.LayoutParams.MATCH_PARENT;
getWindow().setAttributes(params); getWindow().setAttributes(params);
if (type == TYPE_SHARE_H5){ if (type == TYPE_SHARE_H5) {
tvErban.setVisibility(View.GONE); tvErban.setVisibility(View.GONE);
tvQq.setVisibility(View.GONE); tvQq.setVisibility(View.GONE);
} }
@@ -119,8 +118,8 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
if (type != TYPE_SHARE_H5) { if (type != TYPE_SHARE_H5) {
onShareDialogItemClick.onInAppSharingItemClick(); onShareDialogItemClick.onInAppSharingItemClick();
} else { } else {
// Toast.makeText(context, "该内容不能分享给大鹅开黑好友", Toast.LENGTH_SHORT).show(); // Toast.makeText(context, "该内容不能分享给Peko好友", Toast.LENGTH_SHORT).show();
SingleToastUtil.showToastShort("该内容不能分享给大鹅开黑好友"); SingleToastUtil.showToastShort("该内容不能分享给Peko好友");
} }
} }
dismiss(); dismiss();
@@ -128,26 +127,20 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
case R.id.tv_weixin: case R.id.tv_weixin:
if (onShareDialogItemClick != null) { if (onShareDialogItemClick != null) {
onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(Wechat.NAME)); onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(GooglePlus.NAME));
} }
dismiss(); dismiss();
break; break;
case R.id.tv_weixinpy: case R.id.tv_weixinpy:
if (onShareDialogItemClick != null) { if (onShareDialogItemClick != null) {
onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(WechatMoments.NAME)); onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(Line.NAME));
} }
dismiss(); dismiss();
break; break;
case R.id.tv_qq: case R.id.tv_qq:
case R.id.tv_qq_game: case R.id.tv_qq_game:
if (onShareDialogItemClick != null) { if (onShareDialogItemClick != null) {
onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(QQ.NAME)); onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(Facebook.NAME));
}
dismiss();
break;
case R.id.tv_qq_zone:
if (onShareDialogItemClick != null) {
onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(QZone.NAME));
} }
dismiss(); dismiss();
break; break;
@@ -168,6 +161,7 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
/** /**
* 应用外分享包括微信 qq 等平台 * 应用外分享包括微信 qq 等平台
*
* @param platform * @param platform
*/ */
void onSharePlatformClick(Platform platform); void onSharePlatformClick(Platform platform);

View File

@@ -531,7 +531,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
// 这个方法能让图片不失真 // 这个方法能让图片不失真
ImageLoadUtils.laodUsrInfoAvatar(context, userInfo.getAvatar(), avatar); ImageLoadUtils.laodUsrInfoAvatar(context, userInfo.getAvatar(), avatar);
nick.setText(RegexUtil.getPrintableString(userInfo.getNick())); nick.setText(RegexUtil.getPrintableString(userInfo.getNick()));
erbanId.setText("大鹅号:" + userInfo.getErbanNo()); erbanId.setText("Peko号:" + userInfo.getErbanNo());
ivGender.setImageResource( ivGender.setImageResource(
userInfo.getGender() == 1 ? R.drawable.ic_gender_male : R.drawable.ic_gender_female); userInfo.getGender() == 1 ? R.drawable.ic_gender_male : R.drawable.ic_gender_female);
VipHelper.loadVipIcon(ivVipIcon, userInfo.getUserVipInfoVO()); VipHelper.loadVipIcon(ivVipIcon, userInfo.getUserVipInfoVO());

View File

@@ -257,7 +257,7 @@ class VipMainActivity : BaseViewBindingActivity<ActivityVipMainBinding>(),
{ {
val chargeInfo = it.list.getOrNull(0) val chargeInfo = it.list.getOrNull(0)
chargeInfo?.let { chargeBean -> chargeInfo?.let { chargeBean ->
binding.tvOpenVip.text = "${chargeBean.getMoney()}立刻成为大鹅贵族" binding.tvOpenVip.text = "${chargeBean.getMoney()}立刻成为Peko贵族"
binding.tvOpenVip.setOnClickListener { binding.tvOpenVip.setOnClickListener {
StatisticManager.Instance() StatisticManager.Instance()
.onEvent(StatisticsProtocol.EVENT_VIP_OPEN_CLICK, "开通贵族点击事件") .onEvent(StatisticsProtocol.EVENT_VIP_OPEN_CLICK, "开通贵族点击事件")

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

@@ -278,7 +278,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="如有任何问题请咨询客服,大鹅88001" android:text="如有任何问题请咨询客服,Peko88001"
android:textColor="@color/app_248cfe" android:textColor="@color/app_248cfe"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"

View File

@@ -98,7 +98,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14sp" android:textSize="14sp"
tools:text="大鹅号:1234" /> tools:text="Peko号:1234" />
</LinearLayout> </LinearLayout>
<View <View

View File

@@ -31,7 +31,7 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="12dp" android:layout_marginEnd="12dp"
android:background="@drawable/bg_room_pk_common_btn" android:background="@drawable/bg_room_pk_common_btn"
android:hint="请输入大鹅号" android:hint="请输入Peko号"
android:inputType="number" android:inputType="number"
android:maxLength="15" android:maxLength="15"
android:paddingStart="20dp" android:paddingStart="20dp"

View File

@@ -98,7 +98,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14sp" android:textSize="14sp"
tools:text="大鹅号:1234" /> tools:text="Peko号:1234" />
</LinearLayout> </LinearLayout>
<View <View

View File

@@ -31,7 +31,7 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="12dp" android:layout_marginEnd="12dp"
android:background="@drawable/bg_room_pk_common_btn" android:background="@drawable/bg_room_pk_common_btn"
android:hint="请输入大鹅号" android:hint="请输入Peko号"
android:inputType="number" android:inputType="number"
android:maxLength="15" android:maxLength="15"
android:paddingStart="20dp" android:paddingStart="20dp"

View File

@@ -154,7 +154,7 @@
android:id="@+id/text" android:id="@+id/text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="如果您的手机号已丢失\n请咨询客服大鹅88001" android:text="如果您的手机号已丢失\n请咨询客服Peko88001"
android:textColor="@color/text_secondary_4f516a" android:textColor="@color/text_secondary_4f516a"
android:textSize="14sp" /> android:textSize="14sp" />

View File

@@ -56,7 +56,7 @@
android:gravity="center" android:gravity="center"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14sp" android:textSize="14sp"
tools:text="大鹅可可鸭大鹅可..." /> tools:text="Peko可可鸭Peko可..." />
<TextView <TextView
android:id="@+id/tv_id" android:id="@+id/tv_id"
@@ -75,7 +75,7 @@
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:background="@drawable/new_user_hello_bg_content" android:background="@drawable/new_user_hello_bg_content"
android:gravity="center" android:gravity="center"
android:text="欢迎来到大鹅开黑Ta已经等待你很\n久啦快来一起玩吧~" android:text="欢迎来到PekoTa已经等待你很\n久啦快来一起玩吧~"
android:textColor="#ffa00bbb" android:textColor="#ffa00bbb"
android:textSize="12sp" /> android:textSize="12sp" />

View File

@@ -144,7 +144,7 @@
android:textColor="@color/text_secondary_4f516a" android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/dp_13" android:textSize="@dimen/dp_13"
tools:ignore="SpUsage" tools:ignore="SpUsage"
tools:text="大鹅号:123456" /> tools:text="Peko号:123456" />
</LinearLayout> </LinearLayout>

View File

@@ -218,7 +218,7 @@
android:lines="1" android:lines="1"
android:textColor="@color/text_normal_c6c6e9" android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_11" android:textSize="@dimen/dp_11"
tools:text="大鹅1234567" /> tools:text="Peko1234567" />
<TextView <TextView
android:id="@+id/tv_hall_member_num" android:id="@+id/tv_hall_member_num"

View File

@@ -235,7 +235,7 @@
android:lines="1" android:lines="1"
android:textColor="@color/color_999999" android:textColor="@color/color_999999"
android:textSize="@dimen/dp_11" android:textSize="@dimen/dp_11"
tools:text="大鹅1234567" /> tools:text="Peko1234567" />
<TextView <TextView
android:id="@+id/tv_hall_member_num" android:id="@+id/tv_hall_member_num"

View File

@@ -65,6 +65,6 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/fl_room_history_avatar_container" app:layout_constraintTop_toBottomOf="@id/fl_room_history_avatar_container"
tools:text="大鹅开黑大鹅开黑" /> tools:text="PekoPeko" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -49,7 +49,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_nickname" app:layout_constraintStart_toStartOf="@id/tv_nickname"
app:layout_constraintTop_toBottomOf="@id/tv_nickname" app:layout_constraintTop_toBottomOf="@id/tv_nickname"
tools:text="大鹅1234567" /> tools:text="Peko1234567" />
<ImageView <ImageView
android:id="@+id/iv_gender" android:id="@+id/iv_gender"

View File

@@ -35,7 +35,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14sp" android:textSize="14sp"
tools:text="大鹅号:1234" /> tools:text="Peko号:1234" />
</LinearLayout> </LinearLayout>
<View <View

View File

@@ -35,7 +35,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14sp" android:textSize="14sp"
tools:text="大鹅号:1234" /> tools:text="Peko号:1234" />
</LinearLayout> </LinearLayout>
<View <View

View File

@@ -78,7 +78,7 @@
android:textColor="@color/color_666666" android:textColor="@color/color_666666"
android:textSize="14sp" android:textSize="14sp"
android:fontFamily="sans-serif" android:fontFamily="sans-serif"
tools:text="大鹅号:666666" /> tools:text="Peko号:666666" />
</LinearLayout> </LinearLayout>

View File

@@ -37,7 +37,7 @@
android:layout_marginBottom="27dp" android:layout_marginBottom="27dp"
android:textSize="@dimen/dialog_title_text_fnt" android:textSize="@dimen/dialog_title_text_fnt"
android:textColor="#F9E3AE" android:textColor="#F9E3AE"
tools:text="大鹅开黑送你一个现金红包" /> tools:text="Peko送你一个现金红包" />
</RelativeLayout> </RelativeLayout>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 90 KiB

View File

@@ -242,7 +242,7 @@
<!-- 提示框的背景色 --> <!-- 提示框的背景色 -->
<!--大鹅开黑--> <!--Peko-->
<!-- Background color for light LeBubbleView. --> <!-- Background color for light LeBubbleView. -->
@@ -493,7 +493,7 @@
<color name="design_color">@color/color_FE4C62</color> <color name="design_color">@color/color_FE4C62</color>
<color name="color_9af5ef">#9af5ef</color> <color name="color_9af5ef">#9af5ef</color>
<!-- 大鹅开黑主题色 --> <!-- Peko主题色 -->
<color name="color_7154EE">#FFA936</color> <color name="color_7154EE">#FFA936</color>
<color name="color_39EBDF">#39EBDF</color> <color name="color_39EBDF">#39EBDF</color>
@@ -553,7 +553,7 @@
<color name="color_2D93FF">#2D93FF</color> <color name="color_2D93FF">#2D93FF</color>
<!-- 大鹅开黑UI规范 start--> <!-- PekoUI规范 start-->
<!-- 主题色 --> <!-- 主题色 -->
<color name="app_248cfe">#FFFFBC52</color> <color name="app_248cfe">#FFFFBC52</color>
@@ -591,7 +591,7 @@
<color name="main_tab_normal">#66333333</color> <color name="main_tab_normal">#66333333</color>
<!-- 大鹅开黑UI规范 end--> <!-- PekoUI规范 end-->
<!--60透明度--> <!--60透明度-->
<color name="color_60_FFFFFF">#99FFFFFF</color> <color name="color_60_FFFFFF">#99FFFFFF</color>

View File

@@ -1,4 +1,4 @@
<!DOCTYPE resources [<!ENTITY app_name "大鹅开黑" >]> <!DOCTYPE resources [<!ENTITY app_name "Peko" >]>
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<string name="app_name">&app_name;</string> <string name="app_name">&app_name;</string>
<string name="no_list_data">暂无消息</string> <string name="no_list_data">暂无消息</string>
@@ -106,7 +106,7 @@
<string name="text_chat_limit">仅%s或%s的用于可发起聊天</string> <string name="text_chat_limit">仅%s或%s的用于可发起聊天</string>
<string name="room_offline">房主已下线</string> <string name="room_offline">房主已下线</string>
<string name="root_offline_notice">更多好玩的房间在大鹅开黑等您哟!去看看!</string> <string name="root_offline_notice">更多好玩的房间在Peko等您哟!去看看!</string>
<string name="home">主页</string> <string name="home">主页</string>
<string name="back">返回</string> <string name="back">返回</string>
<string name="fan">粉丝</string> <string name="fan">粉丝</string>
@@ -118,7 +118,7 @@
<string name="friend">好友</string> <string name="friend">好友</string>
<string name="attention">关注</string> <string name="attention">关注</string>
<string name="no_frenids_text">你还没有添加任何好友哦! \n快去添加好友吧!</string> <string name="no_frenids_text">你还没有添加任何好友哦! \n快去添加好友吧!</string>
<string name="no_fan_text">你还没有任何大鹅开黑粉丝哦!</string> <string name="no_fan_text">你还没有任何Peko粉丝哦!</string>
<string name="bind_your_alipay">请先绑定您的支付宝帐号</string> <string name="bind_your_alipay">请先绑定您的支付宝帐号</string>
<string name="my_jewel">我的钻石余额</string> <string name="my_jewel">我的钻石余额</string>
<string name="jewel_withdraw">钻石可以用于提现兑换比率1元=10钻</string> <string name="jewel_withdraw">钻石可以用于提现兑换比率1元=10钻</string>
@@ -151,11 +151,11 @@
<!--我的页面--> <!--我的页面-->
<string name="me_user_id">大鹅号:%d</string> <string name="me_user_id">Peko号:%d</string>
<string name="my_attention">我的关注</string> <string name="my_attention">我的关注</string>
<string name="my_fan">我的粉丝</string> <string name="my_fan">我的粉丝</string>
<string name="no_attention_text">你还没有关注任何大鹅开黑好友哦! \n快去添加关注吧!</string> <string name="no_attention_text">你还没有关注任何Peko好友哦! \n快去添加关注吧!</string>
<string name="search_hint">搜索昵称或ID</string> <string name="search_hint">搜索昵称或ID</string>
<string name="online">在线中…</string> <string name="online">在线中…</string>
<string name="me_customer_server">客服</string> <string name="me_customer_server">客服</string>
@@ -249,7 +249,7 @@
<string name="pk_opponent_result"> 查看对方战绩></string> <string name="pk_opponent_result"> 查看对方战绩></string>
<string name="pk_mine_result"> 查看我的战绩></string> <string name="pk_mine_result"> 查看我的战绩></string>
<string name="pk_tip_do_not_give_up">别气馁,大鹅开黑永远支持你哦!</string> <string name="pk_tip_do_not_give_up">别气馁,Peko永远支持你哦!</string>
<!--密聊--> <!--密聊-->
@@ -331,7 +331,7 @@
<string name="car_detail_price_days2">%1$d&#160;&#160;&#160;&#160;有效期%2$d天</string> <string name="car_detail_price_days2">%1$d&#160;&#160;&#160;&#160;有效期%2$d天</string>
<string name="car_user_info_off_shelf">该车辆已下架,无法购买</string> <string name="car_user_info_off_shelf">该车辆已下架,无法购买</string>
<string name="car_dialog_content_before">开着你的车,驾着你的马</string> <string name="car_dialog_content_before">开着你的车,驾着你的马</string>
<string name="car_dialog_content_after">大鹅开黑尽情驰骋吧!</string> <string name="car_dialog_content_after">Peko尽情驰骋吧!</string>
<string name="car_shop_name">座驾商城</string> <string name="car_shop_name">座驾商城</string>
<string name="decoration_status_wrapper">%1$s</string> <string name="decoration_status_wrapper">%1$s</string>
<string name="decoration_remainder">剩余</string> <string name="decoration_remainder">剩余</string>
@@ -351,7 +351,7 @@
5 打爆怪兽的奖励将会随着怪兽的实力血值增加而增加例如打爆一只血值1000的怪兽将获得总价不少于1000钻石的钻石或者座驾奖励\n 5 打爆怪兽的奖励将会随着怪兽的实力血值增加而增加例如打爆一只血值1000的怪兽将获得总价不少于1000钻石的钻石或者座驾奖励\n
6 若有疑问,请咨询大鹅开黑客服微信1213490\n 6 若有疑问,请咨询Peko客服微信1213490\n
</string> </string>
<string name="text_monster_hunting_introduction">·玩法介绍·</string> <string name="text_monster_hunting_introduction">·玩法介绍·</string>
<string name="text_ok">确定</string> <string name="text_ok">确定</string>
@@ -360,7 +360,7 @@
<string name="text_check_damage">查看伤害排行榜</string> <string name="text_check_damage">查看伤害排行榜</string>
<string name="title_monster_hunting_reward">获得奖励(%s)</string> <string name="title_monster_hunting_reward">获得奖励(%s)</string>
<string name="currency_unit">钻石</string> <string name="currency_unit">钻石</string>
<string name="text_user_id">大鹅号:%s</string> <string name="text_user_id">Peko号:%s</string>
<string name="format_monster_hunting_impact">伤害 %s 点/次</string> <string name="format_monster_hunting_impact">伤害 %s 点/次</string>
<string name="format_monster_hunting_magic_value">(%s钻石)</string> <string name="format_monster_hunting_magic_value">(%s钻石)</string>
<string name="exchange_gold_tips">钻石可以兑换钻石兑换比率1钻石=%s钻石\n</string> <string name="exchange_gold_tips">钻石可以兑换钻石兑换比率1钻石=%s钻石\n</string>
@@ -415,7 +415,7 @@
<string name="family_exit_family">退出家族</string> <string name="family_exit_family">退出家族</string>
<string name="family_exit_family_tip">退出家族后您的家族币将无法使用\n重新加入即可还原,你真的要退出吗?</string> <string name="family_exit_family_tip">退出家族后您的家族币将无法使用\n重新加入即可还原,你真的要退出吗?</string>
<string name="family_invite_friends">邀请好友</string> <string name="family_invite_friends">邀请好友</string>
<string name="family_invite_friends_slogan">大鹅开黑】 用声音表达心情,用家族传承微笑。</string> <string name="family_invite_friends_slogan">Peko】 用声音表达心情,用家族传承微笑。</string>
<string name="family_join">加入</string> <string name="family_join">加入</string>
<string name="family_search_member_hint">搜索成员ID/昵称 </string> <string name="family_search_member_hint">搜索成员ID/昵称 </string>
<string name="family_manage_title">家族管理</string> <string name="family_manage_title">家族管理</string>
@@ -435,7 +435,7 @@
<string name="family_join_valid_hint">加入家族身份验证</string> <string name="family_join_valid_hint">加入家族身份验证</string>
<string name="family_disband">解散家族</string> <string name="family_disband">解散家族</string>
<string name="common_tip">提示</string> <string name="common_tip">提示</string>
<string name="family_disband_tip1">需要联系客服才能解散家族哦~\n大鹅开黑家族客服:%1$s</string> <string name="family_disband_tip1">需要联系客服才能解散家族哦~\nPeko家族客服:%1$s</string>
<string name="family_contact_service">联系客服</string> <string name="family_contact_service">联系客服</string>
<string name="family_join_tip">确认加入"%1$s"吗?</string> <string name="family_join_tip">确认加入"%1$s"吗?</string>
<string name="family_join_hint">我希望加入贵家族</string> <string name="family_join_hint">我希望加入贵家族</string>
@@ -527,7 +527,7 @@
<string name="tab_title_friends">好友</string> <string name="tab_title_friends">好友</string>
<string name="tab_title_attentions">关注</string> <string name="tab_title_attentions">关注</string>
<string name="tab_title_fans">粉丝</string> <string name="tab_title_fans">粉丝</string>
<string name="title_share_dialog">每天第一次分享免费领红包(不包含分享至大鹅开黑好友)</string> <string name="title_share_dialog">每天第一次分享免费领红包(不包含分享至Peko好友)</string>
<string name="text_share_erban_friends">好友</string> <string name="text_share_erban_friends">好友</string>
<string name="text_share_wechat_friends">微信好友</string> <string name="text_share_wechat_friends">微信好友</string>
<string name="text_share_qq_friends">QQ好友</string> <string name="text_share_qq_friends">QQ好友</string>
@@ -554,7 +554,7 @@
<string name="tips_bind_alipay_sms_code">验证码将发送至您绑定的手机\"{0}\",请注意查收</string> <string name="tips_bind_alipay_sms_code">验证码将发送至您绑定的手机\"{0}\",请注意查收</string>
<string name="home_more">更多</string> <string name="home_more">更多</string>
<string name="text_qq_login_erban_member">我是兔兔老用户</string> <string name="text_qq_login_erban_member">我是兔兔老用户</string>
<string name="text_qq_login_tutu_member">我是大鹅开黑新用户</string> <string name="text_qq_login_tutu_member">我是Peko新用户</string>
<string name="text_login">登录</string> <string name="text_login">登录</string>
<string name="input_text_qq_id">请输入您耳伴绑定 QQ 的 ID</string> <string name="input_text_qq_id">请输入您耳伴绑定 QQ 的 ID</string>
<string name="input_text_hint_password">请输入您的密码</string> <string name="input_text_hint_password">请输入您的密码</string>
@@ -565,7 +565,7 @@
<string name="label_recall_title">亲爱的小孩:</string> <string name="label_recall_title">亲爱的小孩:</string>
<string name="label_recall_content">好久不见,翻起曾经一起度过的时光,期待你再次出现在身旁,谢谢你回来!</string> <string name="label_recall_content">好久不见,翻起曾经一起度过的时光,期待你再次出现在身旁,谢谢你回来!</string>
<string name="hint_recall_input">请输入邀请码(选填)</string> <string name="hint_recall_input">请输入邀请码(选填)</string>
<string name="tips_recall">输入邀请码,邀请你加入的好友和你都可以获得大鹅开黑回归计划的超级大礼哦!</string> <string name="tips_recall">输入邀请码,邀请你加入的好友和你都可以获得Peko回归计划的超级大礼哦!</string>
<string name="label_recall_accept">收下回归礼</string> <string name="label_recall_accept">收下回归礼</string>
<string name="label_user_info_avatar">头像:</string> <string name="label_user_info_avatar">头像:</string>
@@ -819,7 +819,7 @@
<string name="label_charge_gold">我的账户</string> <string name="label_charge_gold">我的账户</string>
<string name="old_app_name">大鹅开黑</string> <string name="old_app_name">Peko</string>
<string name="tip_login_how_login">如何登录?</string> <string name="tip_login_how_login">如何登录?</string>
<string name="tip_login_old_account">%s也可登录%s哦 %s</string> <string name="tip_login_old_account">%s也可登录%s哦 %s</string>
<string name="me_mentoring_relationship_title">收个徒弟赢钻石</string> <string name="me_mentoring_relationship_title">收个徒弟赢钻石</string>
@@ -857,12 +857,12 @@
<string name="gold_give">钻石转赠</string> <string name="gold_give">钻石转赠</string>
<string name="donee">受赠人</string> <string name="donee">受赠人</string>
<string name="done_hint_input_phone_or_id">请输入手机号/大鹅</string> <string name="done_hint_input_phone_or_id">请输入手机号/Peko</string>
<string name="give_value">转赠金额</string> <string name="give_value">转赠金额</string>
<string name="custom_input">自定义输入</string> <string name="custom_input">自定义输入</string>
<string name="give_immediately">立即转赠</string> <string name="give_immediately">立即转赠</string>
<string name="my_give_record">我的转赠记录</string> <string name="my_give_record">我的转赠记录</string>
<string name="send_gold_confirm_info">%1$s&#160;(大鹅号:&#160;%2$s)</string> <string name="send_gold_confirm_info">%1$s&#160;(Peko号:&#160;%2$s)</string>
<string name="back_login_page">返回登录页</string> <string name="back_login_page">返回登录页</string>
<string name="privacy_setting">隐私设置</string> <string name="privacy_setting">隐私设置</string>

View File

@@ -11,7 +11,7 @@
<string name="toast_unbind_bank_card_success">解除绑定银行卡成功</string> <string name="toast_unbind_bank_card_success">解除绑定银行卡成功</string>
<string name="title_add_bank_card_agreement">用户服务协议及隐私政策</string> <string name="title_add_bank_card_agreement">用户服务协议及隐私政策</string>
<string name="text_add_bank_card_agreement"> <string name="text_add_bank_card_agreement">
尊敬的大鹅开黑用户:\n\u3000\u3000为了更好地保障你的合法权益 尊敬的Peko用户:\n\u3000\u3000为了更好地保障你的合法权益
让你正常使用%s服务%s公司依照国家法律法规对支付账户进行实名制管理、 让你正常使用%s服务%s公司依照国家法律法规对支付账户进行实名制管理、
履行反洗钱职责并采取风险防控措施。你需要向%s公司以及合作公司汇聚支付提交身份信息、 履行反洗钱职责并采取风险防控措施。你需要向%s公司以及合作公司汇聚支付提交身份信息、
联系方式、交易信息。\n\u3000\u3000%s公司将严格依据国家法律法规收集、存储、使用你的个人信息确保信息安全。 联系方式、交易信息。\n\u3000\u3000%s公司将严格依据国家法律法规收集、存储、使用你的个人信息确保信息安全。

View File

@@ -24,7 +24,7 @@ public class HallSearchActivity extends SearchHallActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
searchEdit.setHint("搜索昵称/大鹅开黑ID"); searchEdit.setHint("搜索昵称/PekoID");
} }
} }

View File

@@ -132,7 +132,7 @@ public class ModuleClanActivity extends BaseActivity implements View.OnClickList
if (clanInfo != null && clanInfo.getId() != 0) { if (clanInfo != null && clanInfo.getId() != 0) {
binding.clClan.setVisibility(View.VISIBLE); binding.clClan.setVisibility(View.VISIBLE);
binding.clClan.setOnClickListener(v -> UserInfoActivity.Companion.start(context, clanInfo.getElderUid())); binding.clClan.setOnClickListener(v -> UserInfoActivity.Companion.start(context, clanInfo.getElderUid()));
binding.tvClanOwnerId.setText("大鹅号:" + clanInfo.getElderErbanNo()); binding.tvClanOwnerId.setText("Peko号:" + clanInfo.getElderErbanNo());
binding.tvClanOwnerName.setText(clanInfo.getElderName()); binding.tvClanOwnerName.setText(clanInfo.getElderName());
binding.tvTitle.setText(clanInfo.getName()); binding.tvTitle.setText(clanInfo.getName());
ImageLoadUtils.loadRectImage(context, clanInfo.getAvatar(), binding.ivClanAvatar, R.drawable.default_avatar, ScreenUtil.dip2px(8)); ImageLoadUtils.loadRectImage(context, clanInfo.getAvatar(), binding.ivClanAvatar, R.drawable.default_avatar, ScreenUtil.dip2px(8));

View File

@@ -44,7 +44,7 @@ class SuperAdminAddActivity : BaseViewBindingActivity<ActivitySuperAdminAddBindi
if (view.id == R.id.tv_set) { if (view.id == R.id.tv_set) {
adminAdapter.getItem(position)?.let { adminAdapter.getItem(position)?.let {
dialogManager.showOkCancelDialog( dialogManager.showOkCancelDialog(
"确定要添加用户 ${it.nick} (大鹅开黑ID:${it.erbanNo})为公会超级管理员吗?", "确定要添加用户 ${it.nick} (PekoID:${it.erbanNo})为公会超级管理员吗?",
true true
) { ) {
SuperAdminRoomSetActivity.start(this, clanId, it.uid) SuperAdminRoomSetActivity.start(this, clanId, it.uid)
@@ -57,7 +57,7 @@ class SuperAdminAddActivity : BaseViewBindingActivity<ActivitySuperAdminAddBindi
binding.tvSearch.setOnClickListener { binding.tvSearch.setOnClickListener {
val id = binding.searchEdit.text?.toString()?.toLongOrNull() val id = binding.searchEdit.text?.toString()?.toLongOrNull()
if (id == null) { if (id == null) {
"请输入大鹅号!".toast() "请输入Peko号!".toast()
} else { } else {
searchId = id searchId = id
loadData() loadData()

View File

@@ -18,7 +18,7 @@ class ManageSuperAdminAdapter :
ImageLoadUtils.loadAvatar(item.avatar, helper.getView(R.id.iv_avatar)) ImageLoadUtils.loadAvatar(item.avatar, helper.getView(R.id.iv_avatar))
helper.setText(R.id.tv_nickname,item.nick) helper.setText(R.id.tv_nickname,item.nick)
.setText(R.id.tv_id,"大鹅号:${item.erbanNo}") .setText(R.id.tv_id,"Peko号:${item.erbanNo}")
.addOnClickListener(R.id.iv_more) .addOnClickListener(R.id.iv_more)
val rvRoom = helper.getView<RecyclerView>(R.id.rv_room) val rvRoom = helper.getView<RecyclerView>(R.id.rv_room)

View File

@@ -267,7 +267,7 @@ public class PwdCodeMgr {
@Override @Override
public void onClickTutu() { public void onClickTutu() {
StatisticManager.Instance().onEvent( StatisticManager.Instance().onEvent(
StatisticsProtocol.EVENT_HALL_ADDMEMBERS_USERID_CLICK, "添加成员-大鹅开黑ID"); StatisticsProtocol.EVENT_HALL_ADDMEMBERS_USERID_CLICK, "添加成员-PekoID");
dialog.dismiss(); dialog.dismiss();
HallSearchActivity.start(context, HallModel.get().getHallId(), AbstractSelectFriendAction.TYPE_MODULE_HALL); HallSearchActivity.start(context, HallModel.get().getHallId(), AbstractSelectFriendAction.TYPE_MODULE_HALL);
} }

View File

@@ -36,7 +36,7 @@
<EditText <EditText
android:id="@+id/et_search" android:id="@+id/et_search"
android:hint="搜索用户昵称/大鹅号" android:hint="搜索用户昵称/Peko号"
android:textSize="@dimen/sp_13" android:textSize="@dimen/sp_13"
android:textColor="@color/text_normal_c6c6e9" android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_hint_555574" android:textColorHint="@color/text_hint_555574"

View File

@@ -36,7 +36,7 @@
<EditText <EditText
android:id="@+id/et_search" android:id="@+id/et_search"
android:hint="搜索用户昵称/大鹅号" android:hint="搜索用户昵称/Peko号"
android:textSize="@dimen/sp_13" android:textSize="@dimen/sp_13"
android:textColor="@color/text_normal_c6c6e9" android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_hint_555574" android:textColorHint="@color/text_hint_555574"

View File

@@ -45,7 +45,7 @@
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@null" android:background="@null"
android:hint="请输入公会成员大鹅号" android:hint="请输入公会成员Peko号"
android:inputType="number" android:inputType="number"
android:maxLength="20" android:maxLength="20"
android:maxLines="1" android:maxLines="1"

View File

@@ -162,7 +162,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
tools:text="¥6立刻成为大鹅贵族" /> tools:text="¥6立刻成为Peko贵族" />
<com.yizhuan.erban.base.TitleBar <com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar" android:id="@+id/title_bar"

View File

@@ -44,7 +44,7 @@
android:drawableTop="@drawable/lu_ic_share_tutu" android:drawableTop="@drawable/lu_ic_share_tutu"
android:drawablePadding="9dp" android:drawablePadding="9dp"
android:gravity="center" android:gravity="center"
android:text="大鹅开黑ID添加" android:text="PekoID添加"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="@dimen/sp_12" /> android:textSize="@dimen/sp_12" />
<TextView <TextView

View File

@@ -29,7 +29,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
tools:text="大鹅开黑女神厅" tools:text="Peko女神厅"
android:layout_centerVertical="true" /> android:layout_centerVertical="true" />
<com.coorchice.library.SuperTextView <com.coorchice.library.SuperTextView

View File

@@ -25,7 +25,7 @@
app:layout_constraintStart_toEndOf="@id/riv_group_image" app:layout_constraintStart_toEndOf="@id/riv_group_image"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
android:text="大鹅开黑女神" android:text="Peko女神"
android:textSize="15dp" /> android:textSize="15dp" />
<TextView <TextView

View File

@@ -43,7 +43,7 @@
app:layout_constraintBottom_toTopOf="@id/tv_room_num" app:layout_constraintBottom_toTopOf="@id/tv_room_num"
app:layout_constraintStart_toStartOf="@id/tv_nickname" app:layout_constraintStart_toStartOf="@id/tv_nickname"
app:layout_constraintTop_toBottomOf="@id/tv_nickname" app:layout_constraintTop_toBottomOf="@id/tv_nickname"
tools:text="大鹅号:886887" /> tools:text="Peko号:886887" />
<TextView <TextView
android:id="@+id/tv_room_num" android:id="@+id/tv_room_num"

View File

@@ -20,7 +20,7 @@
<TextView <TextView
android:id="@+id/tv_tips" android:id="@+id/tv_tips"
android:text="大鹅开黑:您收到一条收徒消息哦!" android:text="Peko:您收到一条收徒消息哦!"
android:textSize="@dimen/dp_13" android:textSize="@dimen/dp_13"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

View File

@@ -99,7 +99,7 @@
android:layout_marginStart="@dimen/dp_10" android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_10" android:layout_marginEnd="@dimen/dp_10"
android:text="小哥哥你就从了我吧,做我徒弟,以后我们一起浪迹大鹅开黑,你是风儿我是沙!" android:text="小哥哥你就从了我吧,做我徒弟,以后我们一起浪迹Peko,你是风儿我是沙!"
android:textColor="@color/color_1A1A1A" android:textColor="@color/color_1A1A1A"
android:textSize="@dimen/dp_14" android:textSize="@dimen/dp_14"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"

View File

@@ -101,7 +101,7 @@
app:layout_constraintStart_toStartOf="@+id/ll_mission_steps" app:layout_constraintStart_toStartOf="@+id/ll_mission_steps"
app:layout_constraintTop_toBottomOf="@+id/ll_mission_steps" app:layout_constraintTop_toBottomOf="@+id/ll_mission_steps"
tools:ignore="SpUsage" tools:ignore="SpUsage"
tools:text="大鹅开黑所有问题都可以问Ta哦~" /> tools:text="Peko所有问题都可以问Ta哦~" />
<TextView <TextView
android:id="@+id/btn_action" android:id="@+id/btn_action"

View File

@@ -242,8 +242,8 @@ public class PublicChatHallMessageFragment extends TFragment implements ModulePr
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void onAntiSpamEvent(AntiSpamEvent event) { public void onAntiSpamEvent(AntiSpamEvent event) {
// Toast.makeText(getContext(), "发送失败,大鹅开黑提醒您文明用语~", Toast.LENGTH_SHORT).show(); // Toast.makeText(getContext(), "发送失败,Peko提醒您文明用语~", Toast.LENGTH_SHORT).show();
SingleToastUtil.showToastShort("发送失败,大鹅开黑提醒您文明用语~"); SingleToastUtil.showToastShort("发送失败,Peko提醒您文明用语~");
} }
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
@@ -490,7 +490,7 @@ public class PublicChatHallMessageFragment extends TFragment implements ModulePr
if (throwable != null) { if (throwable != null) {
String throwableMessage = throwable.getMessage(); String throwableMessage = throwable.getMessage();
if (throwable.getMessage().contains("13004")) { if (throwable.getMessage().contains("13004")) {
SingleToastUtil.showToast("你已被禁言,剩余" + PublicChatHallDataManager.get().mOwnerMember.getTempMuteDuration() / 60 + "分钟。大鹅开黑提醒您文明用语"); SingleToastUtil.showToast("你已被禁言,剩余" + PublicChatHallDataManager.get().mOwnerMember.getTempMuteDuration() / 60 + "分钟。Peko提醒您文明用语");
} else { } else {
// Toast.makeText(NimUIKit.getContext(), throwableMessage, Toast.LENGTH_SHORT).show(); // Toast.makeText(NimUIKit.getContext(), throwableMessage, Toast.LENGTH_SHORT).show();
SingleToastUtil.showToastShort(throwableMessage); SingleToastUtil.showToastShort(throwableMessage);

View File

@@ -44,7 +44,7 @@ public class RoomNewbieListAdapter extends BaseQuickAdapter<RoomNewbieInfo, Base
attentionBg.setColor(mContext.getResources().getColor(R.color.appColor)); attentionBg.setColor(mContext.getResources().getColor(R.color.appColor));
} }
baseViewHolder.setText(R.id.tv_userName, newbieInfo.getNick()) baseViewHolder.setText(R.id.tv_userName, newbieInfo.getNick())
.setText(R.id.tv_erban_id, "大鹅号:" + newbieInfo.getErbanNo()) .setText(R.id.tv_erban_id, "Peko号:" + newbieInfo.getErbanNo())
.setOnClickListener(R.id.attention_img, v -> { .setOnClickListener(R.id.attention_img, v -> {
if (onItemClickListener != null) { if (onItemClickListener != null) {
onItemClickListener.onAttentionBtnClick(newbieInfo); onItemClickListener.onAttentionBtnClick(newbieInfo);

View File

@@ -133,7 +133,7 @@ public class XChatConstants {
/** /**
* 分享房间标题 * 分享房间标题
*/ */
public static final String SHARE_ROOM_TITLE = "大鹅,开黑交友玩游戏"; public static final String SHARE_ROOM_TITLE = "Peko,开黑交友玩游戏";
/** /**
* 分享房间 URL * 分享房间 URL
@@ -148,7 +148,7 @@ public class XChatConstants {
/** /**
* 分享家族标题 * 分享家族标题
*/ */
public static final String SHARE_FAMILY_TITLE = "hi,我想邀请您加入我的大鹅开黑家族:"; public static final String SHARE_FAMILY_TITLE = "hi,我想邀请您加入我的Peko家族:";
/** /**
* 分享家族 URL * 分享家族 URL
@@ -163,7 +163,7 @@ public class XChatConstants {
/** /**
* 分享群组标题 * 分享群组标题
*/ */
public static final String SHARE_TEAM_TITLE = "hi,我想邀请您加入我的大鹅开黑群聊:"; public static final String SHARE_TEAM_TITLE = "hi,我想邀请您加入我的Peko群聊:";
/** /**
* 分享群组 URL * 分享群组 URL

View File

@@ -195,7 +195,7 @@ public class UriProvider {
} }
/** /**
* 大鹅开黑专属,实名认证页面 * Peko专属,实名认证页面
* *
* @return * @return
*/ */

View File

@@ -1165,7 +1165,7 @@ public class AuthModel extends BaseModel implements IAuthModel {
@Field("shuMeiDeviceId") String shuMeiDeviceId); @Field("shuMeiDeviceId") String shuMeiDeviceId);
/** /**
* 大鹅开黑上耳伴老用户用 QQ 登录时,判断 QQ 的 open id 是否存在 * Peko上耳伴老用户用 QQ 登录时,判断 QQ 的 open id 是否存在
* *
* @return * @return
*/ */

View File

@@ -311,7 +311,7 @@ public class RoomSettingModel extends BaseMvpModel {
/** /**
* 更新房间设置信息 * 更新房间设置信息
* 大鹅开黑项目-打开关闭房间纯净模式-房主修改 * Peko项目-打开关闭房间纯净模式-房主修改
* *
* @param title * @param title
* @param desc * @param desc
@@ -335,7 +335,7 @@ public class RoomSettingModel extends BaseMvpModel {
/** /**
* 更新房间设置信息 * 更新房间设置信息
* 大鹅开黑项目-打开关闭房间纯净模式 * Peko项目-打开关闭房间纯净模式
* *
* @param title * @param title
* @param desc * @param desc

View File

@@ -10,7 +10,7 @@ import lombok.Data;
@Data @Data
public class PKTeamMember { public class PKTeamMember {
private String uid;//用户uid private String uid;//用户uid
private String erbanNo;//大鹅 private String erbanNo;//Peko
private String nick;//昵称 private String nick;//昵称
private int gender;//性别 private int gender;//性别
private String avatar;//头像 private String avatar;//头像

View File

@@ -25,16 +25,15 @@ import com.yizhuan.xchat_android_core.web.bean.WebJsBeanInfo;
import com.yizhuan.xchat_android_library.net.rxnet.RxNet; import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil; import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import java.net.URL;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.HashMap; import java.util.HashMap;
import cn.sharesdk.facebook.Facebook;
import cn.sharesdk.framework.Platform; import cn.sharesdk.framework.Platform;
import cn.sharesdk.framework.PlatformActionListener; import cn.sharesdk.framework.PlatformActionListener;
import cn.sharesdk.tencent.qq.QQ;
import cn.sharesdk.tencent.qzone.QZone; import cn.sharesdk.google.GooglePlus;
import cn.sharesdk.wechat.friends.Wechat; import cn.sharesdk.line.Line;
import cn.sharesdk.wechat.moments.WechatMoments;
import io.reactivex.Single; import io.reactivex.Single;
import io.reactivex.SingleEmitter; import io.reactivex.SingleEmitter;
import io.reactivex.SingleOnSubscribe; import io.reactivex.SingleOnSubscribe;
@@ -210,17 +209,14 @@ public class ShareModel extends BaseModel implements IShareModel {
*/ */
private void reportShare(String roomUid, int sharePageId, Platform platform, String shareUrl) { private void reportShare(String roomUid, int sharePageId, Platform platform, String shareUrl) {
int shareType = 0; int shareType = 0;
if (platform.getName().equals(Wechat.NAME)) { if (platform.getName().equals(GooglePlus.NAME)) {
shareType = 1; shareType = 1;
} else if (platform.getName().equals(WechatMoments.NAME)) { } else if (platform.getName().equals(Line.NAME)) {
shareType = 2; shareType = 2;
} else if (platform.getName().equals(QQ.NAME)) { } else if (platform.getName().equals(Facebook.NAME)) {
shareType = 3; shareType = 3;
} else if (platform.getName().equals(QZone.NAME)) {
shareType = 4;
} }
api.getShareRedPacket( api.getShareRedPacket(
String.valueOf(AuthModel.get().getCurrentUid()), String.valueOf(AuthModel.get().getCurrentUid()),
roomUid, roomUid,

View File

@@ -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";//添加成员-PekoID
String EVENT_HALL_ADDMEMBERS_WX_CLICK = "hall_addMembers_wx_click";//添加成员-微信导入 String EVENT_HALL_ADDMEMBERS_WX_CLICK = "hall_addMembers_wx_click";//添加成员-微信导入
String EVENT_HALL_ADDMEMBERS_QQ_CLICK = "hall_addMembers_qq_click";//添加成员-QQ导入 String EVENT_HALL_ADDMEMBERS_QQ_CLICK = "hall_addMembers_qq_click";//添加成员-QQ导入
String EVENT_HALL_PASSWORD_SHARE_WX = "hall_password_share_wx";//分享暗号到微信 String EVENT_HALL_PASSWORD_SHARE_WX = "hall_password_share_wx";//分享暗号到微信
@@ -507,7 +507,7 @@ public interface StatisticsProtocol {
/** /**
* 大鹅开黑1.4.0版本埋点整理 * Peko1.4.0版本埋点整理
*/ */
String EVENT_APP_LAUNCH = "app_launch"; //app启动 String EVENT_APP_LAUNCH = "app_launch"; //app启动

View File

@@ -995,7 +995,7 @@ public final class UserModel extends BaseModel implements IUserModel {
@Field("passwd") String password); @Field("passwd") String password);
/** /**
* @param erbanNo 大鹅号或手机号码 * @param erbanNo Peko号或手机号码
* @return - * @return -
*/ */
@GET("user/getSimpleUser") @GET("user/getSimpleUser")

View File

@@ -24,7 +24,7 @@ public class OldHttpErrorHandleUtil {
try { try {
result = new Gson().fromJson(new String(bodyByte, Charset.forName("UTF-8")), ServiceResult.class); result = new Gson().fromJson(new String(bodyByte, Charset.forName("UTF-8")), ServiceResult.class);
} catch (Exception e) { } catch (Exception e) {
return "大鹅开小差中~请稍后再试"; return "Peko开小差中~请稍后再试";
} }
return result.getMessage(); return result.getMessage();
} else { } else {

View File

@@ -10,7 +10,7 @@ public class GrabApprenticesInfo {
private Long uid; private Long uid;
/** /**
* 大鹅 * Peko
*/ */
private Long erbanNo; private Long erbanNo;

View File

@@ -14,7 +14,7 @@ public class SimpleUserVo implements Serializable {
*/ */
private Long uid; private Long uid;
/** /**
* 大鹅 * Peko
*/ */
private Long erbanNo; private Long erbanNo;
/** /**

View File

@@ -451,8 +451,8 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void onAntiSpamEvent(AntiSpamEvent event) { public void onAntiSpamEvent(AntiSpamEvent event) {
// Toast.makeText(getContext(), "发送失败,大鹅开黑提醒您文明用语~", Toast.LENGTH_SHORT).show(); // Toast.makeText(getContext(), "发送失败,Peko提醒您文明用语~", Toast.LENGTH_SHORT).show();
SingleToastUtil.showToastShort("发送失败,大鹅开黑提醒您文明用语~"); SingleToastUtil.showToastShort("发送失败,Peko提醒您文明用语~");
} }
private int moreCustomDrawable; private int moreCustomDrawable;