From ce0061e86edac549084f101268036aace3500c22 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Tue, 13 Dec 2022 14:30:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=88=91=E7=9A=84?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=88=91=E7=9A=84=E7=AD=89=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8F=AA=E6=83=B3=E6=96=B0=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=8A=A0=E5=85=A5=E7=9B=B4?= =?UTF-8?q?=E6=92=AD=E9=97=B4=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 4 +- .../yunbao/live/socket/SocketRyClient.java | 2 +- .../yunbao/main/views/MainMeViewHolder.java | 57 ++++++++++--------- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/config.gradle b/config.gradle index b09f3fcbf..f139351ac 100644 --- a/config.gradle +++ b/config.gradle @@ -5,13 +5,13 @@ ext { minSdkVersion : 21, targetSdkVersion : 31, versionCode : 310, - versionName : "6.4.5" + versionName : "6.4.6" ] manifestPlaceholders = [ //正式 serverHost : "https://napi.yaoulive.com", - //測試 +// 測試 // serverHost : "https://ceshi.yaoulive.com", //腾讯地图 diff --git a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java index 7619b3328..29bdaf0ad 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java @@ -90,7 +90,7 @@ public class SocketRyClient { @Override public void onError(IRongCoreEnum.CoreErrorCode coreErrorCode) { Log.i("tx", "加入" + "失败" + coreErrorCode); - ToastUtil.show(coreErrorCode + ":加入失败"); + ToastUtil.show("網絡不佳無法連接，請重新進入"); } }); diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java index ef3083fba..3e8df3710 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java @@ -343,8 +343,8 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi tv_level.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"; - WebViewActivity.forward(mContext, url); + String url = CommonAppConfig.HOST + "/h5/Grade/index.html?" + "token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&for"; + ZhuangBanActivity.forward(mContext, url); } }); tv_level.setText(anchorLevelBean.getLevel() + ""); @@ -358,8 +358,8 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi tv_level.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(); - WebViewActivity.forward(mContext, url); + String url = CommonAppConfig.HOST + "/h5/Grade/index.html?" + "token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid(); + ZhuangBanActivity.forward(mContext, url); } }); tv_level.setText(levelBean.getLevel() + ""); @@ -457,30 +457,30 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi @Override public void onClick(View v) { - int i = v.getId(); - if (i == R.id.lt_name) { - mContext.startActivity(new Intent(mContext, EditProfileActivity.class)); - } else if (i == R.id.signature) { - mContext.startActivity(new Intent(mContext, EditProfileActivity.class)); - } - else if (i == R.id.lt_star_coin) { - mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1)); - } else if (i == R.id.btn_coin) { - mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 0)); - } else if (i == R.id.btn_gold) { - // 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); - } else if (i == R.id.rt_kefu) { - WebViewActivity.forward(mContext, beanKefu.getHref()); - } else if (i == R.id.rt_setting) { - forwardSetting(); - } else if (i == R.id.lt_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(); - ZhuangBanActivity.forward(mContext, url, false); - } + int i = v.getId(); + if (i == R.id.lt_name) { + mContext.startActivity(new Intent(mContext, EditProfileActivity.class)); + } else if (i == R.id.signature) { + mContext.startActivity(new Intent(mContext, EditProfileActivity.class)); + } + else if (i == R.id.lt_star_coin) { + mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1)); + } else if (i == R.id.btn_coin) { + mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 0)); + } else if (i == R.id.btn_gold) { + // 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); + } else if (i == R.id.rt_kefu) { + WebViewActivity.forward(mContext, beanKefu.getHref()); + } else if (i == R.id.rt_setting) { + forwardSetting(); + } else if (i == R.id.lt_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(); + ZhuangBanActivity.forward(mContext, url, false); + } @@ -606,3 +606,4 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi } } +