新增首页战令入口

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

@@ -189,6 +189,8 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
     private boolean isfloatBannernet = true, isFirst = true;
 
     private View floatRedPacket;
+
+    private View floatWarOrder;
     private List<AnchorStartLiveBean> startListNotifyList = new ArrayList<>();
 
 
@@ -244,7 +246,9 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
         v_table_redpoint = findViewById(R.id.v_table_redpoint);
         v_table_redpoint_me = (View) findViewById(R.id.v_table_redpoint_me);
         floatRedPacket = findViewById(R.id.red_packet);
+        floatWarOrder = findViewById(R.id.war_order);
         initRedPacket();
+        initWarOrder();
 
         Display mDisplay = getWindowManager().getDefaultDisplay();
         Height = mDisplay.getHeight();
@@ -329,25 +333,25 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
                     case 0:
                         //点击埋点
                         MobclickAgent.onEvent(mContext, "home_page", "首页");
-                        if(mMainHomeCommunityViewHolder!=null) {
+                        if (mMainHomeCommunityViewHolder != null) {
                             mMainHomeCommunityViewHolder.onPauseVideo();
                         }
                         break;
                     case 1:
                         MobclickAgent.onEvent(mContext, "community", "社区");
-                        if(mMainHomeCommunityViewHolder!=null) {
+                        if (mMainHomeCommunityViewHolder != null) {
                             mMainHomeCommunityViewHolder.onResumePlay();
                         }
                         break;
                     case 2:
                         MobclickAgent.onEvent(mContext, "information", "消息");
-                        if(mMainHomeCommunityViewHolder!=null) {
+                        if (mMainHomeCommunityViewHolder != null) {
                             mMainHomeCommunityViewHolder.onPauseVideo();
                         }
                         break;
                     case 3:
                         MobclickAgent.onEvent(mContext, "my", "我的");
-                        if(mMainHomeCommunityViewHolder!=null) {
+                        if (mMainHomeCommunityViewHolder != null) {
                             mMainHomeCommunityViewHolder.onPauseVideo();
                         }
                         break;
@@ -513,12 +517,14 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
             } else if (index == 2) {
                 floatBanner.setVisibility(View.GONE);
                 floatRedPacket.setVisibility(View.GONE);
+                floatWarOrder.setVisibility(View.GONE);
                 findViewById(R.id.banner_click).setVisibility(View.GONE);
                 isfloatBannernet = false;
                 if (mainMessageViewHolder != null) mainMessageViewHolder.onResume();
             } else {
                 floatBanner.setVisibility(View.GONE);
                 floatRedPacket.setVisibility(View.GONE);
+                floatWarOrder.setVisibility(View.GONE);
                 findViewById(R.id.banner_click).setVisibility(View.GONE);
                 isfloatBannernet = false;
             }
@@ -528,6 +534,20 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
         checkVersion();
     }
 
+    /**
+     * 展示战令
+     */
+    private void initWarOrder() {
+        if (floatWarOrder != null) {
+            floatWarOrder.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    RouteUtil.forwardBattlePass();
+                }
+            });
+        }
+    }
+
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
@@ -594,6 +614,9 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
             @Override
             public void onSuccess(AnchorRecommendModel data) {
                 if (isFinishing()) return;
+                if (data.getShowWarOrder() == 0) {
+                    floatWarOrder.setVisibility(View.GONE);
+                }
                 if (data.getListShow() == 1 && data.getList().size() > 2) {
                     floatBanner.setVisibility(View.VISIBLE);
                     findViewById(R.id.banner_click).setVisibility(View.VISIBLE);
@@ -610,8 +633,6 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
                     ((ProgressBar) floatRedPacket.findViewById(R.id.progress)).setProgress(data.getRedPacketNum());
                     ((TextView) floatRedPacket.findViewById(R.id.progressText)).setText(data.getRedPacketNum() + "/" + data.getRedPacketTotal());
                 }
-
-
             }
 
             @Override

main/src/main/res/layout/view_float_war_order.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="140dp"
+        android:layout_height="41dp"
+        android:background="@drawable/bg_war_order"
+        android:gravity="center_vertical">
+
+        <ImageView
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:layout_marginLeft="15dp"
+            android:src="@mipmap/icon_war_order" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="5dp"
+            android:gravity="center_vertical"
+            android:text="@string/main_suspension_war_order"
+            android:textColor="@color/white"
+            android:textSize="15dp"
+            android:textStyle="bold" />
+
+    </LinearLayout>
+
+</LinearLayout>

main/src/main/res/layout/view_homemain.xml

@@ -179,6 +179,17 @@
         android:layout_above="@id/rt_main_tab"
         android:layout_alignParentRight="true"
         android:layout_marginRight="12dp"
+        android:visibility="gone"
+        android:layout_marginBottom="10dp" />
+
+    <include
+        android:id="@+id/war_order"
+        layout="@layout/view_float_war_order"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/rt_main_tab"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="12dp"
         android:layout_marginBottom="10dp" />
 
     <LinearLayout