去掉周星榜，修改注册获取验证码验证H5地址，修改启动页UI，

app/src/main/res/layout/activity_launcher.xml

@@ -61,5 +61,12 @@
         android:clickable="true"
         android:src="@mipmap/screen"
         android:scaleType="centerCrop" />
+
+    <ImageView
+        android:layout_gravity="bottom|center_horizontal"
+        android:layout_width="84dp"
+        android:src="@mipmap/logo"
+        android:layout_marginBottom="56dp"
+        android:layout_height="30dp"/>
 </FrameLayout>
 

common/src/main/java/com/yunbao/common/HtmlConfig.java

@@ -7,8 +7,8 @@ package com.yunbao.common;
 public class HtmlConfig {
 
     //登录即代表同意服务和隐私条款
-    public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/h5/page/index.html?posts_id=706";
+    public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/h5/page/index.html?id=706";
-    public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/h5/page/index.html?posts_id=705";
+    public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/h5/page/index.html?id=705";
 
     //注册用户协议
     public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=2";

main/src/main/java/com/yunbao/main/activity/RegisterActivity.java

@@ -241,7 +241,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 + "/TCaptcha.html" + "?isZh=" + (WordUtil.isNewZh() ? "1" : 0));
+        webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html" + "?isZh=" + (WordUtil.isNewZh() ? "1" : 0));
         L.e(CommonAppConfig.HOST + "/h5/live/TCaptcha.html" + "?isZh=" + (WordUtil.isNewZh() ? "1" : 0));
     }
 

main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java

@@ -32,7 +32,6 @@ import com.yunbao.common.utils.SVGAViewUtils;
 import com.yunbao.common.bean.LiveBean;
 import com.yunbao.main.R;
 import com.yunbao.main.views.MainHomeLiveItemViewHolder;
-import com.yunbao.main.views.MainHomeLiveWeekItemViewHolder;
 
 import java.util.List;
 
@@ -67,7 +66,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
 
     @Override
     public int getItemViewType(int position) {
-        LiveBean mode = mList.get(position>4?position-1:position);
+        LiveBean mode = mList.get(position);
         if (TextUtils.equals(mode.getIs_week(), "1")) {
             return WEEKLAYOUT;
         } else {
@@ -91,8 +90,8 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
                 HeadVh headVh = new HeadVh(mHeadView);
                 headVh.setIsRecyclable(false);
                 return headVh;
-            case WEEKLAYOUT:
+         /*   case WEEKLAYOUT:
-                return new MainHomeLiveWeekItemViewHolder(mInflater.inflate(R.layout.item_main_home_lives, parent, false));
+                return new MainHomeLiveWeekItemViewHolder(mInflater.inflate(R.layout.item_main_home_lives, parent, false));*/
             default:
                 return new MainHomeLiveItemViewHolder(mInflater.inflate(R.layout.item_main_home_lives, parent, false));
         }
@@ -101,16 +100,16 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
     @Override
     public void onViewDetachedFromWindow(@NonNull RecyclerView.ViewHolder holder) {
         //局部刷新周星榜svaga
-        if (holder instanceof MainHomeLiveWeekItemViewHolder) {
+       /* if (holder instanceof MainHomeLiveWeekItemViewHolder) {
             ((MainHomeLiveWeekItemViewHolder) holder).upSvga();
-        }
+        }*/
         super.onViewDetachedFromWindow(holder);
     }
 
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder vh, int position) {
-        if (vh instanceof MainHomeLiveWeekItemViewHolder) {
+       /* if (vh instanceof MainHomeLiveWeekItemViewHolder) {
             ((MainHomeLiveWeekItemViewHolder) vh).loadViewDate(mList.get(position), position, Height, new MainHomeLiveWeekItemViewHolder.OnItemClickListener() {
                 @Override
                 public void onItemClick(LiveBean bean, int position) {
@@ -119,7 +118,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
                     }
                 }
             });
-        } else if (vh instanceof MainHomeLiveItemViewHolder) {
+        } else */if (vh instanceof MainHomeLiveItemViewHolder) {
             ((MainHomeLiveItemViewHolder) vh).loadViewDate(mList.get(position), position, Height, new MainHomeLiveItemViewHolder.OnItemClickListener() {
                 @Override
                 public void onItemClick(LiveBean bean, int position) {

main/src/main/java/com/yunbao/main/adapter/MainHomeRemFollLiveAdapter.java

@@ -154,7 +154,7 @@ public class MainHomeRemFollLiveAdapter extends RefreshAdapter<LiveBean> {
             } else {
                 viewBg.setVisibility(View.GONE);
             }
-            if (bean.getContent_pic_size_two() != null && !bean.getContent_pic_size_two().equals("") && Height <= 1920) {
+            /*if (bean.getContent_pic_size_two() != null && !bean.getContent_pic_size_two().equals("") && Height <= 1920) {
                 Log.e("t1", position + "嗯" + Height + "111啊" + bean.getContent_pic_size_two());
 
                 Picasso.with(mContext)
@@ -165,7 +165,7 @@ public class MainHomeRemFollLiveAdapter extends RefreshAdapter<LiveBean> {
                 Picasso.with(mContext)
                         .load(bean.getContent_pic_size_three())
                         .into(live_type);
-            }
+            }*/
 
 
             live_info_view.setVisibility(View.GONE);
@@ -204,7 +204,7 @@ public class MainHomeRemFollLiveAdapter extends RefreshAdapter<LiveBean> {
             mNum.setText(formatBigNum.formatBigNum(bean.getHot_num()));
             views.setVisibility(View.GONE);
             if ("1".equals(bean.getIslive())) {
-                views.setVisibility(View.VISIBLE);
+                //views.setVisibility(View.VISIBLE);
                 //直播中
                 mType.setImageResource(MainIconUtil.getLiveTypeIcon(bean.getType()));
                 mType.setVisibility(View.VISIBLE);
@@ -213,7 +213,7 @@ public class MainHomeRemFollLiveAdapter extends RefreshAdapter<LiveBean> {
                 live_type.setVisibility(View.VISIBLE);
                 mLiveState.setText(mContext.getString(R.string.lives_state));
             } else {
-                views.setVisibility(View.VISIBLE);
+                //views.setVisibility(View.VISIBLE);
                 //休息中
                 mType.setImageResource(MainIconUtil.getLiveTypeIcon(Constants.LIVE_TYPE_RESTING));
                 mType.setVisibility(View.GONE);

main/src/main/java/com/yunbao/main/dialog/SigninDialog.java

@@ -63,7 +63,7 @@ public class SigninDialog extends AbsDialogFragment {
         if (bundle == null) {
             return;
         }
-        gold.setText(bundle.getString("send_gold") + "金豆+" + bundle.getString("send_exp") + "EXP");
+        gold.setText(bundle.getString("send_gold") + "金豆+" + bundle.getString("send_exp") + "經驗值");
     }
 
     @Override

main/src/main/java/com/yunbao/main/views/MainHomeLiveItemViewHolder.java

@@ -11,12 +11,14 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.gson.Gson;
 import com.jakewharton.rxbinding3.view.RxView;
 import com.squareup.picasso.Picasso;
 import com.yunbao.common.Constants;
 import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.utils.DpUtil;
+import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.formatBigNum;
 import com.yunbao.main.R;
 import com.yunbao.main.utils.MainIconUtil;
@@ -67,6 +69,7 @@ public class MainHomeLiveItemViewHolder extends RecyclerView.ViewHolder {
      * @param position 下标
      */
     public void loadViewDate(LiveBean bean, int position, int height, OnItemClickListener listener) {
+        L.e("loadViewDate："+new Gson().toJson(bean));
         dragon_money.setVisibility(View.GONE);
         Context mContext = itemView.getContext();
         itemView.setTag(position);
@@ -78,9 +81,9 @@ public class MainHomeLiveItemViewHolder extends RecyclerView.ViewHolder {
                     .load(bean.getContent_pic_size_two())
                     .into(liveType);*/
         } else if (bean.getContent_pic_size_three() != null && !bean.getContent_pic_size_three().equals("") && height > 1920) {
-            Picasso.with(mContext)
+           /* Picasso.with(mContext)
                     .load(bean.getContent_pic_size_three())
-                    .into(liveType);
+                    .into(liveType);*/
         }
         ImgLoader.display(itemView.getContext(), bean.getThumb(), mCover, 400, 400);
         bgs.setVisibility(View.VISIBLE);
@@ -109,7 +112,7 @@ public class MainHomeLiveItemViewHolder extends RecyclerView.ViewHolder {
         mNum.setText(formatBigNum.formatBigNum(bean.getHot_num()));
         views.setVisibility(View.GONE);
         if ("1".equals(bean.getIslive())) {
-            views.setVisibility(View.VISIBLE);
+            //views.setVisibility(View.VISIBLE);
             //直播中
             mType.setImageResource(MainIconUtil.getLiveTypeIcon(bean.getType()));
             mType.setVisibility(View.VISIBLE);
@@ -118,7 +121,7 @@ public class MainHomeLiveItemViewHolder extends RecyclerView.ViewHolder {
             liveType.setVisibility(View.VISIBLE);
             mLiveState.setText(mContext.getString(R.string.lives_state));
         } else {
-            views.setVisibility(View.VISIBLE);
+            //views.setVisibility(View.VISIBLE);
             //休息中
             mType.setImageResource(MainIconUtil.getLiveTypeIcon(Constants.LIVE_TYPE_RESTING));
             mType.setVisibility(View.GONE);

main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java

@@ -189,7 +189,8 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
                 Log.i("t2", "aaa" + p);
                 if (TextUtils.equals(typeHot, "Hot") || TextUtils.equals(typeHot, "hot") || TextUtils.equals(typeHot, "熱門")) {
                     pp = 1;
-                    LiveHttpUtil.getAnchorLastWeekList(new HttpCallback() {
+                    MainHttpUtil.getHot(p, callback);
+                    /*LiveHttpUtil.getAnchorLastWeekList(new HttpCallback() {
                         @Override
                         public void onSuccess(int code, String msg, String[] info) {
                             if (mWeekListBean != null) {
@@ -210,7 +211,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
                             Constants.getWeekIntIndex = Constants.getWeekIntIndex + 1;
                             MainHttpUtil.getHot(p, callback);
                         }
-                    });
+                    });*/
                 } else {
                     pp = 0;
                     if (select == 0) {

main/src/main/res/layout/item_main_home_lives.xml

@@ -64,6 +64,7 @@
                     android:layout_height="16dp"
                     android:layout_alignParentRight="true"
                     android:layout_marginTop="8dp"
+                    android:visibility="gone"
                     android:layout_marginRight="8dp"
                     android:background="@mipmap/live_zt">