From a5550195616c164406b61dc1f6f4493a9536a066 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Mon, 19 Sep 2022 18:20:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E5=BC=80=E9=80=9A?= =?UTF-8?q?=E8=B4=B5=E6=97=8F=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunbao/live/activity/LiveActivity.java | 2 +- .../live/activity/ZhuangBanActivity.java | 13 ++++++++++ .../live/dialog/HighNobilityDialog.java | 2 +- .../live/presenter/LiveGiftAnimPresenter.java | 2 +- .../res/layout/activity_zhuang_ban_new.xml | 1 + .../main/activity/ZhuangBanActivity.java | 26 ++++++++++++++----- .../yunbao/main/views/MainMeViewHolder.java | 2 +- .../yunbao/main/views/MainMeViewHolder1.java | 4 +-- .../main/res/layout/activity_zhuang_ban.xml | 2 +- 9 files changed, 40 insertions(+), 14 deletions(-) diff --git a/live/src/main/java/com/yunbao/live/activity/LiveActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveActivity.java index 39d4900a0..3ea61dcae 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveActivity.java @@ -1380,7 +1380,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL */ public void openLuckGiftTip() { UserBean u = CommonAppConfig.getInstance().getUserBean(); - String url = CommonAppConfig.HOST + "/h5/Nobility.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&anchorUid=" + mLiveUid + "&anchorName=" + mAncherName; + String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&anchorUid=" + mLiveUid + "&anchorName=" + mAncherName; startActivity(new Intent(this, ZhuangBanActivity.class).putExtra("url", url)); } diff --git a/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java b/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java index a7b846602..6355a160d 100644 --- a/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java @@ -218,6 +218,19 @@ public class ZhuangBanActivity extends AbsActivity { public void onBack() { finish(); } + + @JavascriptInterface + public void androidClickToNewH5PageView(String url) { + url = CommonAppConfig.HOST + url; + url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + + CommonAppConfig.getInstance().getToken(); + Log.i("tag", url); + Intent intent = new Intent(mContext, ZhuangBanActivity.class); + intent.putExtra("url", url); + intent.putExtra("isFull", false); + mContext.startActivity(intent); + + } } // //js调用原生 diff --git a/live/src/main/java/com/yunbao/live/dialog/HighNobilityDialog.java b/live/src/main/java/com/yunbao/live/dialog/HighNobilityDialog.java index 06fcc3bf9..176126632 100644 --- a/live/src/main/java/com/yunbao/live/dialog/HighNobilityDialog.java +++ b/live/src/main/java/com/yunbao/live/dialog/HighNobilityDialog.java @@ -52,7 +52,7 @@ public class HighNobilityDialog extends AbsDialogFragment { findViewById(R.id.go_nobility).setOnClickListener(v -> { Constants.isTitle = true; UserBean u = CommonAppConfig.getInstance().getUserBean(); - String url = CommonAppConfig.HOST + "/h5/Nobility.html?nickname=" + String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken(); ZhuangBanActivity.forward(mContext, url, false); diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java index 84e7e2713..cd0f8f6e1 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java @@ -362,7 +362,7 @@ public class LiveGiftAnimPresenter { @Override public void onClick(View view) { // UserBean u = CommonAppConfig.getInstance().getUserBean(); -// String url = CommonAppConfig.HOST+"/h5/Nobility.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(); // startActivity(new Intent(mContext, ZhuangBanActivity.class).putExtra("url",url)); // WebViewActivity.forward(mContext, HtmlConfig.SHOP); changeLiveRoom(); diff --git a/live/src/main/res/layout/activity_zhuang_ban_new.xml b/live/src/main/res/layout/activity_zhuang_ban_new.xml index 1fcf37766..af6a8ef0f 100644 --- a/live/src/main/res/layout/activity_zhuang_ban_new.xml +++ b/live/src/main/res/layout/activity_zhuang_ban_new.xml @@ -8,6 +8,7 @@ android:id="@+id/ft_title" android:layout_width="match_parent" android:layout_height="65dp" + android:visibility="gone" android:background="@color/white" android:paddingTop="19dp"> diff --git a/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java b/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java index dbd7d9521..1e86a9037 100644 --- a/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java @@ -73,13 +73,13 @@ public class ZhuangBanActivity extends AbsActivity { } v_spacing = (View) findViewById(R.id.v_spacing); lt_title = (LinearLayout) findViewById(R.id.lt_title); - if (Constants.isTitle) { - lt_title.setVisibility(View.VISIBLE); - v_spacing.setVisibility(View.GONE); - } else { - lt_title.setVisibility(View.GONE); - v_spacing.setVisibility(View.VISIBLE); - } +// if (Constants.isTitle) { +// lt_title.setVisibility(View.VISIBLE); +// v_spacing.setVisibility(View.GONE); +// } else { +// lt_title.setVisibility(View.GONE); +// v_spacing.setVisibility(View.VISIBLE); +// } L.e("H5---5>" + url); LinearLayout rootView = (LinearLayout) findViewById(R.id.rootView); mProgressBar = (ProgressBar) findViewById(R.id.progressbar); @@ -273,6 +273,18 @@ public class ZhuangBanActivity extends AbsActivity { Constants.isTitle = true; RouteUtil.forwardZhuangBanActivity(url); } + @JavascriptInterface + public void androidClickToNewH5PageView(String url) { + url = CommonAppConfig.HOST + url; + url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + + CommonAppConfig.getInstance().getToken(); + Log.i("tag", url); + Intent intent = new Intent(mContext, com.yunbao.live.activity.ZhuangBanActivity.class); + intent.putExtra("url", url); + intent.putExtra("isFull", false); + mContext.startActivity(intent); + + } } private void openImageChooserActivity(ValueCallback valueCallback) { 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 4217724c5..881f54078 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java @@ -473,7 +473,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi } else if (i == R.id.lt_noble) { Constants.isTitle = true; UserBean u = CommonAppConfig.getInstance().getUserBean(); - String url = CommonAppConfig.HOST + "/h5/Nobility.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(); ZhuangBanActivity.forward(mContext, url, false); } }); diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java index 379c0bc59..40ed33972 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java +++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java @@ -163,7 +163,7 @@ public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickL // @Override // public void onClick(View v) { // UserBean u = CommonAppConfig.getInstance().getUserBean(); -// String url = CommonAppConfig.HOST + "/h5/Nobility.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(); // ZhuangBanActivity.forward(mContext, url, false); // } // }); @@ -404,7 +404,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/Nobility.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(); ZhuangBanActivity.forward(mContext, url, false); } diff --git a/main/src/main/res/layout/activity_zhuang_ban.xml b/main/src/main/res/layout/activity_zhuang_ban.xml index e9e2cdbbb..7f94bbe3e 100644 --- a/main/src/main/res/layout/activity_zhuang_ban.xml +++ b/main/src/main/res/layout/activity_zhuang_ban.xml @@ -14,7 +14,7 @@ android:id="@+id/lt_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:visibility="visible"> + android:visibility="gone">