Merge branch 'master_umeng'

# Conflicts:
#	app/proguard-rules.pro
#	common/src/main/res/values/strings.xml
#	live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
This commit is contained in:
18401019693
2023-09-05 14:18:42 +08:00
55 changed files with 756 additions and 139 deletions

View File

@@ -9,6 +9,7 @@ import android.view.ViewGroup;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.Constants;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.adapter.ImChatFacePagerAdapter;
@@ -180,4 +181,14 @@ public abstract class AbsVideoCommentActivity extends AbsActivity implements Vie
}
return super.dispatchTouchEvent(ev);
}
@Override
protected void onResume() {
super.onResume();
}
@Override
protected void onPause() {
super.onPause();
}
}

View File

@@ -10,6 +10,7 @@ import android.os.Build;
import android.text.TextUtils;
import android.view.WindowManager;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.bean.ConfigBean;
import com.yunbao.common.http.HttpCallback;
@@ -262,4 +263,7 @@ public abstract class AbsVideoPlayActivity extends AbsVideoCommentActivity {
public void setVideoScrollViewHolder(VideoScrollViewHolder videoScrollViewHolder) {
mVideoScrollViewHolder = videoScrollViewHolder;
}
}

View File

@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.view.ViewGroup;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.event.FollowEvent;
import com.yunbao.common.views.AbsViewHolder;
import com.yunbao.video.R;
@@ -141,6 +142,7 @@ public class VideoScrollViewHolder extends AbsViewHolder implements
@Override
public void onPageSelected(VideoPlayWrapViewHolder videoPlayWrapViewHolder, boolean needLoadMore) {
if (videoPlayWrapViewHolder != null) {
MobclickAgent.onEvent(mContext, "community_video_slide", "社区视频上下滑动");
VideoBean videoBean = videoPlayWrapViewHolder.getVideoBean();
if (videoBean != null) {
mVideoBean = videoBean;