直播关闭

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

@@ -31,9 +31,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.android.billingclient.api.Purchase;
 import com.android.billingclient.api.SkuDetails;
-import com.google.android.gms.ads.identifier.AdvertisingIdClient;
-import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
-import com.google.android.gms.common.GooglePlayServicesRepairableException;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.tencent.imsdk.v2.V2TIMCallback;
@@ -45,14 +42,15 @@ import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
 import com.yunbao.common.activity.AbsActivity;
 import com.yunbao.common.adapter.ViewPagerAdapter;
+import com.yunbao.common.bean.AnchorRecommendModel;
 import com.yunbao.common.bean.ChatRemarksBean;
 import com.yunbao.common.bean.ConfigBean;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.bean.LiveSvgGiftBean;
-import com.yunbao.common.bean.NoviceInstructorModel;
 import com.yunbao.common.bean.UpdataListBean;
 import com.yunbao.common.custom.TabButtonGroup;
 import com.yunbao.common.dialog.InstructorOperationDialog;
+import com.yunbao.common.dialog.LoadingDialog;
 import com.yunbao.common.event.InstructorOperationEvent;
 import com.yunbao.common.event.MessageIMEvent;
 import com.yunbao.common.event.NoviceInstructorEvent;
@@ -60,6 +58,7 @@ import com.yunbao.common.event.RongIMConnectionStatusEvent;
 import com.yunbao.common.event.UpdateTablePointMe;
 import com.yunbao.common.http.CommonHttpConsts;
 import com.yunbao.common.http.HttpCallback;
+import com.yunbao.common.http.main.MainNetManager;
 import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.NoviceInstructorManager;
@@ -77,6 +76,7 @@ import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.VersionUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.AbsMainViewHolder;
+import com.yunbao.common.views.weight.FloatBannerView;
 import com.yunbao.live.bean.LiveBean;
 import com.yunbao.live.http.LiveHttpConsts;
 import com.yunbao.live.http.LiveHttpUtil;
@@ -106,7 +106,6 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import java.io.File;
-import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -161,6 +160,8 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
     private boolean isFirstOpen = true;
     private int messageNumber = 0, numberMe = 1;
     private ImageView waitingTip;
+    private FloatBannerView floatBanner;
+
 
     @Override
     protected int getLayoutId() {
@@ -268,6 +269,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
 
         boolean showInvite = getIntent().getBooleanExtra(Constants.SHOW_INVITE, false);
         mRootView = (ViewGroup) findViewById(R.id.rootView);
+        floatBanner = findViewById(R.id.float_banner_home);
         mTabButtonGroup = (TabButtonGroup) findViewById(R.id.tab_group);
         mViewPager = (ViewPager) findViewById(R.id.viewPager);
         waitingTip = findViewById(R.id.waiting_tip);
@@ -361,8 +363,31 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
         mViewPager.setCurrentItem(0);
         mTabButtonGroup.setCurPosition(0);
         isInstructor();
-        //测试代码要删除
-        NoviceInstructorManager.get(this).setNoviceInstructor(new NoviceInstructorModel());
+        initAnchorRecommendBanner();
+
+    }
+
+    /**
+     * 首页推荐位
+     */
+    private void initAnchorRecommendBanner() {
+        //展示网络请求弹窗
+        LoadingDialog fragment = new LoadingDialog();
+        fragment.show(getSupportFragmentManager(), "LoadingDialog");
+        MainNetManager.get(mContext)
+                .anchorRecommend("10", new com.yunbao.common.http.base.HttpCallback<AnchorRecommendModel>() {
+                    @Override
+                    public void onSuccess(AnchorRecommendModel data) {
+                        fragment.dismiss();
+                        floatBanner.showBanner(data.getList());
+
+                    }
+
+                    @Override
+                    public void onError(String error) {
+                        fragment.dismiss();
+                    }
+                });
     }
 
 
@@ -746,7 +771,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onViewPagerScroll(String str) {
         if ("oneUesrOver".equals(str)) {
-            if(IMLoginManager.get(mContext).isisNewUserOne()==false) {
+            if (IMLoginManager.get(mContext).isisNewUserOne() == false) {
                 getD();
             }
         }

main/src/main/java/com/yunbao/main/fragment/SearchResultsItemFragment.java

@@ -69,9 +69,7 @@ public class SearchResultsItemFragment extends BaseFragment {
      * @param type      類型
      */
     public void setSearchKey(String searchKey, int type) {
-        //展示网络请求弹窗
-        LoadingDialog fragment = new LoadingDialog();
-        fragment.show(getChildFragmentManager(), "LoadingDialog");
+
         this.searchKey = searchKey;
         this.type = type;
         if (type == 1) {
@@ -86,12 +84,10 @@ public class SearchResultsItemFragment extends BaseFragment {
                                     } else {
                                         itemAdapter.showData(data, type);
                                     }
-                                    fragment.dismiss();
                                 }
 
                                 @Override
                                 public void onError(String error) {
-                                    fragment.dismiss();
                                     ToastUtil.show(error);
                                 }
                             });
@@ -114,12 +110,10 @@ public class SearchResultsItemFragment extends BaseFragment {
                                         }
                                     }
 
-                                    fragment.dismiss();
                                 }
 
                                 @Override
                                 public void onError(String error) {
-                                    fragment.dismiss();
                                     ToastUtil.show(error);
                                 }
                             });

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

@@ -1,52 +0,0 @@
-package com.yunbao.main.views;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Path;
-import android.util.AttributeSet;
-import android.widget.ImageView;
-
-/**
- * 圓形圖片
- */
-public class ClipPathCircleImage extends ImageView {
-    private int width;
-    private int height;
-    private Path path;
-
-    public ClipPathCircleImage(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        path = new Path();
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        canvas.save();
-        path.reset();
-        path.addCircle(width / 2, height / 2, width / 2, Path.Direction.CCW);//CCW:逆时针,这里是一个简单的园,无影响
-        canvas.clipPath(path);
-        super.onDraw(canvas);
-        canvas.restore();
-        //使用Path时，如果不与Paint进行共同操作，无法解决抗锯齿问题。
-        //这时候只能使用Paint的PorterDuff.Mode替代Path实现所需要的效果
-    }
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        super.onSizeChanged(w, h, oldw, oldh);
-        width = w;
-        height = h;
-    }
-
-    public ClipPathCircleImage(Context context, AttributeSet attrs, int defStyleAttr) {
-        this(context, attrs, defStyleAttr, 0);
-    }
-
-    public ClipPathCircleImage(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public ClipPathCircleImage(Context context) {
-        this(context, null);
-    }
-}

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

@@ -160,12 +160,12 @@
             android:id="@+id/waiting_tip"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="57dp"
             android:layout_weight="1"
             android:clickable="true"
-            android:visibility="gone"
-            android:layout_marginStart="57dp"
+            android:focusable="true"
             android:src="@mipmap/waiting_tip"
-            android:focusable="true" />
+            android:visibility="gone" />
 
         <View
             android:layout_width="0dp"
@@ -173,5 +173,14 @@
             android:layout_weight="1" />
     </LinearLayout>
 
+    <com.yunbao.common.views.weight.FloatBannerView
+        android:id="@+id/float_banner_home"
+        android:layout_above="@id/rt_main_tab"
+        android:layout_width="wrap_content"
+        android:layout_alignParentRight="true"
+        android:visibility="gone"
+        android:layout_marginBottom="10dp"
+        android:layout_height="wrap_content" />
+
 
 </RelativeLayout>

main/src/main/res/layout/view_search_results_item_holder.xml

@@ -10,7 +10,7 @@
         android:layout_width="60dp"
         android:layout_height="60dp">
 
-        <com.yunbao.main.views.ClipPathCircleImage
+        <com.yunbao.common.views.weight.ClipPathCircleImage
             android:id="@+id/avatar"
             android:layout_width="55dp"
             android:layout_height="55dp" />