feat: 组件阿里云埋点，重新整理工具类

app/src/main/java/com/ydl/component/MainActivity.kt

@@ -19,26 +19,24 @@ import com.umeng.analytics.MobclickAgent
 import com.ydl.component.music.FragmentContainerActivity
 import com.ydl.component.mvp.DemoContract
 import com.ydl.component.mvp.DemoPresenter
+import com.ydl.component.route.PlatformTempCommonRouteImpl
+import com.ydl.confide.home.ConfideHomeActivity
 import com.ydl.media.audio.PlayService
 import com.ydl.ydlcommon.modular.ModularServiceManager
 import com.ydl.ydlcommon.mvp.lce.BaseLceActivity
+import com.ydl.ydlcommon.router.YdlCommonRouterManager
+import com.yidianling.common.tools.LogUtil
 import com.yidianling.common.tools.ToastUtil
+import com.yidianling.consultant.api.IConsultantService
 import com.yidianling.fm.api.service.IFMService
 import com.yidianling.tests.home.NewTestHomeActivity
+import com.yidianling.user.StatusUtils
 import com.yidianling.user.ui.collect.CollectSexAndBirthActivity
+import com.yidianling.user.ui.login.OneKeyLoginHelp
 import com.yidianling.user.widget.SecretDescriptionDialog
 import com.yidianling.user.widget.SecretDialog
 import com.yidianling.user.widget.SecretDialog.OnSecretDialogListener
 import kotlinx.android.synthetic.main.activity_main.*
-import com.ydl.component.route.PlatformTempCommonRouteImpl
-import com.ydl.confide.home.ConfideHomeActivity
-import com.ydl.ydlcommon.router.YdlCommonRouterManager
-import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
-import com.ydl.ydlnet.utils.log.AliYunLogConfig
-import com.yidianling.common.tools.LogUtil
-import com.yidianling.consultant.api.IConsultantService
-import com.yidianling.user.StatusUtils
-import com.yidianling.user.ui.login.OneKeyLoginHelp
 
 
 /**
@@ -91,7 +89,6 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
 
         tv_home?.setOnClickListener {
             mPresenter.loadHome()
-            AliYunRichLogsHelper.getInstance().sendRichLog(AliYunLogConfig.LOGIN,"测试测试啊")
         }
 
         bt_to_other.setOnClickListener {

config.gradle

@@ -5,12 +5,12 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.49.05",
+            "m-confide"       : "0.0.49.06",
             "m-consultant"    : "0.0.59.68",
             "m-fm"            : "0.0.30.01",
-            "m-user"          : "0.0.61.25",
+            "m-user"          : "0.0.61.26",
             "m-home"          : "0.0.22.59",
-            "m-im"            : "0.0.18.47",
+            "m-im"            : "0.0.18.48",
             "m-dynamic"       : "0.0.7.19",
             "m-article"       : "0.0.0.6",
 
@@ -33,18 +33,18 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.39.99",
+            "ydl-platform"    : "0.0.40.00",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.38.40",
+            "ydl-webview"     : "0.0.38.41",
             "ydl-media"       : "0.0.21.6",
-            "ydl-pay"         : "0.0.18.17",
-            "m-audioim"       : "0.0.49.29.35",
+            "ydl-pay"         : "0.0.18.18",
+            "m-audioim"       : "0.0.49.29.36",
             "ydl-flutter-base": "0.0.14.20",
 
             //以下 几乎不会动
             "router"          : "0.0.1",
-            "ydl-net"         : "0.0.3.8",
+            "ydl-net"         : "0.0.3.9",
             "ydl-utils"       : "0.0.3.1",
     ]
     ydl_app = [
@@ -88,12 +88,12 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
 
-            "m-confide"       : "0.0.49.05",
+            "m-confide"       : "0.0.49.06",
             "m-consultant"    : "0.0.59.68",
             "m-fm"            : "0.0.30.01",
-            "m-user"          : "0.0.61.25",
+            "m-user"          : "0.0.61.26",
             "m-home"          : "0.0.22.59",
-            "m-im"            : "0.0.18.47",
+            "m-im"            : "0.0.18.48",
             "m-dynamic"       : "0.0.7.19",
             "m-article"       : "0.0.0.6",
 
@@ -115,18 +115,18 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.39.99",
+            "ydl-platform"    : "0.0.40.00",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.38.40",
+            "ydl-webview"     : "0.0.38.41",
             "ydl-media"       : "0.0.21.6",
-            "ydl-pay"         : "0.0.18.17",
-            "m-audioim"       : "0.0.49.29.35",
+            "ydl-pay"         : "0.0.18.18",
+            "m-audioim"       : "0.0.49.29.36",
             "ydl-flutter-base": "0.0.14.20",
 
             //以下 几乎不会动
             "router"          : "0.0.1",
-            "ydl-net"         : "0.0.3.8",
+            "ydl-net"         : "0.0.3.9",
             "ydl-utils"       : "0.0.3.1",
     ]
 

m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt

@@ -50,10 +50,10 @@ import com.ydl.ydlcommon.utils.LogUtil
 import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.ydl.ydlcommon.utils.Utils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
 import com.ydl.ydlcommon.utils.log.LogHelper
 import com.ydl.ydlcommon.utils.remind.ToastHelper
-import com.ydl.ydlnet.utils.log.AliYunLogConfig
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.user.api.service.IUserService
 import de.greenrobot.event.EventBus

m-audioim/src/main/java/com/ydl/audioim/YDLavManager.kt

@@ -25,9 +25,9 @@ import com.ydl.ydl_av.messge_service.response.CallRemoteResponse
 import com.ydl.ydlcommon.modular.ModularServiceManager
 import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.LogUtil
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
 import com.ydl.ydlcommon.utils.log.LogHelper
-import com.ydl.ydlnet.utils.log.AliYunLogConfig
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.im.api.bean.IMRegisterObserverCustomNotificationCallBack
 import com.yidianling.im.api.bean.IMSendCustomNotificationResultCallBack

m-audioim/src/main/java/com/ydl/consultantim/ConsultantAudioHomeActivity.kt

@@ -47,10 +47,10 @@ import com.ydl.ydlcommon.utils.LogUtil
 import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.ydl.ydlcommon.utils.Utils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
 import com.ydl.ydlcommon.utils.log.LogHelper
 import com.ydl.ydlcommon.utils.remind.ToastHelper
-import com.ydl.ydlnet.utils.log.AliYunLogConfig
 import com.yidianling.user.api.service.IUserService
 import de.greenrobot.event.EventBus
 import io.agora.rtc.Constants

m-im/src/main/java/com/yidianling/avchatkit/AVChatKit.java

@@ -10,8 +10,8 @@ import com.netease.nimlib.sdk.avchat.AVChatManager;
 import com.netease.nimlib.sdk.avchat.constant.AVChatControlCommand;
 import com.netease.nimlib.sdk.avchat.model.AVChatData;
 import com.ydl.ydlcommon.base.BaseActivityMgr;
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig;
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper;
-import com.ydl.ydlnet.utils.log.AliYunLogConfig;
 import com.yidianling.avchatkit.activity.AVChatActivity;
 import com.yidianling.avchatkit.common.log.ILogUtil;
 import com.yidianling.avchatkit.common.log.LogUtil;

m-im/src/main/java/com/yidianling/avchatkit/activity/AVChatActivity.java

@@ -26,8 +26,8 @@ import com.netease.nimlib.sdk.avchat.model.AVChatData;
 import com.netease.nimlib.sdk.avchat.model.AVChatOnlineAckEvent;
 import com.netease.nimlib.sdk.avchat.model.AVChatVideoFrame;
 import com.tbruyelle.rxpermissions2.RxPermissions;
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig;
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper;
-import com.ydl.ydlnet.utils.log.AliYunLogConfig;
 import com.yidianling.avchatkit.AVChatKit;
 import com.yidianling.avchatkit.AVChatProfile;
 import com.yidianling.avchatkit.common.activity.AVChatBaseUI;

m-im/src/main/java/com/yidianling/avchatkit/common/util/NetworkUtil.java

@@ -11,8 +11,8 @@ import android.os.Build;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig;
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper;
-import com.ydl.ydlnet.utils.log.AliYunLogConfig;
 import com.yidianling.avchatkit.common.log.LogUtil;
 
 public class NetworkUtil {

m-im/src/main/java/com/yidianling/avchatkit/controll/AVChatController.java

@@ -15,8 +15,8 @@ import com.netease.nimlib.sdk.avchat.model.AVChatNotifyOption;
 import com.netease.nimlib.sdk.avchat.model.AVChatParameters;
 import com.netease.nimlib.sdk.avchat.video.AVChatCameraCapturer;
 import com.netease.nimlib.sdk.avchat.video.AVChatVideoCapturerFactory;
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig;
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper;
-import com.ydl.ydlnet.utils.log.AliYunLogConfig;
 import com.yidianling.avchatkit.AVChatKit;
 import com.yidianling.avchatkit.common.log.LogUtil;
 import com.yidianling.avchatkit.common.widgets.MultiSelectDialog;

m-im/src/main/java/com/yidianling/avchatkit/teamavchat/activity/TeamAVChatActivity.java

@@ -35,8 +35,8 @@ import com.netease.nimlib.sdk.avchat.model.AVChatParameters;
 import com.netease.nimlib.sdk.avchat.video.AVChatCameraCapturer;
 import com.netease.nimlib.sdk.avchat.video.AVChatVideoCapturerFactory;
 import com.netease.nrtc.video.render.IVideoRender;
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig;
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper;
-import com.ydl.ydlnet.utils.log.AliYunLogConfig;
 import com.yidianling.avchatkit.AVChatKit;
 import com.yidianling.avchatkit.TeamAVChatProfile;
 import com.yidianling.avchatkit.common.activity.AVChatBaseUI;

m-im/src/main/java/com/yidianling/im/helper/IMChatUtil.kt

@@ -17,10 +17,10 @@ import com.ydl.ydlcommon.ui.LoadingDialogFragment
 import com.ydl.ydlcommon.ui.LoadingDialogFragment.Companion.newInstance
 import com.ydl.ydlcommon.utils.NetworkParamsUtils
 import com.ydl.ydlcommon.utils.UserInfoCache
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
 import com.ydl.ydlcommon.utils.remind.HttpErrorUtils.Companion.handleError
 import com.ydl.ydlcommon.view.dialog.CommonDialog
-import com.ydl.ydlnet.utils.log.AliYunLogConfig
 import com.yidianling.common.tools.LogUtil
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.im.R

m-im/src/main/java/com/yidianling/uikit/api/NimUIKit.java

@@ -5,8 +5,8 @@ import android.content.Context;
 import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
 import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
 import com.netease.nimlib.sdk.msg.model.IMMessage;
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig;
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper;
-import com.ydl.ydlnet.utils.log.AliYunLogConfig;
 import com.yidianling.nimbase.api.BaseNimUIKit;
 import com.yidianling.nimbase.api.model.session.SessionCustomization;
 import com.yidianling.uikit.business.contact.selector.activity.ContactSelectActivity;

m-im/src/main/java/com/yidianling/uikit/business/session/activity/YDLP2PMessageActivity.java

@@ -16,8 +16,8 @@ import com.netease.nimlib.sdk.msg.MsgServiceObserve;
 import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
 import com.netease.nimlib.sdk.msg.model.CustomNotification;
 import com.netease.nimlib.sdk.msg.model.IMMessage;
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig;
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper;
-import com.ydl.ydlnet.utils.log.AliYunLogConfig;
 import com.yidianling.common.tools.ToastUtil;
 import com.yidianling.im.R;
 import com.yidianling.im.api.bean.IMRegisterObserverCustomNotificationCallBack;

m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java

@@ -49,11 +49,11 @@ import com.ydl.ydlcommon.utils.LogUtil;
 import com.ydl.ydlcommon.utils.SharedPreferencesEditor;
 import com.ydl.ydlcommon.utils.YdlBuryPointUtil;
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils;
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig;
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper;
 import com.ydl.ydlcommon.utils.log.LogHelper;
 import com.ydl.ydlcommon.view.CircleImageView;
 import com.ydl.ydlcommon.view.dialog.CommonDialog;
-import com.ydl.ydlnet.utils.log.AliYunLogConfig;
 import com.yidianling.common.tools.ToastUtil;
 import com.yidianling.im.R;
 import com.yidianling.im.helper.IMChatUtil;

m-user/src/main/java/com/yidianling/user/LoginUtils.kt

@@ -6,8 +6,8 @@ import com.tencent.bugly.crashreport.CrashReport
 import com.ydl.ydlcommon.data.http.RxUtils
 import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.BuryPointUtils
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
-import com.ydl.ydlnet.utils.log.AliYunLogConfig
 import com.yidianling.common.tools.LogUtil
 import com.yidianling.im.api.bean.IMLoginInfo
 import com.yidianling.im.api.bean.IMRequestCallback

m-user/src/main/java/com/yidianling/user/ui/SmsLoginActivity.kt

@@ -14,9 +14,9 @@ import com.ydl.ydlcommon.router.YdlCommonOut
 import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.UserInfoCache
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
 import com.ydl.ydlcommon.utils.remind.ToastHelper
-import com.ydl.ydlnet.utils.log.AliYunLogConfig
 import com.yidianling.im.api.bean.IMLoginInfo
 import com.yidianling.im.api.bean.IMRequestCallback
 import com.yidianling.user.LoginUtils

m-user/src/main/java/com/yidianling/user/ui/login/OneKeyLoginHelp.kt

@@ -26,9 +26,9 @@ import com.ydl.ydlcommon.utils.JPushUtils
 import com.ydl.ydlcommon.utils.LogUtil
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
 import com.ydl.ydlcommon.utils.log.LogHelper
-import com.ydl.ydlnet.utils.log.AliYunLogConfig
 import com.yidianling.common.tools.RxAppTool
 import com.yidianling.common.tools.RxDeviceTool
 import com.yidianling.common.tools.RxImageTool

m-user/src/main/java/com/yidianling/user/ui/login/presenter/InputPassWordPresenterImpl.kt

@@ -7,9 +7,9 @@ import com.ydl.ydlcommon.router.YdlCommonOut
 import com.ydl.ydlcommon.utils.StringUtils
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
 import com.ydl.ydlcommon.utils.log.LogHelper
-import com.ydl.ydlnet.utils.log.AliYunLogConfig
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.user.LoginUtils
 import com.yidianling.user.StatusUtils

m-user/src/main/java/com/yidianling/user/ui/login/presenter/LoginPresenterImpl.kt

@@ -9,9 +9,9 @@ import com.ydl.ydlcommon.mvp.base.BasePresenter
 import com.ydl.ydlcommon.router.YdlCommonOut
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
 import com.ydl.ydlcommon.utils.log.LogHelper
-import com.ydl.ydlnet.utils.log.AliYunLogConfig
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.user.LoginUtils
 import com.yidianling.user.StatusUtils

ydl-net/src/main/java/com/ydl/ydlnet/utils/log/AliYunLogHelper.kt

-package com.ydl.ydlnet.utils.log
-
-import com.aliyun.sls.android.producer.*
-
-class AliYunLogHelper {
-
-    companion object {
-        var mConfig: LogProducerConfig? = null
-        var mClient: LogProducerClient? = null
-
-        fun getInstance(): AliYunLogHelper {
-            return Holder.INSTANCE
-        }
-    }
-
-    constructor() {
-        val endpoint = "cn-hangzhou.log.aliyuncs.com"
-        val project = "ydl-app-log"
-        val logstore = "ydl-app-log"
-        val accesskeyid = "LTAI5tH6WGqWUqzo4u5GfrCS"
-        val accesskeysecret = "uzccm79mr9d4rIsABu3xwfbdUdaeWT"
-        try {
-            mConfig = LogProducerConfig(endpoint, project, logstore, accesskeyid, accesskeysecret)
-            mClient = LogProducerClient(mConfig)
-        } catch (e: LogProducerException) {
-            e.printStackTrace()
-        }
-    }
-
-
-    private object Holder {
-        val INSTANCE = AliYunLogHelper()
-    }
-
-    /**
-     *
-     * @param key AliYunLogConfig 接口、登录、声网、WebView、支付、其他
-     * @param value 具体的状态值
-     * */
-    fun sendLog(key: String, value: String) {
-        val log = Log()
-        log.putContent(key, value)
-        if (mClient != null) {
-            val res: LogProducerResult = mClient!!.addLog(log)
-        }
-    }
-
-    /**
-     * @param log 子类调用，传递更多参数
-     * */
-    fun sendLog(log: Log) {
-        if (mClient != null) {
-            val res: LogProducerResult = mClient!!.addLog(log)
-        }
-    }
-}
\ No newline at end of file

ydl-pay/src/main/java/com/yidianling/ydl_pay/common/CommonPayDialog.kt

@@ -14,8 +14,8 @@ import android.widget.LinearLayout
 import com.alipay.sdk.app.PayTask
 import com.tencent.mm.opensdk.modelpay.PayReq
 import com.tencent.mm.opensdk.openapi.WXAPIFactory
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
-import com.ydl.ydlnet.utils.log.AliYunLogConfig
 import com.yidianling.common.tools.RxImageTool
 import com.yidianling.ydl_pay.R
 import com.yidianling.ydl_pay.common.bean.*

ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/PayActivity.kt

@@ -18,9 +18,9 @@ import com.ydl.ydlcommon.data.PlatformDataManager
 import com.ydl.ydlcommon.data.http.RxUtils
 import com.ydl.ydlcommon.data.http.ThrowableConsumer
 import com.ydl.ydlcommon.modular.ModularServiceManager
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
 import com.ydl.ydlcommon.utils.log.LogHelper
-import com.ydl.ydlnet.utils.log.AliYunLogConfig
 import com.yidianling.common.tools.LogUtil
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.im.api.service.IImService

ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/RxPay.kt

@@ -7,8 +7,8 @@ import com.tencent.mm.opensdk.constants.Build
 import com.tencent.mm.opensdk.modelpay.PayReq
 import com.tencent.mm.opensdk.openapi.WXAPIFactory
 import com.ydl.ydlcommon.data.http.CustomThrowable
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
-import com.ydl.ydlnet.utils.log.AliYunLogConfig
 import com.yidianling.ydl_pay.common.bean.CommonWXPayBean
 import com.yidianling.ydl_pay.common.bean.PayResult
 import com.yidianling.ydl_pay.pay.bean.PayStatus

ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/payDialog/PayDialog.kt

@@ -9,10 +9,10 @@ import android.support.v7.app.AlertDialog
 import android.view.*
 import com.ydl.ydlcommon.data.http.RxUtils
 import com.ydl.ydlcommon.utils.StringUtils
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
 import com.ydl.ydlcommon.utils.log.LogHelper
 import com.ydl.ydlcommon.utils.remind.ToastHelper
-import com.ydl.ydlnet.utils.log.AliYunLogConfig
 import com.yidianling.ydl_pay.R
 import com.yidianling.ydl_pay.common.bean.params.AliPayParam
 import com.yidianling.ydl_pay.common.bean.params.WxPayParam

ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/HttpConfig.kt

@@ -17,12 +17,12 @@ import com.ydl.ydlcommon.data.http.api.ApiRequestUtil
 import com.ydl.ydlcommon.modular.ModularServiceManager
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
 import com.ydl.ydlnet.builder.config.OkHttpConfig
 import com.ydl.ydlnet.builder.factory.ApiFactory
 import com.ydl.ydlnet.builder.interceptor.log.RequestHandler
 import com.ydl.ydlnet.builder.interceptor.log.RequestLogInterceptor
-import com.ydl.ydlnet.utils.log.AliYunLogConfig
 import com.yidianling.common.tools.LogUtil
 import com.yidianling.common.tools.RxAppTool
 import com.yidianling.common.tools.RxDeviceTool

ydl-net/src/main/java/com/ydl/ydlnet/utils/log/AliYunLogConfig.kt → ydl-platform/src/main/java/com/ydl/ydlcommon/utils/log/AliYunLogConfig.kt

-package com.ydl.ydlnet.utils.log
+package com.ydl.ydlcommon.utils.log
 
 object AliYunLogConfig {
     /**接口*/

ydl-platform/src/main/java/com/ydl/ydlcommon/utils/log/AliYunRichLogsHelper.kt

 package com.ydl.ydlcommon.utils.log
 
-import com.aliyun.sls.android.producer.Log
+import com.aliyun.sls.android.producer.*
 import com.ydl.ydlcommon.base.BaseApp.Companion.getApp
 import com.ydl.ydlcommon.data.PlatformDataManager.getRam
 import com.ydl.ydlcommon.modular.ModularServiceManager.getPlatformUserService
-import com.ydl.ydlnet.utils.log.AliYunLogHelper
 import com.yidianling.common.tools.RxAppTool
 import com.yidianling.common.tools.RxDeviceTool
 
@@ -15,11 +14,27 @@ import com.yidianling.common.tools.RxDeviceTool
  * */
 class AliYunRichLogsHelper {
     companion object {
+        var mConfig: LogProducerConfig? = null
+        var mClient: LogProducerClient? = null
         fun getInstance(): AliYunRichLogsHelper {
             return Holder.INSTANCE
         }
     }
 
+    constructor() {
+        val endpoint = "cn-hangzhou.log.aliyuncs.com"
+        val project = "ydl-app-log"
+        val logstore = "ydl-app-log"
+        val accesskeyid = "LTAI5tH6WGqWUqzo4u5GfrCS"
+        val accesskeysecret = "uzccm79mr9d4rIsABu3xwfbdUdaeWT"
+        try {
+            mConfig = LogProducerConfig(endpoint, project, logstore, accesskeyid, accesskeysecret)
+            mClient = LogProducerClient(mConfig)
+        } catch (e: LogProducerException) {
+            e.printStackTrace()
+        }
+    }
+
     private object Holder {
         val INSTANCE = AliYunRichLogsHelper()
     }
@@ -43,6 +58,22 @@ class AliYunRichLogsHelper {
             log.putContent("uid", userInfo.userId)
             log.putContent("accessToken", userInfo.token)
         }
-        AliYunLogHelper.getInstance().sendLog(log)
+
+        if (mClient != null) {
+            val res: LogProducerResult = mClient!!.addLog(log)
+        }
+    }
+
+    /**
+     *
+     * @param key AliYunLogConfig 接口、登录、声网、WebView、支付、其他
+     * @param value 具体的状态值
+     * */
+    fun sendLog(key: String, value: String) {
+        val log = Log()
+        log.putContent(key, value)
+        if (mClient != null) {
+            val res: LogProducerResult = mClient!!.addLog(log)
+        }
     }
 }
\ No newline at end of file

ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java

@@ -48,11 +48,11 @@ import com.ydl.ydlcommon.utils.LogUtil;
 import com.ydl.ydlcommon.utils.NetWorkSpeedUtils;
 import com.ydl.ydlcommon.utils.StatusBarUtils;
 import com.ydl.ydlcommon.utils.URLUtils;
+import com.ydl.ydlcommon.utils.log.AliYunLogConfig;
 import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper;
 import com.ydl.ydlcommon.view.TitleBar;
 import com.ydl.ydlcommon.view.dialog.YDLCommonDialog;
 import com.ydl.ydlcommon.view.dialog.YDLShareDialog;
-import com.ydl.ydlnet.utils.log.AliYunLogConfig;
 import com.yidianling.common.tools.RxDeviceTool;
 import com.yidianling.common.tools.RxImageTool;
 import com.yidianling.common.tools.ToastUtil;