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
2023-09-05 14:18:42 +08:00
parent a5b0ee757c 82fd35305a
commit 0721ff4f37
55 changed files with 756 additions and 139 deletions
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -196,4 +196,8 @@ dependencies {
    api 'com.github.gzu-liyujiang.AndroidPicker:WheelView:4.1.11'
    //自定义圆角图片
    api 'com.makeramen:roundedimageview:2.3.0'
+    // 友盟统计SDK
+    api  'com.umeng.umsdk:common:9.6.3'// 必选
+    api  'com.umeng.umsdk:asms:1.8.0'// 必选
+    api 'com.umeng.umsdk:uyumao:1.1.2' //高级运营分析功能依赖库，使用卸载分析、开启反作弊能力请务必集成，以免影响高级功能使用。common需搭配v9.6.3及以上版本，asms需搭配v1.7.0及以上版本。需更新隐私声明。
 }
--- a/common/src/main/java/com/yunbao/common/activity/AbsActivity.java
+++ b/common/src/main/java/com/yunbao/common/activity/AbsActivity.java
@@ -24,6 +24,7 @@ import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;

+import com.umeng.analytics.MobclickAgent;
 import com.yunbao.common.R;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.interfaces.LifeCycleListener;
@@ -178,11 +179,15 @@ public abstract class AbsActivity extends AppCompatActivity {
        }
        //友盟统计
 //        MobclickAgent.onResume(this);
+        MobclickAgent.onPageStart(this.mTag);
+        Log.e("MobclickAgent","MobclickAgent:_onResume_"+this.mTag);
    }

    @Override
    protected void onPause() {
        super.onPause();
+        MobclickAgent.onPageEnd(this.mTag);
+        Log.e("MobclickAgent","MobclickAgent:_onPause_"+this.mTag);
        if (mLifeCycleListeners != null) {
            for (LifeCycleListener listener : mLifeCycleListeners) {
                listener.onPause();
@@ -376,4 +381,5 @@ public abstract class AbsActivity extends AppCompatActivity {
                break;
        }
    }
+
 }
--- a/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
+++ b/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
@@ -25,6 +25,7 @@ import androidx.annotation.RequiresApi;

 import com.alibaba.fastjson.JSON;
 import com.lxj.xpopup.XPopup;
+import com.umeng.analytics.MobclickAgent;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.Constants;
@@ -330,6 +331,7 @@ public class WebViewActivity extends AbsActivity {
        if (Constants.isShowPage != -1) {
            finish();
        }
+
    }

    @Subscribe(threadMode = ThreadMode.MAIN)
@@ -434,4 +436,10 @@ public class WebViewActivity extends AbsActivity {


    }
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
+
+
 }
--- a/common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java
+++ b/common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java
@@ -66,6 +66,28 @@ public class LiveGiftBean {
    private String namingCoin;
    @JSONField(name = "naming_user_coin")
    private String namingUserCoin;
+    @JSONField(name = "blind_box_ticket")
+    private int blindBoxTicket;
+    @JSONField(name = "blind_box_ticket_id")
+    private int blindBoxTicketId;
+
+    public int getBlindBoxTicketId() {
+        return blindBoxTicketId;
+    }
+
+    public LiveGiftBean setBlindBoxTicketId(int blindBoxTicketId) {
+        this.blindBoxTicketId = blindBoxTicketId;
+        return this;
+    }
+
+    public int getBlindBoxTicket() {
+        return blindBoxTicket;
+    }
+
+    public LiveGiftBean setBlindBoxTicket(int blindBoxTicket) {
+        this.blindBoxTicket = blindBoxTicket;
+        return this;
+    }

    public String getNamingUserCoin() {
        return namingUserCoin;
@@ -202,7 +224,7 @@ public class LiveGiftBean {
        return this;
    }

-    private int fansGiftLevel=0;//粉丝团礼物等级要求
+    private int fansGiftLevel = 0;//粉丝团礼物等级要求

    public int getFansGiftLevel() {
        return fansGiftLevel;
--- a/common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java
+++ b/common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java
@@ -6,10 +6,6 @@ import com.lzy.okgo.request.GetRequest;
 import com.lzy.okgo.request.PostRequest;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.CommonAppContext;
-import com.yunbao.common.http.CommonHttpUtil;
-import com.yunbao.common.http.HttpCallback;
-import com.yunbao.common.http.HttpClient;
-import com.yunbao.common.http.JsonBean;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.MD5Util;
@@ -292,6 +288,7 @@ public class LiveHttpUtil {

    /**
     * 主播或管理员禁言
+     *
     * @param time 禁言时间 （分）
     */
    public static void setShutUp(String liveUid, String stream, int type, String touid, String time, HttpCallback callback) {
@@ -619,17 +616,19 @@ public class LiveHttpUtil {
     * 观众给主播送礼物
     */
    public static void sendGift(String by, String liveUid, String stream, int giftId, String giftCount, HttpCallback callback) {
-        sendGift(by, liveUid, stream, giftId, giftCount, 0, false,callback);
+        sendGift(by, liveUid, stream, giftId, giftCount, 0, false, callback);
    }
-    public static void sendGift(String by, String liveUid, String stream, int giftId, String giftCount, int isContactGift,  HttpCallback callback) {
-        sendGift(by, liveUid, stream, giftId, giftCount, isContactGift, false,callback);
+
+    public static void sendGift(String by, String liveUid, String stream, int giftId, String giftCount, int isContactGift, HttpCallback callback) {
+        sendGift(by, liveUid, stream, giftId, giftCount, isContactGift, false, callback);
    }
+
    /**
     * 观众给主播送礼物
     *
     * @param isContactGift 是否为联系方式礼物
     */
-    public static void sendGift(String by, String liveUid, String stream, int giftId, String giftCount, int isContactGift, boolean isFansGroupGift,HttpCallback callback) {
+    public static void sendGift(String by, String liveUid, String stream, int giftId, String giftCount, int isContactGift, boolean isFansGroupGift, HttpCallback callback) {
        HttpClient.getInstance().get("Live.sendGift", LiveHttpConsts.SEND_GIFT)
                .params("liveuid", liveUid)
                .params("stream", stream)
@@ -637,7 +636,20 @@ public class LiveHttpUtil {
                .params("isContactGift", isContactGift)
                .params("giftcount", giftCount)
                .params("isprank", by)
-                .params("fans_exclusive_pack",isFansGroupGift?"1":"0")
+                .params("fans_exclusive_pack", isFansGroupGift ? "1" : "0")
+                .params("appVersion", CommonAppConfig.getInstance().getVersion())
+                .execute(callback);
+    }
+
+    public static void sendBlindBoxTicket(String by, String liveUid, String stream, int giftId, HttpCallback callback) {
+        HttpClient.getInstance().get("Live.sendBlindBoxTicket", LiveHttpConsts.SEND_GIFT)
+                .params("liveuid", liveUid)
+                .params("stream", stream)
+                .params("giftid", giftId)
+                .params("isContactGift", 0)
+                .params("giftcount", "1")
+                .params("isprank", by)
+                .params("fans_exclusive_pack", "0")
                .params("appVersion", CommonAppConfig.getInstance().getVersion())
                .execute(callback);
    }
--- a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
@@ -10,6 +10,7 @@ import androidx.annotation.NonNull;

 import com.google.gson.Gson;
 import com.lzf.easyfloat.EasyFloat;
+import com.umeng.analytics.MobclickAgent;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.event.DataUserInfoEvent;
@@ -301,6 +302,8 @@ public class IMLoginManager extends BaseCacheManager {
     * @param model
     */
    public void setupLoginUser(@NonNull IMLoginModel model) {
+        //当用户使用自有账号登录时，可以这样统计：
+        MobclickAgent.onProfileSignIn(String.valueOf(model.getId()));
        this.userInfo = model;
        if (userInfo != null && !TextUtils.isEmpty(userInfo.getToken())) {
            token = userInfo.getToken();
@@ -425,6 +428,8 @@ public class IMLoginManager extends BaseCacheManager {
 //        IMCenter.getInstance().clearConversations(null,   Conversation.ConversationType.PRIVATE);
        RongcloudIMManager.logoutIM();
        MessageIMManager.get(activity).logout();
+        //登出
+        MobclickAgent.onProfileSignOff();
        put(IS_HINT, 0);
        APPEasyFloat.getInstance().dismiss(activity);
        if (EasyFloat.isShow("LiveFloatView")) {
--- a/common/src/main/java/com/yunbao/common/utils/GiftCacheUtil.java
+++ b/common/src/main/java/com/yunbao/common/utils/GiftCacheUtil.java
@@ -3,6 +3,7 @@ package com.yunbao.common.utils;
 import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
+import android.text.TextUtils;
 import android.util.Log;

 import com.yunbao.common.CommonAppConfig;
@@ -151,16 +152,19 @@ public class GiftCacheUtil {
            return;
        }
        clickId.add(bean.getId()+"");
-        getFile(context,getDownloadSaveName(bean.getId()), bean.getSwf(), "0", new CommonCallback<File>() {
-            @Override
-            public void callback(File bean) {
-                if(bean!=null) {
-                    clickId.remove(getIdForFileName(bean.getName())+"");
-                    downloadCache.remove(getIdForFileName(bean.getName()));
+        if (!TextUtils.isEmpty( bean.getSwf())){
+            getFile(context,getDownloadSaveName(bean.getId()), bean.getSwf(), "0", new CommonCallback<File>() {
+                @Override
+                public void callback(File bean) {
+                    if(bean!=null) {
+                        clickId.remove(getIdForFileName(bean.getName())+"");
+                        downloadCache.remove(getIdForFileName(bean.getName()));
+                    }
+                    mDownloadGifCallback.callback(bean);
                }
-                mDownloadGifCallback.callback(bean);
-            }
-        });
+            });
+        }
+
    }

    /**
@@ -241,7 +245,7 @@ public class GiftCacheUtil {
                if (clickId.contains(id+"")) {
                    continue;
                }
-                if (bean.getSwf().isEmpty()) {
+                if (TextUtils.isEmpty(bean.getSwf())) {
                    handler.post(() -> commonCallback.callback(null));
                    continue;
                }
--- a/common/src/main/java/com/yunbao/common/views/FunGamesViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/FunGamesViewHolder.java
@@ -9,6 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

+import com.umeng.analytics.MobclickAgent;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.R;
 import com.yunbao.common.adapter.FunGamesAdapter;
@@ -22,7 +23,9 @@ import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;

+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;

 public class FunGamesViewHolder extends RecyclerView.ViewHolder {
    private FunGamesAdapter funGamesAdapter;
@@ -76,6 +79,7 @@ public class FunGamesViewHolder extends RecyclerView.ViewHolder {
                                .append("&token=")
                                .append(userInfo.getToken());
                    }
+
                    Bus.get().post(new CustomDrawerPopupEvent()
                            .setDisMiss(true)
                            .setHtmlUrl(htmlUrl.toString())
--- a/common/src/main/res/layout/view_full_service_notification.xml
+++ b/common/src/main/res/layout/view_full_service_notification.xml
@@ -42,7 +42,7 @@

        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_marginStart="19dp"
+        android:layout_marginStart="75dp"
        android:layout_marginTop="42dp"
        android:layout_marginEnd="20dp"
        android:layout_toStartOf="@+id/goto_room_view"
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -1054,7 +1054,7 @@ Limited ride And limited avatar frame</string>
    <string name="terms_and_policies">Terms and policies</string>
    <string name="install_the_application">For details, please read the following message to install the application:</string>
    <string name="treat_and_protect">Welcome to PD LIVE. For your personal information and privacy, we will adopt the highest standards of treatment and protection.</string>
-    <string name="anti_cheating_services">In order to provide you with one-click sharing service, our product integrates Mob+U-Share SDK, The Mob+SDK needs to collect your device Mac address, unique device identifier (1MEIandroid IDIDFAOPENUDIDGUID, SIM card IMSI information), and public social account information that you need to share in order to complete the one-click sharing service. And through the geographical location calibration report data accuracy, provide basic anti-cheating services. For the sake of your information security, we have made data security and confidentiality agreements with third-party SDK service providers, and these companies will strictly abide by our data privacy and security requirements. We will not share your personally identifiable information with them unless we have your consent. To facilitate you better understand/Mob + data types and USES, and how to protect your personal information, you can log on to https:www.mob.com aboutpolicy understand [Mob +] privacy policy).</string>
+    <string name="anti_cheating_services">In order to provide users with better services, our products integrate [Alliance SDK], SDK needs to collect your device information (IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP address /SIM card IMSI information, etc.), In order for you to better understand the types and purposes of the data collected by [Alliance SDK] and how to protect your personal information, you can log on to: https://www.umeng.com/page/policy  Learn about [Alliance SDK] Privacy Policy [Alliance +] Privacy Policy [Alliance +], a third-party global big data service provider, providing customers with PC/APP/ offline statistics, advertising effect monitoring, message push/micro community/sharing /IM and other operating tools,DIP, global index and industry reports. https://www.umeng.com/page/policy</string>
    <string name="read_and_agre">Clicking Agree means you have read and agree to all of the above.。</string>
    <string name="agreement">agreement</string>
    <string name="come_to">Welcome to PD LIVE.</string>
--- a/common/src/main/res/values-zh-rHK/strings.xml
+++ b/common/src/main/res/values-zh-rHK/strings.xml
@@ -1080,7 +1080,7 @@
    <string name="terms_and_policies">條款和政策</string>
    <string name="treat_and_protect">歡迎來到PD LIVE，對於您的個人信息及隱私，我們將採用最高標準對待和保護。</string>
    <string name="install_the_application">詳情請您閱讀以下安裝應用程序的消息：</string>
-    <string name="anti_cheating_services">為了向您提供一鍵分享服務，我們的產品集成Mob+U-Share SDK，Mob+SDK需要收集您的設備Mac地址、唯一設備識別碼(1MEI/android ID/IDFA/OPENUDID/GUID、 SIM卡IMSI信息)以及您需要分享的社交賬號公開信息，以便完成一鍵分享服務。並通過地理位置校準報表數據準確性，提供基礎反作弊服務。為了您的信息安全，我們已與第三方SDK服務商進行數據安全保密約定，這些公司會嚴格遵守我們的數據隱私和安全要求。  除非得到您的同意，我們不會與其共享您的個人身份信息。為便於您更好地了解[Mob+]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸https://www.mob.com/about/policy了解[Mob+]隱私權政）。</string>
+    <string name="anti_cheating_services">為了給用戶提供更好的服務，我們的產品集成[友盟SDK]，SDK需要收集您的设备信息（IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP地址/SIM 卡 IMSI 信息等），為便於您更好地了解[友盟SDK]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸：https://www.umeng.com/page/policy 了解[友盟SDK]隱私權政策【友盟+】隐私政策【友盟+】,第三方全域大数据服务提供商,为客户提供PC/APP/线下统计,广告效果监测,消息推送/微社区/分享/IM等运营工具,DIP,全域指数与行业报告等。https://www.umeng.com/page/policy</string>
    <string name="agreement">同意</string>
    <string name="read_and_agre">點擊同意後即代表您已閱讀並同意以上所有內容。</string>
    <string name="support_login">本應用會收集位置數據以支持登錄和註冊的功能使用。</string>
--- a/common/src/main/res/values-zh-rTW/strings.xml
+++ b/common/src/main/res/values-zh-rTW/strings.xml
@@ -1080,7 +1080,7 @@
    <string name="terms_and_policies">條款和政策</string>
    <string name="treat_and_protect">歡迎來到PD LIVE，對於您的個人信息及隱私，我們將採用最高標準對待和保護。</string>
    <string name="install_the_application">詳情請您閱讀以下安裝應用程序的消息：</string>
-    <string name="anti_cheating_services">為了向您提供一鍵分享服務，我們的產品集成Mob+U-Share SDK，Mob+SDK需要收集您的設備Mac地址、唯一設備識別碼(1MEI/android ID/IDFA/OPENUDID/GUID、 SIM卡IMSI信息)以及您需要分享的社交賬號公開信息，以便完成一鍵分享服務。並通過地理位置校準報表數據準確性，提供基礎反作弊服務。為了您的信息安全，我們已與第三方SDK服務商進行數據安全保密約定，這些公司會嚴格遵守我們的數據隱私和安全要求。  除非得到您的同意，我們不會與其共享您的個人身份信息。為便於您更好地了解[Mob+]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸https://www.mob.com/about/policy了解[Mob+]隱私權政）。</string>
+    <string name="anti_cheating_services">為了給用戶提供更好的服務，我們的產品集成[友盟SDK]，SDK需要收集您的设备信息（IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP地址/SIM 卡 IMSI 信息等），為便於您更好地了解[友盟SDK]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸：https://www.umeng.com/page/policy 了解[友盟SDK]隱私權政策【友盟+】隐私政策【友盟+】,第三方全域大数据服务提供商,为客户提供PC/APP/线下统计,广告效果监测,消息推送/微社区/分享/IM等运营工具,DIP,全域指数与行业报告等。https://www.umeng.com/page/policy</string>
    <string name="agreement">同意</string>
    <string name="read_and_agre">點擊同意後即代表您已閱讀並同意以上所有內容。</string>
    <string name="support_login">本應用會收集位置數據以支持登錄和註冊的功能使用。</string>
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -1080,7 +1080,7 @@
    <string name="terms_and_policies">條款和政策</string>
    <string name="treat_and_protect">歡迎來到PD LIVE，對於您的個人信息及隱私，我們將採用最高標準對待和保護。</string>
    <string name="install_the_application">詳情請您閱讀以下安裝應用程序的消息：</string>
-    <string name="anti_cheating_services">為了向您提供一鍵分享服務，我們的產品集成Mob+U-Share SDK，Mob+SDK需要收集您的設備Mac地址、唯一設備識別碼(1MEI/android ID/IDFA/OPENUDID/GUID、 SIM卡IMSI信息)以及您需要分享的社交賬號公開信息，以便完成一鍵分享服務。並通過地理位置校準報表數據準確性，提供基礎反作弊服務。為了您的信息安全，我們已與第三方SDK服務商進行數據安全保密約定，這些公司會嚴格遵守我們的數據隱私和安全要求。  除非得到您的同意，我們不會與其共享您的個人身份信息。為便於您更好地了解[Mob+]採集的數據類型及用途，以及何保護您的個人信息，您可以登陸https://www.mob.com/about/policy了解[Mob+]隱私權政）。</string>
+    <string name="anti_cheating_services">為了給用戶提供更好的服務，我們的產品集成[友盟SDK]，SDK需要收集您的设备信息（IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP地址/SIM 卡 IMSI 信息等），為便於您更好地了解[友盟SDK]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸：https://www.umeng.com/page/policy 了解[友盟SDK]隱私權政策【友盟+】隐私政策【友盟+】,第三方全域大数据服务提供商,为客户提供PC/APP/线下统计,广告效果监测,消息推送/微社区/分享/IM等运营工具,DIP,全域指数与行业报告等。https://www.umeng.com/page/policy</string>
    <string name="agreement">同意</string>
    <string name="read_and_agre">點擊同意後即代表您已閱讀並同意以上所有內容。</string>
    <string name="support_login">本應用會收集位置數據以支持登錄和註冊的功能使用。</string>
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1054,7 +1054,7 @@ Limited ride And limited avatar frame</string>
    <string name="terms_and_policies">Terms and policies</string>
    <string name="install_the_application">For details, please read the following message to install the application:</string>
    <string name="treat_and_protect">Welcome to PD LIVE. For your personal information and privacy, we will adopt the highest standards of treatment and protection.</string>
-    <string name="anti_cheating_services">In order to provide you with one-click sharing service, our product integrates Mob+U-Share SDK, The Mob+SDK needs to collect your device Mac address, unique device identifier (1MEIandroid IDIDFAOPENUDIDGUID, SIM card IMSI information), and public social account information that you need to share in order to complete the one-click sharing service. And through the geographical location calibration report data accuracy, provide basic anti-cheating services. For the sake of your information security, we have made data security and confidentiality agreements with third-party SDK service providers, and these companies will strictly abide by our data privacy and security requirements. We will not share your personally identifiable information with them unless we have your consent. To facilitate you better understand/Mob + data types and USES, and how to protect your personal information, you can log on to https:www.mob.com aboutpolicy understand [Mob +] privacy policy).</string>
+    <string name="anti_cheating_services">In order to provide users with better services, our products integrate [Alliance SDK], SDK needs to collect your device information (IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP address /SIM card IMSI information, etc.), In order for you to better understand the types and purposes of the data collected by [Alliance SDK] and how to protect your personal information, you can log on to: https://www.umeng.com/page/policy  Learn about [Alliance SDK] Privacy Policy [Alliance +] Privacy Policy [Alliance +], a third-party global big data service provider, providing customers with PC/APP/ offline statistics, advertising effect monitoring, message push/micro community/sharing /IM and other operating tools,DIP, global index and industry reports. https://www.umeng.com/page/policy</string>
    <string name="read_and_agre">Clicking Agree means you have read and agree to all of the above.。</string>
    <string name="agreement">agreement</string>
    <string name="come_to">Welcome to PD LIVE.</string>
@@ -1313,6 +1313,8 @@ Limited ride And limited avatar frame</string>
    <string name="cancel_ca">cancel</string>
    <string name="settings_ser">settings</string>
    <string name="too_many_gifts">Too many gifts</string>
+    <string name="trial_coupon">是否使用試用劵</string>
+    <string name="use_diamonds">使用鑽石</string>
    <string name="list_for_lianmai">Current</string>
    <string name="user_apply_for_lianmai">Apply for list</string>
    <string name="live_mic_anchor_to_user_dialog">Anchor:</string>