yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_hui' into develop_new

Browse Source
This commit is contained in:
oujunhui
2020-04-07 16:52:42 +08:00
parent 9bbeb8e1f6 edfdc62302
commit 0358ac2632
96 changed files with 1001 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
66pw.jks Normal file
View File

Binary file not shown.

4
android_crop_lib/build.gradle
View File

@@ -1,11 +1,11 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 26
compileSdkVersion 29
defaultConfig {
minSdkVersion 19
targetSdkVersion 26
targetSdkVersion 29
testApplicationId 'com.soundcloud.android.crop.test'
testInstrumentationRunner 'android.test.InstrumentationTestRunner'

26
app/build.gradle
View File

@@ -4,12 +4,12 @@ apply plugin: 'com.android.application'
apply from: 'and_res_guard.gradle'
android {
compileSdkVersion 27
compileSdkVersion 29
defaultConfig {
applicationId "com.wudoo.qingxun"
applicationId "com.xuanyi.accompany"
minSdkVersion 19
targetSdkVersion 26
targetSdkVersion 29
versionCode Integer.valueOf(version_code)
versionName version_name
@@ -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 {
@@ -149,7 +149,7 @@ android {
}
debug {
// buildConfigField "String", "BASE_URL", "\"https://115.28.86.139/\""
// buildConfigField "String", "BASE_URL", "\"http://120.79.211.243/\""
buildConfigField "String", "BASE_URL", "\"http://apibeta.qxjiaoyou.com/\""
buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
buildConfigField "String", "BASE_URL_STAGING", "\"https://preview.qxjiaoyou.com/\""
@@ -168,7 +168,7 @@ android {
}
productFlavors {
qingxun {
accompany {
dimension 'default'
}

4
app/src/main/AndroidManifest.xml
View File

@@ -403,7 +403,7 @@
<!-- tools:node="merge" />-->
<!-- 为了兼容小程序返回的问题，声明WXEntryActivity，并把之前的 WechatHandlerActivity注释 -->
<activity
android:name="com.wudoo.qingxun.wxapi.WXEntryActivity"
android:name="com.xuanyi.accompany.wxapi.WXEntryActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:exported="true" />
@@ -456,7 +456,7 @@
<activity
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="轻寻"
android:label="66陪玩"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateAlwaysHidden">

2
app/src/main/java/com/wudoo/qingxun/wxapi/WXEntryActivity.java → app/src/main/java/com/xuanyi/accompany/wxapi/WXEntryActivity.java
View File

@@ -1,4 +1,4 @@
package com.wudoo.qingxun.wxapi;
package com.xuanyi.accompany.wxapi;
import android.content.Intent;

19
app/src/main/java/com/yizhuan/erban/MainActivity.java
View File

@@ -62,7 +62,9 @@ import com.yizhuan.erban.decoration.view.widgets.ShowCarGuideDialog;
import com.yizhuan.erban.family.view.activity.FamilyHomeActivity;
import com.yizhuan.erban.guide.GuideActivity;
import com.yizhuan.erban.home.dialog.RecommendRoomForNewerDialog;
import com.yizhuan.erban.home.fragment.CommunityNoticeAct;
import com.yizhuan.erban.home.fragment.ContactsListFragment;
import com.yizhuan.erban.home.fragment.FindTabFragment;
import com.yizhuan.erban.home.fragment.GameHomeFragment;
import com.yizhuan.erban.home.fragment.MeFragment;
@@ -967,7 +969,8 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
//Fragment mainFragment = fragmentManager.findFragmentByTag(MainFragment.TAG);
Fragment attentionFragment = fragmentManager.findFragmentByTag(FindTabFragment.TAG);
Fragment msgFragment = fragmentManager.findFragmentByTag(MsgFragment.TAG);
// Fragment msgFragment = fragmentManager.findFragmentByTag(MsgFragment.TAG);
Fragment contactFragment = fragmentManager.findFragmentByTag(ContactsListFragment.TAG);
Fragment meFragment = fragmentManager.findFragmentByTag(MeFragment.TAG);
Fragment rankingFragment = fragmentManager.findFragmentByTag(RankingFragment.TAG);
Fragment gameFragment = fragmentManager.findFragmentByTag(GameHomeFragment.TAG);
@@ -978,8 +981,8 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
if (attentionFragment != null && attentionFragment.isVisible()) {
fragmentTransaction.hide(attentionFragment);
}
if (msgFragment != null && msgFragment.isVisible()) {
fragmentTransaction.hide(msgFragment);
if (contactFragment != null && contactFragment.isVisible()) {
fragmentTransaction.hide(contactFragment);
}
if (meFragment != null && meFragment.isVisible()) {
fragmentTransaction.hide(meFragment);
@@ -1014,11 +1017,11 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
}
fragmentTransaction.show(attentionFragment);
} else if (position == MainTabLayout.MAIN_TAB_POS_MSG) {
if (msgFragment == null) {
msgFragment = new MsgFragment();
fragmentTransaction.add(R.id.main_fragment, msgFragment, MsgFragment.TAG);
if (contactFragment == null) {
contactFragment = new ContactsListFragment();
fragmentTransaction.add(R.id.main_fragment, contactFragment, ContactsListFragment.TAG);
}
fragmentTransaction.show(msgFragment);
fragmentTransaction.show(contactFragment);
} else if (position == MainTabLayout.MAIN_TAB_POS_ME) {
if (meFragment == null) {
meFragment = new MeFragment();

6
app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
View File

@@ -514,7 +514,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 {
@@ -542,14 +542,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()) {

4
app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
View File

@@ -1483,8 +1483,8 @@ public class HomePartyRoomFragment extends BaseMvpFragment<IHomePartyView, HomeP
@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陪玩提醒您文明用语~");
}
/**

2
app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogManager.java
View File

@@ -413,7 +413,7 @@ public class DialogManager {
}
/**
* 1、轻寻通用的dialog设置，以后尽量所有的dialog都引到这个方法，方便以后改版
* 1、66陪玩通用的dialog设置，以后尽量所有的dialog都引到这个方法，方便以后改版
* 2、如果UI要求弹框是完全自定义的，再重新写过
* @param title 标题，空则隐藏 (ui说，有些弹框带标题，有些不带，两种情况共存)
* @param message 内容，不能为空，配合{@link com.yizhuan.erban.utils.SpannableBuilder} 变色使用

8
app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java
View File

@@ -56,10 +56,10 @@ public class ContactsIndicatorAdapter extends CommonNavigatorAdapter {
public IPagerIndicator getIndicator(Context context) {
LinePagerIndicator indicator = new LinePagerIndicator(context);
indicator.setMode(LinePagerIndicator.MODE_EXACTLY);
indicator.setLineHeight(UIUtil.dip2px(mContext, 3));
indicator.setRoundRadius(UIUtil.dip2px(mContext, 2));
indicator.setLineWidth(UIUtil.dip2px(mContext, 12));
indicator.setColors(context.getResources().getColor(R.color.color_34EBDE));
indicator.setLineHeight(UIUtil.dip2px(mContext, 5));
indicator.setRoundRadius(UIUtil.dip2px(mContext, 5));
indicator.setLineWidth(UIUtil.dip2px(mContext, 9));
indicator.setColors(context.getResources().getColor(R.color.color_7154EE));
FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
lp.bottomMargin = mBottomMargin;
indicator.setLayoutParams(lp);

4
app/src/main/java/com/yizhuan/erban/home/adapter/HomeFragmentAdapter.java
View File

@@ -660,7 +660,7 @@ public class HomeFragmentAdapter extends BaseMultiItemQuickAdapter<HomeItem, Bas
}
/**
* 设置轻寻头条数据
* 设置66陪玩头条数据
*/
private void setErbanTopMessageData(BaseViewHolder holder, HomeItem homeItem) {
VMTopMessageInfo topMessageInfo = (VMTopMessageInfo) homeItem.getData();
@@ -742,7 +742,7 @@ public class HomeFragmentAdapter extends BaseMultiItemQuickAdapter<HomeItem, Bas
}
/**
* 设置轻寻推荐item
* 设置66陪玩推荐item
*/
private void setErbanRecommend(BaseViewHolder holder, HomeItem homeItem) {
RecommendInfo recommendInfo = (RecommendInfo) homeItem.getData();

8
app/src/main/java/com/yizhuan/erban/home/adapter/MainMagicIndicatorAdapter.java
View File

@@ -31,11 +31,11 @@ public class MainMagicIndicatorAdapter extends CommonNavigatorAdapter {
@Override
public IPagerTitleView getTitleView(Context context, final int i) {
ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, true, 8);
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.color_B3B3B3));
scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.color_333333));
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.color_white));
scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.color_white));
scaleTransitionPagerTitleView.setMinScale(0.7f);
scaleTransitionPagerTitleView.setTextSize(21);
int padding = UIUtil.dip2px(context, 6);
scaleTransitionPagerTitleView.setTextSize(18);
int padding = UIUtil.dip2px(context, 5);
scaleTransitionPagerTitleView.setPadding(padding,0,padding,0);
// scaleTransitionPagerTitleView.setTextSize(TypedValue.COMPLEX_UNIT_PX, 36);
scaleTransitionPagerTitleView.setText(mTitleList.get(i));

4
app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.java
View File

@@ -28,7 +28,7 @@ import java.util.List;
* @Date 2018/11/1
*/
public class ContactsListFragment extends BaseFragment implements ContactsIndicatorAdapter.OnItemSelectListener {
public static final String TAG = "ContactsListFragment";
private MagicIndicator indicator;
private ViewPager viewpager;
@@ -52,11 +52,13 @@ public class ContactsListFragment extends BaseFragment implements ContactsIndica
@Override
public void initiate() {
List<String> tabInfoList = new ArrayList<>();
tabInfoList.add(getString(R.string.message));
tabInfoList.add(getString(R.string.friend));
tabInfoList.add(getString(R.string.attention));
tabInfoList.add(getString(R.string.fan));
List<Fragment> mTabs = new ArrayList<>();
mTabs.add(RecentListFragment.newInstance(false));
mTabs.add(new FriendListFragment());
mTabs.add(AttentionFragment.newInstance(AbstractSelectFriendAction.TYPE_NORMAL));
mTabs.add(FansListFragment.newInstance(Constants.FAN_MAIN_PAGE_TYPE));

2
app/src/main/java/com/yizhuan/erban/home/fragment/FindFragment.java
View File

@@ -220,7 +220,7 @@ public class FindFragment extends BaseMvpFragment<IFindFragmentView, FindFragmen
}
/**
* 设置轻寻头条数据
* 设置66陪玩头条数据
*/
private void setTuTuTopMessageData(VMTopMessageInfo topMessageInfo) {
ErbanTopMessageAdapter adapter = new ErbanTopMessageAdapter(mContext, topMessageInfo.getVmTopMessageList());

62
app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
View File

@@ -62,6 +62,7 @@ import com.yizhuan.erban.base.list.BaseViewHolder;
import com.yizhuan.erban.base.list.CommonAdapter;
import com.yizhuan.erban.bindadapter.BaseAdapter;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.community.square.SquareDynamicFragment;
import com.yizhuan.erban.databinding.FragmentGameHomeBinding;
import com.yizhuan.erban.home.adapter.BannerAdapter;
import com.yizhuan.erban.home.adapter.MainMagicIndicatorAdapter;
@@ -70,6 +71,7 @@ import com.yizhuan.erban.home.presenter.MainFragmentPresenter;
import com.yizhuan.erban.home.view.IMainFragmentView;
import com.yizhuan.erban.location.LocationUploadEvent;
import com.yizhuan.erban.radish.signin.SignInActivity;
import com.yizhuan.erban.ui.indicator_impl.IndicatorHelper;
import com.yizhuan.erban.ui.search.SearchActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
@@ -134,7 +136,7 @@ import static com.yizhuan.xchat_android_core.home.bean.BannerInfo.SKIP_TYP_APP;
import static com.yizhuan.xchat_android_core.home.bean.BannerInfo.SKIP_TYP_H5;
/**
* 轻寻首页
* 66陪玩首页
*/
@CreatePresenter(MainFragmentPresenter.class)
public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentPresenter>
@@ -167,6 +169,15 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
private volatile boolean isUserLogin;
private volatile boolean initHomeTitle;
/**
* 动态
*/
public static final int TAB_TYPE_DYNAMIC = 0;
/**
* 聊天交友
*/
public static final int TAB_TYPE_CHAT = 1;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -257,7 +268,7 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
/**
* 初始化tab
*/
private void initTitleTab(List<HomeTitleInfo> homeTitleInfos) {
private void initRoomTitleTab(List<HomeTitleInfo> homeTitleInfos) {
if (ListUtils.isListEmpty(homeTitleInfos)) {
return;
}
@@ -324,6 +335,7 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
commonNavigator.setAdapter(magicIndicatorAdapter);
mBinding.magicIndicator.setNavigator(commonNavigator);
commonNavigator.getTitleContainer().setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE);
mBinding.viewPager.setOffscreenPageLimit(5);
@@ -338,6 +350,40 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
}
/**
* 初始化tab
*/
private void initTitleTab() {
List<Integer> fragmentPos = new ArrayList<>();
fragmentPos.add(TAB_TYPE_DYNAMIC);
fragmentPos.add(TAB_TYPE_CHAT);
List<String> tagList = new ArrayList<>();
List<Fragment> fragmentList = new ArrayList<>();
for (Integer integer : fragmentPos) {
if (integer == TAB_TYPE_DYNAMIC) {
tagList.add(getResources().getString(R.string.home_tab_dynamic));
} else {
tagList.add(getResources().getString(R.string.home_tab_caht));
}
fragmentList.add(SquareDynamicFragment.newInstance(integer));
}
//init viewpager
mBinding.viewPagerBottom.setAdapter(new RoomContributeListAdapter(getChildFragmentManager(), fragmentList));
mBinding.viewPagerBottom.addOnPageChangeListener(new OnPageSelectedListener() {
@Override
public void onPageSelected(int position) {
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_SQUARE_RECOMMEND_FOLLOW,
"切换推荐和关注tab-区分-" + ((position == 0) ? "动态" : "聊天交友"));
}
});
//init indicator
IndicatorHelper.handle(getContext(), mBinding.viewPagerBottom, mBinding.magicIndicatorBottom, tagList);
}
private void exitRoom(BaseAdapter<GameInfo> adapter, int position) {
if (DemoCache.readFirstMatchDialog()) {
DemoCache.saveFirstMatchDialog();
@@ -604,6 +650,7 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
}
}
mBinding.viewPager.setCurrentItem(position);
mBinding.viewPagerBottom.setCurrentItem(position);
mLastPosition = position;
}
@@ -744,7 +791,9 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
initHomeBanner(homeBannerInfo.getFirstPageBannerVos());
this.mHomeTitleInfos = homeBannerInfo.getAllVo();
if (isUserLogin) {
initTitleTab(homeBannerInfo.getAllVo());
initRoomTitleTab(homeBannerInfo.getAllVo());
initTitleTab();
}
initQxTopBanner(homeBannerInfo.getTopBanners());
@@ -767,7 +816,7 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
Iterator<BannerInfo> iterator = bannerInfos.iterator();
while (iterator.hasNext()) {
BannerInfo next = iterator.next();
if (Objects.equals(next.getBannerName(), "轻寻-小世界")) {
if (Objects.equals(next.getBannerName(), "66陪玩-小世界")) {
iterator.remove();
break;
}
@@ -805,7 +854,6 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
}
helper.itemView.setLayoutParams(params);
}
};
baseQuickAdapter.setOnItemClickListener((ada, view, position) -> {
@@ -873,7 +921,9 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
private void refreshData() {
isUserLogin = true;
if (!initHomeTitle && mHomeTitleInfos != null) {
initTitleTab(mHomeTitleInfos);
initRoomTitleTab(mHomeTitleInfos);
initTitleTab();
}
UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
//登录的时候显示位置，更好的

280
app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java
View File

@@ -1,16 +1,12 @@
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.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -19,31 +15,25 @@ 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;
@@ -51,15 +41,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;
@@ -143,7 +129,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);
}
});
@@ -155,14 +141,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(() -> {
@@ -223,19 +209,14 @@ public class MeFragment extends BaseFragment implements View.OnClickListener {
getString(R.string.text_user_id), String.valueOf(mUserInfo.getErbanNo())));
if (mUserInfo.getNameplate() != null) {
setOfficialMask(mUserInfo.getNameplate().getFixedWord(), mUserInfo.getNameplate().getIconPic());
} else {
setOfficialMask("", "");
}
// 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();
@@ -246,7 +227,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) {
@@ -257,37 +238,37 @@ 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()));
mBinding.tvConstellation.setText(star);
// 头像遮罩
GlideApp.with(mContext)
.load(mUserInfo.getAvatar())
.dontAnimate()
.centerInside()
.diskCacheStrategy(DiskCacheStrategy.RESOURCE)
.listener(new RequestListener<Drawable>() {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object o,
Target<Drawable> target, boolean b) {
return false;
}
@Override
public boolean onResourceReady(Drawable drawable, Object o,
Target<Drawable> target, DataSource dataSource, boolean b) {
drawable.setColorFilter(mContext.getResources().getColor(R.color.black_transparent_20), PorterDuff.Mode.DARKEN);
ViewTarget<ImageView, Drawable> viewTarget = (ViewTarget<ImageView, Drawable>) target;
viewTarget.getView().setImageDrawable(drawable);
return true;
}
})
// “23”：设置模糊度(在0.0到25.0之间)，默认”25";"4":图片缩放比例,默认“1”。
.transforms(new BlurTransformation(mContext, 25, 1))
.into(mBinding.ivUserAvatarShadow);
// GlideApp.with(mContext)
// .load(mUserInfo.getAvatar())
// .dontAnimate()
// .centerInside()
// .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
// .listener(new RequestListener<Drawable>() {
// @Override
// public boolean onLoadFailed(@Nullable GlideException e, Object o,
// Target<Drawable> target, boolean b) {
// return false;
// }
//
// @Override
// public boolean onResourceReady(Drawable drawable, Object o,
// Target<Drawable> target, DataSource dataSource, boolean b) {
// drawable.setColorFilter(mContext.getResources().getColor(R.color.black_transparent_20), PorterDuff.Mode.DARKEN);
// ViewTarget<ImageView, Drawable> viewTarget = (ViewTarget<ImageView, Drawable>) target;
// viewTarget.getView().setImageDrawable(drawable);
// return true;
// }
// })
// // “23”：设置模糊度(在0.0到25.0之间)，默认”25";"4":图片缩放比例,默认“1”。
// .transforms(new BlurTransformation(mContext, 25, 1))
// .into(mBinding.ivUserAvatarShadow);
}
}
@@ -310,17 +291,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) {
@@ -341,96 +322,115 @@ 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_anchor_certification:
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_MY_OFFICIAL_ANCHOR, "官方主播");
CommonWebViewActivity.start(getActivity(), UriProvider.getAnchorCertification());
case R.id.me_item_setting:
UIHelper.showSettingAct(mContext);
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.me_item_charge:
// startActivity(new Intent(mContext, WalletGoldActivity.class));
// 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_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() {
@@ -466,7 +466,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);
}
}

2
app/src/main/java/com/yizhuan/erban/home/presenter/FindFragmentPresenter.java
View File

@@ -112,7 +112,7 @@ public class FindFragmentPresenter extends BaseMvpPresenter<IFindFragmentView> {
return null;
}
VMTopMessageInfo topMessageInfo = new VMTopMessageInfo();
topMessageInfo.setTitle("轻寻头条");
topMessageInfo.setTitle("66陪玩头条");
List<VMTopMessage> vmTopMessageList = new ArrayList<>();
//组装成2个2个一组
final int groupSize = 2;

2
app/src/main/java/com/yizhuan/erban/home/presenter/RecommendFragmentPresenter.java
View File

@@ -382,7 +382,7 @@ public class RecommendFragmentPresenter extends BaseMvpPresenter<IRecommendFragm
}
} else if (homeInfo.getType() == HomeItem.TYPE_TOP_MESSAGE) {
//轻寻头条数据
//66陪玩头条数据
//3.1.2开始不处理
} else if (homeInfo.getType() == HomeItem.TYPE_RECOMMEND ||
homeInfo.getType() == HomeItem.TYPE_CONFIG) {

2
app/src/main/java/com/yizhuan/erban/radish/signin/SignInActivity.java
View File

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

4
app/src/main/java/com/yizhuan/erban/team/viewmodel/TeamViewModel.java
View File

@@ -81,10 +81,10 @@ public class TeamViewModel extends BaseViewModel {
}
/**
* 通过轻寻号搜索群聊成员
* 通过66陪玩号搜索群聊成员
*
* @param chatId 群组 ID
* @param erbanNo 轻寻号
* @param erbanNo 66陪玩号
* @param page 页码
* @return
*/

2
app/src/main/java/com/yizhuan/erban/ui/login/RegisterActivity.java
View File

@@ -94,7 +94,7 @@ public class RegisterActivity extends BaseActivity implements View.OnClickListen
btnRegister = findViewById(R.id.btn_register);
tvProtocol = findViewById(R.id.tv_protocol);
String userAgreementTip = "《轻寻用户协议》";
String userAgreementTip = "《66陪玩用户协议》";
String privacyAgreementDescTip = context.getString(R.string.text_login_protocol_2, userAgreementTip);
SpannableString ss = new SpannableString(privacyAgreementDescTip);
int userAgreementTipIndex = privacyAgreementDescTip.indexOf(userAgreementTip);

2
app/src/main/java/com/yizhuan/erban/ui/pay/ChargeAdapter.java
View File

@@ -25,7 +25,7 @@ public class ChargeAdapter extends BaseQuickAdapter<ChargeBean, BaseViewHolder>
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);

2
app/src/main/java/com/yizhuan/erban/ui/user/AboutActivity.java
View File

@@ -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();
}

2
app/src/main/java/com/yizhuan/erban/ui/user/AboutActivityKotlin.kt
View File

@@ -11,7 +11,7 @@
// override fun onCreate(savedInstanceState: Bundle?) {
// super.onCreate(savedInstanceState)
// setContentView(R.layout.activity_about)
// initTitleBar("关于轻寻")
// initTitleBar("关于66陪玩")
// initView()
// initData()
// }

4
app/src/main/java/com/yizhuan/erban/ui/widget/MainRedPointTab.java
View File

@@ -24,6 +24,7 @@ public class MainRedPointTab extends RelativeLayout {
private int mTabIcon, mTabIconSelect;
private MainTab mMainTab;
private TextView mTvNum;
private String mTabText;
private RedPointDismissListener mListener;
@@ -42,11 +43,12 @@ public class MainRedPointTab extends RelativeLayout {
TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.MainTab);
mTabIcon = typedArray.getResourceId(R.styleable.MainTab_tab_icon, R.mipmap.ic_main_tab_game_home);
mTabIconSelect = typedArray.getResourceId(R.styleable.MainTab_tab_icon_select, R.mipmap.ic_main_tab_game_pressed);
mTabText = typedArray.getString(R.styleable.MainTab_tab_text);
boolean draggable = typedArray.getBoolean(R.styleable.MainTab_tab_draggable, false);
mMainTab = findViewById(R.id.main_tab_msg);
mMainTab.setmTabIcon(mTabIcon);
mMainTab.setmTabIconSelect(mTabIconSelect);
mMainTab.setText(mTabText);
mTvNum = findViewById(R.id.msg_number);
if (draggable) {

4
app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java
View File

@@ -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();

2
app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/titles/ClipPagerTitleView.java
View File

@@ -91,7 +91,7 @@ public class ClipPagerTitleView extends View implements IMeasurablePagerTitleVie
canvas.drawText(mText, x, y, mPaint);
// 画clip层
canvas.save(Canvas.CLIP_SAVE_FLAG);
canvas.save();
if (mLeftToRight) {
canvas.clipRect(0, 0, getWidth() * mClipPercent, getHeight());
} else {

BIN
app/src/main/res/drawable-xhdpi/ic_female.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 574 B

After

Width:  |  Height:  |  Size: 802 B

2
app/src/main/res/drawable/shape_58559d.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#4d73e8" />
<solid android:color="#30ffffff" />
<corners android:radius="50dp" />
</shape>

2
app/src/main/res/drawable/shape_white_20dp_round.xml
View File

@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/white" />
<solid android:color="#40FFFFFF" />
<corners android:radius="20dp" />
</shape>

2
app/src/main/res/layout/activity_patriarch_mode.xml
View File

@@ -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" />
</LinearLayout>

2
app/src/main/res/layout/dialog_privacy_agreement.xml
View File

@@ -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" />

146
app/src/main/res/layout/fragment_game_home.xml
View File

@@ -17,22 +17,35 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/color_F9F9F9">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:src="@mipmap/bg_home_top"
app:layout_constraintTop_toTopOf="parent" />
<android.support.design.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_FAFAFA"
android:visibility="visible">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
app:elevation="0dp">
<android.support.design.widget.CollapsingToolbarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:contentScrim="#6956F0"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -48,6 +61,77 @@
app:layout_constraintTop_toTopOf="parent" />
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:paddingLeft="14dp"
android:paddingRight="14dp"
app:layout_constraintTop_toBottomOf="@id/iv_bg"
app:layout_constraintStart_toStartOf="parent"
/>
<android.support.v4.view.ViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="300dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
app:layout_constraintTop_toBottomOf="@id/magic_indicator"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
/>
<FrameLayout
android:id="@+id/fl_roll_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_F9F9F9"
app:layout_constraintTop_toBottomOf="@id/view_pager"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
>
<com.jude.rollviewpager.RollPagerView
android:id="@+id/roll_view"
android:layout_width="match_parent"
android:layout_height="120dp"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_12"
app:rollviewpager_hint_gravity="left"
app:rollviewpager_hint_paddingBottom="8dp"
/>
</FrameLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@+id/fl_roll_view" />
<android.support.constraint.Group
android:id="@+id/home_banner_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="fl_roll_view" />
</android.support.constraint.ConstraintLayout>
<android.support.v7.widget.Toolbar
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:contentInsetStart="0dp"
app:layout_collapseMode="pin">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<LinearLayout
android:id="@+id/title_bar"
android:layout_width="match_parent"
@@ -66,7 +150,7 @@
android:text="@string/search_hint"
android:gravity="center_vertical"
android:textSize="@dimen/sp_13"
android:textColor="@color/color_B3B3B3"
android:textColor="@color/white"
android:paddingStart="@dimen/dp_11"
android:paddingEnd="5dp"
android:drawablePadding="@dimen/dp_7"
@@ -94,54 +178,45 @@
android:visibility="@{open_visible ? View.VISIBLE : View.GONE}"
android:src="@mipmap/ic_open_room" />
</LinearLayout>
</FrameLayout>
<com.jude.rollviewpager.RollPagerView
android:id="@+id/roll_view"
app:layout_constraintTop_toBottomOf="@id/title_bar"
android:layout_width="match_parent"
android:layout_height="120dp"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_12"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:rollviewpager_hint_gravity="left"
app:rollviewpager_hint_paddingBottom="8dp"
/>
</android.support.v7.widget.Toolbar>
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view"
</android.support.design.widget.CollapsingToolbarLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
app:layout_constraintTop_toBottomOf="@+id/roll_view" />
<android.support.constraint.Group
android:id="@+id/home_banner_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="recycler_view" />
</android.support.constraint.ConstraintLayout>
android:background="@color/color_F9F9F9"
>
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator"
android:id="@+id/magic_indicator_bottom"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:paddingLeft="14dp"
android:paddingRight="14dp" />
</FrameLayout>
</android.support.design.widget.AppBarLayout>
<android.support.v4.view.ViewPager
android:id="@+id/view_pager_bottom"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<LinearLayout
android:id="@+id/layout_empty"
android:onClick="@{click}"
android:focusable="true"
android:clickable="true"
android:id="@+id/layout_empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:visibility="gone"
android:orientation="vertical">
<ImageView
@@ -162,11 +237,6 @@
</LinearLayout>
<android.support.v4.view.ViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</android.support.design.widget.CoordinatorLayout>

717
app/src/main/res/layout/fragment_me.xml
View File

File diff suppressed because it is too large Load Diff

55
app/src/main/res/layout/main_tab_layout.xml
View File

@@ -16,9 +16,9 @@
android:textSize="10sp"
app:tab_icon="@mipmap/ic_main_tab_game_home"
app:tab_icon_select="@mipmap/ic_main_tab_game_pressed"
app:tab_text=""
app:tab_text_color_select="@color/color_1A1A1A"
app:tab_text_color="@color/color_CCCCCC" />
app:tab_text="首页"
app:tab_text_color_select="@color/appColor"
app:tab_text_color="@color/color_999999" />
<com.yizhuan.erban.ui.widget.MainTab
android:id="@+id/main_home_tab"
@@ -26,24 +26,13 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:textSize="10sp"
android:textSize="@dimen/sp_10"
android:visibility="gone"
app:tab_icon="@mipmap/ic_main_tab_home"
app:tab_icon_select="@mipmap/ic_main_tab_home_pressed"
app:tab_text=""
app:tab_text_color_select="@color/color_1A1A1A"
app:tab_text_color="@color/color_CCCCCC" />
<com.yizhuan.erban.ui.widget.MainRedPointTab
android:id="@+id/main_msg_tab"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
app:tab_icon="@mipmap/ic_main_tab_msg"
app:tab_icon_select="@mipmap/ic_main_tab_msg_pressed"
app:tab_draggable="true"
/>
app:tab_text_color_select="@color/appColor"
app:tab_text_color="@color/color_999999" />
<com.yizhuan.erban.ui.widget.MainRedPointTab
android:id="@+id/main_attention_tab"
@@ -51,13 +40,27 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:textSize="10sp"
android:textSize="@dimen/sp_10"
app:tab_icon="@mipmap/ic_main_tab_find"
app:tab_icon_select="@mipmap/ic_main_tab_find_pressed"
app:tab_text=""
app:tab_text_color_select="@color/color_1A1A1A"
app:tab_text_color="@color/color_CCCCCC"
app:tab_draggable="false"/>
app:tab_text="广场"
app:tab_text_color_select="@color/appColor"
app:tab_text_color="@color/color_999999"
/>
<com.yizhuan.erban.ui.widget.MainRedPointTab
android:id="@+id/main_msg_tab"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:textSize="@dimen/sp_10"
app:tab_icon="@mipmap/ic_main_tab_msg"
app:tab_icon_select="@mipmap/ic_main_tab_msg_pressed"
app:tab_text="消息"
app:tab_text_color_select="@color/appColor"
app:tab_text_color="@color/color_999999"
/>
<com.yizhuan.erban.ui.widget.MainTab
android:id="@+id/main_me_tab"
@@ -65,11 +68,11 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:textSize="10sp"
android:textSize="@dimen/sp_10"
app:tab_icon="@mipmap/ic_main_tab_me"
app:tab_icon_select="@mipmap/ic_main_tab_me_pressed"
app:tab_text=""
app:tab_text_color_select="@color/color_1A1A1A"
app:tab_text_color="@color/color_CCCCCC" />
app:tab_text="我的"
app:tab_text_color_select="@color/appColor"
app:tab_text_color="@color/color_999999" />
</merge>

10
app/src/main/res/layout/maint_tab_red_poin_layout.xml
View File

@@ -10,11 +10,13 @@
android:id="@+id/main_tab_msg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="0sp"
app:tab_text=""
android:layout_centerInParent="true"
app:tab_text_color_select="@color/color_1A1A1A"
app:tab_text_color="@color/color_CCCCCC" />
android:textSize="10sp"
app:tab_icon="@mipmap/ic_main_tab_game_home"
app:tab_icon_select="@mipmap/ic_main_tab_game_pressed"
app:tab_text="首页"
app:tab_text_color_select="@color/appColor"
app:tab_text_color="@color/color_999999" />
<com.netease.nim.uikit.common.ui.draggablebubbles.BubbleView
android:id="@+id/msg_number"

2
app/src/main/res/layout/red_packet_dialog.xml
View File

@@ -37,7 +37,7 @@
android:layout_marginBottom="27dp"
android:textSize="@dimen/dialog_title_text_fnt"
android:textColor="#F9E3AE"
tools:text="轻寻送你一个现金红包" />
tools:text="66陪玩送你一个现金红包" />
</RelativeLayout>

BIN
app/src/main/res/mipmap-xhdpi/bg_home_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 145 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_home_search.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 546 B

After

Width:  |  Height:  |  Size: 908 B

BIN
app/src/main/res/mipmap-xhdpi/ic_main_tab_find.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 809 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_main_tab_find_pressed.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_main_tab_game_home.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 899 B

After

Width:  |  Height:  |  Size: 808 B

BIN
app/src/main/res/mipmap-xhdpi/ic_main_tab_game_pressed.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_main_tab_me.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 649 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_main_tab_me_pressed.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 969 B

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_main_tab_msg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 744 B

After

Width:  |  Height:  |  Size: 999 B

BIN
app/src/main/res/mipmap-xhdpi/ic_main_tab_msg_pressed.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/src/main/res/mipmap-xxhdpi/bg_me_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 484 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_me_radish.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 808 B

BIN
app/src/main/res/mipmap-xxhdpi/icon_collect_room.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_decoration.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_level.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_my_room.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_patriarch.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_setting.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_union.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_wallet.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 736 B

18
app/src/main/res/values/colors.xml
View File

@@ -51,7 +51,7 @@
<color name="white_transparent_12">#1EFFFFFF</color>
<color name="white_transparent_14">#23FFFFFF</color>
<color name="appColor">@color/color_34EBDE</color>
<color name="appColor">@color/color_7154EE</color>
<color name="color_common_text_content">#2C2C2E</color>
<!-- 灰色 对应以前的 666666 -->
<color name="color_common_text_gray">#626166</color>
@@ -241,7 +241,7 @@
<!-- 提示框的背景色 -->
<!--轻寻-->
<!--66陪玩-->
<!-- Background color for light LeBubbleView. -->
@@ -256,6 +256,7 @@
<color name="bubbleView_dark_press_background">#E6000000</color>
<color name="color_333333">#333333</color>
<color name="color_666666">#666666</color>
<color name="color_ffc160">#ffc160</color>
@@ -321,7 +322,10 @@
<color name="color_FF1E1E">#FF1E1E</color>
<color name="color_FFD888">#FFD888</color>
<color name="color_2E3047">#2E3047</color>
<!-- 30透明度-->
<color name="color_30_FFFFFF">#B3FFFFFF</color>
<!-- 75透明度-->
<color name="color_75_FFFFFF">#40FFFFFF</color>
<color name="color_ff5454">#ff5454</color>
<color name="color_ff0000">#ff0000</color>
<color name="color_fac41e">#fac41e</color>
@@ -485,7 +489,9 @@
<color name="design_color">@color/color_FE4C62</color>
<color name="color_9af5ef">#9af5ef</color>
<!-- 轻寻主题色 -->
<!-- 66陪玩主题色 -->
<color name="color_7154EE">#7154EE</color>
<color name="color_34EBDE">#34EBDE</color>
<color name="color_39EBDF">#39EBDF</color>
@@ -514,6 +520,12 @@
<color name="color_E0E0E0">#E0E0E0</color>
<color name="color_F3F2F5">#F3F2F5</color>
<color name="color_FFF044">#FFF044</color>
<color name="color_CEC0FF">#CEC0FF</color>
<color name="color_shadow">#05a5a5a5</color>
<color name="color_F9F9F9">#F9F9F9</color>
<color name="color_1CE9E7">#1CE9E7</color>
<color name="color_45F1E5">#45F1E5</color>
<color name="color_ABAAB2">#ABAAB2</color>

2
app/src/main/res/values/dimens.xml
View File

@@ -202,7 +202,7 @@
<dimen name="dp_me_icon_width">37dp</dimen>
<dimen name="dp_me_icon_height">55dp</dimen>
<dimen name="dp_me_padding_left">12dp</dimen>
<dimen name="dp_me_text_padding_to_icon">13dp</dimen>
<dimen name="dp_me_text_padding_to_icon">15dp</dimen>
<dimen name="dp_drag_layout_bg_size">80dp</dimen>
<dimen name="dp_drag_layout_avatar_size">55dp</dimen>

58
app/src/main/res/values/strings.xml
View File

@@ -1,5 +1,5 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="app_name">轻寻</string>
<string name="app_name">66陪玩</string>
<string name="no_list_data">这里什么都没有</string>
<string name="str_network_not_capable">网络不给力</string>
<string name="network_error_reload">网络异常，加载失败</string>
@@ -14,7 +14,7 @@
<string name="title_activity_scrolling">ScrollingActivity</string>
<string name="hint_login_account">请输入您的手机号/轻寻ID</string>
<string name="hint_login_account">请输入您的手机号/66陪玩ID</string>
<string name="hint_login_account_2">请输入您的手机号/兔兔ID</string>
<string name="hint_login_password">请输入您的密码</string>
<string name="hint_login_password_2">请输入密码</string>
@@ -90,13 +90,16 @@
<string name="bill_no_data_text">您还没有记录喔</string>
<string name="menu_my_wallet">我的钱包</string>
<string name="menu_my_income">礼物收入</string>
<string name="menu_my_income">我的礼物票</string>
<string name="menu_my_level">我的等级</string>
<string name="menu_my_decoration">我的装饰</string>
<string name="menu_my_union">我的公会</string>
<string name="menu_my_gold_charge">金币/充值</string>
<string name="menu_my_auction">竞拍记录</string>
<string name="menu_setting">设置</string>
<string name="room_offline">房主已下线</string>
<string name="root_offline_notice">更多好玩的房间在轻寻等您哟！去看看！</string>
<string name="root_offline_notice">更多好玩的房间在66陪玩等您哟！去看看！</string>
<string name="home">主页</string>
<string name="back">返回</string>
<string name="fan">粉丝</string>
@@ -108,7 +111,7 @@
<string name="friend">好友</string>
<string name="attention">关注</string>
<string name="no_frenids_text">你还没有添加任何好友哦! \n快去添加好友吧!</string>
<string name="no_fan_text">你还没有任何轻寻粉丝哦!</string>
<string name="no_fan_text">你还没有任何66陪玩粉丝哦!</string>
<string name="bind_your_alipay">请先绑定您的支付宝帐号</string>
<string name="my_jewel">我的钻石余额</string>
<string name="jewel_withdraw">钻石可以用于提现，兑换比率1元=10钻</string>
@@ -141,12 +144,12 @@
<!--我的页面-->
<string name="me_user_id">轻寻号:%d</string>
<string name="me_user_id">66陪玩号:%d</string>
<string name="my_attention">我的关注</string>
<string name="my_fan">我的粉丝</string>
<string name="no_attention_text">你还没有关注任何轻寻好友哦! \n快去添加关注吧!</string>
<string name="search_hint">搜索昵称、ID、房间名</string>
<string name="no_attention_text">你还没有关注任何66陪玩好友哦! \n快去添加关注吧!</string>
<string name="search_hint">搜索昵称/66号/房间名</string>
<string name="online">在线中…</string>
<string name="me_customer_server">客服</string>
@@ -239,7 +242,7 @@
<string name="pk_opponent_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">别气馁，66陪玩永远支持你哦！</string>
<!--密聊-->
@@ -321,7 +324,7 @@
<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_dialog_content_before">开着你的车，驾着你的马</string>
<string name="car_dialog_content_after">来轻寻尽情驰骋吧!</string>
<string name="car_dialog_content_after">来66陪玩尽情驰骋吧!</string>
<string name="car_shop_name">座驾商城</string>
<string name="decoration_status_wrapper">%1$s</string>
<string name="decoration_remainder">剩余</string>
@@ -341,7 +344,7 @@
5 打爆怪兽的奖励将会随着怪兽的实力（血值）增加而增加，例如：打爆一只血值1000的怪兽将获得总价不少于1000金币的金币或者座驾奖励\n
6 若有疑问，请咨询轻寻客服微信：1213490\n
6 若有疑问，请咨询66陪玩客服微信：1213490\n
</string>
<string name="text_monster_hunting_introduction">·玩法介绍·</string>
<string name="text_ok">确定</string>
@@ -350,7 +353,7 @@
<string name="text_check_damage">查看伤害排行榜</string>
<string name="title_monster_hunting_reward">获得奖励(%s)</string>
<string name="currency_unit">金币</string>
<string name="text_user_id">ID:%s</string>
<string name="text_user_id">66号:%s</string>
<string name="format_monster_hunting_impact">伤害 %s 点/次</string>
<string name="format_monster_hunting_magic_value">(%s金币)</string>
<string name="exchange_gold_tips">钻石可以兑换金币，兑换比率：1钻石=%s金币；\n</string>
@@ -405,7 +408,7 @@
<string name="family_exit_family">退出家族</string>
<string name="family_exit_family_tip">退出家族后您的家族币将无法使用\n重新加入即可还原,你真的要退出吗?</string>
<string name="family_invite_friends">邀请好友</string>
<string name="family_invite_friends_slogan">【轻寻】 用声音表达心情，用家族传承微笑。</string>
<string name="family_invite_friends_slogan">【66陪玩】 用声音表达心情，用家族传承微笑。</string>
<string name="family_join">加入</string>
<string name="family_search_member_hint">搜索成员ID/昵称 </string>
<string name="family_manage_title">家族管理</string>
@@ -425,7 +428,7 @@
<string name="family_join_valid_hint">加入家族身份验证</string>
<string name="family_disband">解散家族</string>
<string name="common_tip">提示</string>
<string name="family_disband_tip1">需要联系客服才能解散家族哦~\n轻寻家族客服:%1$s</string>
<string name="family_disband_tip1">需要联系客服才能解散家族哦~\n66陪玩家族客服:%1$s</string>
<string name="family_contact_service">联系客服</string>
<string name="family_join_tip">确认加入"%1$s"吗?</string>
<string name="family_join_hint">我希望加入贵家族</string>
@@ -517,7 +520,7 @@
<string name="tab_title_friends">好友</string>
<string name="tab_title_attentions">关注</string>
<string name="tab_title_fans">粉丝</string>
<string name="title_share_dialog">每天第一次分享免费领红包（不包含分享至轻寻好友）</string>
<string name="title_share_dialog">每天第一次分享免费领红包（不包含分享至66陪玩好友）</string>
<string name="text_share_erban_friends">好友</string>
<string name="text_share_wechat_friends">微信好友</string>
<string name="text_share_qq_friends">QQ好友</string>
@@ -544,7 +547,7 @@
<string name="tips_bind_alipay_sms_code">验证码将发送至您绑定的手机\"{0}\",请注意查收</string>
<string name="home_more">更多</string>
<string name="text_qq_login_erban_member">我是兔兔老用户</string>
<string name="text_qq_login_tutu_member">我是轻寻新用户</string>
<string name="text_qq_login_tutu_member">我是66陪玩新用户</string>
<string name="text_login">登录</string>
<string name="input_text_qq_id">请输入您耳伴绑定 QQ 的 ID</string>
<string name="input_text_hint_password">请输入您的密码</string>
@@ -555,7 +558,7 @@
<string name="label_recall_title">亲爱的小孩:</string>
<string name="label_recall_content">好久不见，翻起曾经一起度过的时光，期待你再次出现在身旁，谢谢你回来！</string>
<string name="hint_recall_input">请输入邀请码(选填)</string>
<string name="tips_recall">输入邀请码，邀请你加入的好友和你都可以获得轻寻回归计划的超级大礼哦！</string>
<string name="tips_recall">输入邀请码，邀请你加入的好友和你都可以获得66陪玩回归计划的超级大礼哦！</string>
<string name="label_recall_accept">收下回归礼</string>
<string name="label_user_info_avatar">头像:</string>
@@ -665,7 +668,7 @@
<string name="text_setting_community_norms">社区规范</string>
<string name="text_setting_contact_us">联系官方</string>
<string name="text_setting_help">帮助</string>
<string name="text_setting_about">关于轻寻</string>
<string name="text_setting_about">关于66陪玩</string>
<string name="text_setting_check_for_update">检查版本</string>
<string name="text_setting_lab">实验室</string>
<string name="text_setting_logout">退出当前账号</string>
@@ -704,7 +707,7 @@
<string name="label_draw_gold">瓜分金币</string>
<string name="label_draw_gold_reward">瓜分金币\n28天</string>
<string name="sign_in_continue_number_days">已累计签到%d天</string>
<string name="label_my_radish">萝卜账户</string>
<string name="label_my_radish">我的账户</string>
<string name="register_password_strong_tip">密码必须使用6–16个字符内的数字和英文字母组合哦!</string>
<string name="register_password_strong_tip_2">密码必须6-16字符内数字英文组合哦！</string>
<string name="text_bind">绑定</string>
@@ -795,7 +798,7 @@
<string name="new_user_task_content">萝卜X20</string>
<string name="new_user_task_receive_award">领取奖励</string>
<string name="new_user_task_hint">萝卜可用于送礼物、购买头饰座驾哦~</string>
<string name="tip_privacy_agreement_content">欢迎您使用轻寻。我们将通过《隐私政策》和《用户协议》帮助您了解我们收集、使用、存储和共享个人信息的情况，特别是我们所采集的个人信息类型与用途的对应关系。\n\n为了保障产品的正常运行，我们会收集您的部分必要信息。我们可能会收集联络方式、地理位置等个人敏感信息，您有权拒绝向我们提供这些信息。我们不会向第三方共享、提供、转让或者从第三方获取您的个人信息，除非经过您的同意。</string>
<string name="tip_privacy_agreement_content">欢迎您使用66陪玩。我们将通过《隐私政策》和《用户协议》帮助您了解我们收集、使用、存储和共享个人信息的情况，特别是我们所采集的个人信息类型与用途的对应关系。\n\n为了保障产品的正常运行，我们会收集您的部分必要信息。我们可能会收集联络方式、地理位置等个人敏感信息，您有权拒绝向我们提供这些信息。我们不会向第三方共享、提供、转让或者从第三方获取您的个人信息，除非经过您的同意。</string>
<string name="tip_privacy_agreement_desc">您可以查看完整的%s和%s，如果您同意，请点击下方同意按钮开始接受我们的服务。</string>
<string name="tip_privacy_agreement">《隐私政策》</string>
<string name="tip_user_agreement">《用户协议》</string>
@@ -803,7 +806,7 @@
<string name="label_charge_gold">金币充值</string>
<string name="old_app_name">轻寻</string>
<string name="old_app_name">66陪玩</string>
<string name="tip_login_how_login">如何登录？</string>
<string name="tip_login_old_account">%s也可登录%s哦 %s</string>
<string name="me_mentoring_relationship_title">收个徒弟赢金币</string>
@@ -812,7 +815,7 @@
<string name="tip_login_other_login">其他方式登录</string>
<string name="tip_login_account_login">账号登录</string>
<string name="text_dialog_pm_notice">为呵护青少年健康成长，轻寻推出“青少年模式”，该模式下针对青少年推送精选优化的内容。</string>
<string name="text_dialog_pm_notice">为呵护青少年健康成长，66陪玩推出“青少年模式”，该模式下针对青少年推送精选优化的内容。</string>
<string name="to_set_pm">设置青少年模式</string>
<string name="text_pm_set_pwd_tips">设置青少年模式的开启和关闭的数字密码</string>
<string name="text_pm_close_pwd">青少年模式关闭密码</string>
@@ -820,7 +823,7 @@
<string name="qq_login">QQ登录</string>
<string name="hint_input_nick">请输入昵称</string>
<string name="text_bind_phone">绑定手机号</string>
<string name="slogan">上轻寻，轻松寻觅对的TA</string>
<string name="slogan">上66陪玩，轻松寻觅对的TA</string>
<string name="text_agree">同意</string>
<string name="text_disagree">不同意</string>
@@ -841,12 +844,12 @@
<string name="gold_give">金币转赠</string>
<string name="donee">受赠人</string>
<string name="done_hint_input_phone_or_id">请输入手机号/轻寻号</string>
<string name="done_hint_input_phone_or_id">请输入手机号/66陪玩号</string>
<string name="give_value">转赠金额</string>
<string name="custom_input">自定义输入</string>
<string name="give_immediately">立即转赠</string>
<string name="my_give_record">我的转赠记录</string>
<string name="send_gold_confirm_info">%1$s&#160;(轻寻号:&#160;%2$s)</string>
<string name="send_gold_confirm_info">%1$s&#160;(66陪玩号:&#160;%2$s)</string>
<string name="back_login_page">返回登录页</string>
<string name="privacy_setting">隐私设置</string>
@@ -857,8 +860,13 @@
<string name="label_search_history">搜索记录</string>
<string name="label_room_history">进房记录</string>
<string name="label_clear">清空</string>
<string name="send_code_success_tips">验证码已发送至您绑定的手机%s</string>
<string name="quick_pass_slogan">轻松寻觅对的TA</string>
<string name="my_room">我的房间</string>
<string name="collect_room">收藏房间</string>
</resources>

2
app/src/model_customer_server/java/com/yizhuan/xchat_android_core/customer_server/CustomerServerModel.java
View File

@@ -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));

2
app/src/module_bank_card/res/values/strings.xml
View File

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

2
app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java
View File

@@ -193,7 +193,7 @@ public class PublishActivity extends BaseMvpActivity<IPublishView, PublishPresen
PublishItem item = imageShowList.get(position);
if (item.isAddItem()) {
LogUtil.print("跳转到图库");
CaptureStrategy captureStrategy = new CaptureStrategy(true, "com.wudoo.qingxun.fileprovider",
CaptureStrategy captureStrategy = new CaptureStrategy(true, "com.xuanyi.accompany.fileprovider",
BasicConfig.INSTANCE.getImageDir().getAbsolutePath());
int maxCanSelect = 9 - uploadList.size();
Matisse.from(PublishActivity.this)

2
app/src/module_community/res/values/strings.xml
View File

@@ -14,6 +14,8 @@
<string name="dy_comment_text">评论</string>
<string name="dys_tab_recommend">推荐</string>
<string name="dys_tab_attent">关注</string>
<string name="home_tab_dynamic">动态</string>
<string name="home_tab_caht">聊天交友</string>
<string name="dys_find_tab_square">广场</string>
<string name="dys_jump_mini_world">去看看</string>
</resources>

2
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallSearchActivity.java
View File

@@ -32,7 +32,7 @@ public class HallSearchActivity extends SearchActivity{
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
searchEdit.setHint("搜索昵称/轻寻ID");
searchEdit.setHint("搜索昵称/66陪玩ID");
}
@Override

2
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/PwdCodeMgr.java
View File

@@ -268,7 +268,7 @@ public class PwdCodeMgr {
@Override
public void onClickTutu() {
StatisticManager.Instance().onEvent(
StatisticsProtocol.Event.EVENT_HALL_ADDMEMBERS_USERID_CLICK, "添加成员-轻寻ID");
StatisticsProtocol.Event.EVENT_HALL_ADDMEMBERS_USERID_CLICK, "添加成员-66陪玩ID");
dialog.dismiss();
HallSearchActivity.start(context, AbstractSelectFriendAction.TYPE_MODULE_HALL);
}

2
app/src/module_labour_union/res/layout/activity_add_member.xml
View File

@@ -33,7 +33,7 @@
<EditText
android:id="@+id/et_search"
android:hint="搜索成员昵称/轻寻ID"
android:hint="搜索成员昵称/66陪玩ID"
android:textSize="@dimen/sp_13"
android:textColor="@color/color_333333"
android:textColorHint="@color/color_999999"

2
app/src/module_labour_union/res/layout/dialog_share_secret_code.xml
View File

@@ -44,7 +44,7 @@
android:drawableTop="@drawable/lu_ic_share_tutu"
android:drawablePadding="9dp"
android:gravity="center"
android:text="轻寻ID添加"
android:text="66陪玩ID添加"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_12" />
<TextView

2
app/src/module_labour_union/res/layout/include_user_module_hall.xml
View File

@@ -29,7 +29,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_333333"
tools:text="轻寻女神厅"
tools:text="66陪玩女神厅"
android:layout_centerVertical="true" />
<com.coorchice.library.SuperTextView

2
app/src/module_labour_union/res/layout/item_group_list.xml
View File

@@ -25,7 +25,7 @@
app:layout_constraintStart_toEndOf="@id/riv_group_image"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:text="轻寻女神"
android:text="66陪玩女神"
android:textSize="15dp" />
<TextView

21
app/src/module_mentoring_relationship/res/drawable/bg_corner_shadow_12.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/color_shadow"/>
<corners android:radius="@dimen/dp_20"/>
</shape>
</item>
<item
android:bottom="5dp"
android:left="1dp"
android:right="1dp"
android:top="1dp">
<shape android:shape="rectangle">
<solid android:color="@android:color/white"/>
<corners android:radius="@dimen/dp_12"/>
</shape>
</item>
</layer-list>

2
app/src/module_mentoring_relationship/res/layout/dialog_grab_apprentices_notify.xml
View File

@@ -20,7 +20,7 @@
<TextView
android:id="@+id/tv_tips"
android:text="轻寻：您收到一条收徒消息哦！"
android:text="66陪玩：您收到一条收徒消息哦！"
android:textSize="@dimen/dp_13"
android:textColor="@color/color_333333"
app:layout_constraintStart_toStartOf="parent"

2
app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_four.xml
View File

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

2
app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_one.xml
View File

@@ -101,7 +101,7 @@
app:layout_constraintStart_toStartOf="@+id/ll_mission_steps"
app:layout_constraintTop_toBottomOf="@+id/ll_mission_steps"
tools:ignore="SpUsage"
tools:text="轻寻所有问题都可以问Ta哦~" />
tools:text="66陪玩所有问题都可以问Ta哦~" />
<TextView
android:id="@+id/btn_action"

8
app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMessageFragment.java
View File

@@ -262,8 +262,8 @@ public class PublicChatHallMessageFragment extends TFragment implements ModulePr
@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陪玩提醒您文明用语~");
}
@Subscribe(threadMode = ThreadMode.MAIN)
@@ -542,7 +542,7 @@ public class PublicChatHallMessageFragment extends TFragment implements ModulePr
ImGameMode.get().setImGameInfo(imGameInfo1.setUuId(imMessage.getUuid()));
} else {
if (throwable.getMessage().contains("13004")) {
SingleToastUtil.showToast("你已被禁言，剩余" + PublicChatHallDataManager.get().mOwnerMember.getTempMuteDuration() / 60 + "分钟。轻寻提醒您文明用语");
SingleToastUtil.showToast("你已被禁言，剩余" + PublicChatHallDataManager.get().mOwnerMember.getTempMuteDuration() / 60 + "分钟。66陪玩提醒您文明用语");
}
throwable.printStackTrace();
}
@@ -611,7 +611,7 @@ public class PublicChatHallMessageFragment extends TFragment implements ModulePr
if (throwable != null) {
String throwableMessage = throwable.getMessage();
if (throwable.getMessage().contains("13004")) {
SingleToastUtil.showToast("你已被禁言，剩余" + PublicChatHallDataManager.get().mOwnerMember.getTempMuteDuration() / 60 + "分钟。轻寻提醒您文明用语");
SingleToastUtil.showToast("你已被禁言，剩余" + PublicChatHallDataManager.get().mOwnerMember.getTempMuteDuration() / 60 + "分钟。66陪玩提醒您文明用语");
} else {
// Toast.makeText(NimUIKit.getContext(), throwableMessage, Toast.LENGTH_SHORT).show();
SingleToastUtil.showToastShort(throwableMessage);

8
core/build.gradle
View File

@@ -2,10 +2,10 @@ apply plugin: 'com.android.library'
apply plugin: 'realm-android'
android {
compileSdkVersion 26
compileSdkVersion 29
defaultConfig {
minSdkVersion 19
targetSdkVersion 26
targetSdkVersion 29
versionCode 1
versionName "1.0"
@@ -27,7 +27,7 @@ android {
}
sourceSets {
qingxun {
accompany {
java.srcDirs = [
'src/main/java',
'src/diff_src_erban/java',
@@ -72,7 +72,7 @@ android {
}
productFlavors{
qingxun {
accompany {
dimension 'default'
}
mengsheng{

24
core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
View File

@@ -11,12 +11,12 @@ public class XChatConstants {
/**
* 包名(各种缓存目录的根目录)
*/
public static final String XCHAT_DIR_NAME = "com.wudoo.qingxun";
public static final String XCHAT_DIR_NAME = "com.xuanyi.accompany";
/**
* sp名字
*/
public static final String XCHAT_SHARE_PREFERENCE_NAME = "qx_share_data";
public static final String XCHAT_SHARE_PREFERENCE_NAME = "accompany_share_data";
/**
* 加密接口参数
@@ -31,7 +31,7 @@ public class XChatConstants {
/**
* 本地数据库的名字(目前是用 realm 数据库)
*/
public static final String XCHAT_DATABASE_NAME = "qx.db";
public static final String XCHAT_DATABASE_NAME = "accompany.db";
/**
* 微信支付 APP ID
@@ -41,12 +41,12 @@ public class XChatConstants {
/**
* bugly key (DEBUG)
*/
public static final String BUGLY_KEY_DEBUG = "0a1c8049b9";
public static final String BUGLY_KEY_DEBUG = "f251d1616b";//已更改
/**
* bugly key (RELEASE)
*/
public static final String BUGLY_KEY_RELEASE = "3ffe6f95c2";
public static final String BUGLY_KEY_RELEASE = "d2dec194c0";//已更改
/**
* 云信 key (DEBUG)
@@ -105,21 +105,21 @@ public class XChatConstants {
/**
* 阿里云日志空间名字
*/
public static final String ALIYUN_LOG_NAME = "qingxunlog";
public static final String ALIYUN_LOG_NAME = "66accompanylog";
/**
* 阿里云日志空间名字
*/
public static final String ALIYUN_LOG_STORE = "qingxunlog";
public static final String ALIYUN_LOG_STORE = "66accompanylog";
/**
* 百度统计 key
*/
public static final String BAIDU_APP_KEY = "a9d2302aef";
public static final String BAIDU_APP_KEY = "b8a4cb4bd1";//已更改
/**
* 友盟统计 key
*/
public static final String UMENG_APP_KEY = "5d3ac7853fc19591d2000384";
public static final String UMENG_APP_KEY = "5e86d850978eea071c37bf48";//已更改
/**
* linkedMe key
@@ -149,7 +149,7 @@ public class XChatConstants {
/**
* 分享房间标题
*/
public static final String SHARE_ROOM_TITLE = "上轻寻，轻松寻觅对的TA";
public static final String SHARE_ROOM_TITLE = "上66陪玩，轻松寻觅对的TA";
/**
* 分享房间 URL
@@ -164,7 +164,7 @@ public class XChatConstants {
/**
* 分享家族标题
*/
public static final String SHARE_FAMILY_TITLE = "hi,我想邀请您加入我的轻寻家族:";
public static final String SHARE_FAMILY_TITLE = "hi,我想邀请您加入我的66陪玩家族:";
/**
* 分享家族 URL
@@ -179,7 +179,7 @@ public class XChatConstants {
/**
* 分享群组标题
*/
public static final String SHARE_TEAM_TITLE = "hi,我想邀请您加入我的轻寻群聊:";
public static final String SHARE_TEAM_TITLE = "hi,我想邀请您加入我的66陪玩群聊:";
/**
* 分享群组 URL

4
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java
View File

@@ -209,7 +209,7 @@ public class UriProvider {
}
/**
* 轻寻专属，实名认证页面
* 66陪玩专属，实名认证页面
*
* @return
*/
@@ -218,7 +218,7 @@ public class UriProvider {
}
/**
* 轻寻专属，101技能认证页面
* 66陪玩专属，101技能认证页面
*
* @return
*/

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/RoomTabInfo.java
View File

@@ -11,7 +11,7 @@ public class RoomTabInfo implements Serializable {
* uid : 2
* officeUser : 1
* roomId : 58892673
* title : 轻寻张展伟的房间
* title : 66陪玩张展伟的房间
* type : 5
* meetingName : edc36c59bc9b449bb5bb58ac17b9c0b4
* valid : true

4
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/Test.java
View File

@@ -5,7 +5,7 @@ import java.util.List;
public class Test {
/**
* data : [{"uid":2,"officeUser":1,"roomId":58892673,"title":"轻寻张展伟的房间","type":5,"meetingName":"edc36c59bc9b449bb5bb58ac17b9c0b4","valid":true,"operatorStatus":1,"avatar":"https://img.erbanyy.com/FikxU2u59uOjPVS1Sv_zfu4icqMS?imageslim","roomDesc":"","backPic":"","openTime":1545018501000,"onlineNum":1,"abChannelType":1,"roomPwd":"","roomTag":"聊天","calcSumDataIndex":0,"tagId":8,"tagPict":"https://img.erbanyy.com/new_tag_%E8%81%8A%E5%A4%A9@3x.png","badge":"","isPermitRoom":2,"isRecom":0,"count":0,"hasAnimationEffect":true,"audioQuality":1,"isCloseScreen":false,"hasDragonGame":true,"hasKTVPriv":true,"isOpenKTV":false,"isOpenGame":true,"roomModeType":0,"roomGame":{"roomId":58892673,"uid":2,"startUid":2,"gameId":"doushouqi1","gameName":"doushouqi1","status":5,"createTime":1548856711000,"updateTime":1548856711000},"isExceptionClose":false,"exceptionClose":false}]
* data : [{"uid":2,"officeUser":1,"roomId":58892673,"title":"66陪玩张展伟的房间","type":5,"meetingName":"edc36c59bc9b449bb5bb58ac17b9c0b4","valid":true,"operatorStatus":1,"avatar":"https://img.erbanyy.com/FikxU2u59uOjPVS1Sv_zfu4icqMS?imageslim","roomDesc":"","backPic":"","openTime":1545018501000,"onlineNum":1,"abChannelType":1,"roomPwd":"","roomTag":"聊天","calcSumDataIndex":0,"tagId":8,"tagPict":"https://img.erbanyy.com/new_tag_%E8%81%8A%E5%A4%A9@3x.png","badge":"","isPermitRoom":2,"isRecom":0,"count":0,"hasAnimationEffect":true,"audioQuality":1,"isCloseScreen":false,"hasDragonGame":true,"hasKTVPriv":true,"isOpenKTV":false,"isOpenGame":true,"roomModeType":0,"roomGame":{"roomId":58892673,"uid":2,"startUid":2,"gameId":"doushouqi1","gameName":"doushouqi1","status":5,"createTime":1548856711000,"updateTime":1548856711000},"isExceptionClose":false,"exceptionClose":false}]
* title : 墙裂推荐
* type : 1
* maxNum : 3
@@ -53,7 +53,7 @@ public class Test {
* uid : 2
* officeUser : 1
* roomId : 58892673
* title : 轻寻张展伟的房间
* title : 66陪玩张展伟的房间
* type : 5
* meetingName : edc36c59bc9b449bb5bb58ac17b9c0b4
* valid : true

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.java
View File

@@ -754,7 +754,7 @@ public class HomeModel extends BaseModel implements IHomeModel {
/**
* 新版首页获取导航栏列表和下拉选择列表
*
* @param type 1-导航栏 2-首页下方的banner 3 轻寻的banner
* @param type 1-导航栏 2-首页下方的banner 3 66陪玩的banner
* @return
*/
@GET("home/v5/getFirstPageBanner")

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/IHomeModel.java
View File

@@ -181,7 +181,7 @@ public interface IHomeModel extends IModel {
Single<ArrayList<BannerInfo>> getTabBanner(String tabId);
/**
* 轻寻顶部 banner信息
* 66陪玩顶部 banner信息
* 包含3部分，顶部banner，测一测那个列表，标签页
*/
Single<HomeBannerInfo> getQxBannerInfo();

4
core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java
View File

@@ -592,7 +592,7 @@ public class AuthModel extends BaseModel implements IAuthModel {
}
/**
* 账号密码登录(耳伴老用户绑定 QQ 号登录轻寻)
* 账号密码登录(耳伴老用户绑定 QQ 号登录66陪玩)
*
* @param account
* @param password
@@ -1475,7 +1475,7 @@ public class AuthModel extends BaseModel implements IAuthModel {
@Query("shuMeiDeviceId") String shuMeiDeviceId);
/**
* 轻寻上耳伴老用户用 QQ 登录时，判断 QQ 的 open id 是否存在
* 66陪玩上耳伴老用户用 QQ 登录时，判断 QQ 的 open id 是否存在
*
* @return
*/

4
core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomSettingModel.java
View File

@@ -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

2
core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamMember.java
View File

@@ -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;//头像

2
core/src/main/java/com/yizhuan/xchat_android_core/statistic/protocol/StatisticsProtocol.java
View File

@@ -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"),//分享暗号到微信

2
core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java
View File

@@ -914,7 +914,7 @@ public final class UserModel extends BaseModel implements IUserModel {
/**
*
* @param erbanNo 轻寻号或手机号码
* @param erbanNo 66陪玩号或手机号码
* @return -
*/
@GET("user/getSimpleUser")

2
core/src/main/java/com/yizhuan/xchat_android_core/user/bean/RecommendationUserInfo.java
View File

@@ -32,7 +32,7 @@ public class RecommendationUserInfo implements Serializable {
* recommendRoom : false
* liveTag : false
* status : 0
* description : 她在轻寻魅力四射...
* description : 她在66陪玩魅力四射...
*/
private int uid;

2
core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.java
View File

@@ -10,7 +10,7 @@ public class GrabApprenticesInfo {
private Long uid;
/**
* 轻寻号
* 66陪玩号
*/
private Long erbanNo;

2
core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.java
View File

@@ -14,7 +14,7 @@ public class SimpleUserVo implements Serializable {
*/
private Long uid;
/**
* 轻寻号
* 66陪玩号
*/
private Long erbanNo;
/**

2
core/src/model_pay/java/com/wudoo/qingxun/wxapi/WXPayEntryActivity.java → core/src/model_pay/java/com/xuanyi/accompany/wxapi/WXPayEntryActivity.java
View File

@@ -1,4 +1,4 @@
package com.wudoo.qingxun.wxapi;
package com.xuanyi.accompany.wxapi;
import android.app.Activity;
import android.content.Intent;

6
gradle.properties
View File

@@ -20,8 +20,10 @@ org.gradle.daemon=true
android.enableD8=true
android.injected.testOnly=false
# CI jenkins 参数化构建传入参数
version_name=1.3.6
version_code=15
version_name=1.0.0
version_code=1
# jenkins打包参数 可选值 arm x86 arm_x86
ndk_abi_filters=arm
# jenkins参数，debug下打渠道包用到，

4
library/build.gradle
View File

@@ -1,10 +1,10 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 27
compileSdkVersion 29
defaultConfig {
minSdkVersion 19
targetSdkVersion 26
targetSdkVersion 29
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

2
library/src/main/java/com/yizhuan/xchat_android_library/utils/AppMetaDataUtil.java
View File

@@ -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;
}

4
nim_uikit/build.gradle
View File

@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 26
compileSdkVersion 29
buildToolsVersion '27.0.3'
defaultConfig {
minSdkVersion 19
targetSdkVersion 26
targetSdkVersion 29
renderscriptTargetApi 26
renderscriptSupportModeEnabled true

4
nim_uikit/src/com/netease/nim/uikit/business/session/fragment/MessageFragment.java
View File

@@ -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;