Skip to content

D
Data Recovery White
Commit 2def6a00 authored by wanglei's avatar wanglei
Browse files
Options

...

parent 48fdbf57
Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 24 deletions
app/src/main/java/com/base/datarecovery/ads/AdmobEvent.kt
View file @ 2def6a00
......@@ -3,6 +3,7 @@ package com.base.datarecovery.ads
import android.app.Activity
import android.os.Bundle
import com.base.datarecovery.help.BaseApplication
import com.base.datarecovery.utils.EventUtils
import com.google.android.gms.ads.AdValue
import com.google.android.gms.ads.OnPaidEventListener
import com.google.android.gms.ads.ResponseInfo
......@@ -46,7 +47,7 @@ object AdmobEvent {
obj.put("errMsg", error)
obj.put("status", "2")
}
// EventUtils.event("ad_pull", ext = obj)
EventUtils.event("ad_pull", ext = obj)
}
private val taichiPref by lazy {
......@@ -191,7 +192,7 @@ object AdmobEvent {
obj.put("session_id", sessionId)
}
}
// EventUtils.event("ad_price", ext = obj)
EventUtils.event("ad_price", ext = obj)
}
}
......@@ -211,13 +212,13 @@ object AdmobEvent {
obj.put("session_id", responseInfo?.responseId)
obj.put("networkname", responseInfo?.mediationAdapterClassName)
if (adUnit != "nativeAd") {
// EventUtils.event("ad_click", ext = obj)
EventUtils.event("ad_click", ext = obj)
} else {
// EventUtils.event("bigimage_ad_click", ext = obj)
EventUtils.event("bigimage_ad_click", ext = obj)
}
}
fun showAd(responseInfo: ResponseInfo?, adUnit: String, activity: Activity? = null) {
fun showAd(responseInfo: ResponseInfo?, adUnit: String, activity: Activity? = null) {
val response = responseInfo?.adapterResponses?.getOrNull(0)
val obj = JSONObject()
obj.put("source", response?.adSourceName)
......@@ -232,9 +233,9 @@ object AdmobEvent {
obj.put("session_id", responseInfo?.responseId)
obj.put("from", activity?.javaClass?.simpleName)
if (adUnit != "nativeAd") {
// EventUtils.event("ad_show", ext = obj)
EventUtils.event("ad_show", ext = obj)
} else {
// EventUtils.event("bigimage_ad_show", ext = obj)
EventUtils.event("bigimage_ad_show", ext = obj)
}
}
}
\ No newline at end of file
app/src/main/java/com/base/datarecovery/ads/AdmobInterstitialUtils.kt
View file @ 2def6a00
......@@ -13,6 +13,7 @@ import com.base.datarecovery.ads.AdmobEvent.pullAd
import com.base.datarecovery.ads.AdmobEvent.showAd
import com.base.datarecovery.help.BaseApplication
import com.base.datarecovery.help.ConfigHelper
import com.base.datarecovery.utils.EventUtils
import com.base.datarecovery.view.CustomDialog
import com.google.android.gms.ads.AdError
import com.google.android.gms.ads.AdRequest
......@@ -48,12 +49,12 @@ object AdmobInterstitialUtils {
}
val obj = JSONObject()
obj.put("ad_unit", "interAd")
// EventUtils.event("ad_prepare_show", ext = obj)
EventUtils.event("ad_prepare_show", ext = obj)
if (isAdExpired()) {
val obj = JSONObject()
obj.put("ad_unit", "interAd")
// EventUtils.event("ad_expire", ext = obj)
EventUtils.event("ad_expire", ext = obj)
interAd = null
loadInterstitialAd(activity)
onHidden?.invoke()
......@@ -66,9 +67,9 @@ object AdmobInterstitialUtils {
}
if (interAd != null) {
showIntervalDialogAndShowAd(activity,isShowDialog, onHidden, 2)
showIntervalDialogAndShowAd(activity, isShowDialog, onHidden, 2)
} else {
showAdDialogAndLoadInterstitial(activity, isReLoadAd,isShowDialog, onHidden)
showAdDialogAndLoadInterstitial(activity, isReLoadAd, isShowDialog, onHidden)
}
}
......@@ -86,7 +87,7 @@ object AdmobInterstitialUtils {
obj.put("req_id", reqId)
obj.put("ad_type", "interAd")
obj.put("from", activity.javaClass.simpleName)
// EventUtils.event("ad_pull_start", ext = obj)
EventUtils.event("ad_pull_start", ext = obj)
InterstitialAd.load(
activity,
ConfigHelper.interAdmobId,
......@@ -122,7 +123,7 @@ object AdmobInterstitialUtils {
onHidden: (() -> Unit)?,
interval: Int
) {
if(!isShowDialog){
if (!isShowDialog) {
displayInterstitialAd(activity, onHidden)
return
}
......@@ -157,7 +158,7 @@ object AdmobInterstitialUtils {
isShowDialog: Boolean,
onHidden: (() -> Unit)?
) {
if(!isShowDialog){
if (!isShowDialog) {
return
}
var mDialog: Dialog? = null
......@@ -171,7 +172,7 @@ object AdmobInterstitialUtils {
loadInterstitialAd(activity) {
mDialog?.dismiss()
if (!isReLoadAd) {
showInterstitialAd(activity, true,false) {
showInterstitialAd(activity, true, false) {
onHidden?.invoke()
}
}
......
app/src/main/java/com/base/datarecovery/ads/AdmobNativeUtils.kt
View file @ 2def6a00
......@@ -10,6 +10,7 @@ import com.base.datarecovery.ads.AdmobEvent.pullAd
import com.base.datarecovery.ads.AdmobEvent.showAd
import com.base.datarecovery.help.BaseApplication
import com.base.datarecovery.help.ConfigHelper
import com.base.datarecovery.utils.EventUtils
import com.base.datarecovery.utils.LogEx
import com.google.android.gms.ads.AdListener
import com.google.android.gms.ads.AdLoader
......@@ -78,7 +79,7 @@ object AdmobNativeUtils {
fun showNativeAd(activity: Activity?, parent: ViewGroup, layout: Int = R.layout.layout_native_custom) {
val obj = JSONObject()
obj.put("ad_unit", "NativeAd")
// EventUtils.event("ad_prepare_show", ext = obj)
EventUtils.event("ad_prepare_show", ext = obj)
if (!AdDisplayUtils.getInstance().shouldShowAd()) {
return
}
......@@ -103,7 +104,7 @@ object AdmobNativeUtils {
val obj2 = JSONObject()
obj2.put("reason", "no_ad")
obj2.put("ad_unit", "nativeAd")
// EventUtils.event("ad_show_error", ext = obj2)
EventUtils.event("ad_show_error", ext = obj2)
} else {
loadingListener?.invoke()
}
......
app/src/main/java/com/base/datarecovery/ads/AdmobOpenUtils.kt
View file @ 2def6a00
......@@ -7,6 +7,7 @@ import com.base.datarecovery.ads.AdmobEvent.pullAd
import com.base.datarecovery.ads.AdmobEvent.showAd
import com.base.datarecovery.help.BaseApplication
import com.base.datarecovery.help.ConfigHelper
import com.base.datarecovery.utils.EventUtils
import com.base.datarecovery.utils.LogEx
import com.google.android.gms.ads.AdError
import com.google.android.gms.ads.AdRequest
......@@ -38,7 +39,7 @@ object AdmobOpenUtils {
val obj = JSONObject()
obj.put("req_id", reqId)
obj.put("ad_type", "openAd")
// EventUtils.event("ad_pull_start", ext = obj)
EventUtils.event("ad_pull_start", ext = obj)
AppOpenAd.load(
BaseApplication.context,
ConfigHelper.openAdmobId,
......@@ -73,7 +74,7 @@ object AdmobOpenUtils {
}
val obj1 = JSONObject()
obj1.put("ad_unit", "openAd")
// EventUtils.event("ad_prepare_show", ext = obj1)
EventUtils.event("ad_prepare_show", ext = obj1)
if (System.currentTimeMillis() - openLoadTime > 1000 * 60 * 60) {
LogEx.logDebug(TAG, "openLoadTime out time")
mOpenAd = null
......@@ -81,7 +82,7 @@ object AdmobOpenUtils {
onHidden?.invoke(2)
val obj2 = JSONObject()
obj2.put("ad_unit", "openAd")
// EventUtils.event("ad_expire", ext = obj2)
EventUtils.event("ad_expire", ext = obj2)
return
}
......@@ -108,7 +109,7 @@ object AdmobOpenUtils {
val obj = JSONObject()
obj.put("reason", p0.message)
obj.put("ad_unit", "openAd")
// EventUtils.event("ad_show_error", ext = obj)
EventUtils.event("ad_show_error", ext = obj)
}
override fun onAdShowedFullScreenContent() {
......@@ -123,7 +124,7 @@ object AdmobOpenUtils {
val obj = JSONObject()
obj.put("reason", "no_ad")
obj.put("ad_unit", "openAd")
// EventUtils.event("ad_show_error", ext = obj)
EventUtils.event("ad_show_error", ext = obj)
}
}
}
\ No newline at end of file
app/src/main/java/com/base/datarecovery/fcm/MessagingService.java
View file @ 2def6a00
......@@ -8,6 +8,7 @@ import com.base.datarecovery.MyApplication;
import com.base.datarecovery.ads.AdDisplayUtils;
import com.base.datarecovery.ads.AdmobCommonUtils;
import com.base.datarecovery.utils.AppPreferences;
import com.base.datarecovery.utils.EventUtils;
import com.google.firebase.messaging.FirebaseMessagingService;
import com.google.firebase.messaging.RemoteMessage;
......@@ -26,7 +27,7 @@ public class MessagingService extends FirebaseMessagingService {
Log.d("glc",remoteMessage.getData().toString());
AdDisplayUtils.getInstance().setMaxAdDisplayCount(Integer.valueOf(AppPreferences.getInstance().getString("adShowCount","45")));
AdDisplayUtils.getInstance().setMaxAdClickCount(Integer.valueOf(AppPreferences.getInstance().getString("adClickCount","10")));
// EventUtils.INSTANCE.event("FCM_Received",null,null,false);
EventUtils.INSTANCE.event("FCM_Received",null,null,false);
sendLocalNotification();
}
......
app/src/main/java/com/base/datarecovery/fcm/NotificationUtil.kt
View file @ 2def6a00
......@@ -25,8 +25,10 @@ import com.base.datarecovery.bean.ConstObject.ID_SIMILAR_IMAGE
import com.base.datarecovery.utils.AppPreferences
import com.base.datarecovery.utils.CleanJunkStringResourceManager
import com.base.datarecovery.utils.DuplicatePhotoStringResourceManager
import com.base.datarecovery.utils.EventUtils
import com.base.datarecovery.utils.ScreenshotCleanupStringManager
import java.util.Random
import kotlin.reflect.KParameter
/**
* 构建发送通知
......@@ -190,7 +192,7 @@ object NotificationUtil {
fun sendNotification(context: Context) {
val actionId: Int =getNextNotificationId()
// EventUtils.INSTANCE.event("showNotification", null, null, false)
// KParameter.Kind.INSTANCE.event("showNotification", null, null, false)
if (MyApplication.PAUSED_VALUE == 1) {
return
......
app/src/main/java/com/base/datarecovery/utils/EventUtils.kt 0 → 100644
View file @ 2def6a00
package com.base.datarecovery.utils
import com.base.datarecovery.BuildConfig
import com.base.datarecovery.bean.ConstObject.ifAgreePrivacy
import com.base.datarecovery.help.ConfigHelper
import com.base.datarecovery.utils.ReportUtils.doPost
import org.json.JSONException
import org.json.JSONObject
object EventUtils {
fun event(
key: String,
value: String? = null,
ext: JSONObject? = null,
isSingleEvent: Boolean = false
) {
if (!ifAgreePrivacy) {
return
}
// if (isSingleEvent) {
// val stringSet = AppPreferences.getInstance().getString("singleEvent")
// if (stringSet.contains(key)) {
// return
// }
// }
Thread {
var parmJson: String? = ""
try {
val pkg = ConfigHelper.packageName
val s = JSONObject()
.put("action", key)
.put("value", value)
.put("ext", ext)
val s2 = JSONObject()
.put("${pkg}_3", AppPreferences.getInstance().getString("Equipment", ""))
.put("${pkg}_4", AppPreferences.getInstance().getString("Manufacturer", ""))
.put("${pkg}_5", AppPreferences.getInstance().getString("svn", ""))
.put("${pkg}_9", AppPreferences.getInstance().getString("uuid", ""))
.put("${pkg}_10", AppPreferences.getInstance().getString("gid", ""))
.put("${pkg}_13", "android")
.put("${pkg}_15", "google")
.put("${pkg}_14", BuildConfig.VERSION_CODE)
.put("${pkg}_8", BuildConfig.VERSION_NAME)
.put("${pkg}_24", BuildConfig.BUILD_TYPE)
val data = JSONObject()
.put("data", s)
.put("bp", s2)
.toString()
parmJson = AESHelper.encrypt(data)
} catch (e: JSONException) {
parmJson = ""
}
doPost(
url,
HashMap(),
parmJson
)
}.start()
}
private val url by lazy {
val pkg = ConfigHelper.packageName
val url = StringBuilder(
"${ConfigHelper.eventUrl}/${
pkg.filter { it.isLowerCase() }.substring(4, 9)
}sp"
)
url.append("?pkg=$pkg")
url.toString()
}
}
\ No newline at end of file
app/src/main/java/com/base/datarecovery/utils/ReportUtils.java 0 → 100644
View file @ 2def6a00
package com.base.datarecovery.utils;
import android.text.TextUtils;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.Map;
public class ReportUtils {
public static String doPost(String urlPath, Map<String, String> paramsMap, String json) {
try {
HttpURLConnection conn = (HttpURLConnection) new URL(urlPath).openConnection();
conn.setRequestMethod("POST");
conn.setDoOutput(true);
conn.setConnectTimeout(600000);
if (!TextUtils.isEmpty(json)) {
conn.setRequestProperty("Content-Type", "application/json");
conn.setRequestProperty("Content-Length", Integer.toString(json.getBytes().length));
conn.getOutputStream().write(json.getBytes());
}
StringBuilder result = new StringBuilder();
for (Map.Entry<String, String> entry : paramsMap.entrySet()) {
result.append("&").append(entry.getKey()).append("=").append(entry.getValue());
}
if (result.length() > 0) {
conn.getOutputStream().write(result.substring(1).getBytes());
} else {
// conn.getOutputStream().write(result.substring(0).getBytes());
}
if (conn.getResponseCode() == 200) {
String s = new BufferedReader(new InputStreamReader(conn.getInputStream())).readLine();
if (!TextUtils.isEmpty(s)) {
} else {
s = "";
}
return s;
} else {
}
} catch (Exception e) {
e.printStackTrace();
}
return "{ \"success\": false,\n \"errorMsg\": \"后台服务器开小差了!\",\n \"result\":{}}";
}
}
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