diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c534756..52496f7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,8 +16,8 @@ android { applicationId = "com.key.simplekeyboard" minSdk = 23 targetSdk = 34 - versionCode = 2 - versionName = "1.0.1" + versionCode = 3 + versionName = "1.0.2" setProperty("archivesBaseName", "simplekeyboard_V" + versionName + "(${versionCode})_$timestamp") testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -60,62 +60,6 @@ dependencies { implementation(platform("com.google.firebase:firebase-bom:32.3.1")) implementation("com.google.firebase:firebase-analytics-ktx") implementation("com.google.firebase:firebase-crashlytics-ktx") - //-----------------------------------------------TopOn(pangle、IronSource、mintegral、unityads、liftoff(vungle)、Bigo) - //Anythink (Necessary) - implementation("com.anythink.sdk:core-tpn:6.3.68") - implementation("com.anythink.sdk:nativead-tpn:6.3.68") - implementation("com.anythink.sdk:banner-tpn:6.3.68") - implementation("com.anythink.sdk:interstitial-tpn:6.3.68") - implementation("com.anythink.sdk:rewardedvideo-tpn:6.3.68") - implementation("com.anythink.sdk:splash-tpn:6.3.68") - //Androidx (Necessary) - implementation("androidx.appcompat:appcompat:1.1.0") - implementation("androidx.browser:browser:1.4.0") - - //Vungle - implementation("com.anythink.sdk:adapter-tpn-vungle:6.3.68") - implementation("com.vungle:vungle-ads:7.3.2") - implementation("com.google.android.gms:play-services-basement:18.1.0") - implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") - - //UnityAds - implementation("com.anythink.sdk:adapter-tpn-unityads:6.3.68") - implementation("com.unity3d.ads:unity-ads:4.9.3") - - //Ironsource - implementation("com.anythink.sdk:adapter-tpn-ironsource:6.3.68") - implementation("com.ironsource.sdk:mediationsdk:8.1.0") - implementation("com.google.android.gms:play-services-appset:16.0.2") - implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") - implementation("com.google.android.gms:play-services-basement:18.1.0") - - //Bigo - implementation("com.anythink.sdk:adapter-tpn-bigo:6.3.68") - implementation("com.bigossp:bigo-ads:4.7.4") - - //Pangle - implementation("com.anythink.sdk:adapter-tpn-pangle-nonchina:6.3.68.1") - implementation("com.pangle.global:ads-sdk:6.0.0.3") - implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") - - //Mintegral - implementation("com.anythink.sdk:adapter-tpn-mintegral-nonchina:6.3.68") - implementation("com.mbridge.msdk.oversea:reward:16.7.51") - implementation("com.mbridge.msdk.oversea:newinterstitial:16.7.51") - implementation("com.mbridge.msdk.oversea:mbnative:16.7.51") - implementation("com.mbridge.msdk.oversea:mbnativeadvanced:16.7.51") - implementation("com.mbridge.msdk.oversea:mbsplash:16.7.51") - implementation("com.mbridge.msdk.oversea:mbbanner:16.7.51") - implementation("com.mbridge.msdk.oversea:mbbid:16.7.51") - implementation("androidx.recyclerview:recyclerview:1.1.0") - - //Tramini - implementation("com.anythink.sdk:tramini-plugin-tpn:6.3.68") - - // Debugger UI Tools -// implementation ("com.anythink.sdk:debugger-ui:1.0.7") - - //----------------------------------------------TopOn } \ No newline at end of file diff --git a/app/src/main/java/com/key/simplekeyboard/SimpleKeyboardSkins.java b/app/src/main/java/com/key/simplekeyboard/SimpleKeyboardSkins.java index 4fe36d4..f34f465 100644 --- a/app/src/main/java/com/key/simplekeyboard/SimpleKeyboardSkins.java +++ b/app/src/main/java/com/key/simplekeyboard/SimpleKeyboardSkins.java @@ -1,15 +1,9 @@ package com.key.simplekeyboard; -import static android.content.ContentValues.TAG; - import android.app.Application; import android.content.Context; import android.content.SharedPreferences; -import android.util.Log; -import com.anythink.core.api.ATSDK; -import com.anythink.core.api.NetTrafficeCallback; -import com.anythink.interstitial.api.ATInterstitial; import com.key.simplekeyboard.data.Mydata; import com.key.simplekeyboard.data.MydataBase; import com.key.simplekeyboard.data.Otherdata; @@ -33,7 +27,7 @@ public class SimpleKeyboardSkins extends Application { public static List aestheticlist = new ArrayList<>(); public static List superlist = new ArrayList<>(); - public static final String VERSION_NAME = "1.0.0"; + public static final String VERSION_NAME = "1.0.2"; public static final String DB_Name = "keyboard_database"; public static final String Table_Name = "keyboard_table"; public static final int DB_Version = 1; @@ -45,7 +39,7 @@ public class SimpleKeyboardSkins extends Application { private static final String TOP_ID = "h66ab2087ca5f6"; private static final String TOP_KEY = "abd49d8b0a0203888f56dd3c9b35201d3"; private static final String TOP_DEBUG = "04e8ce6db9751f67501af2bfed0cd0de0391453a"; - public static List ads; + @Override public void onCreate() { @@ -54,23 +48,6 @@ public class SimpleKeyboardSkins extends Application { context = getApplicationContext(); - ATSDK.checkIsEuTraffic(this, new NetTrafficeCallback() { - - @Override - public void onResultCallback(boolean isEU) { - Log.e(TAG, "onResultCallback:" + isEU); - if (isEU && ATSDK.getGDPRDataLevel(context) == ATSDK.UNKNOWN) { - ATSDK.showGdprAuth(context); - } - - } - - @Override - public void onErrorCallback(String errorMsg) { - Log.e(TAG, "onErrorCallback:" + errorMsg); - } - }); - initSdk(); @@ -95,18 +72,9 @@ public class SimpleKeyboardSkins extends Application { } private void initSdk() { -// ATSDK.integrationChecking(context); - ATSDK.init(context, TOP_ID, TOP_KEY); - - ads = Mytools.getAllAd(); -// ATSDK.setNetworkLogDebug(true); -// ATDebuggerUITest.showDebuggerUI(context,TOP_DEBUG); } - public static List lodAd() { - return ads; - } public static Context getContext() { diff --git a/app/src/main/java/com/key/simplekeyboard/activity/AllActivity.java b/app/src/main/java/com/key/simplekeyboard/activity/AllActivity.java index 46b2395..50d0feb 100644 --- a/app/src/main/java/com/key/simplekeyboard/activity/AllActivity.java +++ b/app/src/main/java/com/key/simplekeyboard/activity/AllActivity.java @@ -1,5 +1,16 @@ package com.key.simplekeyboard.activity; +import android.annotation.SuppressLint; +import android.content.Intent; +import android.content.res.TypedArray; +import android.graphics.Typeface; +import android.graphics.drawable.Drawable; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + import androidx.activity.EdgeToEdge; import androidx.appcompat.app.AppCompatActivity; import androidx.core.graphics.Insets; @@ -8,32 +19,11 @@ import androidx.core.view.WindowInsetsCompat; import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; -import android.annotation.SuppressLint; -import android.content.Intent; -import android.content.res.TypedArray; -import android.graphics.Typeface; -import android.graphics.drawable.Drawable; -import android.os.Bundle; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; - -import com.anythink.core.api.AdError; -import com.anythink.interstitial.api.ATInterstitial; import com.google.android.material.tabs.TabLayout; import com.key.simplekeyboard.R; - -import com.key.simplekeyboard.SimpleKeyboardSkins; import com.key.simplekeyboard.adapter.PageAdapter; -import com.key.simplekeyboard.data.MydataBase; -import com.key.simplekeyboard.data.Otherdata; import com.key.simplekeyboard.fragment.AllFragment; -import com.key.simplekeyboard.fragment.LikeFragment; import com.key.simplekeyboard.tools.AdActionListener; -import com.key.simplekeyboard.tools.Adcallback; -import com.key.simplekeyboard.tools.Mytools; import java.util.ArrayList; import java.util.List; @@ -49,7 +39,7 @@ public class AllActivity extends AppCompatActivity { private List list = new ArrayList<>(); private TypedArray imageArray; private PageAdapter adapter; - private List ads; + @SuppressLint("MissingInflatedId") @Override @@ -63,7 +53,7 @@ public class AllActivity extends AppCompatActivity { return insets; }); - ads = SimpleKeyboardSkins.lodAd(); + adapter = new PageAdapter(getSupportFragmentManager(), list); @@ -113,23 +103,10 @@ public class AllActivity extends AppCompatActivity { } private void showAd(AdActionListener listener) { - ATInterstitial mInterstitialAd = Mytools.onCache(ads); - if (mInterstitialAd == null) { - listener.onAction(); - } else { - Mytools.setCallback(mInterstitialAd, new Adcallback() { - @Override - public void onShowFail(AdError ad) { - listener.onAction(); - } - @Override - public void onAdHidden() { - listener.onAction(); - } - }); - mInterstitialAd.show(this); - } + listener.onAction(); + // TODO: 2024/9/19 + } private void setTabIcons(int position) { diff --git a/app/src/main/java/com/key/simplekeyboard/activity/PreviewActivity.java b/app/src/main/java/com/key/simplekeyboard/activity/PreviewActivity.java index 8d9f2bc..4c8ddfa 100644 --- a/app/src/main/java/com/key/simplekeyboard/activity/PreviewActivity.java +++ b/app/src/main/java/com/key/simplekeyboard/activity/PreviewActivity.java @@ -1,5 +1,16 @@ package com.key.simplekeyboard.activity; +import android.content.Intent; +import android.graphics.Bitmap; +import android.graphics.drawable.Drawable; +import android.os.Bundle; +import android.view.View; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.ProgressBar; +import android.widget.TextView; +import android.widget.Toast; + import androidx.activity.EdgeToEdge; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -11,31 +22,15 @@ import androidx.core.view.WindowInsetsCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import android.content.Intent; -import android.graphics.Bitmap; -import android.graphics.drawable.Drawable; -import android.os.Bundle; -import android.util.Log; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.ProgressBar; -import android.widget.TextView; -import android.widget.Toast; - -import com.anythink.core.api.AdError; -import com.anythink.interstitial.api.ATInterstitial; import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import com.key.simplekeyboard.R; -import com.key.simplekeyboard.SimpleKeyboardSkins; import com.key.simplekeyboard.adapter.ThumAdapter; import com.key.simplekeyboard.data.MydataBase; import com.key.simplekeyboard.data.Otherdata; import com.key.simplekeyboard.fragment.MainFragment; import com.key.simplekeyboard.tools.AdActionListener; -import com.key.simplekeyboard.tools.Adcallback; import com.key.simplekeyboard.tools.Mytools; import com.key.simplekeyboard.tools.SpaceItem; import com.key.simplekeyboard.tools.StaticValue; @@ -55,7 +50,7 @@ public class PreviewActivity extends AppCompatActivity { private final Boolean[] islike = {false}; private Otherdata otherdata; private List prerandomlist = new ArrayList<>(); - private List ads; + @Override protected void onCreate(Bundle savedInstanceState) { @@ -68,7 +63,7 @@ public class PreviewActivity extends AppCompatActivity { return insets; }); - ads = SimpleKeyboardSkins.lodAd(); + intView(); @@ -125,23 +120,8 @@ public class PreviewActivity extends AppCompatActivity { } private void showAd(AdActionListener listener) { - ATInterstitial mInterstitialAd = Mytools.onCache(ads); - if (mInterstitialAd == null) { - listener.onAction(); - } else { - Mytools.setCallback(mInterstitialAd, new Adcallback() { - @Override - public void onShowFail(AdError ad) { - listener.onAction(); - } - - @Override - public void onAdHidden() { - listener.onAction(); - } - }); - mInterstitialAd.show(this); - } + listener.onAction(); + // TODO: 2024/9/19 } private void intEvent() { diff --git a/app/src/main/java/com/key/simplekeyboard/activity/SplashActivity.java b/app/src/main/java/com/key/simplekeyboard/activity/SplashActivity.java index 4e9711e..71a7de4 100644 --- a/app/src/main/java/com/key/simplekeyboard/activity/SplashActivity.java +++ b/app/src/main/java/com/key/simplekeyboard/activity/SplashActivity.java @@ -1,28 +1,21 @@ package com.key.simplekeyboard.activity; -import androidx.appcompat.app.AppCompatActivity; -import androidx.core.graphics.Insets; -import androidx.core.view.ViewCompat; -import androidx.core.view.WindowInsetsCompat; - import android.annotation.SuppressLint; import android.content.Intent; import android.os.Bundle; import android.os.CountDownTimer; -import com.anythink.core.api.AdError; -import com.anythink.interstitial.api.ATInterstitial; -import com.key.simplekeyboard.R; -import com.key.simplekeyboard.SimpleKeyboardSkins; -import com.key.simplekeyboard.tools.Adcallback; -import com.key.simplekeyboard.tools.CustomProgressBar; -import com.key.simplekeyboard.tools.Mytools; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; -import java.util.List; +import com.key.simplekeyboard.R; +import com.key.simplekeyboard.tools.CustomProgressBar; public class SplashActivity extends AppCompatActivity { private CountDownTimer countDownTimer; - private List ads; + private boolean isAlreadyShow = false; private float i = 0; @@ -37,7 +30,7 @@ public class SplashActivity extends AppCompatActivity { v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); return insets; }); - ads = SimpleKeyboardSkins.lodAd(); + CustomProgressBar customProgressBar = findViewById(R.id.splash_pg); @@ -63,34 +56,12 @@ public class SplashActivity extends AppCompatActivity { } private void showAd(boolean go) { - ATInterstitial mInterstitialAd = Mytools.onCache(ads); - if (mInterstitialAd == null) { - isAlreadyShow = false; - if (go) { - starMainactivity(); - } - } else { - isAlreadyShow = true; - Mytools.setCallback(mInterstitialAd, new Adcallback() { - @Override - public void onShowFail(AdError ad) { - if (countDownTimer != null) { - countDownTimer.cancel(); - countDownTimer = null; - } - starMainactivity(); - } - - @Override - public void onAdHidden() { - isAlreadyShow = true; - starMainactivity(); - } - }); - mInterstitialAd.show(this); + if(go){ + starMainactivity(); } + } private void starMainactivity() { diff --git a/app/src/main/java/com/key/simplekeyboard/tools/Adcallback.java b/app/src/main/java/com/key/simplekeyboard/tools/Adcallback.java deleted file mode 100644 index 53bf45c..0000000 --- a/app/src/main/java/com/key/simplekeyboard/tools/Adcallback.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.key.simplekeyboard.tools; - - -import com.anythink.core.api.AdError; - -public interface Adcallback { - void onShowFail(AdError ad); - void onAdHidden( ); -} diff --git a/app/src/main/java/com/key/simplekeyboard/tools/Mytools.java b/app/src/main/java/com/key/simplekeyboard/tools/Mytools.java index 678abec..49c2772 100644 --- a/app/src/main/java/com/key/simplekeyboard/tools/Mytools.java +++ b/app/src/main/java/com/key/simplekeyboard/tools/Mytools.java @@ -6,7 +6,6 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.StateListDrawable; import android.os.Build; import android.provider.Settings; -import android.util.Log; import android.util.TypedValue; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; @@ -15,16 +14,11 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.anythink.core.api.ATAdInfo; -import com.anythink.core.api.AdError; -import com.anythink.interstitial.api.ATInterstitial; -import com.anythink.interstitial.api.ATInterstitialListener; import com.bumptech.glide.Glide; import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.engine.GlideException; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; - import com.key.simplekeyboard.R; import com.key.simplekeyboard.SimpleKeyboardSkins; import com.key.simplekeyboard.callback.DownloadCallback; @@ -32,7 +26,6 @@ import com.key.simplekeyboard.callback.UnzipCallback; import com.key.simplekeyboard.data.Mydata; import com.key.simplekeyboard.data.Otherdata; - import net.sf.sevenzipjbinding.ArchiveFormat; import net.sf.sevenzipjbinding.IInArchive; import net.sf.sevenzipjbinding.SevenZip; @@ -54,7 +47,6 @@ import java.io.InputStreamReader; import java.io.RandomAccessFile; import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -64,98 +56,6 @@ public class Mytools { private static InputMethodManager methodManager = (InputMethodManager) SimpleKeyboardSkins.app.getSystemService(Context.INPUT_METHOD_SERVICE); private static ExecutorService executorService; - private static final String one_AD = "n66ab20d96dc7a"; - private static final String two_Ad = "n66ab20d92323b"; - private static final String three_ad = "n66ab20d8c5d7e"; - private static ArrayList adArrayList; - - - public static void setCallback(ATInterstitial ad, Adcallback adcallback) { - ad.setAdListener(new ATInterstitialListener() { - @Override - public void onInterstitialAdLoaded() { -// Log.e("zzj", "---------onInterstitialAdLoaded--------" + ad.mPlacementId); - } - - @Override - public void onInterstitialAdLoadFail(AdError adError) { -// Log.e("zzj", "---------onInterstitialAdLoadFail--------" + adError.getFullErrorInfo()); - adcallback.onShowFail(adError); - } - - @Override - public void onInterstitialAdClicked(ATAdInfo atAdInfo) { - - } - - @Override - public void onInterstitialAdShow(ATAdInfo atAdInfo) { - ad.load(); - } - - @Override - public void onInterstitialAdClose(ATAdInfo atAdInfo) { - adcallback.onAdHidden(); - } - - @Override - public void onInterstitialAdVideoStart(ATAdInfo atAdInfo) { - - } - - @Override - public void onInterstitialAdVideoEnd(ATAdInfo atAdInfo) { - - } - - @Override - public void onInterstitialAdVideoError(AdError adError) { - - } - }); - } - - public static ATInterstitial onCache(List list) { - Collections.shuffle(list); - for (ATInterstitial ad : list) { - if (ad.isAdReady()) { - return ad; - } - } - return null; - } - - public static List getAllAd() { - if (adArrayList == null) { - adArrayList = new ArrayList<>(); - adArrayList.add(createAd(one_AD, SimpleKeyboardSkins.getContext())); - adArrayList.add(createAd(two_Ad, SimpleKeyboardSkins.getContext())); - adArrayList.add(createAd(three_ad, SimpleKeyboardSkins.getContext())); - } - for (ATInterstitial ad : adArrayList) { - if (!ad.isAdReady()) { - setCallback(ad, new Adcallback() { - @Override - public void onShowFail(AdError ad) { - - } - - @Override - public void onAdHidden() { - - } - }); - ad.load(); - } - } - return adArrayList; - } - - private static ATInterstitial createAd(String adUnitId, Context context) { - ATInterstitial ad = new ATInterstitial(context, adUnitId); - return ad; - } - public static void runIO(Runnable task) { getExecutorService().execute(task); diff --git a/settings.gradle.kts b/settings.gradle.kts index ef1493d..cb8719c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,7 +11,7 @@ dependencyResolutionManagement { google() mavenCentral() maven("https://jitpack.io") - maven("https://jitpack.io") + //Anythink(Core) maven("https://jfrog.anythinktech.com/artifactory/overseas_sdk") //Ironsource