yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw
2022-11-23 17:41:44 +08:00
parent 08906e028a 6e36e15ef3
commit 1eca5b0309
35 changed files with 104 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
live/src/main/AndroidManifest.xml
View File

@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.yunbao.live">
<!--com.kugou.fanxing.allinone.watch.liveroominone.media.FALiveRoomInOneActivity"-->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.VIBRATE" />
<application
android:allowBackup="true"

4
live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
View File

@@ -24,8 +24,6 @@ import androidx.core.view.WindowInsetsCompat;
import androidx.core.view.WindowInsetsControllerCompat;
import androidx.viewpager.widget.ViewPager;
import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustEvent;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -1132,8 +1130,6 @@ public class LiveAudienceActivity extends LiveActivity {
case "3":
FirebaseAnalytics.getInstance(mContext).logEvent("FS_customer_service", null);
AppEventsLogger.newLogger(mContext).logEvent("FB_customer_service");
AdjustEvent adjustEvent1 = new AdjustEvent("ww5z2p");
Adjust.trackEvent(adjustEvent1);
if (bean.getLink() != null && !"".equals(bean.getLink())) {
WebViewActivity.forward(mContext, bean.getLink());
} else {

17
live/src/main/java/com/yunbao/live/activity/MyTUIConversationFragment.java
View File

@@ -1,5 +1,6 @@
package com.yunbao.live.activity;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.graphics.drawable.BitmapDrawable;
@@ -24,8 +25,6 @@ import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustEvent;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
@@ -64,9 +63,6 @@ import io.rong.imlib.model.Message;
import io.rong.message.RecallNotificationMessage;
import io.rong.message.TextMessage;
import static com.yunbao.common.CommonAppContext.logger;
import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
public class MyTUIConversationFragment extends Fragment {
private LinearLayout lt_nodata_msg;
@@ -168,18 +164,7 @@ public class MyTUIConversationFragment extends Fragment {
mAdapter.setActionListener(new ImListAdapter.ActionListener() {
@Override
public void onItemClick(ImUserBean bean) {
if (bean.getContent().equals("在線客服")) {
mFirebaseAnalytics.logEvent("FS_customer_service", null);
logger.logEvent("FB_customer_service");
AdjustEvent adjustEvent1 = new AdjustEvent("ww5z2p");
Adjust.trackEvent(adjustEvent1);
} else if (bean.getContent().equals("新手指導員")) {
mFirebaseAnalytics.logEvent("FS_guide", null);
logger.logEvent("FB_guide", null);
AdjustEvent adjustEvent1 = new AdjustEvent("m0nfpn");
Adjust.trackEvent(adjustEvent1);
}
if (bean.getLink() != null && !bean.getLink().equals("")) {
// startActivity(new Intent(getContext(), ZhuangBanActivity.class).putExtra("url", bean.getLink()));
startActivity(new Intent(getContext(), WebViewActivity.class).putExtra("url", bean.getLink()));

19
live/src/main/java/com/yunbao/live/activity/PDLiveConversationActivity.java
View File

@@ -8,7 +8,6 @@ import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.view.WindowManager;
import android.view.animation.AnimationUtils;
import android.view.inputmethod.InputMethodManager;
import android.widget.ImageView;
import android.widget.TextView;
@@ -18,18 +17,12 @@ import androidx.core.content.ContextCompat;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustEvent;
import com.blankj.utilcode.util.GsonUtils;
import com.facebook.appevents.AppEventsLogger;
import com.google.firebase.analytics.FirebaseAnalytics;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.activity.SelectImageActivity;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.bean.ImageEntity;
import com.yunbao.common.bean.NoviceInstructorModel;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.NoviceInstructorManager;
import com.yunbao.common.manager.imrongcloud.MessageIMManager;
@@ -111,18 +104,6 @@ public class PDLiveConversationActivity extends AbsActivity implements View.OnCl
}
isAdmin = true;
imgMore.setVisibility(View.GONE);
AdjustEvent adjustEvent1 = new AdjustEvent("exlgn3");
Adjust.trackEvent(adjustEvent1);
CommonHttpUtil.setAdvertisingChannels("exlgn3", new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
FirebaseAnalytics.getInstance(mContext).logEvent("FS_director_read", null);
AppEventsLogger.newLogger(mContext).logEvent("FB_director_read");
}
}
});
} else {//非指导员
isAdmin = false;
imgMore.setVisibility(View.VISIBLE);

11
live/src/main/java/com/yunbao/live/activity/ZhuangBanActivity.java
View File

@@ -1,7 +1,5 @@
package com.yunbao.live.activity;
import static com.yunbao.common.CommonAppContext.logger;
import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
import android.content.ClipData;
import android.content.ClipboardManager;
@@ -29,8 +27,6 @@ import android.widget.TextView;
import androidx.annotation.RequiresApi;
import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustEvent;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.opensource.svgaplayer.SVGACallback;
import com.opensource.svgaplayer.SVGADrawable;
@@ -57,6 +53,8 @@ import org.greenrobot.eventbus.ThreadMode;
import java.net.MalformedURLException;
import java.net.URL;
;
@Route(path = RouteUtil.PATH_LiveZHUANGBANACTIVITY)
public class ZhuangBanActivity extends AbsActivity {
@@ -371,11 +369,6 @@ public class ZhuangBanActivity extends AbsActivity {
} catch (MalformedURLException e) {
e.printStackTrace();
}
} else if (TextUtils.equals(event.getMethod(), "AndroidAdjustConsume")) {
mFirebaseAnalytics.logEvent("FS_event_interaction", null);
logger.logEvent("FB_event_interaction", null);
AdjustEvent adjustEvent1 = new AdjustEvent("rq2c5n");
Adjust.trackEvent(adjustEvent1);
}
}

7
live/src/main/java/com/yunbao/live/adapter/SystemChatMessageAdapter.java
View File

@@ -1,5 +1,6 @@
package com.yunbao.live.adapter;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
@@ -11,8 +12,6 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustEvent;
import com.alibaba.fastjson.JSON;
import com.facebook.appevents.AppEventsLogger;
import com.google.firebase.analytics.FirebaseAnalytics;
@@ -50,6 +49,7 @@ public class SystemChatMessageAdapter extends RecyclerView.Adapter {
return new SystemChatMessageViewHolder(mInflater.inflate(R.layout.view_system_message_item, parent, false));
}
@SuppressLint("MissingPermission")
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
ImUserBean model = listUserBean.get(position);
@@ -90,8 +90,7 @@ public class SystemChatMessageAdapter extends RecyclerView.Adapter {
if (model1.getContent().equals("在線客服")) {
FirebaseAnalytics.getInstance(mContext).logEvent("FS_customer_service", null);
AppEventsLogger.newLogger(mContext).logEvent("FB_customer_service");
AdjustEvent adjustEvent1 = new AdjustEvent("ww5z2p");
Adjust.trackEvent(adjustEvent1);
}
if (!TextUtils.isEmpty(model1.getLink())) {
mContext.startActivity(new Intent(mContext, WebViewActivity.class).putExtra("url", model1.getLink()));

11
live/src/main/java/com/yunbao/live/dialog/LiveGameDialogFragment.java
View File

@@ -1,7 +1,5 @@
package com.yunbao.live.dialog;
import static com.yunbao.common.CommonAppContext.logger;
import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
import android.content.DialogInterface;
import android.graphics.Color;
@@ -22,8 +20,6 @@ import android.widget.LinearLayout;
import androidx.annotation.Nullable;
import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustEvent;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.android.material.tabs.TabLayout;
@@ -368,12 +364,7 @@ public class LiveGameDialogFragment extends AbsDialogFragment {
if (event.getData() != null && !event.getData().isEmpty()) {
onTrickerySendGiftInto(new JsWishBean(event.getData()));
}
} else if (TextUtils.equals(event.getMethod(), "AndroidAdjustPrank")) {
AdjustEvent adjustEvent1 = new AdjustEvent("v1nekv");
Adjust.trackEvent(adjustEvent1);
mFirebaseAnalytics.logEvent("FS_prank_interaction", null);
logger.logEvent("FB_prank_interaction", null);
} else if (TextUtils.equals(event.getMethod(), "androidMethodClickUser")) {
} else if (TextUtils.equals(event.getMethod(), "androidMethodClickUser")) {
if (!(mContext instanceof LiveRyAnchorActivity)) {
//点击用户头像
if (!TextUtils.isEmpty(event.getUserId()) && !TextUtils.isEmpty(event.getLiveId())) {

9
live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
View File

@@ -1,8 +1,6 @@
package com.yunbao.live.dialog;
import static com.yunbao.common.CommonAppConfig.isGetNewWrap;
import static com.yunbao.common.CommonAppContext.logger;
import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
import static com.yunbao.common.utils.RouteUtil.PATH_COIN;
import static com.yunbao.live.views.LiveRoomViewHolder.bean1;
@@ -32,8 +30,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager.widget.ViewPager;
import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustEvent;
import com.alibaba.android.arouter.launcher.ARouter;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -728,10 +725,6 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
mFirebaseAnalytics.logEvent("FS_present_interaction", null);
logger.logEvent("FB_present_interaction");
AdjustEvent adjustEvent1 = new AdjustEvent("22x4u2");
Adjust.trackEvent(adjustEvent1);
if (mLiveGiftBean.getSwf().contains("svga")) {
LiveGiftDialogFragment.this.dismiss();
}

13
live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java
View File

@@ -1,7 +1,5 @@
package com.yunbao.live.dialog;
import static com.yunbao.common.CommonAppContext.logger;
import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
import android.content.DialogInterface;
import android.graphics.Color;
@@ -28,8 +26,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentManager;
import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustEvent;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yunbao.common.Constants;
@@ -209,9 +205,9 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
// 这个方法在6.0才出现
int statusCode = errorResponse.getStatusCode();
if (404 == statusCode || 500 == statusCode) {
if ( !request.getUrl().toString().contains("favicon")){
if (!request.getUrl().toString().contains("favicon")) {
htmlError.setVisibility(View.VISIBLE);
htmlError.setText("errorCode:" + statusCode +"\n failingUrl:" + request.getUrl());
htmlError.setText("errorCode:" + statusCode + "\n failingUrl:" + request.getUrl());
}
}
}
@@ -313,11 +309,6 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
if (event.getData() != null && !event.getData().isEmpty()) {
onTrickerySendGiftInto(new JsWishBean(event.getData()));
}
} else if (TextUtils.equals(event.getMethod(), "AndroidAdjustPrank")) {
AdjustEvent adjustEvent1 = new AdjustEvent("v1nekv");
Adjust.trackEvent(adjustEvent1);
mFirebaseAnalytics.logEvent("FS_prank_interaction", null);
logger.logEvent("FB_prank_interaction", null);
} else if (TextUtils.equals(event.getMethod(), "androidMethodClickUser")) {
//点击用户头像
if (!(mContext instanceof LiveRyAnchorActivity)) {

17
live/src/main/java/com/yunbao/live/dialog/NewUserDialog.java
View File

@@ -11,15 +11,9 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentManager;
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.dialog.AbsDialogFragment;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.live.R;
@@ -110,17 +104,6 @@ public class NewUserDialog extends AbsDialogFragment {
btn_confirm.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
AdjustEvent adjustEvent1 = new AdjustEvent("a50ofs");
Adjust.trackEvent(adjustEvent1);
CommonHttpUtil.setAdvertisingChannels("a50ofs", new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
FirebaseAnalytics.getInstance(mContext).logEvent("FS_newbie_reward", null);
AppEventsLogger.newLogger(mContext).logEvent("FB_newbie_reward");
}
}
});
EventBus.getDefault().post("showBanner");
EventBus.getDefault().post("svga_new_user_gif");
IMLoginManager.get(mContext).setNewUserGif(true);

20
live/src/main/java/com/yunbao/live/dialog/PDLIiveChatConversationFragment.java
View File

@@ -18,18 +18,12 @@ import androidx.core.content.ContextCompat;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustEvent;
import com.blankj.utilcode.util.GsonUtils;
import com.facebook.appevents.AppEventsLogger;
import com.google.firebase.analytics.FirebaseAnalytics;
import com.yunbao.common.activity.SelectImageActivity;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.bean.ImageEntity;
import com.yunbao.common.bean.NoviceInstructorModel;
import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.NoviceInstructorManager;
import com.yunbao.live.R;
@@ -58,6 +52,7 @@ public class PDLIiveChatConversationFragment extends AbsDialogFragment implement
private final int SELECT_IMAGE_REQUEST = 0x0001;
private ArrayList<ImageEntity> mSelectImages = new ArrayList<>();
private boolean isAdmin = false;
@Override
protected int getLayoutId() {
return R.layout.fragment_chat_conversation;
@@ -139,18 +134,6 @@ public class PDLIiveChatConversationFragment extends AbsDialogFragment implement
if (!TextUtils.isEmpty(userBean.getIs_admin()) && TextUtils.equals(userBean.getIs_admin(), "1")) {
isAdmin = true;
imgMore.setVisibility(View.GONE);
AdjustEvent adjustEvent1 = new AdjustEvent("exlgn3");
Adjust.trackEvent(adjustEvent1);
CommonHttpUtil.setAdvertisingChannels("exlgn3", new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
FirebaseAnalytics.getInstance(mContext).logEvent("FS_director_read", null);
AppEventsLogger.newLogger(mContext).logEvent("FB_director_read");
}
}
});
} else {//非指导员
isAdmin = false;
imgMore.setVisibility(View.VISIBLE);
@@ -202,6 +185,7 @@ public class PDLIiveChatConversationFragment extends AbsDialogFragment implement
startActivityForResult(intent, SELECT_IMAGE_REQUEST);
}
}
/**
* 获取草稿箱信息系
*/

81
live/src/main/java/com/yunbao/live/presenter/LiveLinkMicPresenter.java
View File

@@ -1,7 +1,6 @@
package com.yunbao.live.presenter;
import android.Manifest;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
@@ -20,19 +19,15 @@ import android.widget.PopupWindow;
import android.widget.TextView;
import android.widget.Toast;
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.Constants;
import com.yunbao.common.bean.BannerBean;
import com.yunbao.common.bean.LevelBean;
import com.yunbao.common.bean.UserBean;
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.utils.ClickUtil;
@@ -117,82 +112,10 @@ public class LiveLinkMicPresenter implements View.OnClickListener {
@Subscribe(threadMode = ThreadMode.MAIN)
public void onUpdata(String str) {
if ("stop_svga_new_user_double1".equals(str)) {
AdjustEvent adjustEvent1 = new AdjustEvent("80lzdi");
Adjust.trackEvent(adjustEvent1);
CommonHttpUtil.setAdvertisingChannels("80lzdi", new HttpCallback() {
@SuppressLint("MissingPermission")
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
FirebaseAnalytics.getInstance(mContext).logEvent("FS_mission_3", null);
AppEventsLogger.newLogger(mContext).logEvent("FB_mission_3");
}
}
});
AdjustEvent adjustEvent2 = new AdjustEvent("6va52i");
Adjust.trackEvent(adjustEvent2);
CommonHttpUtil.setAdvertisingChannels("6va52i", new HttpCallback() {
@SuppressLint("MissingPermission")
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
FirebaseAnalytics.getInstance(mContext).logEvent("FS_mission_either", null);
AppEventsLogger.newLogger(mContext).logEvent("FB_mission_either");
}
}
});
publicToast(mContext);
} else if ("stop_svga_new_user_follow1".equals(str)) {
AdjustEvent adjustEvent1 = new AdjustEvent("f084wh");
Adjust.trackEvent(adjustEvent1);
CommonHttpUtil.setAdvertisingChannels("f084wh", new HttpCallback() {
@SuppressLint("MissingPermission")
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
FirebaseAnalytics.getInstance(mContext).logEvent("FS_mission_2", null);
AppEventsLogger.newLogger(mContext).logEvent("FB_mission_2");
}
}
});
AdjustEvent adjustEvent2 = new AdjustEvent("6va52i");
Adjust.trackEvent(adjustEvent2);
CommonHttpUtil.setAdvertisingChannels("6va52i", new HttpCallback() {
@SuppressLint("MissingPermission")
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
FirebaseAnalytics.getInstance(mContext).logEvent("FS_mission_either", null);
AppEventsLogger.newLogger(mContext).logEvent("FB_mission_either");
}
}
});
publicToast(mContext);
} else if ("stop_new_user_gif1".equals(str)) {
AdjustEvent adjustEvent1 = new AdjustEvent("aqqz70");
Adjust.trackEvent(adjustEvent1);
CommonHttpUtil.setAdvertisingChannels("aqqz70", new HttpCallback() {
@SuppressLint("MissingPermission")
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
FirebaseAnalytics.getInstance(mContext).logEvent("FS_mission_1", null);
AppEventsLogger.newLogger(mContext).logEvent("FB_mission_1");
}
}
});
AdjustEvent adjustEvent2 = new AdjustEvent("6va52i");
Adjust.trackEvent(adjustEvent2);
CommonHttpUtil.setAdvertisingChannels("6va52i", new HttpCallback() {
@SuppressLint("MissingPermission")
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
FirebaseAnalytics.getInstance(mContext).logEvent("FS_mission_either", null);
AppEventsLogger.newLogger(mContext).logEvent("FB_mission_either");
}
}
});
publicToast(mContext);
}
}
@@ -857,6 +780,6 @@ public class LiveLinkMicPresenter implements View.OnClickListener {
}
public void setLiveSdk(int mLiveSDK) {
this.mLiveSdk=mLiveSDK;
this.mLiveSdk = mLiveSDK;
}
}

23
live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java
View File

@@ -1,18 +1,13 @@
package com.yunbao.live.socket;
import static com.yunbao.common.CommonAppContext.logger;
import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
import android.util.Log;
import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustEvent;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.CommonAppContext;
import com.yunbao.common.Constants;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.bean.UserBean;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.ToastUtil;
@@ -130,24 +125,6 @@ public class SocketRyChatUtil {
@Override
public void onSuccess(Message message) {
Log.i("tx", "ssss" + "发送成功" + mLiveUid);
//首发言成功
AdjustEvent adjustEvent1 = new AdjustEvent("j7isvr");
Adjust.trackEvent(adjustEvent1);
CommonHttpUtil.setAdvertisingChannels("j7isvr", new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
mFirebaseAnalytics.logEvent("FS_liveinteraction", null);
logger.logEvent("FB_liveinteraction ");
}
}
});
mFirebaseAnalytics.logEvent("FS_type_interaction", null);
logger.logEvent("FB_type_interaction");
AdjustEvent adjustEvent = new AdjustEvent("cs6j0s");
Adjust.trackEvent(adjustEvent);
if (SocketRyClient.mSocketHandler != null) {
SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
}

19
live/src/main/java/com/yunbao/live/views/InputPanelViewHolder.java
View File

@@ -16,12 +16,8 @@ import android.widget.LinearLayout;
import androidx.annotation.Nullable;
import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustEvent;
import com.facebook.appevents.AppEventsLogger;
import com.google.firebase.analytics.FirebaseAnalytics;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.manager.NoviceInstructorManager;
import com.yunbao.common.utils.FileUtil;
import com.yunbao.common.utils.TimeUtils;
@@ -175,20 +171,7 @@ public class InputPanelViewHolder extends LinearLayout implements View.OnClickLi
@Override
public void onSuccess(Message message) {
if(isAdmin){
AdjustEvent adjustEvent1 = new AdjustEvent("2kjbwx");
Adjust.trackEvent(adjustEvent1);
CommonHttpUtil.setAdvertisingChannels("2kjbwx", new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
FirebaseAnalytics.getInstance(getContext()).logEvent("FS_director_first_chat", null);
AppEventsLogger.newLogger(getContext()).logEvent("FB_director_first_chat");
}
}
});
AdjustEvent adjustEvent2 = new AdjustEvent("g9lzss");
Adjust.trackEvent(adjustEvent2);
if (isAdmin) {
FirebaseAnalytics.getInstance(getContext()).logEvent("FS_director_chat", null);
AppEventsLogger.newLogger(getContext()).logEvent("FB_director_chat");
}

11
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@@ -1,7 +1,5 @@
package com.yunbao.live.views;
import static com.yunbao.common.CommonAppContext.logger;
import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
import static com.yunbao.live.bean.LiveChatBean.RECOMMEND_CARD_NOTIFY;
import android.app.Activity;
@@ -38,8 +36,6 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustEvent;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -1947,7 +1943,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
public void run() {
goto_room_view.setVisibility(View.VISIBLE);
touid = touids;
pkUid=touids;
pkUid = touids;
ImgLoader.displayAvatar(mContext, url, avatarOther);
tv_avatarOther_name.setText(name);
goto_room_view.setOnClickListener(new View.OnClickListener() {
@@ -2309,11 +2305,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
@Override
public void callback(Integer isAttention) {
if (isAttention == 1) {
mFirebaseAnalytics.logEvent("FS_Follow", null);
logger.logEvent("FB_Follow", null);
AdjustEvent adjustEvent1 = new AdjustEvent("oess6a");
Adjust.trackEvent(adjustEvent1);
// SocketChatUtil.sendSystemMessage(mLiveUid, CommonAppConfig.getInstance().getUserBean().getUserNiceName() + WordUtil.getString(R.string.live_follow_anchor));
LiveActivity.sendSystemMessage(
CommonAppConfig.getInstance().getUserBean().getUserNiceName() + WordUtil.getString(R.string.live_follow_anchor));
}

67
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@@ -1,7 +1,5 @@
package com.yunbao.live.views;
import static com.yunbao.common.CommonAppContext.logger;
import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
import static com.yunbao.live.views.LivePlayRyViewHolder.Micing;
import static com.yunbao.live.views.LiveRoomViewHolder.isStayRoomfive;
@@ -23,13 +21,10 @@ import androidx.annotation.NonNull;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.viewpager.widget.PagerAdapter;
import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustEvent;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.blankj.utilcode.util.GsonUtils;
import com.facebook.appevents.AppEventsLogger;
import com.lzf.easyfloat.EasyFloat;
import com.lzf.easyfloat.permission.PermissionUtils;
import com.lzf.easyfloat.utils.LifecycleUtils;
@@ -446,8 +441,6 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
@Override
public void onResume() {
// if (mLivePlayViewHolder != null)
// mLivePlayViewHolder.onResume();
//判断是否有直播悬浮窗，有直接关闭
if (EasyFloat.isShow("LiveFloatView")) {
EasyFloat.dismiss("LiveFloatView", true);
@@ -1141,66 +1134,6 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
.setmDanMuLevel(mDanMuLevel)
.setLiveBg(liveBg)));
//进入直播间
AdjustEvent adjustEvent1 = new AdjustEvent("hiepcu");
Adjust.trackEvent(adjustEvent1);
mFirebaseAnalytics.logEvent("FS_enterroom", null);
logger.logEvent("FB_enterroom");
AdjustEvent adjustEvent2 = new AdjustEvent("unutgg");
Adjust.trackEvent(adjustEvent2);
CommonHttpUtil.setAdvertisingChannels("unutgg", new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
mFirebaseAnalytics.logEvent("FS_first_Enterroom", null);
AppEventsLogger.newLogger(mContext).logEvent("FB_first_Enterroom");
}
}
});
//观看1分钟
if (obj.getLongValue("see_time") >= 60) {
AdjustEvent good_user = new AdjustEvent("7zxuxz");
Adjust.trackEvent(good_user);
CommonHttpUtil.setAdvertisingChannels("7zxuxz", new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
mFirebaseAnalytics.logEvent("FS_enter_app_1min", null);
logger.logEvent("FB_enter_app_1min", null);
}
}
});
}
if (obj.getLongValue("see_time") >= 600 && obj.getIntValue("un_charge") == 1) {
AdjustEvent good_user = new AdjustEvent("val8lv");
Adjust.trackEvent(good_user);
CommonHttpUtil.setAdvertisingChannels("val8lv", new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
mFirebaseAnalytics.logEvent("FS_good_user", null);
logger.logEvent("FB_good_user", null);
}
}
});
//有效用户
} else if (obj.getLongValue("see_time") >= 600) {
AdjustEvent valid_user = new AdjustEvent("xuf8ep");
Adjust.trackEvent(valid_user);
CommonHttpUtil.setAdvertisingChannels("xuf8ep", new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0) {
mFirebaseAnalytics.logEvent("FS_Valid_user", null);
logger.logEvent("FB_Valid_user", null);
}
}
});
}
//连接socket
LiveHttpUtil.enterBackRoom(mLiveBean.getUid(), mLiveBean.getStream(), new HttpCallback() {
@Override