yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev_6.5.5_语聊

Browse Source 
# Conflicts:
#	Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java
#	Share/src/main/java/com/yunbao/share/ui/SharePopDialog.java
#	app/proguard-rules.pro
#	app/src/main/AndroidManifest.xml
#	build.gradle
#	common/build.gradle
#	common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
#	common/src/main/java/com/yunbao/common/utils/ToastUtil.java
#	common/src/main/java/com/yunbao/common/utils/WordUtil.java
#	config.gradle
This commit is contained in:
zlzw
2023-11-09 15:20:39 +08:00
parent 526e05f554 d7bc2615d6
commit f15c609f1c
485 changed files with 19453 additions and 2421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/src/main/java/com/yunbao/main/activity/BindUserActivity.java
View File

@@ -38,6 +38,7 @@ import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.main.R;
import com.yunbao.main.event.EditProfileEvent;
import com.yunbao.main.event.RegSuccessEvent;
@@ -204,7 +205,7 @@ public class BindUserActivity extends AbsActivity {
webSettings.setJavaScriptEnabled(true);
webview.addJavascriptInterface(new JsBridge(), "jsBridge");
// 也可以加载本地html(webView.loadUrl("file:///android_asset/xxx.html"))
webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html");
webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html"+ "?isZh=" + (WordUtil.isNewZh() ? "1" : 0));
allCountries.clear();
allCountries.addAll(Country.getAll(mContext, null));
@@ -272,9 +273,9 @@ public class BindUserActivity extends AbsActivity {
} else if (i == R.id.btn_register) {
register();
} else if (i == R.id.btn_tip2) {
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1,false);
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
} else if (i == R.id.btn_tip3) {
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2,false);
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
} else if (i == R.id.btn_goto_updata) {
lt_now_bind.setVisibility(View.GONE);
lt_first_bind.setVisibility(View.VISIBLE);

3
main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
View File

@@ -44,6 +44,7 @@ import com.yunbao.common.utils.ProcessImageUtil;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.CompleteInformationPopup;
import com.yunbao.common.views.UpdateSexPopup;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
@@ -446,7 +447,7 @@ public class EditProfileActivity extends AbsActivity {
}
Constants.myIntoIndex = 2;
Intent intent = new Intent(mContext, MyWebViewActivity2.class);
intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/table/Modify-information.html" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid());
intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/table/Modify-information.html" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
startActivity(intent);
}

7
main/src/main/java/com/yunbao/main/activity/EntryActivity.java
View File

@@ -88,6 +88,7 @@ import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.main.R;
import com.yunbao.main.dialog.LoginTipsDialog;
import com.yunbao.main.http.MainHttpUtil;
@@ -208,14 +209,14 @@ public class EntryActivity extends AppCompatActivity {
btn_tip1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY,false);
WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
}
});
btn_tip.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY1,false);
WebViewActivity.forward(EntryActivity.this, HtmlConfig.LOGIN_PRIVCAY1+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
}
});
@@ -275,7 +276,7 @@ public class EntryActivity extends AppCompatActivity {
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
}
});

2
main/src/main/java/com/yunbao/main/activity/FindPwdActivity.java
View File

@@ -221,7 +221,7 @@ public class FindPwdActivity extends AbsActivity {
webSettings.setJavaScriptEnabled(true);
webview.addJavascriptInterface(new JsBridge(), "jsBridge");
// 也可以加载本地html(webView.loadUrl("file:///android_asset/xxx.html"))
webview.loadUrl(CommonAppConfig.HOST +"/h5/live/TCaptcha.html");
webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html"+ "?isZh=" + (WordUtil.isNewZh() ? "1" : 0));
}
private void showCountryCode(){

3
main/src/main/java/com/yunbao/main/activity/LoginActivity.java
View File

@@ -50,6 +50,7 @@ import com.yunbao.common.manager.NoviceInstructorManager;
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
@@ -239,7 +240,7 @@ public class LoginActivity extends AbsActivity {
//登录即代表同意服务和隐私条款
private void forwardTip() {
WebViewActivity.forward(mContext, HtmlConfig.LOGIN_PRIVCAY,false);
WebViewActivity.forward(mContext, HtmlConfig.LOGIN_PRIVCAY+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
}

58
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@@ -52,6 +52,7 @@ import com.tencent.imsdk.v2.V2TIMManager;
import com.tencent.imsdk.v2.V2TIMSDKConfig;
import com.tencent.imsdk.v2.V2TIMSDKListener;
import com.tencent.imsdk.v2.V2TIMUserFullInfo;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.activity.AbsActivity;
@@ -80,15 +81,19 @@ import com.yunbao.common.event.UpdateTablePointMe;
import com.yunbao.common.http.CommonHttpConsts;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpConsts;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.http.main.MainNetManager;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.manager.APKManager;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.NoviceInstructorManager;
import com.yunbao.common.manager.OpenAdManager;
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.GiftCacheUtil;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.common.utils.LocationUtil;
import com.yunbao.common.utils.ProcessResultUtil;
import com.yunbao.common.utils.RouteUtil;
@@ -101,9 +106,6 @@ import com.yunbao.common.views.AbsMainViewHolder;
import com.yunbao.common.views.floatingview.APPEasyFloat;
import com.yunbao.common.views.weight.LiveFloatView;
import com.yunbao.live.activity.LiveAudienceActivity;
import com.yunbao.common.http.LiveHttpConsts;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.live.utils.LiveStorge;
import com.yunbao.main.R;
import com.yunbao.main.adapter.FullAdToBannerTransition;
@@ -133,6 +135,7 @@ import java.io.File;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -206,10 +209,17 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
}
@Override
protected void onPause() {
super.onPause();
OpenAdManager.getInstance().dismiss();
}
@Override
protected void main() {
ActivityCompat.postponeEnterTransition(this);
ConversationIMListManager.get(this);
OpenAdManager.getInstance();
//在请求一下这个接口给我后台版本号
CommonHttpUtil.getConfig(mContext, new CommonCallback<ConfigBean>() {
@Override
@@ -279,7 +289,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
}
} else if (getIntent().getStringExtra("type") != null && getIntent().getStringExtra("type").equals("8")) {
WebViewActivity.forward(mContext, getIntent().getStringExtra("activityUrl"), true,false);
WebViewActivity.forward(mContext, getIntent().getStringExtra("activityUrl"), true, false);
}
FirebaseMessaging.getInstance().getToken()
.addOnCompleteListener(new OnCompleteListener<String>() {
@@ -327,6 +337,21 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
@Override
public void onPageSelected(int position) {
switch (position) {
case 0:
//点击埋点
MobclickAgent.onEvent(mContext, "home_page", "首页");
break;
case 1:
MobclickAgent.onEvent(mContext, "community", "社区");
break;
case 2:
MobclickAgent.onEvent(mContext, "information", "消息");
break;
case 3:
MobclickAgent.onEvent(mContext, "my", "我的");
break;
}
if (mTabButtonGroup.getCurPosition() != position) {
System.err.println("重连IM:" + IMLoginManager.isLogin(mContext));
if (!IMLoginManager.isLogin(mContext)) {
@@ -445,6 +470,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
@Override
public void onNext(Unit unit) {
MobclickAgent.onEvent(mContext, "home_page_to_recommend", "首页点击右下角去推荐直播间按钮");
String Uid = floatBanner.getUid();
LiveHttpUtil.getLiveInfo(Uid + "", new HttpCallback() {
@Override
@@ -503,7 +529,6 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
//获取指导员账号
ConversationIMListManager.get(this).getUserInstructor(this);
checkVersion();
}
@Override
@@ -564,8 +589,11 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
*/
private synchronized void initAnchorRecommendBanner() {
if (!isfloatBannernet) return;
Map<String, Object> map = new HashMap<>();
map.put("num", "10");
map.put("live_recommend", "quick_look");
MainNetManager.get(mContext)
.anchorRecommend("10", new com.yunbao.common.http.base.HttpCallback<AnchorRecommendModel>() {
.anchorRecommend(map, new com.yunbao.common.http.base.HttpCallback<AnchorRecommendModel>() {
@SuppressLint("SetTextI18n")
@Override
public void onSuccess(AnchorRecommendModel data) {
@@ -592,7 +620,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
@Override
public void onError(String error) {
ToastUtil.show(com.yunbao.live.R.string.net_error);
ToastUtil.show(mContext.getString(R.string.net_error));
}
});
@@ -706,13 +734,18 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
int i = v.getId();
if (i == R.id.btn_start) {
showStartDialog();
MobclickAgent.onEvent(mContext, "broadcast", "开播按钮");
} else if (i == R.id.btn_search) {
SearchActivity.forward(mContext);
MobclickAgent.onEvent(mContext, "home_page_search", "右上角搜索按钮");
} else if (i == R.id.btn_follow) {
//关注
FollowActivity.forward(mContext, CommonAppConfig.getInstance().getUid(), 0);
} else if (i == R.id.img_trophy) {
MainListActivity.forward(mContext, 0);
MobclickAgent.onEvent(mContext, "home_page_ranking", "右上角排行榜按钮");
//RandomPkDialogFragment fragment = new RandomPkDialogFragment();
//fragment.show(this.getSupportFragmentManager(), "RandomPkDialogFragment");
}
@@ -847,6 +880,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
NoviceInstructorManager.get(mContext).getNoviceInstructor();
NoviceInstructorManager.get(mContext).checktHomeZdyPop();
initAnchorRecommendBanner();
OpenAdManager.getInstance().show(OpenAdManager.TYPE_HOME, false);
}
/**
@@ -981,6 +1015,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
MobclickAgent.onEvent(mContext, "home_page_enter_room", "首页点击直播间");
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal));
}
@@ -1036,7 +1071,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
long curTime = System.currentTimeMillis();
if (curTime - mLastClickBackTime > 2000) {
mLastClickBackTime = curTime;
ToastUtil.show(R.string.main_click_next_exit);
ToastUtil.show(WordUtil.getNewString(R.string.main_click_next_exit));
return;
}
APPEasyFloat.getInstance().dismiss(mContext);
@@ -1044,6 +1079,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
if (EasyFloat.isShow("LiveFloatView")) {
EasyFloat.dismiss("LiveFloatView", true);
}
OpenAdManager.getInstance().reset();
super.onBackPressed();
}
}
@@ -1079,15 +1115,20 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
if (position == 0) {
mainHomeViewHolder = new MainHomeViewHolder(mContext, parent);
vh = mainHomeViewHolder;
} else if (position == 1) {
mMainHomeCommunityViewHolder = new MainHomeCommunityViewHolder(mContext, parent, this);//社区
vh = mMainHomeCommunityViewHolder;
} else if (position == 2) {
mainMessageViewHolder = new MainMessageViewHolder(this, parent);
vh = mainMessageViewHolder;
} else if (position == 3) {
mMeViewHolder = new MainMeViewHolder(mContext, parent);
vh = mMeViewHolder;
}
if (vh == null) {
return;
@@ -1421,6 +1462,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
title.setImageResource(R.mipmap.icon_red_packet_float_text_en);
}
floatRedPacket.setOnClickListener(v -> {
MobclickAgent.onEvent(mContext, "home_page_to_redpk", "首页点击右下角去红包专区");
mainHomeViewHolder.setCurPosition(3);
});
}

8
main/src/main/java/com/yunbao/main/activity/MainListActivity.java
View File

@@ -20,6 +20,7 @@ import com.opensource.svgaplayer.SVGADrawable;
import com.opensource.svgaplayer.SVGAImageView;
import com.opensource.svgaplayer.SVGAParser;
import com.opensource.svgaplayer.SVGAVideoEntity;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.adapter.RefreshAdapter;
import com.yunbao.common.adapter.ViewPagerAdapter;
@@ -100,7 +101,6 @@ public class MainListActivity extends AbsActivity implements OnItemClickListener
@Override
protected void onResume() {
super.onResume();
}
@Override
@@ -178,7 +178,7 @@ public class MainListActivity extends AbsActivity implements OnItemClickListener
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
ToastUtil.show( mContext.getString(R.string.net_error));
}
});
initView();
@@ -309,6 +309,10 @@ public class MainListActivity extends AbsActivity implements OnItemClickListener
public void onItemClick(ListBean bean, int position) {
}
@Override
protected void onPause() {
super.onPause();
}
}

2
main/src/main/java/com/yunbao/main/activity/MsgSettActivity.java
View File

@@ -240,7 +240,7 @@ public class MsgSettActivity extends AbsActivity {
@Override
public void onError(String error) {
ToastUtil.show(com.yunbao.live.R.string.net_error);
ToastUtil.show(mContext.getString(R.string.net_error));
}
});
}

21
main/src/main/java/com/yunbao/main/activity/MyWebViewActivity.java
View File

@@ -37,8 +37,10 @@ import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.bean.UserBean;
import com.yunbao.common.event.JavascriptInterfaceEvent;
import com.yunbao.common.event.LiveRoomChangeEvent;
import com.yunbao.common.event.MainHomeCommunityToChatEvent;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.interfaces.ActivityResultCallback;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.interfaces.ImageResultCallback;
@@ -48,15 +50,14 @@ import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.JavascriptInterfaceUtils;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.ProcessImageUtil;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.activity.LiveAudienceActivity;
import com.yunbao.common.event.LiveRoomChangeEvent;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.live.views.LiveRoomViewHolder;
import com.yunbao.main.dialog.EncourageDialog;
import com.yunbao.main.http.MainHttpUtil;
@@ -211,6 +212,10 @@ public class MyWebViewActivity extends AbsActivity {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
}
if (!urlNow.contains("&isZh")) {
urlNow = urlNow + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
}
Log.e("MyH5", urlNow);
mWebView.loadUrl(urlNow);
if (Constants.myIntoIndex == 2) {
@@ -415,7 +420,7 @@ public class MyWebViewActivity extends AbsActivity {
public static void forward(Context context, String url, boolean addArgs) {
if (addArgs) {
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
}
Intent intent = new Intent(context, MyWebViewActivity.class);
intent.putExtra(Constants.URL, url);
@@ -593,10 +598,16 @@ public class MyWebViewActivity extends AbsActivity {
} else if (TextUtils.equals(event.getMethod(), "androidCancelAnchorAttention")) {
if (!StringUtil.isEmpty(LiveAudienceActivity.is_fans)) {
LiveAudienceActivity.is_fans = "-2";
LiveRoomViewHolder.setFansNum( LiveAudienceActivity.fansNum - 1);
LiveRoomViewHolder.setFansNum(LiveAudienceActivity.fansNum - 1);
IMLoginManager.get(mContext).upDataUserInfo();
}
}
}
}
@Override
protected void onPause() {
super.onPause();
}
}

3
main/src/main/java/com/yunbao/main/activity/MyWebViewActivity2.java
View File

@@ -38,6 +38,7 @@ import com.yunbao.common.utils.L;
import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.activity.SystemMessageActivity;
import com.yunbao.common.event.LiveRoomChangeEvent;
import com.yunbao.common.http.LiveHttpUtil;
@@ -324,7 +325,7 @@ public class MyWebViewActivity2 extends AbsActivity {
public static void forward(Context context, String url, boolean addArgs) {
if (addArgs) {
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
}
Intent intent = new Intent(context, MyWebViewActivity2.class);
intent.putExtra(Constants.URL, url);

4
main/src/main/java/com/yunbao/main/activity/OneLoginActivity.java
View File

@@ -113,8 +113,8 @@ public class OneLoginActivity extends AbsActivity {
avatar.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ToastUtil.show("1111");
updataImg();
// ToastUtil.show("1111");
// updataImg();
}
});

5
main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java
View File

@@ -48,6 +48,7 @@ import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.ProcessResultUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.activity.SystemMessageActivity;
import com.yunbao.live.bean.ImUserBean;
@@ -443,7 +444,7 @@ public class PDLiveConversationListActivity extends AbsActivity implements View.
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
ToastUtil.show( mContext.getString(R.string.net_error));
}
});
MessageIMManager.get(mContext).setSystemNumber(0);
@@ -502,7 +503,7 @@ public class PDLiveConversationListActivity extends AbsActivity implements View.
long curTime = System.currentTimeMillis();
if (curTime - mLastClickBackTime > 2000) {
mLastClickBackTime = curTime;
ToastUtil.show(R.string.main_click_next_exit);
ToastUtil.show(WordUtil.getNewString(R.string.main_click_next_exit));
} else {
EventBus.getDefault().post(new PDLiveConversationListEvent().setPage(11));
finish();

4
main/src/main/java/com/yunbao/main/activity/RedPacketInfoActivity.java
View File

@@ -59,11 +59,11 @@ public class RedPacketInfoActivity extends AbsActivity implements View.OnClickLi
if (bean.getCurrentStatus() == RedPacketListBean.RED_PACKET_CURRENT_STATUS_SUCCESS) {
status.setText(R.string.red_packet_info_status_success);
} else {
status.setText(R.string.red_packet_info_status_timeout);
status.setText(mContext.getString(R.string.red_packet_info_status_timeout));
}
if (bean.getRedPacketStatus() == 1 && bean.getAmountRefund() == 0) {
gold.setVisibility(View.GONE);
backAccountText.setText(R.string.red_packet_info_residue_none);
backAccountText.setText(mContext.getString(R.string.red_packet_info_residue_none));
} else {
gold.setVisibility(View.VISIBLE);
}

7
main/src/main/java/com/yunbao/main/activity/RegisterActivity.java
View File

@@ -50,6 +50,7 @@ import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.main.R;
import com.yunbao.main.event.RegSuccessEvent;
import com.yunbao.main.http.MainHttpConsts;
@@ -239,7 +240,7 @@ public class RegisterActivity extends AbsActivity {
webSettings.setJavaScriptEnabled(true);
webview.addJavascriptInterface(new JsBridge(), "jsBridge");
// 也可以加载本地html(webView.loadUrl("file:///android_asset/xxx.html"))
webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html");
webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html"+ "?isZh=" + (WordUtil.isNewZh() ? "1" : 0));
}
@@ -281,9 +282,9 @@ public class RegisterActivity extends AbsActivity {
} else if (i == R.id.btn_register) {
register();
} else if (i == R.id.btn_tip2) {
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1,false);
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY1+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
} else if (i == R.id.btn_tip3) {
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2,false);
WebViewActivity.forward(mContext, HtmlConfig.REG_PRIVCAY2+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0"),false);
}
}

16
main/src/main/java/com/yunbao/main/activity/SearchActivity.java
View File

@@ -17,16 +17,17 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.alibaba.fastjson.JSON;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.event.CloseEvent;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.manager.SearchHistoryRecordManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.WordsTypeUtil;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.main.R;
import com.yunbao.main.event.JumpUserHomeEvent;
import com.yunbao.main.fragment.SearchRecommendFragment;
@@ -176,7 +177,7 @@ public class SearchActivity extends AbsActivity {
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal));
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal));
}
@Override
@@ -220,4 +221,13 @@ public class SearchActivity extends AbsActivity {
}
@Override
protected void onPause() {
super.onPause();
}
@Override
protected void onResume() {
super.onResume();
}
}

2
main/src/main/java/com/yunbao/main/activity/SettingActivity.java
View File

@@ -395,7 +395,7 @@ public class SettingActivity extends AbsActivity implements OnItemClickListener<
mAdapter.setCacheString(getCacheSize());
mAdapter.notifyItemChanged(position);
}
ToastUtil.show(R.string.setting_clear_cache);
ToastUtil.show(mContext.getString(R.string.setting_clear_cache));
}
}, 2000);
}

18
main/src/main/java/com/yunbao/main/activity/ThreeDistributActivity.java
View File

@@ -271,7 +271,7 @@ public class ThreeDistributActivity extends AbsActivity implements View.OnClickL
public static void forward(Context context, String title, String url) {
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
Intent intent = new Intent(context, ThreeDistributActivity.class);
intent.putExtra(Constants.URL, url);
intent.putExtra(Constants.TIP, title);
@@ -309,10 +309,18 @@ public class ThreeDistributActivity extends AbsActivity implements View.OnClickL
* 生成分享图片
*/
private void saveBitmapFile() {
mProcessResultUtil.requestPermissions(new String[]{
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
}, new Runnable() {
String[] permissions;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
permissions=new String[]{
Manifest.permission.READ_MEDIA_IMAGES
};
}else{
permissions=new String[]{
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
};
}
mProcessResultUtil.requestPermissions(permissions, new Runnable() {
@Override
public void run() {
if (mContainer == null) {

2
main/src/main/java/com/yunbao/main/activity/UserAvatarSelectActivity.java
View File

@@ -40,7 +40,7 @@ public class UserAvatarSelectActivity extends AbsActivity {
super.main();
titleView = findViewById(R.id.titleView);
submit = findViewById(R.id.send);
titleView.setText(R.string.me_edit_avatar_title);
titleView.setText(mContext.getString(R.string.me_edit_avatar_title));
recyclerView = findViewById(R.id.recyclerView);
adapter = new UserAvatarSelectAdapter(mContext);
recyclerView.setLayoutManager(new GridLayoutManager(mContext, 3));

3
main/src/main/java/com/yunbao/main/activity/WeekWebViewActivity.java
View File

@@ -35,6 +35,7 @@ import com.yunbao.common.utils.JavascriptInterfaceUtils;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.activity.WebViewActivityMedal;
import com.yunbao.live.dialog.LiveUserDialogFragment;
import com.yunbao.common.http.LiveHttpUtil;
@@ -270,7 +271,7 @@ public class WeekWebViewActivity extends AbsActivity {
public static void forward(Context context, String url, boolean addArgs) {
if (addArgs) {
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
}
Intent intent = new Intent(context, WeekWebViewActivity.class);
intent.putExtra(Constants.URL, url);

5
main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java
View File

@@ -50,6 +50,7 @@ import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.main.R;
import org.greenrobot.eventbus.Subscribe;
@@ -282,9 +283,9 @@ public class ZhuangBanActivity extends AbsActivity {
public static void forward(Context context, String url, boolean addArgs) {
if (addArgs) {
if (url.contains("?")) {
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
} else {
url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
}
}

4
main/src/main/java/com/yunbao/main/adapter/MainHomeRemFollLiveAdapter.java
View File

@@ -208,14 +208,14 @@ public class MainHomeRemFollLiveAdapter extends RefreshAdapter<LiveBean> {
mLiveIco.setImageResource(R.mipmap.icon_main_rest_work);
mNum.setVisibility(View.VISIBLE);
live_type.setVisibility(View.VISIBLE);
mLiveState.setText(R.string.lives_state);
mLiveState.setText(mContext.getString(R.string.lives_state));
} else {
views.setVisibility(View.VISIBLE);
//休息中
mType.setImageResource(MainIconUtil.getLiveTypeIcon(Constants.LIVE_TYPE_RESTING));
mType.setVisibility(View.GONE);
mLiveIco.setImageResource(R.mipmap.icon_main_rest_spot);
mLiveState.setText(R.string.rest_state);
mLiveState.setText(mContext.getString(R.string.rest_state));
live_type.setVisibility(View.GONE);
mNum.setVisibility(View.GONE);
}

2
main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java
View File

@@ -227,7 +227,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
itemView.setTag(bean);
mOrder.setText("" + (position + 4));
if (bean.isHide()) {
mName.setText(R.string.mystery_man);
mName.setText(mContext.getString(R.string.mystery_man));
ImgLoader.display(mContext, R.mipmap.hide, mAvatar);
mSex.setVisibility(View.GONE);
} else {

2
main/src/main/java/com/yunbao/main/adapter/SearchResultsAdapter.java
View File

@@ -61,7 +61,7 @@ public class SearchResultsAdapter extends RecyclerView.Adapter {
@Override
public void onError(String error) {
ToastUtil.show(com.yunbao.live.R.string.net_error);
ToastUtil.show(R.string.net_error);
}
});
}

24
main/src/main/java/com/yunbao/main/dialog/EncourageDialog.java
View File

@@ -1,11 +1,16 @@
package com.yunbao.main.dialog;
import static com.yunbao.common.utils.RouteUtil.PATH_COIN;
import android.annotation.SuppressLint;
import android.app.Dialog;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -16,12 +21,14 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.alibaba.fastjson.JSON;
import com.makeramen.roundedimageview.RoundedImageView;
import com.yunbao.common.Constants;
import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.main.R;
@@ -265,8 +272,23 @@ public class EncourageDialog extends AbsDialogFragment implements View.OnClickLi
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
dismiss();
} else if (code == 1001) {
DialogUitl.showSimpleDialog(mContext, msg, new DialogUitl.SimpleCallback2() {
@Override
public void onCancelClick() {
}
@Override
public void onConfirmClick(Dialog dialog, String content) {
dialog.dismiss();
ARouter.getInstance().build(PATH_COIN).withInt("p", 0).navigation();
}
});
} else {
ToastUtil.show(msg);
}
ToastUtil.show(msg);
}
});

3
main/src/main/java/com/yunbao/main/dialog/LoginTipsDialog.java
View File

@@ -10,6 +10,7 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.Button;
import com.umeng.commonsdk.UMConfigure;
import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.main.R;
@@ -53,6 +54,8 @@ public class LoginTipsDialog extends AbsDialogFragment{
btn_agree.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
//友盟预初始化
UMConfigure.preInit(mContext,"64e40ee55488fe7b3afa2c96","PDLive");
EntryActivity.ToLogin();
dismiss();
}

61
main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java
View File

@@ -6,6 +6,7 @@ import android.animation.AnimatorListenerAdapter;
import android.animation.ObjectAnimator;
import android.app.Dialog;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.view.Gravity;
@@ -17,6 +18,7 @@ import android.widget.LinearLayout;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.CommonAppContext;
import com.yunbao.common.Constants;
@@ -28,6 +30,7 @@ import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.PluginManager;
import com.yunbao.common.utils.ProcessResultUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.LiveConfig;
import com.yunbao.live.activity.LiveAnchorActivity;
import com.yunbao.live.activity.LiveRyAnchorActivity;
@@ -160,12 +163,22 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
public void onLiveClick() {
boolean isAnchor = IMLoginManager.get(mContext).getUserInfo().anchorUserType();
if (isAnchor) {
mProcessResultUtil.requestPermissions(new String[]{
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.CAMERA,
Manifest.permission.RECORD_AUDIO
}, mStartLiveRunnable);
String[] permissions;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
permissions=new String[]{
Manifest.permission.READ_MEDIA_IMAGES,
Manifest.permission.CAMERA,
Manifest.permission.RECORD_AUDIO
};
}else{
permissions=new String[]{
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.CAMERA,
Manifest.permission.RECORD_AUDIO
};
}
mProcessResultUtil.requestPermissions(permissions, mStartLiveRunnable);
} else {
ToastUtil.show(getString(R.string.only_open_anchor));
}
@@ -176,12 +189,22 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
public void onVideoClick() {
boolean isAnchor = IMLoginManager.get(mContext).getUserInfo().anchorUserType();
if (isAnchor) {
mProcessResultUtil.requestPermissions(new String[]{
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.CAMERA,
Manifest.permission.RECORD_AUDIO
}, mStartVideoRunnable);
String[] permissions;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
permissions=new String[]{
Manifest.permission.READ_MEDIA_IMAGES,
Manifest.permission.CAMERA,
Manifest.permission.RECORD_AUDIO
};
}else{
permissions=new String[]{
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.CAMERA,
Manifest.permission.RECORD_AUDIO
};
}
mProcessResultUtil.requestPermissions(permissions, mStartVideoRunnable);
} else {
ToastUtil.show(getString(R.string.only_open_anchor));
}
@@ -221,10 +244,14 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
LiveHttpUtil.getLiveSdk(mGetLiveSdkCallback);
});
} else {
DialogUitl.showSimpleDialog(mContext, "需要下载开播插件，是否下载", new DialogUitl.SimpleCallback() {
String tips="需要下載開播插件，是否下載";
if(!WordUtil.isNewZh()){
tips="You need to download the plug-in, whether to download";
}
DialogUitl.showSimpleDialog(mContext, tips, new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
Dialog downloadDialog = DialogUitl.loadingDialog(mContext, "下载中");
Dialog downloadDialog = DialogUitl.loadingDialog(mContext, "Downloading...");
downloadDialog.show();
PluginManager.getInstance().loadAnchorPlugin(it -> {
LiveHttpUtil.getLiveSdk(mGetLiveSdkCallback);
@@ -247,12 +274,12 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
if ("2".equals(mBeautySdkType)) {
Constants.myIntoIndex = 2;
Intent intent = new Intent(mContext, MyWebViewActivity.class);
intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/release" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isRelease=1");
intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/release" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isRelease=1"+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
CommonAppContext.getTopActivity().startActivity(intent);
} else {
Constants.myIntoIndex = 2;
Intent intent = new Intent(mContext, MyWebViewActivity.class);
intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/release" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isRelease=1");
intent.putExtra(Constants.URL, CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ/release" + "?token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isRelease=1"+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
CommonAppContext.getTopActivity().startActivity(intent);
}
}
@@ -268,10 +295,12 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
if (i == R.id.btn_close) {
} else if (i == R.id.btn_live) {
if (mCallback != null) {
MobclickAgent.onEvent(mContext, "home_page_broadcast", "点击开播按钮");
mCallback.onLiveClick();
}
} else if (i == R.id.btn_video) {
if (mCallback != null) {
MobclickAgent.onEvent(mContext, "home_page_post", "点击发动态按钮");
mCallback.onVideoClick();
}
}

8
main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java
View File

@@ -89,7 +89,7 @@ public class OneLoginDialog extends AbsDialogFragment {
btn_enter.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
HttpClient.getInstance().post("User.userBindAgentAdmin", "User.userBindAgentAdmin")
HttpClient.getInstance().get("User.userBindAgentAdmin", "User.userBindAgentAdmin")
.params("invitation_code", bundle.getString("code"))
.params("user_nicename", bundle.getString("name"))
.execute(new HttpCallback() {
@@ -123,11 +123,11 @@ public class OneLoginDialog extends AbsDialogFragment {
});
} else {
if (msg.contains("暱稱重複，請重新輸入")) {
ToastUtil.show(R.string.edit_one_5);
ToastUtil.show(mContext.getString(R.string.edit_one_5));
} else if (msg.contains("該邀請碼不存在，請重新輸入")) {
ToastUtil.show(R.string.edit_one_6);
ToastUtil.show(mContext.getString(R.string.edit_one_6));
} else if (msg.contains("暱稱不合法")) {
ToastUtil.show(R.string.edit_one_7);
ToastUtil.show(mContext.getString(R.string.edit_one_7));
}
}
}

4
main/src/main/java/com/yunbao/main/dialog/ReturnUserDialog.java
View File

@@ -15,6 +15,7 @@ import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.activity.ZhuangBanActivity;
import com.yunbao.main.R;
@@ -77,7 +78,8 @@ public class ReturnUserDialog extends AbsDialogFragment {
.append("&uid=")
.append(userInfo.getId())
.append("&token=")
.append(userInfo.getToken());
.append(userInfo.getToken()) .append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0);
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false,0);
}
});

3
main/src/main/java/com/yunbao/main/dialog/SigninDialog.java
View File

@@ -15,6 +15,7 @@ import com.alibaba.android.arouter.launcher.ARouter;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.main.R;
public class SigninDialog extends AbsDialogFragment {
@@ -57,7 +58,7 @@ public class SigninDialog extends AbsDialogFragment {
goto_sign.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
ARouter.getInstance().build(PATH_REWARD).withString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index" + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()).navigation();
ARouter.getInstance().build(PATH_REWARD).withString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index" + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0")).navigation();
dismiss();
}

9
main/src/main/java/com/yunbao/main/fragment/SearchRecommendFragment.java
View File

@@ -23,6 +23,7 @@ import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -65,9 +66,11 @@ public class SearchRecommendFragment extends BaseFragment {
searchRecommendModels.add(model.setHistoryRecordMap(historyRecordMap));
}
adapter.addData(searchRecommendModels);
Map<String, Object> map = new HashMap<>();
map.put("num", "10");
map.put("live_recommend", "search");
MainNetManager.get(getActivity())
.anchorRecommend("10", new HttpCallback<AnchorRecommendModel>() {
.anchorRecommend(map, new HttpCallback<AnchorRecommendModel>() {
@Override
public void onSuccess(AnchorRecommendModel data) {
if (getActivity().isFinishing()) return;
@@ -85,7 +88,7 @@ public class SearchRecommendFragment extends BaseFragment {
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
ToastUtil.show(R.string.net_error);
}
});
}

45
main/src/main/java/com/yunbao/main/fragment/SearchResultsItemFragment.java
View File

@@ -17,14 +17,16 @@ import com.yunbao.common.fragment.BaseFragment;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.main.MainNetManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordsTypeUtil;
import com.yunbao.common.views.weight.OnRecyclerViewScrollListener;
import com.yunbao.main.R;
import com.yunbao.main.adapter.SearchRecommendBodyAdapter;
import com.yunbao.main.adapter.SearchResultsItemAdapter;
import com.yunbao.common.utils.WordsTypeUtil;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 展示結果的分類頁面
@@ -76,7 +78,7 @@ public class SearchResultsItemFragment extends BaseFragment {
searchList.addOnScrollListener(new OnRecyclerViewScrollListener() {
@Override
public void onBottom() {
if (type>1){
if (type > 1) {
page = page + 1;
setSearchKey(searchKey, type);
}
@@ -93,8 +95,12 @@ public class SearchResultsItemFragment extends BaseFragment {
changeBatch.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Map<String, Object> map = new HashMap<>();
map.put("num", "10");
map.put("live_recommend", "search");
map.put("refresh", "1");
MainNetManager.get(getActivity())
.anchorRecommend("10", new HttpCallback<AnchorRecommendModel>() {
.anchorRecommend(map, new HttpCallback<AnchorRecommendModel>() {
@Override
public void onSuccess(AnchorRecommendModel data) {
adapter.showData(data.getList());
@@ -107,8 +113,11 @@ public class SearchResultsItemFragment extends BaseFragment {
});
}
});
Map<String, Object> map = new HashMap<>();
map.put("num", "10");
map.put("live_recommend", "search");
MainNetManager.get(getActivity())
.anchorRecommend("10", new HttpCallback<AnchorRecommendModel>() {
.anchorRecommend(map, new HttpCallback<AnchorRecommendModel>() {
@Override
public void onSuccess(AnchorRecommendModel data) {
adapter.showData(data.getList());
@@ -117,7 +126,7 @@ public class SearchResultsItemFragment extends BaseFragment {
@Override
public void onError(String error) {
ToastUtil.show( R.string.net_error);
ToastUtil.show(R.string.net_error);
}
});
}
@@ -142,22 +151,24 @@ public class SearchResultsItemFragment extends BaseFragment {
type, page, new HttpCallback<List<List<SearchModel>>>() {
@Override
public void onSuccess(List<List<SearchModel>> data) {
if (getActivity()==null||getActivity().isFinishing()) return;
if (getActivity() == null || getActivity().isFinishing())
return;
if (data.get(0).size() == 0 && data.get(1).size() == 0) {
emptyLayout.setVisibility(View.VISIBLE);
searchList.setVisibility(View.GONE);
} else {
itemAdapter.showData(data, type, searchKey);
searchList.setVisibility(View.VISIBLE);
}
if (data.get(0).size() == 0 && data.get(1).size() == 0) {
emptyLayout.setVisibility(View.VISIBLE);
searchList.setVisibility(View.GONE);
} else {
itemAdapter.showData(data, type, searchKey);
searchList.setVisibility(View.VISIBLE);
}
}
@Override
public void onError(String error) {
if (getActivity()==null||getActivity().isFinishing()) return;
if (getActivity() == null || getActivity().isFinishing())
return;
emptyLayout.setVisibility(View.VISIBLE);
searchList.setVisibility(View.GONE);
}
@@ -169,7 +180,8 @@ public class SearchResultsItemFragment extends BaseFragment {
type, page, new HttpCallback<List<SearchModel>>() {
@Override
public void onSuccess(List<SearchModel> data) {
if (getActivity()==null||getActivity().isFinishing()) return;
if (getActivity() == null || getActivity().isFinishing())
return;
List<List<SearchModel>> listList = new ArrayList<>();
listList.add(data);
if (page > 1) {
@@ -191,7 +203,8 @@ public class SearchResultsItemFragment extends BaseFragment {
@Override
public void onError(String error) {
if (getActivity()==null||getActivity().isFinishing()) return;
if (getActivity() == null || getActivity().isFinishing())
return;
emptyLayout.setVisibility(View.VISIBLE);
searchList.setVisibility(View.GONE);
}

2
main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java
View File

@@ -318,7 +318,7 @@ public class ConversationIMListManager {
@Override
public void onError(String error) {
ToastUtil.show(com.yunbao.live.R.string.net_error);
}
});
}

4
main/src/main/java/com/yunbao/main/views/AbsMainListChildViewHolder.java
View File

@@ -368,7 +368,7 @@ public abstract class AbsMainListChildViewHolder extends AbsMainViewHolder imple
getItem(position, mVotes1, mVotes2, mVotes3).setText(bean.getTotalCoinFormat());
getItem(position, diamond1, diamond2, diamond3).setVisibility(View.VISIBLE);
if (bean.isHide()) {
getItem(position, mName1, mName2, mName3).setText(R.string.mystery_man);
getItem(position, mName1, mName2, mName3).setText(mContext.getString(R.string.mystery_man));
ImgLoader.display(mContext, R.mipmap.hide, getItem(position, mAvatar1, mAvatar2, mAvatar3));
getItem(position, mSex1, mSex2, mSex3).setVisibility(View.GONE);
@@ -394,7 +394,7 @@ public abstract class AbsMainListChildViewHolder extends AbsMainViewHolder imple
});
getItem(position, mItem1, mItem2, mItem3).setOnClickListener(v -> {
if (bean.isHide()) {
ToastUtil.show(R.string.can_not_go);
ToastUtil.show(mContext.getString(R.string.can_not_go));
} else {
if (bean.getIslive() == 1) {

12
main/src/main/java/com/yunbao/main/views/CashAccountViewHolder.java
View File

@@ -124,39 +124,39 @@ public class CashAccountViewHolder extends AbsViewHolder implements View.OnClick
if (mKey == Constants.CASH_ACCOUNT_ALI) {
account = mEditAliAccount.getText().toString().trim();
if (TextUtils.isEmpty(account)) {
ToastUtil.show(R.string.cash_input_ali_account);
ToastUtil.show(mContext.getString(R.string.cash_input_ali_account));
return;
}
mEditAliAccount.setText("");
name = mEditAliName.getText().toString().trim();
if (TextUtils.isEmpty(name)) {
ToastUtil.show(R.string.cash_input_ali_name);
ToastUtil.show(mContext.getString(R.string.cash_input_ali_name));
return;
}
mEditAliName.setText("");
} else if (mKey == Constants.CASH_ACCOUNT_WX) {
account = mEditWxAccount.getText().toString().trim();
if (TextUtils.isEmpty(account)) {
ToastUtil.show(R.string.cash_input_wx_account);
ToastUtil.show(mContext.getString(R.string.cash_input_wx_account));
return;
}
mEditWxAccount.setText("");
} else {
account = mEditBankAccount.getText().toString().trim();
if (TextUtils.isEmpty(account)) {
ToastUtil.show(R.string.cash_input_bank_account);
ToastUtil.show(mContext.getString(R.string.cash_input_bank_account));
return;
}
mEditBankAccount.setText("");
name = mEditBankUserName.getText().toString().trim();
if (TextUtils.isEmpty(account)) {
ToastUtil.show(R.string.cash_input_bank_user_name);
ToastUtil.show(mContext.getString(R.string.cash_input_bank_user_name));
return;
}
mEditBankUserName.setText("");
bank = mEditBankName.getText().toString().trim();
if (TextUtils.isEmpty(account)) {
ToastUtil.show(R.string.cash_input_bank_name);
ToastUtil.show(mContext.getString(R.string.cash_input_bank_name));
return;
}
mEditBankName.setText("");

128
main/src/main/java/com/yunbao/main/views/FlowLayout.java
View File

@@ -1,128 +0,0 @@
package com.yunbao.main.views;
import android.content.Context;
import android.graphics.Rect;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
import java.util.HashMap;
import java.util.Map;
/**
* 流式佈局
*/
public class FlowLayout extends ViewGroup {
public FlowLayout(Context context) {
super(context);
}
public FlowLayout(Context context, AttributeSet attrs) {
super(context, attrs);
}
public FlowLayout(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
// super.onMeasure(widthMeasureSpec, heightMeasureSpec);
//遍历去调用所有子元素的measure方法（child.getMeasuredHeight()才能获取到值，否则为0）
measureChildren(widthMeasureSpec, heightMeasureSpec);
int measuredWidth = 0, measuredHeight = 0;
int widthSize = MeasureSpec.getSize(widthMeasureSpec);
int widtMode = MeasureSpec.getMode(widthMeasureSpec);
int heightMode = MeasureSpec.getMode(heightMeasureSpec);
int heightSize = MeasureSpec.getSize(heightMeasureSpec);
//由于计算子view所占宽度，这里传值需要自身减去PaddingRight宽度，PaddingLeft会在接下来计算子元素位置时加上
Map<String, Integer> compute = compute(widthSize - getPaddingRight());
//EXACTLY模式：对应于给定大小或者match_parent情况
if (widtMode == MeasureSpec.EXACTLY) {
measuredWidth = widthSize;
//AT_MOS模式：对应wrap-content（需要手动计算大小，否则相当于match_parent）
} else if (widtMode == MeasureSpec.AT_MOST) {
measuredWidth = compute.get("allChildWidth");
}
if (heightMode == MeasureSpec.EXACTLY) {
measuredHeight = heightSize;
} else {
measuredHeight = compute.get("allChildHeight");
}
//设置flow的宽高
setMeasuredDimension(measuredWidth, measuredHeight);
}
@Override
protected void onLayout(boolean changed, int l, int t, int r, int b) {
for (int i = 0; i < getChildCount(); i++) {
View child = getChildAt(i);
Rect rect = (Rect) getChildAt(i).getTag();
child.layout(rect.left, rect.top, rect.right, rect.bottom);
}
}
/**
* 测量过程
*
* @param flowWidth 该view的宽度
* @return 返回子元素总所占宽度和高度（用于计算Flowlayout的AT_MOST模式设置宽高）
*/
private Map<String, Integer> compute(int flowWidth) {
//是否是单行
boolean aRow = true;
MarginLayoutParams marginParams;//子元素margin
int rowsWidth = getPaddingLeft();//当前行已占宽度(注意需要加上paddingLeft)
int columnHeight = getPaddingTop();//当前行顶部已占高度(注意需要加上paddingTop)
int rowsMaxHeight = 0;//当前行所有子元素的最大高度（用于换行累加高度）
for (int i = 0; i < getChildCount(); i++) {
View child = getChildAt(i);
//获取元素测量宽度和高度
int measuredWidth = child.getMeasuredWidth();
int measuredHeight = child.getMeasuredHeight();
//获取元素的margin
marginParams = (MarginLayoutParams) child.getLayoutParams();
//子元素所占宽度 = MarginLeft+ child.getMeasuredWidth+MarginRight 注意此时不能child.getWidth,因为界面没有绘制完成，此时wdith为0
int childWidth = marginParams.leftMargin + marginParams.rightMargin + measuredWidth;
int childHeight = marginParams.topMargin + marginParams.bottomMargin + measuredHeight;
//判断是否换行： 该行已占大小+该元素大小>父容器宽度 则换行
rowsMaxHeight = Math.max(rowsMaxHeight, childHeight);
//换行
if (rowsWidth + childWidth > flowWidth) {
//重置行宽度
rowsWidth = getPaddingLeft() + getPaddingRight();
//累加上该行子元素最大高度
columnHeight += rowsMaxHeight;
//重置该行最大高度
rowsMaxHeight = childHeight;
aRow = false;
}
//累加上该行子元素宽度
rowsWidth += childWidth;
//判断时占的宽段时加上margin计算，设置顶点位置时不包括margin位置，不然margin会不起作用，这是给View设置tag,在onlayout给子元素设置位置再遍历取出
child.setTag(new Rect(rowsWidth - childWidth + marginParams.leftMargin, columnHeight + marginParams.topMargin, rowsWidth - marginParams.rightMargin, columnHeight + childHeight - marginParams.bottomMargin));
}
//返回子元素总所占宽度和高度（用于计算Flowlayout的AT_MOST模式设置宽高）
Map<String, Integer> flowMap = new HashMap<>();
//单行
if (aRow) {
flowMap.put("allChildWidth", rowsWidth);
} else {
//多行
flowMap.put("allChildWidth", flowWidth);
}
//FlowLayout测量高度 = 当前行顶部已占高度 +当前行内子元素最大高度+FlowLayout的PaddingBottom
flowMap.put("allChildHeight", columnHeight + rowsMaxHeight + getPaddingBottom());
return flowMap;
}
}

422
main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java Normal file
View File

@@ -0,0 +1,422 @@
package com.yunbao.main.views;
import android.animation.ObjectAnimator;
import android.content.DialogInterface;
import android.content.Intent;
import android.text.TextUtils;
import android.util.Log;
import android.view.ViewGroup;
import android.view.animation.LinearInterpolator;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.google.gson.Gson;
import com.lxj.xpopup.XPopup;
import com.lxj.xpopup.enums.PopupPosition;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.activity.SudGameActivity;
import com.yunbao.common.adapter.RefreshAdapter;
import com.yunbao.common.adapter.SudGameListAdapter;
import com.yunbao.common.bean.CreateSudRoomModel;
import com.yunbao.common.bean.CustomSidebarChildModel;
import com.yunbao.common.bean.CustomSidebarInfoModel;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.bean.SudRoomListModel;
import com.yunbao.common.custom.CommonRefreshView;
import com.yunbao.common.dialog.CreateSudGamePopup;
import com.yunbao.common.dialog.SudGameListSelectPopup;
import com.yunbao.common.dialog.SudGameSearchDialogPopup;
import com.yunbao.common.event.RoomHolderTypeEvent;
import com.yunbao.common.event.SudGameListEvent;
import com.yunbao.common.event.SudGameListRefreshEvent;
import com.yunbao.common.event.SudGameListSillEvent;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.main.R;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
/**
* Created by cxf on 2018/9/22.
* MainActivity 首页 游戏
*/
public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implements OnItemClickListener<LiveBean> {
private CommonRefreshView mRefreshView;
private ImageView roomGameArrow, roomSillArrow, houseOwnerArrow;
private TextView gameTitle, sillTitle, houseOwnerTitle;
private long interactionID = 0;
private List<CustomSidebarChildModel> customSidebarChildModels = new ArrayList<>();
private String mSill = "0,0", mSillName, roomHolderType = "0", roomHolderTypeName;
private long animDuration = 500;
private String id = "0";
private SudGameListAdapter sudGameListAdapter;
private AbsActivity context;
public MainHomeGameViewHolder(AbsActivity context, ViewGroup parentView) {
super(context, parentView);
this.context = context;
Bus.getOn(this);
}
@Override
protected int getLayoutId() {
return R.layout.view_main_home_sud_game_list;
}
@Override
public void init() {
initData();
mSill = "0,0";
roomHolderType = "0";
id = "0";
roomGameArrow = (ImageView) findViewById(R.id.room_game_arrow);
roomSillArrow = (ImageView) findViewById(R.id.room_sill_arrow);
houseOwnerArrow = (ImageView) findViewById(R.id.house_owner_arrow);
gameTitle = (TextView) findViewById(R.id.game_title);
sillTitle = (TextView) findViewById(R.id.room_sill_text);
houseOwnerTitle = (TextView) findViewById(R.id.house_owner_text);
mRefreshView = (CommonRefreshView) findViewById(R.id.refreshView);
mRefreshView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
sudGameListAdapter = new SudGameListAdapter(mContext, true);
mRefreshView.setLoadMoreEnable(true);
mRefreshView.setRecyclerViewAdapter(sudGameListAdapter);
mRefreshView.setDataHelper(new CommonRefreshView.DataHelper<SudRoomListModel>() {
@Override
public RefreshAdapter<SudRoomListModel> getAdapter() {
return null;
}
@Override
public void loadData(int p, com.yunbao.common.http.HttpCallback callback) {
LiveHttpUtil.getRoomList(id, mSill, roomHolderType, "0", p-1, callback);
}
@Override
public List<SudRoomListModel> processData(String[] info) {
if (info.length > 0) {
List<SudRoomListModel> sudRoomListModels = new ArrayList<>();
for (String json : info) {
SudRoomListModel model = new Gson().fromJson(json, SudRoomListModel.class);
sudRoomListModels.add(model);
}
return sudRoomListModels;
} else {
return new ArrayList<>();
}
}
@Override
public void onRefreshSuccess(List<SudRoomListModel> list, int listCount) {
Log.i("onRefreshSuccess", listCount + "");
}
@Override
public void onRefreshFailure() {
}
@Override
public void onLoadMoreSuccess(List<SudRoomListModel> loadItemList, int loadItemCount) {
sudGameListAdapter.insertList(loadItemList);
}
@Override
public void onLoadMoreFailure() {
}
});
mRefreshView.initData();
mRefreshView.setEmptyLayoutId(R.layout.sud_no_data);
ViewClicksAntiShake.clicksAntiShake(findViewById(com.yunbao.common.R.id.random_start), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
LiveNetManager.get(mContext)
.randomRoom(id, mSill, roomHolderType,new com.yunbao.common.http.base.HttpCallback<CreateSudRoomModel>() {
@Override
public void onSuccess(CreateSudRoomModel data) {
if (data != null) {
Intent intent = new Intent(context, SudGameActivity.class);
intent.putExtra("CreateSudRoom", new Gson().toJson(data));
context.startActivity(intent);
}else {
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("当前没有可加入的房间");
} else {
ToastUtil.show("There are currently no rooms to join");
}
}
}
@Override
public void onError(String error) {
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
ToastUtil.show("当前没有可加入的房间");
} else {
ToastUtil.show("There are currently no rooms to join");
}
}
});
// List<SudRoomListModel> sudRoomListModels = sudGameListAdapter.getList();
// if (sudRoomListModels.size() > 1) {
// int random = RandomUtil.nextInt(sudRoomListModels.size() - 1);
// CreateSudRoomModel createSudRoomModel = new CreateSudRoomModel();
// createSudRoomModel.setSudGameId(sudRoomListModels.get(random).getSudGameId());
// createSudRoomModel.setSudGameRoomId(sudRoomListModels.get(random).getSudGameRoomId());
// createSudRoomModel.setAvatar(sudRoomListModels.get(random).getAvatar());
// createSudRoomModel.setRoomName(sudRoomListModels.get(random).getRoomName());
// createSudRoomModel.setSudGameName(sudRoomListModels.get(random).getSudGameName());
// new XPopup.Builder(mContext)
// .enableDrag(false)
// .dismissOnTouchOutside(false)
// .dismissOnBackPressed(false)
// .asCustom(new LiveSudGamePopup(mContext, createSudRoomModel))
// .show();
}
});
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.interactive_game_room_game), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
ObjectAnimator animator = ObjectAnimator.ofFloat(roomGameArrow, "rotation", 0f, 90f);
animator.setDuration(animDuration);
animator.setInterpolator(new LinearInterpolator());
animator.start();
XPopup.Builder builder = new XPopup.Builder(mContext).atView(findViewById(com.yunbao.common.R.id.interactive_game_room_game));
builder.hasShadowBg(false)
.isDestroyOnDismiss(true)
.isLightStatusBar(false)
.popupPosition(PopupPosition.Bottom)
.asCustom(new SudGameListSelectPopup(mContext, 0, customSidebarChildModels, interactionID)
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
closeAnimSudGameListEvent();
}
})
)
.show();
}
});
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.room_sill), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
ObjectAnimator animator = ObjectAnimator.ofFloat(roomSillArrow, "rotation", 0f, 90f);
animator.setDuration(animDuration);
animator.setInterpolator(new LinearInterpolator());
animator.start();
XPopup.Builder builder = new XPopup.Builder(mContext).atView(findViewById(com.yunbao.common.R.id.room_sill));
builder.hasShadowBg(false)
.isDestroyOnDismiss(true)
.isLightStatusBar(false)
.popupPosition(PopupPosition.Bottom)
.asCustom(new SudGameListSelectPopup(mContext, 1, mSillName).setOnDismissListener(dialog -> {
closeAnimSudGameListSillEvent();
}))
.show();
}
});
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.house_owner), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
ObjectAnimator animator = ObjectAnimator.ofFloat(houseOwnerArrow, "rotation", 0f, 90f);
animator.setDuration(animDuration);
animator.setInterpolator(new LinearInterpolator());
animator.start();
XPopup.Builder builder = new XPopup.Builder(mContext).atView(findViewById(com.yunbao.common.R.id.house_owner));
builder.hasShadowBg(false)
.isDestroyOnDismiss(true)
.isLightStatusBar(false)
.popupPosition(PopupPosition.Bottom)
.asCustom(new SudGameListSelectPopup(mContext, 2, roomHolderTypeName).setOnDismissListener(dialog -> {
closeAnimRoomHolderTypeEvent();
}))
.show();
}
});
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.interactive_game_add), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
new XPopup.Builder(mContext)
.enableDrag(false)
.moveUpToKeyboard(true)
.asCustom(new CreateSudGamePopup(mContext, customSidebarChildModels, true).setHomeView(true))
.show();
}
});
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.search), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
new SudGameSearchDialogPopup(mContext, true).showDialog();
}
});
LiveNetManager.get(mContext)
.getCustomSidebarInfo("1", new HttpCallback<List<CustomSidebarInfoModel>>() {
@Override
public void onSuccess(List<CustomSidebarInfoModel> data) {
for (CustomSidebarInfoModel datum : data) {
if (datum.getType().equals("6")) {
customSidebarChildModels = datum.getChild();
return;
}
}
}
@Override
public void onError(String error) {
}
});
}
private void initData() {
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onSudGameListEvent(SudGameListEvent event) {
interactionID = event.getInteractionID();
if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
gameTitle.setText(event.getTitle().substring(0, 2));
} else {
if (event.getTitle().contains("All")) {
gameTitle.setText("All");
} else {
if ((event.getTitle().length() > 6)) {
gameTitle.setText(event.getTitle().substring(0, 5));
} else {
gameTitle.setText(event.getTitle());
}
}
}
id = event.getId();
mRefreshView.initData();
closeAnimSudGameListEvent();
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onSudGameListSillEvent(SudGameListSillEvent event) {
mSill = event.getSill();
mSillName = event.getSillName();
if (TextUtils.equals("0,0", mSill)) {
sillTitle.setText(mSillName);
} else {
sillTitle.setText(mSillName.substring(0, mSillName.length() - 2));
}
closeAnimSudGameListSillEvent();
mRefreshView.initData();
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onRoomHolderTypeEvent(RoomHolderTypeEvent event) {
roomHolderType = event.getRoomHolderType();
roomHolderTypeName = event.getRoomHolderTypeName();
houseOwnerTitle.setText(roomHolderTypeName);
mRefreshView.initData();
closeAnimRoomHolderTypeEvent();
}
private void closeAnimSudGameListEvent() {
ObjectAnimator animator = ObjectAnimator.ofFloat(roomGameArrow, "rotation", 90f, 0f);
animator.setDuration(animDuration);
animator.setInterpolator(new LinearInterpolator());
animator.start();
}
private void closeAnimSudGameListSillEvent() {
ObjectAnimator backAnimator = ObjectAnimator.ofFloat(roomSillArrow, "rotation", 90f, 0f);
backAnimator.setDuration(animDuration);
backAnimator.setInterpolator(new LinearInterpolator());
backAnimator.start();
}
private void closeAnimRoomHolderTypeEvent() {
ObjectAnimator backAnimator = ObjectAnimator.ofFloat(houseOwnerArrow, "rotation", 90f, 0f);
backAnimator.setDuration(animDuration);
backAnimator.setInterpolator(new LinearInterpolator());
backAnimator.start();
}
@Override
public void onItemClick(LiveBean bean, int position) {
}
@Override
public void loadData() {
}
@Override
public void release() {
Bus.getOff(this);
}
@Override
public void onDestroy() {
super.onDestroy();
release();
}
//显示顶部商城tab时，显示底部tabGroup
@Subscribe(threadMode = ThreadMode.MAIN)
public void onUpdata(String str) {
if ("Updata".equals(str)) {
if (mRefreshView != null) {
mRefreshView.showRefreshBar();
mRefreshView.mRecyclerView.scrollToPosition(0);
}
} else if ("blacklist".equals(str)) {
if (mRefreshView != null) {
mRefreshView.showRefreshBar();
}
}
}
@Override
public void onResume() {
super.onResume();
}
@Override
public void onPause() {
super.onPause();
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onSudGameListRefreshEvent(SudGameListRefreshEvent event) {
mRefreshView.initData();
}
}

4
main/src/main/java/com/yunbao/main/views/MainHomeLiveItemViewHolder.java
View File

@@ -112,14 +112,14 @@ public class MainHomeLiveItemViewHolder extends RecyclerView.ViewHolder {
mLiveIco.setImageResource(R.mipmap.icon_main_rest_work);
mNum.setVisibility(View.VISIBLE);
liveType.setVisibility(View.VISIBLE);
mLiveState.setText(R.string.lives_state);
mLiveState.setText(mContext.getString(R.string.lives_state));
} else {
views.setVisibility(View.VISIBLE);
//休息中
mType.setImageResource(MainIconUtil.getLiveTypeIcon(Constants.LIVE_TYPE_RESTING));
mType.setVisibility(View.GONE);
mLiveIco.setImageResource(R.mipmap.icon_main_rest_spot);
mLiveState.setText(R.string.rest_state);
mLiveState.setText(mContext.getString(R.string.rest_state));
liveType.setVisibility(View.GONE);
mNum.setVisibility(View.GONE);
}

61
main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
View File

@@ -29,6 +29,7 @@ import com.bumptech.glide.request.target.DrawableImageViewTarget;
import com.bumptech.glide.request.target.Target;
import com.ms.banner.Banner;
import com.ms.banner.listener.OnBannerClickListener;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.activity.WebViewActivity;
@@ -40,18 +41,18 @@ import com.yunbao.common.bean.LiveClassBean;
import com.yunbao.common.bean.WeekListBean;
import com.yunbao.common.custom.CommonRefreshView;
import com.yunbao.common.custom.ItemDecoration;
import com.yunbao.common.event.LiveRoomChangeEvent;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.LiveClassManager;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.common.utils.MicStatusManager;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.CustomViewHolder;
import com.yunbao.common.event.LiveRoomChangeEvent;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.live.utils.LiveStorge;
import com.yunbao.live.views.LiveRoomViewHolder;
import com.yunbao.main.R;
@@ -289,6 +290,29 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
topAdapter.setOnItemClickListener(new OnItemClickListener<LiveClassBean>() {
@Override
public void onItemClick(LiveClassBean bean, int position) {
switch (bean.getEnglish()) {
case "Hot":
MobclickAgent.onEvent(mContext, "home_page_recommend_hot", "热门");
break;
case "New":
MobclickAgent.onEvent(mContext, "home_page_recommend_new", "新秀");
break;
case "Pretty":
MobclickAgent.onEvent(mContext, "home_page_recommend_pretty", "颜值");
break;
case "Dance":
MobclickAgent.onEvent(mContext, "home_page_recommend_dance", "舞蹈");
break;
case "Mr.Right":
MobclickAgent.onEvent(mContext, "home_page_recommend_mr.right", "男神");
break;
case "Music":
MobclickAgent.onEvent(mContext, "home_page_recommend_music", "音乐");
break;
default:
MobclickAgent.onEvent(mContext, "home_page_recommend_other", "其他");
break;
}
if (!canClick()) {
return;
}
@@ -340,19 +364,19 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
return false;
}
})
/* .addListener(new RequestListener<Drawable>() {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
ActivityCompat.startPostponedEnterTransition((Activity) mContext);
return false;
}
/* .addListener(new RequestListener<Drawable>() {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
ActivityCompat.startPostponedEnterTransition((Activity) mContext);
return false;
}
@Override
public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
ActivityCompat.startPostponedEnterTransition((Activity) mContext);
return false;
}
})*/
@Override
public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
ActivityCompat.startPostponedEnterTransition((Activity) mContext);
return false;
}
})*/
.error(R.mipmap.ic_launcher)
.into(new DrawableImageViewTarget(ad));
@@ -425,8 +449,13 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
}
}
showLoadingDialog();
Map<String, String> map_ekv = new HashMap<String, String>();
map_ekv.put("link", link);
MobclickAgent.onEvent(mContext, "home_page_recommend_banner", map_ekv);
if (link.contains("http")) {
WebViewActivity.forward(mContext, link, true,false);
WebViewActivity.forward(mContext, link, true, false);
} else {
gotoLive(link);
}

3
main/src/main/java/com/yunbao/main/views/MainHomeShopViewHolder.java
View File

@@ -23,6 +23,7 @@ import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.main.R;
import com.yunbao.main.utils.BottomBarUtil;
@@ -48,7 +49,7 @@ public class MainHomeShopViewHolder extends AbsMainHomeChildViewHolder implement
@Override
public void init() {
String url = HtmlConfig.SHOP + "?t="+Math.random()+"&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
String url = HtmlConfig.SHOP + "?t="+Math.random()+"&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
// String url = HtmlConfig.SHOP + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
L.e("H5---88>" + url);

32
main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
View File

@@ -5,6 +5,8 @@ import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.main.R;
@@ -17,8 +19,8 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
private MainHomeFollLiveViewHolder mainHomeFollLiveViewHolder;
private MainHomeLiveViewHolder mainHomeLiveViewHolder;
private MainHomeRecomLiveViewHolder mainHomeRecomLiveViewHolder;
private MainHomeRedPacketLiveViewHolder mainHomeRedPacketLiveViewHolder;
private MainHomeGameViewHolder mainHomeGameLiveViewHolder;
private final String mPageName = "home_page";
private ImageView img_trophy;
public MainHomeViewHolder(Context context, ViewGroup parentView) {
@@ -38,14 +40,28 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
ImgLoader.display(mContext, "https://downs.yaoulive.com/gif_trophy.gif", img_trophy);
}
public void setCurPosition(int position){
public void setCurPosition(int position) {
mViewPager.setCurrentItem(position);
}
@Override
protected void loadPageData(int position) {
switch (position) {
case 0:
MobclickAgent.onEvent(mContext, "home_page_follow", "首页关注列表按钮");
break;
case 1:
MobclickAgent.onEvent(mContext, "home_page_hot", "首页热门列表按钮");
break;
case 2:
MobclickAgent.onEvent(mContext, "home_page_recommend", "首页推荐列表按钮");
break;
case 3:
MobclickAgent.onEvent(mContext, "home_page_redpk", "首页红包列表按钮");
break;
}
if (mViewHolders == null) {
return;
}
@@ -60,15 +76,19 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
} else if (position == 0) {
mainHomeFollLiveViewHolder = new MainHomeFollLiveViewHolder(mContext, parent);
vh = mainHomeFollLiveViewHolder;
} else if (position == 1) {
mainHomeLiveViewHolder = new MainHomeLiveViewHolder(mContext, parent);
vh = mainHomeLiveViewHolder;
} else if (position == 2) {
mainHomeRecomLiveViewHolder = new MainHomeRecomLiveViewHolder(mContext, parent);
vh = mainHomeRecomLiveViewHolder;
} else if (position == 3) {
mainHomeRedPacketLiveViewHolder = new MainHomeRedPacketLiveViewHolder(mContext, parent);
vh = mainHomeRedPacketLiveViewHolder;
mainHomeGameLiveViewHolder = new MainHomeGameViewHolder((AbsActivity) mContext, parent);
vh = mainHomeGameLiveViewHolder;
}
if (vh == null) {

48
main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
View File

@@ -27,6 +27,7 @@ import com.opensource.svgaplayer.SVGADrawable;
import com.opensource.svgaplayer.SVGAImageView;
import com.opensource.svgaplayer.SVGAParser;
import com.opensource.svgaplayer.SVGAVideoEntity;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.CommonAppContext;
import com.yunbao.common.Constants;
@@ -47,6 +48,7 @@ import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.AbsMainViewHolder;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.activity.LiveRecordActivity;
@@ -74,8 +76,10 @@ import org.greenrobot.eventbus.EventBus;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
/**
* Created by cxf on 2018/9/22.
@@ -127,6 +131,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
ViewClicksAntiShake.clicksAntiShake(mAvatar, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
MobclickAgent.onEvent(mContext, "my_avatar", "个人头像按钮");
RouteUtil.forwardUserHome(mContext, CommonAppConfig.getInstance().getUid(), 2);
}
});
@@ -137,6 +142,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
ViewClicksAntiShake.clicksAntiShake(gift_svga, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
MobclickAgent.onEvent(mContext, "my_avatar", "个人头像按钮");
RouteUtil.forwardUserHome(mContext, CommonAppConfig.getInstance().getUid(), 2);
}
});
@@ -358,6 +364,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
tv_level.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
MobclickAgent.onEvent(mContext, "my_top_level", "个人中心最上面的等级");
String url = CommonAppConfig.HOST + "/h5/Grade/index.html?" + "token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&for";
ZhuangBanActivity.forward(mContext, url);
}
@@ -373,6 +380,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
tv_level.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
MobclickAgent.onEvent(mContext, "my_top_level", "个人中心最上面的等级");
String url = CommonAppConfig.HOST + "/h5/Grade/index.html?" + "token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
ZhuangBanActivity.forward(mContext, url);
}
@@ -434,6 +442,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
forwardProfit();
break;
case 2:
MobclickAgent.onEvent(mContext, "my_wallet", "个人中心点钱包");
forwardCoin();
break;
case 13:
@@ -443,6 +452,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
forwardMyVideo();
break;
case 20:
MobclickAgent.onEvent(mContext, "my_room", "个人中心点房间管理");
forwardRoomManage();
break;
}
@@ -453,22 +463,36 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
ThreeDistributActivity.forward(mContext, bean.getName(), url);
} else {
if (bean.getId() == 31) {
MobclickAgent.onEvent(mContext, "my_medal", "个人中心点勋章");
//跳转网页版粉丝徽章
WebViewActivityMedal.forward(mContext, url);
} else if (bean.getId() == 5) {
MobclickAgent.onEvent(mContext, "my_decorate", "个人中心点装扮");
Constants.isTitle = true;
ZhuangBanActivity.forward(mContext, CommonAppConfig.HOST + "/h5/Personality.html");
} else if (bean.getId() == 23) { //獎勵中心
MobclickAgent.onEvent(mContext, "my_award", "獎勵中心");
Log.i("tsa", url);
RewardActivity.forward(mContext, url);
} else if (bean.getId() == 4) {
url = HtmlConfig.SHOP + "?t=" + Math.random() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
WebViewActivity.forward(mContext, url, false);
} else if (bean.getId() == 3) {//我的等级
MobclickAgent.onEvent(mContext, "my_level", "个人中心点我的等级");
Constants.myIntoIndex = 2;
Constants.isTitle = false;
ZhuangBanActivity.forward(mContext, url);
} else {
if (bean.getId() == 11){
MobclickAgent.onEvent(mContext, "my_anchor", "个人中心点主播中心");
}
if (bean.getId() == 25){
MobclickAgent.onEvent(mContext, "my_friend_invitation", "个人中心点好友邀请");
}
if (bean.getId() == 24){
MobclickAgent.onEvent(mContext, "my_pack", "个人中心点包裹");
}
WebViewActivity.forward(mContext, url, false);
}
@@ -486,10 +510,17 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
} else if (i == R.id.signature) {
mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
} else if (i == R.id.lt_star_coin) {
Map<String, String> map_ekv = new HashMap<String, String>();
map_ekv.put("from", "xb");
MobclickAgent.onEvent(mContext, "my_recharge", map_ekv);
mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1));
} else if (i == R.id.btn_coin) {
Map<String, String> map_ekv = new HashMap<String, String>();
map_ekv.put("from", "zs");
MobclickAgent.onEvent(mContext, "my_recharge", map_ekv);
mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 0));
} else if (i == R.id.btn_gold) {
MobclickAgent.onEvent(mContext, "my_receive", "充值旁边领取金豆的按钮");
// mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 2));
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index";
RewardActivity.forward(mContext, url);
@@ -498,9 +529,10 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
} else if (i == R.id.rt_setting) {
forwardSetting();
} else if (i == R.id.lt_noble) {
MobclickAgent.onEvent(mContext, "my_noble", "个人中心点贵族");
Constants.isTitle = true;
UserBean u = CommonAppConfig.getInstance().getUserBean();
String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid();
String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
ZhuangBanActivity.forward(mContext, url, false);
}
@@ -593,8 +625,13 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
SlideBean bean = mBannerList.get(p);
if (!bean.getSlide_url().equals("")) {
Constants.isTitle = true;
String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
WebViewActivity.forward(mContext, url, false, false);
Map<String, String> map_ekv = new HashMap<String, String>();
map_ekv.put("link", url);
MobclickAgent.onEvent(mContext, "my_banner", map_ekv);
}
}
}
@@ -614,8 +651,13 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
SlideBean bean = mBannerList.get(p);
if (!bean.getSlide_url().equals("")) {
Constants.isTitle = true;
String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
RouteUtil.forwardCustomerService(url);
Map<String, String> map_ekv = new HashMap<String, String>();
map_ekv.put("link", url);
MobclickAgent.onEvent(mContext, "my_banner", map_ekv);
/*if(bean.getSlide_id().equals("95")){
RouteUtil.forwardCustomerService(url);
}else {

7
main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java
View File

@@ -30,6 +30,7 @@ import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.AbsMainViewHolder;
import com.yunbao.live.activity.LiveRecordActivity;
import com.yunbao.live.activity.RoomManageActivity;
@@ -147,7 +148,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
mLevelAnchor.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&for";
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0") + "&for";
WebViewActivity.forward(mContext, url,false);
}
});
@@ -155,7 +156,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
mLevel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid();
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
WebViewActivity.forward(mContext, url,false);
}
});
@@ -405,7 +406,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL
forwardSetting();
} else if (i == R.id.v_noble) {
UserBean u = CommonAppConfig.getInstance().getUserBean();
String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid();
String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
ZhuangBanActivity.forward(mContext, url, false);
}

5
main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java
View File

@@ -25,6 +25,7 @@ import com.opensource.svgaplayer.SVGADrawable;
import com.opensource.svgaplayer.SVGAImageView;
import com.opensource.svgaplayer.SVGAParser;
import com.opensource.svgaplayer.SVGAVideoEntity;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.bean.ImUserInfoModel;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.glide.ImgLoader;
@@ -233,6 +234,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
}
ImgLoader.display(mContext, userBean.getNewImage(), imgNewsNotice);
ViewClicksAntiShake.clicksAntiShake(imgNewsNotice, () -> {
MobclickAgent.onEvent(mContext, "information_official_notice", "官方通知");
type = userBean.getType();
netHandler.post(systemNumberRunnable);
mContext.startActivity(new Intent(mContext, SystemMessageActivity.class)
@@ -252,6 +254,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
}
ImgLoader.display(mContext, userBean.getNewImage(), imgNewsInteraction);
ViewClicksAntiShake.clicksAntiShake(imgNewsInteraction, () -> {
MobclickAgent.onEvent(mContext, "information_system_interactive", "互動消息");
type = userBean.getType();
netHandler.post(systemNumberRunnable);
mContext.startActivity(new Intent(mContext, SystemMessageActivity.class)
@@ -271,6 +274,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
}
ImgLoader.display(mContext, userBean.getNewImage(), imgNewsOnline);
ViewClicksAntiShake.clicksAntiShake(imgNewsOnline, () -> {
MobclickAgent.onEvent(mContext, "information_system_service", "在線客服");
type = userBean.getType();
netHandler.post(systemNumberRunnable);
FirebaseAnalytics.getInstance(mContext).logEvent("FS_customer_service", null);
@@ -297,6 +301,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
}
ImgLoader.display(mContext, userBean.getNewImage(), imgSystemMessages);
ViewClicksAntiShake.clicksAntiShake(imgSystemMessages, () -> {
MobclickAgent.onEvent(mContext, "information_system_notice", "系统消息");
type = userBean.getType();
netHandler.post(systemNumberRunnable);
mContext.startActivity(new Intent(mContext, SystemMessageActivity.class)

4
main/src/main/java/com/yunbao/main/views/SearchRecommendBodyItemViewHolder.java
View File

@@ -102,14 +102,14 @@ public class SearchRecommendBodyItemViewHolder extends RecyclerView.ViewHolder {
mLiveIco.setImageResource(R.mipmap.icon_main_rest_work);
mNum.setVisibility(View.VISIBLE);
liveType.setVisibility(View.VISIBLE);
mLiveState.setText(R.string.lives_state);
mLiveState.setText(mContext.getString(R.string.lives_state));
} else {
views.setVisibility(View.VISIBLE);
//休息中
mType.setImageResource(MainIconUtil.getLiveTypeIcon(Constants.LIVE_TYPE_RESTING));
mType.setVisibility(View.GONE);
mLiveIco.setImageResource(R.mipmap.icon_main_rest_spot);
mLiveState.setText(R.string.rest_state);
mLiveState.setText(mContext.getString(R.string.rest_state));
liveType.setVisibility(View.GONE);
mNum.setVisibility(View.GONE);
}//防抖

7
main/src/main/java/com/yunbao/main/views/SearchRecommendBodyViewHolder.java
View File

@@ -21,6 +21,7 @@ import com.yunbao.main.R;
import com.yunbao.main.adapter.SearchRecommendBodyAdapter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -43,8 +44,12 @@ public class SearchRecommendBodyViewHolder extends RecyclerView.ViewHolder {
@Override
public void onClick(View v) {
// Bus.get().post(new SearchRecommendEvent());
Map<String, Object> map = new HashMap<>();
map.put("num", "10");
map.put("live_recommend", "search");
map.put("refresh", "1");
MainNetManager.get((Activity) itemView.getContext())
.anchorRecommend("10", new HttpCallback<AnchorRecommendModel>() {
.anchorRecommend(map, new HttpCallback<AnchorRecommendModel>() {
@Override
public void onSuccess(AnchorRecommendModel data) {
showData(data.getList());

1
main/src/main/java/com/yunbao/main/views/SearchRecommendHeardViewHolder.java
View File

@@ -12,6 +12,7 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.yunbao.common.manager.SearchHistoryRecordManager;
import com.yunbao.common.views.FlowLayout;
import com.yunbao.main.R;
import java.util.Map;

3
main/src/main/java/com/yunbao/main/views/SearchResultsViewHolder.java
View File

@@ -20,6 +20,7 @@ import com.yunbao.common.bean.SearchModel;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.manager.NewLevelManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.utils.WordsTypeUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.main.R;
@@ -71,7 +72,7 @@ public class SearchResultsViewHolder extends RecyclerView.ViewHolder {
ImgLoader.displayAvatar(itemView.getContext(), model.getAvatar(), avatar);
Glide.with(itemView.getContext())
.asGif()
.load(R.mipmap.icon_user_home_living).skipMemoryCache(false)
.load(WordUtil.isNewZh()?R.mipmap.icon_user_home_living:R.mipmap.icon_user_home_living_en).skipMemoryCache(false)
.into(isLive);
//用戶直接隱藏
if (type == 3) {

2
main/src/main/java/com/yunbao/main/views/UserHomeViewHolder.java
View File

@@ -550,7 +550,7 @@ public class UserHomeViewHolder extends AbsLivePageViewHolder implements AppBarL
}
if (mBtnBlack != null) {
if (isAttention == 1) {
mBtnBlack.setText(R.string.black);
mBtnBlack.setText(mContext.getString(R.string.black));
}
}
}

68
main/src/main/res/layout/activity_modify_pwd.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/view_title"/>
<include layout="@layout/view_title" />
<LinearLayout
android:layout_width="match_parent"
@@ -13,108 +13,97 @@
android:background="@color/white"
android:orientation="vertical"
android:paddingLeft="15dp"
android:paddingRight="15dp"
>
android:paddingRight="15dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="horizontal"
>
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_width="110dp"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_centerVertical="true"
android:text="@string/modify_pwd_old"
android:textColor="@color/textColor"
android:textSize="16sp"
/>
android:textSize="13sp" />
<EditText
android:id="@+id/edit_old"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_marginLeft="80dp"
android:layout_marginLeft="110dp"
android:background="@null"
android:hint="@string/modify_pwd_old_1"
android:inputType="textPassword"
android:textColor="@color/textColor"
android:textColorHint="@color/gray3"
android:textSize="16sp"
/>
android:textSize="16sp" />
</RelativeLayout>
<View
style="@style/line2"
/>
<View style="@style/line2" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="horizontal"
>
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_width="110dp"
android:gravity="center"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/modify_pwd_new"
android:textColor="@color/textColor"
android:textSize="16sp"
/>
android:textSize="13sp" />
<EditText
android:id="@+id/edit_new"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_marginLeft="80dp"
android:layout_marginLeft="110dp"
android:background="@null"
android:hint="@string/modify_pwd_new_1"
android:inputType="textPassword"
android:textColor="@color/textColor"
android:textColorHint="@color/gray3"
android:textSize="16sp"
/>
android:textSize="16sp" />
</RelativeLayout>
<View
style="@style/line2"
/>
<View style="@style/line2" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="horizontal"
>
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_width="110dp"
android:gravity="center"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/modify_pwd_confirm"
android:textColor="@color/textColor"
android:textSize="16sp"
/>
android:textSize="13sp" />
<EditText
android:id="@+id/edit_confirm"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="80dp"
android:layout_alignParentEnd="true"
android:layout_marginLeft="110dp"
android:background="@null"
android:hint="@string/modify_pwd_confirm_1"
android:inputType="textPassword"
android:textColor="@color/textColor"
android:textColorHint="@color/gray3"
android:textSize="16sp"
/>
android:textSize="16sp" />
</RelativeLayout>
@@ -125,12 +114,11 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_marginTop="30dp"
android:layout_marginRight="30dp"
android:background="@drawable/login_btn"
android:gravity="center"
android:text="@string/modify_pwd_confirm_2"
android:textColor="@color/white"
android:textSize="16sp"
/>
android:textSize="16sp" />
</LinearLayout>

2
main/src/main/res/layout/item_main_home_lives_class.xml
View File

@@ -11,7 +11,7 @@
<TextView
android:id="@+id/tv_class_name"
android:layout_width="56dp"
android:layout_width="65dp"
android:layout_height="26dp"
android:text="音乐"
android:textSize="16sp"

2
main/src/main/res/layout/item_main_me_2.xml
View File

@@ -18,6 +18,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text=""
android:singleLine="true"
android:ellipsize="end"
android:textColor="@color/textColor"
android:textSize="12sp" />

203
main/src/main/res/layout/view_main_home_sud_game_list.xml Normal file
View File

@@ -0,0 +1,203 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/bg_main_home_sub_game"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="12dp"
android:text="@string/interactive_game_room_list"
android:textColor="#000"
android:textSize="16sp"
android:textStyle="bold" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1" />
<ImageView
android:id="@+id/search"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="14dp"
android:src="@mipmap/icon_home_interactive_game_search" />
<ImageView
android:id="@+id/interactive_game_add"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="14dp"
android:src="@mipmap/icon_home_interactive_game_add" />
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="17dp"
android:src="@mipmap/icon_home_interactive_game_ranking"
android:visibility="gone" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="14dp"
android:text="@string/interactive_game_room_game"
android:textColor="#000"
android:textSize="10sp"
android:textStyle="bold" />
<LinearLayout
android:id="@+id/interactive_game_room_game"
android:layout_width="58dp"
android:layout_height="28dp"
android:layout_marginStart="4dp"
android:background="@drawable/bg_home_sud_list_btn"
android:gravity="center_vertical">
<TextView
android:id="@+id/game_title"
android:layout_width="40dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/interactive_game_create_unlimited"
android:textColor="#000"
android:textSize="10sp" />
<ImageView
android:id="@+id/room_game_arrow"
android:layout_width="8dp"
android:layout_height="14dp"
android:layout_marginEnd="8dp"
android:src="@mipmap/icon_home_interactive_game_arrow" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text="@string/interactive_game_room_sill"
android:textColor="#000"
android:textSize="10sp"
android:textStyle="bold" />
<FrameLayout
android:id="@+id/room_sill"
android:layout_width="74dp"
android:layout_height="28dp"
android:layout_marginStart="4dp"
android:background="@drawable/bg_home_sud_list_btn">
<TextView
android:id="@+id/room_sill_text"
android:layout_width="55dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="6dp"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/interactive_game_create_unlimited"
android:textColor="#000"
android:textSize="10sp" />
<ImageView
android:id="@+id/room_sill_arrow"
android:layout_width="8dp"
android:layout_height="14dp"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="8dp"
android:src="@mipmap/icon_home_interactive_game_arrow" />
</FrameLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text="@string/interactive_game_room_house_owner"
android:textColor="#000"
android:textSize="10sp"
android:textStyle="bold" />
<LinearLayout
android:id="@+id/house_owner"
android:layout_width="70dp"
android:layout_height="28dp"
android:layout_marginStart="4dp"
android:background="@drawable/bg_home_sud_list_btn"
android:gravity="center_vertical">
<TextView
android:id="@+id/house_owner_text"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:text="@string/interactive_game_create_unlimited"
android:singleLine="true"
android:ellipsize="end"
android:textColor="#000"
android:textSize="10sp" />
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<ImageView
android:id="@+id/house_owner_arrow"
android:layout_width="8dp"
android:layout_height="14dp"
android:layout_marginEnd="5dp"
android:src="@mipmap/icon_home_interactive_game_arrow" />
</LinearLayout>
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.yunbao.common.custom.CommonRefreshView
android:id="@+id/refreshView"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/random_start"
android:layout_width="174dp"
android:layout_height="61dp"
android:layout_gravity="center_horizontal|bottom"
android:layout_marginBottom="80dp"
android:background="@mipmap/icon_interactive_game_room_random_start"
android:gravity="center"
android:text="@string/interactive_game_room_random_start"
android:textColor="#FF8100"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="@+id/refreshView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

8
main/src/main/res/layout/view_main_message.xml
View File

@@ -62,7 +62,7 @@
android:text="7"
android:textColor="@color/white"
android:textSize="12sp"
android:visibility="visible" />
android:visibility="gone" />
</RelativeLayout>
<RelativeLayout
@@ -91,7 +91,7 @@
android:text="7"
android:textColor="@color/white"
android:textSize="12sp"
android:visibility="visible" />
android:visibility="gone" />
</RelativeLayout>
<RelativeLayout
@@ -118,7 +118,7 @@
android:text="7"
android:textColor="@color/white"
android:textSize="12sp"
android:visibility="visible" />
android:visibility="gone" />
</RelativeLayout>
<RelativeLayout
@@ -145,7 +145,7 @@
android:text="7"
android:textColor="@color/white"
android:textSize="12sp"
android:visibility="visible" />
android:visibility="gone" />
</RelativeLayout>
</LinearLayout>
<!-- 此容器用于动态放置 fragment-->

4
main/src/main/res/layout/view_search_recommend_body.xml
View File

@@ -15,8 +15,8 @@
<ImageView
android:id="@+id/change_batch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="65dp"
android:layout_height="22dp"
android:layout_gravity="center_vertical|right"
android:background="@mipmap/icon_cange" />

2
main/src/main/res/layout/view_search_recommend_heard.xml
View File

@@ -33,7 +33,7 @@
android:src="@mipmap/search_del" />
</FrameLayout>
<com.yunbao.main.views.FlowLayout
<com.yunbao.common.views.FlowLayout
android:id="@+id/search_history"
android:layout_marginTop="10dp"
android:layout_width="match_parent"

BIN
main/src/main/res/mipmap-b+en+us/icon_main_live_type_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
main/src/main/res/mipmap-b+en+us/icon_user_home_living.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 37 KiB

BIN
main/src/main/res/mipmap-b+en+us/multiplayerpk.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
main/src/main/res/mipmap-mdpi/icon_main_live_type_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB