Merge branch 'refs/heads/master' into v681小游戏

# Conflicts:
#	live/src/main/java/com/yunbao/live/activity/SystemMessageActivity.java
#	main/src/main/java/com/yunbao/main/activity/MainActivity.java

live/src/main/java/com/yunbao/live/activity/SystemMessageActivity.java

@@ -73,6 +73,7 @@ public class SystemMessageActivity extends AbsActivity {
 //        }
         init();
         punish = findViewById(R.id.tv_sys_msg_punish);
+        punish.setVisibility(View.VISIBLE);
         punishNotice = findViewById(R.id.tv_sys_msg_punish_notice);
         punish.setOnClickListener(v -> {
             RouteUtil.forwardPunishActivity();

live/src/main/java/com/yunbao/live/dialog/GiftPopDialog.java

@@ -62,7 +62,12 @@ public class GiftPopDialog extends AbsDialogPopupWindow implements ActionListene
     private TextView mTitle;
     private boolean isOldGiftList = false;
     private boolean hideGiftType = false;
+    private boolean isHotGiftListUrl = false;
 
+    public GiftPopDialog setHotGiftListUrl(boolean hotGiftListUrl) {
+        isHotGiftListUrl = hotGiftListUrl;
+        return this;
+    }
 
     public GiftPopDialog(@NonNull Context context) {
         super(context);
@@ -183,6 +188,25 @@ public class GiftPopDialog extends AbsDialogPopupWindow implements ActionListene
                     }
                 }
 
+                @Override
+                public void onFinish() {
+                    if (mLoading != null) {
+                        mLoading.setVisibility(View.INVISIBLE);
+                    }
+                }
+            });
+        } else if (isHotGiftListUrl) {
+            LiveHttpUtil.getHotGiftList(new HttpCallback() {
+                @Override
+                public void onSuccess(int code, String msg, String[] info) {
+                    if (code == 0 && info.length > 0) {
+                        JSONObject obj = JSON.parseObject(info[0]);
+                        JSONArray list = obj.getJSONArray("listarray");
+                        setDate(list);
+
+                    }
+                }
+
                 @Override
                 public void onFinish() {
                     if (mLoading != null) {

live/src/main/res/layout/view_sys_msg.xml

@@ -56,7 +56,8 @@
             android:text="@string/live_end_view_ban_punish_title"
             android:textColor="@color/colorWhite"
             android:textSize="12sp"
-            android:visibility="visible" />
+            android:visibility="gone"
+            tools:visibility="visible" />
 
         <TextView
             android:id="@+id/tv_sys_msg_punish_notice"