直播间开通贵族结束

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

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调用原生

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

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

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

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) {
+//        if (Constants.isTitle) {
-            lt_title.setVisibility(View.VISIBLE);
+//            lt_title.setVisibility(View.VISIBLE);
-            v_spacing.setVisibility(View.GONE);
+//            v_spacing.setVisibility(View.GONE);
-        } else {
+//        } else {
-            lt_title.setVisibility(View.GONE);
+//            lt_title.setVisibility(View.GONE);
-            v_spacing.setVisibility(View.VISIBLE);
+//            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<Uri> valueCallback) {

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

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

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">
 
         <include layout="@layout/view_title" />
     </LinearLayout>