diff --git a/66pw.jks b/66pw.jks new file mode 100644 index 000000000..2667b79c6 Binary files /dev/null and b/66pw.jks differ diff --git a/app/build.gradle b/app/build.gradle index d329cbdc8..38f55d2e9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ android { compileSdkVersion 29 defaultConfig { - applicationId "com.wudoo.qingxun" + applicationId "com.xuanyi.accompany" minSdkVersion 19 targetSdkVersion 29 versionCode Integer.valueOf(version_code) @@ -52,19 +52,19 @@ android { signingConfigs { v2 { - storeFile file('../qx.jks') - storePassword "123456789" - keyAlias "key_qingxun" - keyPassword "123456789" + storeFile file('../66pw.jks') + storePassword "accompanyplay" + keyAlias "66accompany" + keyPassword "accompanyplay" v2SigningEnabled true v1SigningEnabled true } v1 { - storeFile file('../qx.jks') - storePassword "123456789" - keyAlias "key_qingxun" - keyPassword "123456789" + storeFile file('../66pw.jks') + storePassword "accompanyplay" + keyAlias "66accompany" + keyPassword "accompanyplay" if (sign_mode == "v1v2") { v2SigningEnabled true } else { @@ -166,7 +166,7 @@ android { } productFlavors { - qingxun { + accompany { dimension 'default' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3d567f194..2307fc63a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -376,7 +376,7 @@ @@ -429,7 +429,7 @@ diff --git a/app/src/main/java/com/wudoo/qingxun/wxapi/WXEntryActivity.java b/app/src/main/java/com/xuanyi/accompany/wxapi/WXEntryActivity.java similarity index 94% rename from app/src/main/java/com/wudoo/qingxun/wxapi/WXEntryActivity.java rename to app/src/main/java/com/xuanyi/accompany/wxapi/WXEntryActivity.java index 496b8f2d4..e9154fb12 100644 --- a/app/src/main/java/com/wudoo/qingxun/wxapi/WXEntryActivity.java +++ b/app/src/main/java/com/xuanyi/accompany/wxapi/WXEntryActivity.java @@ -1,4 +1,4 @@ -package com.wudoo.qingxun.wxapi; +package com.xuanyi.accompany.wxapi; import android.content.Intent; diff --git a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java index 569b5e0f7..fca505585 100644 --- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java +++ b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java @@ -498,7 +498,7 @@ public class XChatApplication extends Application { private void init(String channel) { initNimUIKit(); initYiDun(); - initShuMeiTianWang(channel); +// initShuMeiTianWang(channel); //暂时不用 MobSDK.init(this); UriProvider.initUri(BuildConfig.BASE_URL_DEBUG, BuildConfig.BASE_URL_STAGING, BuildConfig.BASE_URL_RELEASE); try { @@ -526,14 +526,14 @@ public class XChatApplication extends Application { */ Realm.init(BasicConfig.INSTANCE.getAppContext()); RealmConfiguration config = new RealmConfiguration.Builder() - .name("qingxun.realm") + .name("accompany.realm") .deleteRealmIfMigrationNeeded() .build(); Realm.setDefaultConfiguration(config); LogUtil.i(TAG, channel); - initBaiduStatistic(channel); +// initBaiduStatistic(channel); 百度统计 initUmengAppStatistic(channel); if (isDebug()) { diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java index 33586fbd7..38b4fcf5d 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java @@ -1486,8 +1486,8 @@ public class HomePartyRoomFragment extends BaseMvpFragment @@ -767,7 +767,7 @@ public class GameHomeFragment extends BaseMvpFragment iterator = bannerInfos.iterator(); while (iterator.hasNext()) { BannerInfo next = iterator.next(); - if (Objects.equals(next.getBannerName(), "轻寻-小世界")) { + if (Objects.equals(next.getBannerName(), "66陪玩-小世界")) { iterator.remove(); break; } diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java index 3dbb208bc..41eb12490 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java @@ -1,47 +1,29 @@ package com.yizhuan.erban.home.fragment; -import android.Manifest; import android.content.Intent; import android.databinding.DataBindingUtil; -import android.graphics.PorterDuff; -import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.annotation.Nullable; import android.view.View; -import android.widget.ImageView; -import com.bumptech.glide.load.DataSource; -import com.bumptech.glide.load.engine.DiskCacheStrategy; -import com.bumptech.glide.load.engine.GlideException; -import com.bumptech.glide.request.RequestListener; -import com.bumptech.glide.request.target.Target; -import com.bumptech.glide.request.target.ViewTarget; -import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.MainActivity; import com.yizhuan.erban.R; import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.avroom.recommendcard.MyRecommendCardActivity; import com.yizhuan.erban.base.BaseFragment; import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.databinding.FragmentMeBinding; -import com.yizhuan.erban.decoration.view.DecorationStoreActivity; -import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; -import com.yizhuan.erban.module_hall.HallDataManager; -import com.yizhuan.erban.module_hall.hall.activity.ModuleHallActivity; +import com.yizhuan.erban.decoration.view.MyDecorationActivity; import com.yizhuan.erban.radish.activity.RadishRecordActivity; import com.yizhuan.erban.ui.patriarch.PatriarchModeActivity; import com.yizhuan.erban.ui.relation.AttentionListActivity; import com.yizhuan.erban.ui.relation.FansListActivity; -import com.yizhuan.erban.ui.wallet.WalletGoldActivity; import com.yizhuan.erban.ui.webview.CommonWebViewActivity; import com.yizhuan.erban.ui.widget.ObservableScrollView; import com.yizhuan.erban.ui.widget.higuide.TuTuGuideHelper; -import com.yizhuan.erban.utils.BlurTransformation; import com.yizhuan.xchat_android_core.UriProvider; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.customer_server.CustomerServerModel; import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; import com.yizhuan.xchat_android_core.manager.RelationShipEvent; import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; @@ -49,15 +31,11 @@ import com.yizhuan.xchat_android_core.market_verify.event.MarketVerifyUpdateEven import com.yizhuan.xchat_android_core.noble.NobleInfo; import com.yizhuan.xchat_android_core.noble.NobleProtocol; import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; import com.yizhuan.xchat_android_core.utils.StarUtils; import com.yizhuan.xchat_android_library.rxbus.RxBusHelper; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -138,7 +116,7 @@ public class MeFragment extends BaseFragment implements View.OnClickListener { requestUpdateUserInfo(); } else if (second == CUSTOM_MESS_SUB_HADEXPIRE) { mBinding.ivUserNobleLevel.setVisibility(View.GONE); - mBinding.tvNobleRemainTime.setVisibility(View.GONE); +// mBinding.tvNobleRemainTime.setVisibility(View.GONE); mBinding.ivAvatarHeadWear.setVisibility(View.GONE); } }); @@ -150,14 +128,14 @@ public class MeFragment extends BaseFragment implements View.OnClickListener { onMarketVerifyUpdateEvent(null); //模厅 - HallDataManager.get().registerHallExist(this, hallExist -> { - if (hallExist != null && hallExist) { - mBinding.llModuleHall.setVisibility(View.VISIBLE); - return; - } - mBinding.llModuleHall.setVisibility(View.GONE); - }); - HallDataManager.get().registerName(this, name -> mBinding.tvModuleHall.setText(name)); +// HallDataManager.get().registerHallExist(this, hallExist -> { +// if (hallExist != null && hallExist) { +// mBinding.llModuleHall.setVisibility(View.VISIBLE); +// return; +// } +// mBinding.llModuleHall.setVisibility(View.GONE); +// }); +// HallDataManager.get().registerName(this, name -> mBinding.tvModuleHall.setText(name)); if (TuTuGuideHelper.isNeedHiGuide(TuTuGuideHelper.KEY_GUIDE_ME_TAB)) { mBinding.meItemRadish.post(() -> { @@ -198,13 +176,13 @@ public class MeFragment extends BaseFragment implements View.OnClickListener { mBinding.tvUserId.setText(String.format(Locale.getDefault(), getString(R.string.text_user_id), String.valueOf(mUserInfo.getErbanNo()))); - int nobleExpire = mUserInfo.getRemainDay(); - if (nobleExpire > -1) { - mBinding.tvNobleRemainTime.setVisibility(View.VISIBLE); - } else { - mBinding.tvNobleRemainTime.setVisibility(View.GONE); - } - mBinding.tvNobleRemainTime.setText(getString(R.string.noble_remain_time, nobleExpire)); +// int nobleExpire = mUserInfo.getRemainDay(); +// if (nobleExpire > -1) { +// mBinding.tvNobleRemainTime.setVisibility(View.VISIBLE); +// } else { +// mBinding.tvNobleRemainTime.setVisibility(View.GONE); +// } +// mBinding.tvNobleRemainTime.setText(getString(R.string.noble_remain_time, nobleExpire)); NobleInfo nobleInfo = mUserInfo.getNobleInfo(); HeadWearInfo headWearInfo = mUserInfo.getUserHeadwear(); @@ -215,7 +193,7 @@ public class MeFragment extends BaseFragment implements View.OnClickListener { NobleUtil.loadResource(NobleUtil.getBadgeByLevel(nobleInfo.getLevel()), mBinding.ivUserNobleLevel); } else { mBinding.ivUserNobleLevel.setVisibility(View.GONE); - mBinding.tvNobleRemainTime.setVisibility(View.GONE); +// mBinding.tvNobleRemainTime.setVisibility(View.GONE); } NobleUtil.loadHeadWear(headWearInfo.getPic(), mBinding.ivAvatarHeadWear); } else if (nobleInfo != null) { @@ -226,7 +204,7 @@ public class MeFragment extends BaseFragment implements View.OnClickListener { } else { mBinding.ivAvatarHeadWear.setImageDrawable(null); mBinding.ivUserNobleLevel.setVisibility(View.GONE); - mBinding.tvNobleRemainTime.setVisibility(View.GONE); +// mBinding.tvNobleRemainTime.setVisibility(View.GONE); } String star = StarUtils.getConstellation(new Date(mUserInfo.getBirth())); @@ -279,17 +257,17 @@ public class MeFragment extends BaseFragment implements View.OnClickListener { public void onClick(View v) { int id = v.getId(); switch (id) { - case R.id.me_item_my_family: - - StatisticManager.Instance().onEvent(BasicConfig.INSTANCE.getAppContext(), - StatisticsProtocol.Event.MY_FAMILY_CLICK, "我的家族入口", null); - - String familyId = null; - if (null != FamilyModel.Instance().getMyFamily()) { - familyId = FamilyModel.Instance().getMyFamily().getFamilyId(); - } - FamilyHomeActivity.start(mContext, familyId); - break; +// case R.id.me_item_my_family: +// +// StatisticManager.Instance().onEvent(BasicConfig.INSTANCE.getAppContext(), +// StatisticsProtocol.Event.MY_FAMILY_CLICK, "我的家族入口", null); +// +// String familyId = null; +// if (null != FamilyModel.Instance().getMyFamily()) { +// familyId = FamilyModel.Instance().getMyFamily().getFamilyId(); +// } +// FamilyHomeActivity.start(mContext, familyId); +// break; case R.id.iv_user_head: case R.id.rl_user_info: if (mUserInfo != null) { @@ -310,90 +288,113 @@ public class MeFragment extends BaseFragment implements View.OnClickListener { case R.id.tv_user_fans: +// case R.id.fl_me_charm: +// CommonWebViewActivity.start(mContext, UriProvider.getUserCharmLevelUrl()); +// break; + case R.id.tv_user_fan_text: startActivity(new Intent(mContext, FansListActivity.class)); break; - case R.id.me_item_wallet: - UIHelper.showWalletAct(mContext); + case R.id.ll_my_room: + toast("我的房间"); break; - case R.id.me_item_patriarch: - startActivity(new Intent(getActivity(), PatriarchModeActivity.class)); - break; - case R.id.me_item_setting: - UIHelper.showSettingAct(mContext); - break; - - case R.id.me_item_charge: - startActivity(new Intent(mContext, WalletGoldActivity.class)); + case R.id.ll_collect_room: + toast("收藏房间"); break; case R.id.me_item_radish: RadishRecordActivity.startActivity(mContext); break; - case R.id.me_item_noble: - boolean isNoble = mNobleInfo != null && mNobleInfo.getLevel() > 0 || mUserInfo != null && mUserInfo.getNobleInfo() != null && mUserInfo.getNobleInfo().getLevel() > 0; - if (isNoble) { - CommonWebViewActivity.start(mContext, UriProvider.IM_SERVER_URL + "modules/nobles/homepage.html", - new CommonWebViewActivity.WebViewCallBack() { - @Override - public void onResult(String str) { - UserModel.get().updateCurrentUserInfo().subscribe(); - } - }); - } else { - CommonWebViewActivity.start(mContext, UriProvider.getNobleIntro(), - new CommonWebViewActivity.WebViewCallBack() { - @Override - public void onResult(String str) { - UserModel.get().updateCurrentUserInfo().subscribe(); - } - }); - } + case R.id.me_item_wallet: + UIHelper.showWalletAct(mContext); break; - case R.id.fl_me_level: + case R.id.me_item_level: CommonWebViewActivity.start(mContext, UriProvider.getUserLevelUrl()); break; - case R.id.fl_me_charm: - CommonWebViewActivity.start(mContext, UriProvider.getUserCharmLevelUrl()); + case R.id.me_item_decoration_store: + startActivity(new Intent(mContext, MyDecorationActivity.class)); break; - case R.id.me_item_car_shop: - if (mUserInfo != null) { - DecorationStoreActivity.start(mContext, mUserInfo.getUid()); - } - break; - case R.id.ll_module_hall: - if (mUserInfo == null) { - return; - } - ModuleHallActivity.start(mContext); + case R.id.me_item_union: + toast("我的公会"); break; - case R.id.ll_approve: - StatisticManager.Instance().onEvent(StatisticsProtocol.Event.personal_data_101prove, "101认证"); - - CommonWebViewActivity.start(getActivity(), UriProvider.getTutuAprove()); + case R.id.me_item_patriarch: + startActivity(new Intent(getActivity(), PatriarchModeActivity.class)); break; - case R.id.ll_authen: - checkPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA) - .subscribe(result -> { - if (result) { - CommonWebViewActivity.start(getActivity(), UriProvider.getTutuRealNamePage()); - } else { - SingleToastUtil.showToast(getString(R.string.ask_again)); - } - }); + case R.id.me_item_setting: + UIHelper.showSettingAct(mContext); break; - case R.id.ll_recommend_position: - StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_MY_RECOMMEND_CLICK, "我的推荐卡"); - MyRecommendCardActivity.start(getActivity()); - break; +// case R.id.me_item_charge: +// startActivity(new Intent(mContext, WalletGoldActivity.class)); +// break; + + + +// case R.id.me_item_noble: +// boolean isNoble = mNobleInfo != null && mNobleInfo.getLevel() > 0 || mUserInfo != null && mUserInfo.getNobleInfo() != null && mUserInfo.getNobleInfo().getLevel() > 0; +// if (isNoble) { +// CommonWebViewActivity.start(mContext, UriProvider.IM_SERVER_URL + "modules/nobles/homepage.html", +// new CommonWebViewActivity.WebViewCallBack() { +// @Override +// public void onResult(String str) { +// UserModel.get().updateCurrentUserInfo().subscribe(); +// } +// }); +// } else { +// CommonWebViewActivity.start(mContext, UriProvider.getNobleIntro(), +// new CommonWebViewActivity.WebViewCallBack() { +// @Override +// public void onResult(String str) { +// UserModel.get().updateCurrentUserInfo().subscribe(); +// } +// }); +// } +// break; + + + + + +// case R.id.me_item_car_shop: +// if (mUserInfo != null) { +// DecorationStoreActivity.start(mContext, mUserInfo.getUid()); +// } +// break; +// case R.id.ll_module_hall: +// if (mUserInfo == null) { +// return; +// } +// ModuleHallActivity.start(mContext); +// break; + +// case R.id.ll_approve: +// StatisticManager.Instance().onEvent(StatisticsProtocol.Event.personal_data_101prove, "101认证"); +// +// CommonWebViewActivity.start(getActivity(), UriProvider.getTutuAprove()); +// break; + +// case R.id.ll_authen: +// checkPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA) +// .subscribe(result -> { +// if (result) { +// CommonWebViewActivity.start(getActivity(), UriProvider.getTutuRealNamePage()); +// } else { +// SingleToastUtil.showToast(getString(R.string.ask_again)); +// } +// }); +// break; + +// case R.id.ll_recommend_position: +// StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_MY_RECOMMEND_CLICK, "我的推荐卡"); +// MyRecommendCardActivity.start(getActivity()); +// break; case R.id.ll_kf: getDialogManager().showOkCancelDialog("点击确认后将发起客户对话框，确认联系客服吗？", new DialogManager.OkCancelDialogListener() { @@ -429,7 +430,7 @@ public class MeFragment extends BaseFragment implements View.OnClickListener { public void onMarketVerifyUpdateEvent(MarketVerifyUpdateEvent event) { //审核包隐藏tab if (MarketVerifyModel.get().isMarketChecking()) { - mBinding.meItemMyFamily.setVisibility(View.GONE); +// mBinding.meItemMyFamily.setVisibility(View.GONE); } } diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/FindFragmentPresenter.java b/app/src/main/java/com/yizhuan/erban/home/presenter/FindFragmentPresenter.java index 787fd9912..4c461f42d 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/FindFragmentPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/home/presenter/FindFragmentPresenter.java @@ -112,7 +112,7 @@ public class FindFragmentPresenter extends BaseMvpPresenter { return null; } VMTopMessageInfo topMessageInfo = new VMTopMessageInfo(); - topMessageInfo.setTitle("轻寻头条"); + topMessageInfo.setTitle("66陪玩头条"); List vmTopMessageList = new ArrayList<>(); //组装成2个2个一组 final int groupSize = 2; diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/RecommendFragmentPresenter.java b/app/src/main/java/com/yizhuan/erban/home/presenter/RecommendFragmentPresenter.java index 94c142f19..c65536d5e 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/RecommendFragmentPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/home/presenter/RecommendFragmentPresenter.java @@ -382,7 +382,7 @@ public class RecommendFragmentPresenter extends BaseMvpPresenter baseViewHolder.setVisible(R.id.ll_gold_charge, !TextUtils.isEmpty(chargeBean.getProdName())); - baseViewHolder.setText(R.id.tv_money_gold, chargeBean.prodName.replace("轻寻", "")) + baseViewHolder.setText(R.id.tv_money_gold, chargeBean.prodName.replace("66陪玩", "")) .setText(R.id.cb_money, mContext.getString(R.string.charge_number, chargeBean.money)); RelativeLayout rl_gold_charge = baseViewHolder.getView(R.id.ll_gold_charge); diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/AboutActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/AboutActivity.java index a1624861f..835df8553 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/AboutActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/AboutActivity.java @@ -14,7 +14,7 @@ public class AboutActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_about); - initTitleBar("关于轻寻"); + initTitleBar("关于66陪玩"); initView(); initData(); } diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/AboutActivityKotlin.kt b/app/src/main/java/com/yizhuan/erban/ui/user/AboutActivityKotlin.kt index 4170ffbd4..8b8dd7ddc 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/AboutActivityKotlin.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/user/AboutActivityKotlin.kt @@ -11,7 +11,7 @@ // override fun onCreate(savedInstanceState: Bundle?) { // super.onCreate(savedInstanceState) // setContentView(R.layout.activity_about) -// initTitleBar("关于轻寻") +// initTitleBar("关于66陪玩") // initView() // initData() // } diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java index 269db075b..c4570ac2d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java @@ -112,8 +112,8 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen if (type != TYPE_SHARE_H5) { onShareDialogItemClick.onInAppSharingItemClick(); } else { -// Toast.makeText(context, "该内容不能分享给轻寻好友", Toast.LENGTH_SHORT).show(); - SingleToastUtil.showToastShort("该内容不能分享给轻寻好友"); +// Toast.makeText(context, "该内容不能分享给66陪玩好友", Toast.LENGTH_SHORT).show(); + SingleToastUtil.showToastShort("该内容不能分享给66陪玩好友"); } } dismiss(); diff --git a/app/src/main/res/drawable/shape_58559d.xml b/app/src/main/res/drawable/shape_58559d.xml index 468e33b2b..c16ca0af0 100644 --- a/app/src/main/res/drawable/shape_58559d.xml +++ b/app/src/main/res/drawable/shape_58559d.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_patriarch_mode.xml b/app/src/main/res/layout/activity_patriarch_mode.xml index 308a7dde2..cdfc3b7b3 100644 --- a/app/src/main/res/layout/activity_patriarch_mode.xml +++ b/app/src/main/res/layout/activity_patriarch_mode.xml @@ -120,7 +120,7 @@ android:id="@+id/tv_plan" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="轻寻护苗计划" + android:text="66陪玩护苗计划" android:textColor="@color/color_FE4C62" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/dialog_privacy_agreement.xml b/app/src/main/res/layout/dialog_privacy_agreement.xml index 73efb424e..64a72f50a 100644 --- a/app/src/main/res/layout/dialog_privacy_agreement.xml +++ b/app/src/main/res/layout/dialog_privacy_agreement.xml @@ -23,7 +23,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:text="“轻寻”隐私政策" + android:text="“66陪玩”隐私政策" android:textColor="#ff1b1b1b" android:textSize="16sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index 96d374948..bc75e817f 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -91,8 +91,8 @@ android:id="@+id/iv_user_info_arrow_right" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="20dp" - android:src="@drawable/arrow_right_2" + android:layout_marginEnd="@dimen/dp_me_text_padding_to_icon" + android:src="@drawable/arrow_right_white" app:layout_constraintBottom_toBottomOf="@+id/iv_user_head" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@+id/iv_user_head" @@ -101,8 +101,8 @@ + android:layout_marginStart="@dimen/dp_5" + app:layout_constraintTop_toTopOf="@id/ll_id" + app:layout_constraintBottom_toBottomOf="@id/ll_id"> @@ -342,78 +344,113 @@ - - + - - - - - - - - + + - - + android:drawableTop="@mipmap/icon_collect_room" + android:text="@string/collect_room" + android:drawablePadding="@dimen/dp_3" + android:textColor="@color/color_CEC0FF" + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -427,8 +464,6 @@ android:layout_marginRight="15dp" android:layout_marginTop="@dimen/dp_15" android:background="@drawable/bg_corner_shadow_12" - android:paddingTop="20dp" - android:paddingBottom="16dp" android:orientation="vertical" android:layout_below="@id/rl_user_info" android:gravity="center_vertical"> @@ -436,56 +471,59 @@ - - + android:textSize="13sp" /> + + - - + android:textSize="13sp" /> @@ -500,108 +538,102 @@ android:layout_marginRight="15dp" android:layout_marginTop="@dimen/dp_15" android:background="@drawable/bg_corner_shadow_12" - android:paddingTop="20dp" - android:paddingBottom="16dp" android:orientation="vertical" android:gravity="center_vertical"> - - - - - - - - - - - - - - - - + android:drawableEnd="@drawable/arrow_right" + android:paddingTop="@dimen/dp_20" + android:paddingBottom="@dimen/dp_20" + android:textColor="@color/color_333333" + android:textSize="13sp" /> - + + - - + android:textSize="13sp" /> + + + + + + + + + @@ -612,190 +644,44 @@ android:layout_marginRight="15dp" android:layout_marginTop="@dimen/dp_15" android:background="@drawable/bg_corner_shadow_12" - android:paddingTop="20dp" - android:paddingBottom="16dp" android:orientation="vertical" + android:layout_marginBottom="@dimen/dp_30" + android:layout_below="@id/rl_user_info" android:gravity="center_vertical"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:textSize="13sp" /> + + - - + android:textSize="13sp" /> diff --git a/app/src/main/res/layout/red_packet_dialog.xml b/app/src/main/res/layout/red_packet_dialog.xml index c7076d27e..0cd717ec6 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="66陪玩送你一个现金红包" /> diff --git a/app/src/main/res/mipmap-xxhdpi/bg_me_top.png b/app/src/main/res/mipmap-xxhdpi/bg_me_top.png index b8f8b7e04..5b30a8429 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_me_top.png and b/app/src/main/res/mipmap-xxhdpi/bg_me_top.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_me_radish.webp b/app/src/main/res/mipmap-xxhdpi/ic_me_radish.webp index 537b4d7a1..7bc01cc3e 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_me_radish.webp and b/app/src/main/res/mipmap-xxhdpi/ic_me_radish.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_collect_room.webp b/app/src/main/res/mipmap-xxhdpi/icon_collect_room.webp new file mode 100644 index 000000000..c20951b54 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_collect_room.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_decoration.webp b/app/src/main/res/mipmap-xxhdpi/icon_decoration.webp new file mode 100644 index 000000000..2eb9b5df1 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_decoration.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_level.webp b/app/src/main/res/mipmap-xxhdpi/icon_level.webp new file mode 100644 index 000000000..7e05c8d18 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_level.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_my_room.webp b/app/src/main/res/mipmap-xxhdpi/icon_my_room.webp new file mode 100644 index 000000000..92b5ebf09 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_my_room.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_patriarch.webp b/app/src/main/res/mipmap-xxhdpi/icon_patriarch.webp index 444e20c34..34f50c89c 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_patriarch.webp and b/app/src/main/res/mipmap-xxhdpi/icon_patriarch.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_setting.webp b/app/src/main/res/mipmap-xxhdpi/icon_setting.webp index 4efe2f0bf..9efcb011e 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_setting.webp and b/app/src/main/res/mipmap-xxhdpi/icon_setting.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_union.png b/app/src/main/res/mipmap-xxhdpi/icon_union.png new file mode 100644 index 000000000..5401dc6aa Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_union.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_wallet.webp b/app/src/main/res/mipmap-xxhdpi/icon_wallet.webp index 796d6a388..5f1468869 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_wallet.webp and b/app/src/main/res/mipmap-xxhdpi/icon_wallet.webp differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e9860761a..14caca304 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -241,7 +241,7 @@ - + @@ -486,7 +486,7 @@ @color/color_FE4C62 #9af5ef - + #34EBDE #39EBDF diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 0be658ca0..d10efe9b7 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -202,7 +202,7 @@ 37dp 55dp 12dp - 13dp + 15dp 80dp 55dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dbd618a18..2330223b7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - 轻寻 + 66陪玩 这里什么都没有 网络不给力 网络异常，加载失败 @@ -14,7 +14,7 @@ ScrollingActivity - 请输入您的手机号/轻寻ID + 请输入您的手机号/66陪玩ID 请输入您的手机号/兔兔ID 请输入您的密码 请输入密码 @@ -90,13 +90,16 @@ 您还没有记录喔 我的钱包 - 礼物收入 + 我的礼物票 + 我的等级 + 我的装饰 + 我的公会 金币/充值 竞拍记录 设置 房主已下线 - 更多好玩的房间在轻寻等您哟！去看看！ + 更多好玩的房间在66陪玩等您哟！去看看！ 主页 返回 粉丝 @@ -108,7 +111,7 @@ 好友 关注 你还没有添加任何好友哦! \n快去添加好友吧! - 你还没有任何轻寻粉丝哦! + 你还没有任何66陪玩粉丝哦! 请先绑定您的支付宝帐号 我的钻石余额 钻石可以用于提现，兑换比率1元=10钻 @@ -141,11 +144,11 @@ - 轻寻号:%d + 66陪玩号:%d 我的关注 我的粉丝 - 你还没有关注任何轻寻好友哦! \n快去添加关注吧! + 你还没有关注任何66陪玩好友哦! \n快去添加关注吧! 搜索昵称、ID、房间名 在线中… 客服 @@ -239,7 +242,7 @@ 查看对方战绩> 查看我的战绩> - 别气馁，轻寻永远支持你哦！ + 别气馁，66陪玩永远支持你哦！ @@ -321,7 +324,7 @@ %1$d    有效期%2$d天 该车辆已下架，无法购买 开着你的车，驾着你的马 - 来轻寻尽情驰骋吧! + 来66陪玩尽情驰骋吧! 座驾商城 %1$s 剩余 @@ -341,7 +344,7 @@ 5 打爆怪兽的奖励将会随着怪兽的实力（血值）增加而增加，例如：打爆一只血值1000的怪兽将获得总价不少于1000金币的金币或者座驾奖励\n - 6 若有疑问，请咨询轻寻客服微信：1213490\n + 6 若有疑问，请咨询66陪玩客服微信：1213490\n ·玩法介绍· 确定 @@ -405,7 +408,7 @@ 退出家族 退出家族后您的家族币将无法使用\n重新加入即可还原,你真的要退出吗? 邀请好友 - 【轻寻】 用声音表达心情，用家族传承微笑。 + 【66陪玩】 用声音表达心情，用家族传承微笑。 加入 搜索成员ID/昵称 家族管理 @@ -425,7 +428,7 @@ 加入家族身份验证 解散家族 提示 - 需要联系客服才能解散家族哦~\n轻寻家族客服:%1$s + 需要联系客服才能解散家族哦~\n66陪玩家族客服:%1$s 联系客服 确认加入"%1$s"吗? 我希望加入贵家族 @@ -517,7 +520,7 @@ 好友 关注 粉丝 - 每天第一次分享免费领红包（不包含分享至轻寻好友） + 每天第一次分享免费领红包（不包含分享至66陪玩好友） 好友 微信好友 QQ好友 @@ -544,7 +547,7 @@ 验证码将发送至您绑定的手机\"{0}\",请注意查收 更多 我是兔兔老用户 - 我是轻寻新用户 + 我是66陪玩新用户 登录 请输入您耳伴绑定 QQ 的 ID 请输入您的密码 @@ -555,7 +558,7 @@ 亲爱的小孩: 好久不见，翻起曾经一起度过的时光，期待你再次出现在身旁，谢谢你回来！ 请输入邀请码(选填) - 输入邀请码，邀请你加入的好友和你都可以获得轻寻回归计划的超级大礼哦！ + 输入邀请码，邀请你加入的好友和你都可以获得66陪玩回归计划的超级大礼哦！ 收下回归礼 头像: @@ -665,7 +668,7 @@ 社区规范 联系官方 帮助 - 关于轻寻 + 关于66陪玩 检查版本 实验室 退出当前账号 @@ -704,7 +707,7 @@ 瓜分金币 瓜分金币\n28天 已累计签到%d天 - 萝卜账户 + 我的账户 密码必须使用6–16个字符内的数字和英文字母组合哦! 密码必须6-16字符内数字英文组合哦！ 绑定 @@ -794,7 +797,7 @@ 萝卜X20 领取奖励 萝卜可用于送礼物、购买头饰座驾哦~ - 欢迎您使用轻寻。我们将通过《隐私政策》和《用户协议》帮助您了解我们收集、使用、存储和共享个人信息的情况，特别是我们所采集的个人信息类型与用途的对应关系。\n\n为了保障产品的正常运行，我们会收集您的部分必要信息。我们可能会收集联络方式、地理位置等个人敏感信息，您有权拒绝向我们提供这些信息。我们不会向第三方共享、提供、转让或者从第三方获取您的个人信息，除非经过您的同意。 + 欢迎您使用66陪玩。我们将通过《隐私政策》和《用户协议》帮助您了解我们收集、使用、存储和共享个人信息的情况，特别是我们所采集的个人信息类型与用途的对应关系。\n\n为了保障产品的正常运行，我们会收集您的部分必要信息。我们可能会收集联络方式、地理位置等个人敏感信息，您有权拒绝向我们提供这些信息。我们不会向第三方共享、提供、转让或者从第三方获取您的个人信息，除非经过您的同意。 您可以查看完整的%s和%s，如果您同意，请点击下方同意按钮开始接受我们的服务。 《隐私政策》 《用户协议》 @@ -802,7 +805,7 @@ 金币充值 - 轻寻 + 66陪玩 如何登录？ %s也可登录%s哦 %s 收个徒弟赢金币 @@ -811,7 +814,7 @@ 其他方式登录 账号登录 - 为呵护青少年健康成长，轻寻推出“青少年模式”，该模式下针对青少年推送精选优化的内容。 + 为呵护青少年健康成长，66陪玩推出“青少年模式”，该模式下针对青少年推送精选优化的内容。 设置青少年模式 设置青少年模式的开启和关闭的数字密码 青少年模式关闭密码 @@ -819,7 +822,7 @@ QQ登录 请输入昵称 绑定手机号 - 上轻寻，轻松寻觅对的TA + 上66陪玩，轻松寻觅对的TA 同意 不同意 @@ -840,12 +843,12 @@ 金币转赠 受赠人 - 请输入手机号/轻寻号 + 请输入手机号/66陪玩号 转赠金额 自定义输入 立即转赠 我的转赠记录 - %1$s (轻寻号: %2$s) + %1$s (66陪玩号: %2$s) 返回登录页 隐私设置 @@ -856,5 +859,7 @@ 搜索记录 进房记录 清空 + 我的房间 + 收藏房间 diff --git a/app/src/model_customer_server/java/com/yizhuan/xchat_android_core/customer_server/CustomerServerModel.java b/app/src/model_customer_server/java/com/yizhuan/xchat_android_core/customer_server/CustomerServerModel.java index adbca9b73..2ab6e4d55 100644 --- a/app/src/model_customer_server/java/com/yizhuan/xchat_android_core/customer_server/CustomerServerModel.java +++ b/app/src/model_customer_server/java/com/yizhuan/xchat_android_core/customer_server/CustomerServerModel.java @@ -105,7 +105,7 @@ public class CustomerServerModel extends BaseModel implements ICustomerServerMod .setIndex(1)); userData.add(new CustomerItemInfo("erbanNo") - .setLabel("轻寻号：") + .setLabel("66陪玩号：") .setValue(UserModel.get().getCacheLoginUserInfo().getErbanNo() + "") .setIndex(2)); diff --git a/app/src/module_bank_card/res/values/strings.xml b/app/src/module_bank_card/res/values/strings.xml index 4baed0a1c..a183b7885 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为了更好地保障你的合法权益， + 尊敬的66陪玩用户：\n\u3000\u3000为了更好地保障你的合法权益， 让你正常使用%s服务，%s公司依照国家法律法规，对支付账户进行实名制管理、 履行反洗钱职责并采取风险防控措施。你需要向%s公司以及合作公司（汇聚支付）提交身份信息、 联系方式、交易信息。\n\u3000\u3000%s公司将严格依据国家法律法规收集、存储、使用你的个人信息，确保信息安全。 diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java index 0736a0615..dbd837653 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java @@ -193,7 +193,7 @@ public class PublishActivity extends BaseMvpActivity + tools:text="66陪玩所有问题都可以问Ta哦~" /> > getTabBanner(String tabId); /** - * 轻寻顶部 banner信息 + * 66陪玩顶部 banner信息 * 包含3部分，顶部banner，测一测那个列表，标签页 */ Single getQxBannerInfo(); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java index ce7f4d12d..703d870c5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java @@ -585,7 +585,7 @@ public class AuthModel extends BaseModel implements IAuthModel { } /** - * 账号密码登录(耳伴老用户绑定 QQ 号登录轻寻) + * 账号密码登录(耳伴老用户绑定 QQ 号登录66陪玩) * * @param account * @param password @@ -1397,7 +1397,7 @@ public class AuthModel extends BaseModel implements IAuthModel { @Query("shuMeiDeviceId") String shuMeiDeviceId); /** - * 轻寻上耳伴老用户用 QQ 登录时，判断 QQ 的 open id 是否存在 + * 66陪玩上耳伴老用户用 QQ 登录时，判断 QQ 的 open id 是否存在 * * @return */ diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomSettingModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomSettingModel.java index b2dd4752c..450014734 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomSettingModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomSettingModel.java @@ -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 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamMember.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamMember.java index 377df56d3..b2315946e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamMember.java +++ b/core/src/main/java/com/yizhuan/xchat_android_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;//66陪玩号 private String nick;//昵称 private int gender;//性别 private String avatar;//头像 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/protocol/StatisticsProtocol.java b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/protocol/StatisticsProtocol.java index 023667e79..4054bd846 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/protocol/StatisticsProtocol.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/protocol/StatisticsProtocol.java @@ -182,7 +182,7 @@ public class StatisticsProtocol { //模厅暗号 - EVENT_HALL_ADDMEMBERS_USERID_CLICK("hall_addMembers_userid_click"),//添加成员-轻寻ID + EVENT_HALL_ADDMEMBERS_USERID_CLICK("hall_addMembers_userid_click"),//添加成员-66陪玩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"),//分享暗号到微信 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java index 54fa787d3..14c53ba44 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java @@ -882,7 +882,7 @@ public final class UserModel extends BaseModel implements IUserModel { /** * - * @param erbanNo 轻寻号或手机号码 + * @param erbanNo 66陪玩号或手机号码 * @return - */ @GET("user/getSimpleUser") diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/RecommendationUserInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/RecommendationUserInfo.java index d10f330d7..af4d19de2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/RecommendationUserInfo.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/RecommendationUserInfo.java @@ -32,7 +32,7 @@ public class RecommendationUserInfo implements Serializable { * recommendRoom : false * liveTag : false * status : 0 - * description : 她在轻寻魅力四射... + * description : 她在66陪玩魅力四射... */ private int uid; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.java index 9ef3593cb..8e45a20a7 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.java +++ b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.java @@ -10,7 +10,7 @@ public class GrabApprenticesInfo { private Long uid; /** - * 轻寻号 + * 66陪玩号 */ private Long erbanNo; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.java index a7ca99ce1..966bd49d0 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.java +++ b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.java @@ -14,7 +14,7 @@ public class SimpleUserVo implements Serializable { */ private Long uid; /** - * 轻寻号 + * 66陪玩号 */ private Long erbanNo; /** diff --git a/core/src/model_pay/java/com/wudoo/qingxun/wxapi/WXPayEntryActivity.java b/core/src/model_pay/java/com/xuanyi/accompany/wxapi/WXPayEntryActivity.java similarity index 97% rename from core/src/model_pay/java/com/wudoo/qingxun/wxapi/WXPayEntryActivity.java rename to core/src/model_pay/java/com/xuanyi/accompany/wxapi/WXPayEntryActivity.java index d5a50f718..03a4109f9 100644 --- a/core/src/model_pay/java/com/wudoo/qingxun/wxapi/WXPayEntryActivity.java +++ b/core/src/model_pay/java/com/xuanyi/accompany/wxapi/WXPayEntryActivity.java @@ -1,4 +1,4 @@ -package com.wudoo.qingxun.wxapi; +package com.xuanyi.accompany.wxapi; import android.app.Activity; import android.content.Intent; diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/AppMetaDataUtil.java b/library/src/main/java/com/yizhuan/xchat_android_library/utils/AppMetaDataUtil.java index eb228faf5..90496f91f 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/AppMetaDataUtil.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/utils/AppMetaDataUtil.java @@ -26,7 +26,7 @@ public class AppMetaDataUtil { */ public static String getChannelID() { String channelID = BasicConfig.INSTANCE.getChannel(); - channelID = TextUtils.isEmpty(channelID) ? "qingxun_official" : channelID; + channelID = TextUtils.isEmpty(channelID) ? "official" : channelID; return channelID; } 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 da58d2e3a..56b2edc01 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(), "发送失败，66陪玩提醒您文明用语~", Toast.LENGTH_SHORT).show(); + SingleToastUtil.showToastShort("发送失败，66陪玩提醒您文明用语~"); } private int moreCustomDrawable;