From 859f54b1e1f1dc4e66ff95027f4aa54a4169f08c Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Thu, 9 Feb 2023 14:14:02 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 4 ++-- .../src/main/java/com/yunbao/main/activity/EntryActivity.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config.gradle b/config.gradle index 5628c118a..66e026ffe 100644 --- a/config.gradle +++ b/config.gradle @@ -10,9 +10,9 @@ ext { manifestPlaceholders = [ //正式 -// serverHost : "https://napi.yaoulive.com", + serverHost : "https://napi.yaoulive.com", // - serverHost : "https://ceshi.yaoulive.com", +// serverHost : "https://ceshi.yaoulive.com", //腾讯地图 txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", diff --git a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java index 74fbdbd92..ed4935535 100644 --- a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java @@ -611,7 +611,7 @@ public class EntryActivity extends AppCompatActivity { JSONObject obj = JSON.parseObject(info[0]); String uid = obj.getString("id"); String token = obj.getString("token"); - if (obj.getString("need_bind").equals("0")) { + if (obj.containsKey("need_bind") && obj.getString("need_bind").equals("0")) { mFirstLogin = obj.getIntValue("first_login") == 1; mShowInvite = obj.getIntValue("isagent") == 1; CommonAppConfig.getInstance().setLoginInfo(uid, token, true); @@ -687,7 +687,7 @@ public class EntryActivity extends AppCompatActivity { new LiveRoomCheckLivePresenter(activity, 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 From 3549c25ccac6e6570899d753d5e1b88e31dc3f7b Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Thu, 9 Feb 2023 14:15:05 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98=20Fatal=20Excepti?= =?UTF-8?q?on:=20java.lang.RuntimeException=20java.lang.NullPointerExcepti?= =?UTF-8?q?on:=20Attempt=20to=20invoke=20virtual=20method=20'boolean=20jav?= =?UTF-8?q?a.lang.String.equals(java.lang.Object)'=20on=20a=20null=20objec?= =?UTF-8?q?t=20reference?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/src/main/java/com/yunbao/main/activity/EntryActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java index ed4935535..a14825137 100644 --- a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java @@ -608,6 +608,7 @@ public class EntryActivity extends AppCompatActivity { private void onLoginSuccess(int code, String msg, String[] info) { Log.e("他", code + "code" + info.toString()); if (code == 0 && info.length > 0) { + JSONObject obj = JSON.parseObject(info[0]); String uid = obj.getString("id"); String token = obj.getString("token"); From d3268e57bc8c5af652b676602f5a8f9d6628423d Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Thu, 9 Feb 2023 16:21:19 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E7=9B=B4=E6=92=AD=E9=97=B4=E6=BB=91=E5=8A=A8=E4=BB=A5?= =?UTF-8?q?=E5=90=8E=E4=B8=BA=E4=BD=A0=E6=8E=A8=E8=8D=90=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=9B=B4=E6=92=AD=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yunbao/live/activity/LiveAudienceActivity.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index aa96bdef8..cb93c9155 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -690,7 +690,7 @@ public class LiveAudienceActivity extends LiveActivity { @Subscribe(threadMode = ThreadMode.MAIN) public void onLiveRoomChangeEvent(LiveRoomChangeEvent e) { - if (verticalViewPager.ismEnableScroll()) { + LiveBean liveBean = e.getLiveBean(); if (e.isLiveEnd()) { manager.removeLiveEnd(); @@ -709,9 +709,7 @@ public class LiveAudienceActivity extends LiveActivity { mAncherIcon = liveBean.getAvatar(); manager.onAdd(liveBean, mLiveType, mLiveTypeVal, mLiveSDK); } - } else { - verticalViewPager.setEnableScroll(IMLoginManager.get(mContext).isSlide()); - } + } @Override From 3d5ac05d36b21a88082a162b95aa986bfb311c7a Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Mon, 13 Feb 2023 15:09:54 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=9D=9E=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E6=8F=90=E7=A4=BA=E5=BD=B1=E5=93=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BD=93=E9=AA=8C=E6=84=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yunbao/live/activity/LiveAudienceActivity.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index cb93c9155..629ddb15f 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -1244,13 +1244,11 @@ public class LiveAudienceActivity extends LiveActivity { } break; case SOCKET_LIVE_DRPK_SET_PK_VIEW: - ToastUtil.show("setPkView"); if (manager.getmLivePlayViewHolder() != null) { manager.getmLivePlayViewHolder().setPkview(); } break; case SOCKET_LIVE_DRPK_SET_PK_END_VIEW: - ToastUtil.show("setPkEndview"); if (manager.getmLivePlayViewHolder() != null) { manager.getmLivePlayViewHolder().setPkEndview(); } From 11cf971514cfd6c23c4a6d23ade4f3c48354ab78 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Mon, 13 Feb 2023 16:25:04 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8D=95=E8=8E=B7=E5=90=8E=E6=9D=80=E6=AD=BB?= =?UTF-8?q?=E8=BF=9B=E7=A8=8B=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/shayu/phonelive/AppContext.java | 8 ++++---- .../main/java/com/shayu/phonelive/NeverCrashUtils.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/shayu/phonelive/AppContext.java b/app/src/main/java/com/shayu/phonelive/AppContext.java index 4cc9e4c31..af69b040a 100644 --- a/app/src/main/java/com/shayu/phonelive/AppContext.java +++ b/app/src/main/java/com/shayu/phonelive/AppContext.java @@ -278,17 +278,17 @@ public class AppContext extends CommonAppContext { Log.e("ApplicationError", "主线程异常");//此处log只是展示，当debug为true时，主类内部log会打印异常信息 e.printStackTrace(); //闪退后finish所有Activity并且杀死进程 - for (WeakReference activity : activities) { + /* for (WeakReference activity : activities) { if (activity != null && activity.get() != null) { activity.get().finish(); } } - /* Process.killProcess(Process.myPid()); - System.exit(0);*/ + *//* Process.killProcess(Process.myPid()); + System.exit(0);*//* setFirebaseCrashData(); new Handler(Looper.getMainLooper()).postDelayed(() -> { throw new RuntimeException(e); - }, 100); + }, 100);*/ }) .setUncaughtCrashHandler((t, e) -> { Log.e("ApplicationError", "子线程异常");//此处log只是展示，当debug为true时，主类内部log会打印异常信息 diff --git a/app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java b/app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java index f99f3a492..676852fd0 100644 --- a/app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java +++ b/app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java @@ -101,10 +101,10 @@ public class NeverCrashUtils { Log.e(TAG, "未捕获的主线程异常行为", e); } e.printStackTrace(); - Toast.makeText(application, "发生闪退", Toast.LENGTH_SHORT).show(); + Toast.makeText(application, "发生闪退:"+e.getMessage(), Toast.LENGTH_SHORT).show(); FileUtil.saveStringToFile(new File(application.getDir("files", Context.MODE_PRIVATE).getAbsolutePath()), throwableToString(e), "error.log"); getMainCrashHandler().mainException(Looper.getMainLooper().getThread(), e); - return; + // return; } } }); From d36ece4c54d08d2e8438d2819bc37dfabaf27d0b Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Mon, 13 Feb 2023 16:28:11 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=97=AA=E9=80=80=E5=85=A5=E5=8F=A3=EF=BC=9A=E5=9C=A8=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E9=95=BF=E6=8C=89=E6=8E=92=E8=A1=8C=E6=A6=9C=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E8=A7=A6=E5=8F=91=E7=A9=BA=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yunbao/main/views/MainHomeViewHolder.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java index 2ff16a0d5..a2a259a94 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java @@ -1,6 +1,7 @@ package com.yunbao.main.views; import android.content.Context; +import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.ImageView; @@ -37,6 +38,12 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder { super.init(); img_trophy = (ImageView) findViewById(R.id.img_trophy); + img_trophy.setOnLongClickListener(v -> { + if(true){ + throw new NullPointerException("test"); + } + return false; + }); ImgLoader.display(mContext, "https://downs.yaoulive.com/gif_trophy.gif", img_trophy);