Skip to content

A
android_fiveworld
Commit b9b31c7b authored by mengcuiguang2's avatar mengcuiguang2
Browse files
Options

解决冲突

parent f9fa5228
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 104 deletions
app/build.gradle
View file @ b9b31c7b
...@@ -13,8 +13,8 @@ android { ...@@ -13,8 +13,8 @@ android {
applicationId rootProject.APPLICATION_ID applicationId rootProject.APPLICATION_ID
minSdkVersion rootProject.ext.androidMinSdkVersion minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 20211022 versionCode 20211023
versionName "1.1.6" versionName "1.1.7"
flavorDimensions "default" flavorDimensions "default"
// dex突破65535的限制 // dex突破65535的限制
......
app/src/main/java/com/mints/fiveworld/manager/UmengManager.kt
View file @ b9b31c7b
...@@ -66,59 +66,28 @@ object UmengManager { ...@@ -66,59 +66,28 @@ object UmengManager {
* 友盟埋点 * 友盟埋点
*/ */
fun onEvent(name: String) { fun onEvent(name: String) {
// if(BuildConfig.DEBUG){ if(BuildConfig.DEBUG){
// LogUtil.d(TAG, "name=${name} remark=${AdReportManager.EventType.valueOf(name).value}") LogUtil.d(TAG, "name=${name} remark=${AdReportManager.EventType.valueOf(name).value}")
//
//
// TrackManager.getInstance().tempaddCallImp(
// "",
// "",
// "",
// "",
// "",
// "",
// "",
// "",
// "",
// "",
// System.currentTimeMillis(),
// name,
// AdReportManager.EventType.valueOf(name).value
// )
// }
// 上送umeng
MobclickAgent.onEvent(MintsApplication.getContext(), name)
}
/** TrackManager.getInstance().tempaddCallImp(
* 友盟埋点 "",
*/ "",
fun onEventArgs(name: String, arg: String) { "",
// if(BuildConfig.DEBUG){ "",
// LogUtil.d(TAG, "name=${name} remark=${AdReportManager.EventType.valueOf(name).value}") "",
// "",
// TrackManager.getInstance().tempaddCallImp( "",
// "", "",
// "", "",
// "", "",
// "", System.currentTimeMillis(),
// "", name,
// "", AdReportManager.EventType.valueOf(name).value
// "", )
// "", }
// "",
// "",
// System.currentTimeMillis(),
// name,
// AdReportManager.EventType.valueOf(name).value
// )
// }
val map = mutableMapOf<String, String>()
map["scene"] = arg
// 上送umeng // 上送umeng
MobclickAgent.onEvent(MintsApplication.getContext(), name, map) MobclickAgent.onEvent(MintsApplication.getContext(), name)
} }
} }
\ No newline at end of file
app/src/main/java/com/mints/fiveworld/manager/wifi/WifiDataManager.kt
View file @ b9b31c7b
...@@ -335,10 +335,8 @@ object WifiDataManager { ...@@ -335,10 +335,8 @@ object WifiDataManager {
// 开关关闭 return // 开关关闭 return
if (!sp.getBoolean(PHONE_OFF_SWITCH, SCENE_SWITCH_DEFAULT)) { if (!sp.getBoolean(PHONE_OFF_SWITCH, SCENE_SWITCH_DEFAULT)) {
UmengManager.onEventArgs( UmengManager.onEvent(
AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name, AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name)
PHONE_OFF_SWITCH
)
AdReportManager.eventScene( AdReportManager.eventScene(
AdReportManager.INNER_OUT, AdReportManager.INNER_OUT,
System.currentTimeMillis(), System.currentTimeMillis(),
...@@ -443,10 +441,8 @@ object WifiDataManager { ...@@ -443,10 +441,8 @@ object WifiDataManager {
// 总开关关闭 return // 总开关关闭 return
if (!sp.getBoolean(WIFI_ON_SWITCH, SCENE_SWITCH_DEFAULT)) { if (!sp.getBoolean(WIFI_ON_SWITCH, SCENE_SWITCH_DEFAULT)) {
// 场景开关关闭 // 场景开关关闭
UmengManager.onEventArgs( UmengManager.onEvent(
AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name, AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name)
WIFI_ON_SWITCH
)
AdReportManager.eventScene( AdReportManager.eventScene(
AdReportManager.INNER_OUT, AdReportManager.INNER_OUT,
...@@ -546,10 +542,8 @@ object WifiDataManager { ...@@ -546,10 +542,8 @@ object WifiDataManager {
// 总开关关闭 return // 总开关关闭 return
if (!sp.getBoolean(WIFI_OFF_SWITCH, SCENE_SWITCH_DEFAULT)) { if (!sp.getBoolean(WIFI_OFF_SWITCH, SCENE_SWITCH_DEFAULT)) {
// 场景开关关闭 // 场景开关关闭
UmengManager.onEventArgs( UmengManager.onEvent(
AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name, AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name)
WIFI_OFF_SWITCH
)
AdReportManager.eventScene( AdReportManager.eventScene(
AdReportManager.INNER_OUT, AdReportManager.INNER_OUT,
...@@ -646,10 +640,8 @@ object WifiDataManager { ...@@ -646,10 +640,8 @@ object WifiDataManager {
// 总开关关闭 return // 总开关关闭 return
if (!sp.getBoolean(BATTERY_OFF_SWITCH, SCENE_SWITCH_DEFAULT)) { if (!sp.getBoolean(BATTERY_OFF_SWITCH, SCENE_SWITCH_DEFAULT)) {
// 场景开关关闭 // 场景开关关闭
UmengManager.onEventArgs( UmengManager.onEvent(
AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name, AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name)
BATTERY_OFF_SWITCH
)
AdReportManager.eventScene( AdReportManager.eventScene(
AdReportManager.INNER_OUT, AdReportManager.INNER_OUT,
...@@ -750,10 +742,8 @@ object WifiDataManager { ...@@ -750,10 +742,8 @@ object WifiDataManager {
// 开关关闭 return // 开关关闭 return
if (!sp.getBoolean(LOCK_ON_SWITCH, SCENE_SWITCH_DEFAULT)) { if (!sp.getBoolean(LOCK_ON_SWITCH, SCENE_SWITCH_DEFAULT)) {
// 场景开关关闭 // 场景开关关闭
UmengManager.onEventArgs( UmengManager.onEvent(
AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name, AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name)
LOCK_ON_SWITCH
)
AdReportManager.eventScene( AdReportManager.eventScene(
AdReportManager.INNER_OUT, AdReportManager.INNER_OUT,
...@@ -856,10 +846,8 @@ object WifiDataManager { ...@@ -856,10 +846,8 @@ object WifiDataManager {
// 总开关关闭 return // 总开关关闭 return
if (!sp.getBoolean(INSTALL_APK_SWITCH, SCENE_SWITCH_DEFAULT)) { if (!sp.getBoolean(INSTALL_APK_SWITCH, SCENE_SWITCH_DEFAULT)) {
// 场景开关关闭 // 场景开关关闭
UmengManager.onEventArgs( UmengManager.onEvent(
AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name, AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name)
INSTALL_APK_SWITCH
)
AdReportManager.eventScene( AdReportManager.eventScene(
AdReportManager.INNER_OUT, AdReportManager.INNER_OUT,
System.currentTimeMillis(), System.currentTimeMillis(),
...@@ -961,10 +949,8 @@ object WifiDataManager { ...@@ -961,10 +949,8 @@ object WifiDataManager {
// 总开关关闭 return // 总开关关闭 return
if (!sp.getBoolean(UNINSTALL_APK_SWITCH, SCENE_SWITCH_DEFAULT)) { if (!sp.getBoolean(UNINSTALL_APK_SWITCH, SCENE_SWITCH_DEFAULT)) {
// 场景开关关闭 // 场景开关关闭
UmengManager.onEventArgs( UmengManager.onEvent(
AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name, AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name)
UNINSTALL_APK_SWITCH
)
AdReportManager.eventScene( AdReportManager.eventScene(
AdReportManager.INNER_OUT, AdReportManager.INNER_OUT,
...@@ -1066,10 +1052,8 @@ object WifiDataManager { ...@@ -1066,10 +1052,8 @@ object WifiDataManager {
// 总开关关闭 return // 总开关关闭 return
if (!sp.getBoolean(UPDATE_APK_SWITCH, SCENE_SWITCH_DEFAULT)) { if (!sp.getBoolean(UPDATE_APK_SWITCH, SCENE_SWITCH_DEFAULT)) {
// 场景开关关闭 // 场景开关关闭
UmengManager.onEventArgs( UmengManager.onEvent(
AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name, AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name)
UPDATE_APK_SWITCH
)
AdReportManager.eventScene( AdReportManager.eventScene(
AdReportManager.INNER_OUT, AdReportManager.INNER_OUT,
System.currentTimeMillis(), System.currentTimeMillis(),
...@@ -1156,10 +1140,8 @@ object WifiDataManager { ...@@ -1156,10 +1140,8 @@ object WifiDataManager {
// 总开关关闭 return // 总开关关闭 return
if (!sp.getBoolean(TIMING_SWITCH, SCENE_SWITCH_DEFAULT)) { if (!sp.getBoolean(TIMING_SWITCH, SCENE_SWITCH_DEFAULT)) {
// 场景开关关闭 // 场景开关关闭
UmengManager.onEventArgs( UmengManager.onEvent(
AdReportManager.EventType.EVENT_TYPE_SCENCE_OUT_TIME10_SWITCH.name, AdReportManager.EventType.EVENT_TYPE_SCENCE_OUT_TIME10_SWITCH.name)
TIMING_SWITCH
)
AdReportManager.eventScene( AdReportManager.eventScene(
AdReportManager.INNER_OUT, AdReportManager.INNER_OUT,
System.currentTimeMillis(), System.currentTimeMillis(),
...@@ -1246,10 +1228,8 @@ object WifiDataManager { ...@@ -1246,10 +1228,8 @@ object WifiDataManager {
// 总开关关闭 return // 总开关关闭 return
if (!sp.getBoolean(LOW_POWER_SWITCH, SCENE_SWITCH_DEFAULT)) { if (!sp.getBoolean(LOW_POWER_SWITCH, SCENE_SWITCH_DEFAULT)) {
// 场景开关关闭 // 场景开关关闭
UmengManager.onEventArgs( UmengManager.onEvent(
AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name, AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name)
LOW_POWER_SWITCH
)
AdReportManager.eventScene( AdReportManager.eventScene(
AdReportManager.INNER_OUT, AdReportManager.INNER_OUT,
System.currentTimeMillis(), System.currentTimeMillis(),
...@@ -1341,10 +1321,8 @@ object WifiDataManager { ...@@ -1341,10 +1321,8 @@ object WifiDataManager {
// 总开关关闭 return // 总开关关闭 return
if (!sp.getBoolean(WEAK_SIGNAL_SWITCH, SCENE_SWITCH_DEFAULT)) { if (!sp.getBoolean(WEAK_SIGNAL_SWITCH, SCENE_SWITCH_DEFAULT)) {
// 场景开关关闭 // 场景开关关闭
UmengManager.onEventArgs( UmengManager.onEvent(
AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name, AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name)
WEAK_SIGNAL_SWITCH
)
AdReportManager.eventScene( AdReportManager.eventScene(
AdReportManager.INNER_OUT, AdReportManager.INNER_OUT,
System.currentTimeMillis(), System.currentTimeMillis(),
...@@ -1437,10 +1415,8 @@ object WifiDataManager { ...@@ -1437,10 +1415,8 @@ object WifiDataManager {
// 总开关关闭 return // 总开关关闭 return
if (!sp.getBoolean(COOL_SWITCH, SCENE_SWITCH_DEFAULT)) { if (!sp.getBoolean(COOL_SWITCH, SCENE_SWITCH_DEFAULT)) {
// 场景开关关闭 // 场景开关关闭
UmengManager.onEventArgs( UmengManager.onEvent(
AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name, AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name)
COOL_SWITCH
)
AdReportManager.eventScene( AdReportManager.eventScene(
AdReportManager.INNER_OUT, AdReportManager.INNER_OUT,
System.currentTimeMillis(), System.currentTimeMillis(),
...@@ -1532,10 +1508,8 @@ object WifiDataManager { ...@@ -1532,10 +1508,8 @@ object WifiDataManager {
// 总开关关闭 return // 总开关关闭 return
if (!sp.getBoolean(LOW_STORAGE_SWITCH, SCENE_SWITCH_DEFAULT)) { if (!sp.getBoolean(LOW_STORAGE_SWITCH, SCENE_SWITCH_DEFAULT)) {
// 场景开关关闭 // 场景开关关闭
UmengManager.onEventArgs( UmengManager.onEvent(
AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name, AdReportManager.EventType.EVENT_TYPE_SCENCE_SWITCH_CLOSE.name)
LOW_STORAGE_SWITCH
)
AdReportManager.eventScene( AdReportManager.eventScene(
AdReportManager.INNER_OUT, AdReportManager.INNER_OUT,
System.currentTimeMillis(), System.currentTimeMillis(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment