添加渠道名称

CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/AppConfig.kt

@@ -81,20 +81,17 @@ class AppConfig {
 
     // 友盟测试环境配置
     const val UMAppTestKey = "60c8479fe044530ff0a49936"//umeng统计key注释
-    const val UMTestChannel = "ANDROID_CHANNEL"
-    const val UMTestType = "metro"
+    const val UMTestChannel = "android_test"
     const val UMTestPushSecret = "e78446e86d153e2891ae7523e1532f13"// push secret
 
     // 友盟线上环境配置
     const val UMAppKey = "60ccc0c68a102159db70438c"//umeng统计key注释
-    const val UMChannel = "ANDROID_CHANNEL"
-    const val UMType = "metro"
+    const val UMChannel = "android_prod"
     const val UMPushSecret = "27ac72f77ef4ff6593cca8be3069ecd0"// push secret
     const val PUSH_XIAOMI_SUPPORT_MASK = 0x40000000
     const val PUSH_UMENG_SUPPORT_MASK = 0x20000000
     const val PUSH_GETUI_SUPPORT_MASK = 0x10000000
     const val PUSH_PASS_THROGH_UNIQUE_MASK = 0x00000001
-    const val ZIXUN_PUSH_LEVEL = PUSH_XIAOMI_SUPPORT_MASK
 
     const val PUSH_LEVEL = (PUSH_XIAOMI_SUPPORT_MASK or PUSH_UMENG_SUPPORT_MASK
       or PUSH_GETUI_SUPPORT_MASK or PUSH_PASS_THROGH_UNIQUE_MASK)

CommonLib/BCommon/src/main/java/com/yidian/bcommon/utils/UMConfigUtils.kt

@@ -6,9 +6,9 @@ import com.umeng.analytics.MobclickAgent
 import com.umeng.commonsdk.UMConfigure
 import com.umeng.message.entity.UMessage
 import com.yidian.bcommon.constant.AppConfig
-import com.yidian.bcommon.BuildConfig
 import com.yidian.bcommon.constant.RunConfig
 import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.xarc.xbase.utils.ChannelUtil
 import com.yidian.xpage.XPageManager
 
 
@@ -18,24 +18,14 @@ import com.yidian.xpage.XPageManager
 class UMConfigUtils {
   companion object {
 
-//    /**
-//     * 预初始化
-//     */
-//    fun preInit(context: Context) {
-//      if (RunConfig.IS_UMENG_RELEASE) {
-//        UMConfigure.preInit(context, AppConfig.UMAppKey, AppConfig.UMChannel)
-//      } else {
-//        UMConfigure.preInit(context, AppConfig.UMAppTestKey, AppConfig.UMTestChannel)
-//      }
-//    }
-
     /**
      * 正式初始化
      */
     fun init(context: Context) {
-      //release环境上报错误信息，参数有：上下文、APPkey、渠道号、设备类型、推送密钥
+      //release环境上报错误信息，参数有：上下文、APPKey、渠道号、设备类型、推送密钥
       if (RunConfig.IS_UMENG_RELEASE) {
-        UMConfigure.init(context, AppConfig.UMAppKey, AppConfig.UMChannel, UMConfigure.DEVICE_TYPE_PHONE, AppConfig.UMPushSecret)
+        val channelValue = ChannelUtil.getChannelFromApk(context, "channel")
+        UMConfigure.init(context, AppConfig.UMAppKey, channelValue, UMConfigure.DEVICE_TYPE_PHONE, AppConfig.UMPushSecret)
       } else {
         UMConfigure.init(
           context,