111

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

@@ -37,6 +37,8 @@ public class CommonAppContext extends MultiDexApplication {
     public static FirebaseAnalytics mFirebaseAnalytics;
     public static AppEventsLogger logger;
     public static boolean isReady = false;
+    public static String home_zdy_img_us = "";
+    public static String home_zdy_img_cn = "";
 
     @Override
     public void onCreate() {

common/src/main/java/com/yunbao/common/bean/FaceBookUpModel.java

@@ -0,0 +1,21 @@
+package com.yunbao.common.bean;
+
+public class FaceBookUpModel extends BaseModel {
+    String type,link;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getLink() {
+        return link;
+    }
+
+    public void setLink(String link) {
+        this.link = link;
+    }
+}

common/src/main/java/com/yunbao/common/dialog/InstructorOperationDialog.java

@@ -5,6 +5,7 @@ import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.ImageView;
 
 import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
@@ -13,18 +14,28 @@ import androidx.fragment.app.FragmentTransaction;
 
 import com.adjust.sdk.Adjust;
 import com.adjust.sdk.AdjustEvent;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.facebook.appevents.AppEventsLogger;
 import com.google.firebase.analytics.FirebaseAnalytics;
+import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.R;
 import com.yunbao.common.event.InstructorOperationEvent;
+import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
+import com.yunbao.common.http.HttpClient;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.NoviceInstructorManager;
 
 import org.greenrobot.eventbus.EventBus;
 
 import java.lang.reflect.Field;
 
+import static com.yunbao.common.CommonAppContext.home_zdy_img_cn;
+import static com.yunbao.common.CommonAppContext.home_zdy_img_us;
+import static com.yunbao.common.CommonAppContext.lang;
+
 public class InstructorOperationDialog extends AbsDialogFragment {
 
     @Override
@@ -84,8 +95,15 @@ public class InstructorOperationDialog extends AbsDialogFragment {
     @Override
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
+        ImageView to_msg = mRootView.findViewById(R.id.to_msg);
+        if(lang.equals("english")){
+            ImgLoader.display(mContext,home_zdy_img_us, to_msg);
+        }else{
+            ImgLoader.display(mContext,home_zdy_img_cn, to_msg);
+        }
+
         NoviceInstructorManager.get(getActivity()).setHomeZdyPop("");
-        mRootView.findViewById(R.id.hurry_contact).setOnClickListener(new View.OnClickListener() {
+        mRootView.findViewById(R.id.to_msg).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 AdjustEvent adjustEvent1 = new AdjustEvent("82nzkz");

common/src/main/java/com/yunbao/common/http/PDLiveApi.java

@@ -2,12 +2,16 @@ package com.yunbao.common.http;
 
 import com.yunbao.common.bean.AnchorRecommendModel;
 import com.yunbao.common.bean.BaseModel;
+import com.yunbao.common.bean.FaceBookUpModel;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.bean.LiveInfoModel;
 import com.yunbao.common.bean.NobleTrumpetModel;
 import com.yunbao.common.bean.SearchModel;
 import com.yunbao.common.bean.SetAttentsModel;
 
+import org.json.JSONObject;
+
+import java.util.HashMap;
 import java.util.List;
 
 import io.reactivex.Observable;
@@ -61,6 +65,12 @@ public interface PDLiveApi {
             @Query("trumpet_msg") String trumpetMsg,
             @Query("anchor_id") String anchorid);
 
+    /**
+     * FB是否替换新key
+     */
+    @GET("/api/public/?service=Login.getFaceBookUpType")
+    Observable<ResponseModel<FaceBookUpModel>> faceBookUp();
+
     /**
      * 搜索
      *

common/src/main/java/com/yunbao/common/http/main/MainNetManager.java

@@ -2,6 +2,7 @@ package com.yunbao.common.http.main;
 
 import android.app.Activity;
 
+import com.yunbao.common.bean.FaceBookUpModel;
 import com.yunbao.common.bean.AnchorRecommendModel;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.bean.SearchModel;
@@ -9,6 +10,8 @@ import com.yunbao.common.http.API;
 import com.yunbao.common.http.ResponseModel;
 import com.yunbao.common.http.base.HttpCallback;
 
+import org.json.JSONObject;
+
 import java.util.List;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -66,21 +69,19 @@ public class MainNetManager {
     }
 
     /**
-     * 搜索
-     *
-     * @param jianKey 簡體關鍵字
-     * @param fanKey  繁體關鍵字
-     * @param type    搜索類型 1，全部  2，主播  3，用戶
-     * @param p       頁碼
+     * FB是否替换新Key
+     * @param callback
      */
-    public void search(String jianKey, String fanKey, int type, int p, HttpCallback<List<List<SearchModel>>> callback) {
-        API.get().pdLiveApi(mContext).search(jianKey, fanKey, type, p)
+    public void FaceBookUp(HttpCallback<FaceBookUpModel> callback) {
+        API.get().pdLiveApi(mContext).faceBookUp()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(listResponseModel -> {
-                    if (callback != null) {
-                        List<List<SearchModel>> model = listResponseModel.getData().getInfo();
-                        callback.onSuccess(model);
+                .subscribe(new Consumer<ResponseModel<FaceBookUpModel>>() {
+                    @Override
+                    public void accept(ResponseModel<FaceBookUpModel> obj) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(obj.getData().getInfo());
+                        }
                     }
                 }, throwable -> {
                     if (callback != null) {
@@ -88,31 +89,6 @@ public class MainNetManager {
                     }
                 }).isDisposed();
     }
-
-    /**
-     * 搜索
-     *
-     * @param jianKey 簡體關鍵字
-     * @param fanKey  繁體關鍵字
-     * @param type    搜索類型 1，全部  2，主播  3，用戶
-     * @param p       頁碼
-     */
-    public void searchNew(String jianKey, String fanKey, int type, int p, HttpCallback<List<SearchModel>> callback) {
-        API.get().pdLiveApi(mContext).searchNew(jianKey, fanKey, type, p)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(listResponseModel -> {
-                    if (callback != null) {
-                        List<SearchModel> model = listResponseModel.getData().getInfo();
-                        callback.onSuccess(model);
-                    }
-                }, throwable -> {
-                    if (callback != null) {
-                        callback.onError(throwable.getMessage());
-                    }
-                }).isDisposed();
-    }
-
     /**
      * 猜你喜欢
      *