V1.0.1(2) 集成topon
This commit is contained in:
parent
a3a483cfb5
commit
0c47735d26
@ -18,8 +18,8 @@ android {
|
|||||||
applicationId = "com.paint.ar.drawing"
|
applicationId = "com.paint.ar.drawing"
|
||||||
minSdk = 23
|
minSdk = 23
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 1
|
versionCode = 2
|
||||||
versionName = "1.0.0"
|
versionName = "1.0.1"
|
||||||
setProperty(
|
setProperty(
|
||||||
"archivesBaseName",
|
"archivesBaseName",
|
||||||
"AR Paint Drawing_V" + versionName + "(${versionCode})_$timestamp"
|
"AR Paint Drawing_V" + versionName + "(${versionCode})_$timestamp"
|
||||||
@ -70,7 +70,7 @@ dependencies {
|
|||||||
//noinspection GradleDependency
|
//noinspection GradleDependency
|
||||||
implementation("androidx.camera:camera-extensions:${camerax_version}")
|
implementation("androidx.camera:camera-extensions:${camerax_version}")
|
||||||
|
|
||||||
implementation(platform("com.google.firebase:firebase-bom:33.1.1"))
|
implementation(platform("com.google.firebase:firebase-bom:33.7.0"))
|
||||||
implementation("com.google.firebase:firebase-crashlytics")
|
implementation("com.google.firebase:firebase-crashlytics")
|
||||||
implementation("com.google.firebase:firebase-analytics")
|
implementation("com.google.firebase:firebase-analytics")
|
||||||
|
|
||||||
@ -160,6 +160,6 @@ dependencies {
|
|||||||
implementation("com.google.android.gms:play-services-ads-identifier:18.0.1")
|
implementation("com.google.android.gms:play-services-ads-identifier:18.0.1")
|
||||||
|
|
||||||
// Debugger UI Tools
|
// Debugger UI Tools
|
||||||
//implementation ("com.anythink.sdk:debugger-ui:1.0.7")
|
// implementation ("com.anythink.sdk:debugger-ui:1.0.7")
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -6,6 +6,7 @@ import android.graphics.Typeface;
|
|||||||
import com.anythink.core.api.ATSDK;
|
import com.anythink.core.api.ATSDK;
|
||||||
import com.anythink.core.api.NetTrafficeCallback;
|
import com.anythink.core.api.NetTrafficeCallback;
|
||||||
import com.paint.ar.drawing.ob.ObManager;
|
import com.paint.ar.drawing.ob.ObManager;
|
||||||
|
import com.paint.ar.drawing.topon.AdManager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
@ -21,9 +22,9 @@ public class MyApp extends android.app.Application {
|
|||||||
|
|
||||||
public static MyApp app;
|
public static MyApp app;
|
||||||
|
|
||||||
private String APPId ="";
|
private String APPId ="h679200e7bcbc3";
|
||||||
|
|
||||||
private String AppKey ="";
|
private String AppKey ="a6ad05d72569e4c67d2458cc8e548a764";
|
||||||
|
|
||||||
public static Typeface defaultFont;
|
public static Typeface defaultFont;
|
||||||
|
|
||||||
@ -55,6 +56,8 @@ public class MyApp extends android.app.Application {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
ATSDK.init( this, APPId, AppKey);
|
ATSDK.init( this, APPId, AppKey);
|
||||||
|
AdManager.loadAllAd();
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -25,7 +25,7 @@ public class AllActivity extends AppCompatActivity {
|
|||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
AdManager.loadAllAd();
|
||||||
preViewBinding = ActivityAllBinding.inflate(getLayoutInflater());
|
preViewBinding = ActivityAllBinding.inflate(getLayoutInflater());
|
||||||
setContentView(preViewBinding.getRoot());
|
setContentView(preViewBinding.getRoot());
|
||||||
Utils.setStatusBarTextColor(this, true);
|
Utils.setStatusBarTextColor(this, true);
|
||||||
|
|||||||
@ -36,6 +36,7 @@ import com.paint.ar.drawing.MyApp;
|
|||||||
import com.paint.ar.drawing.R;
|
import com.paint.ar.drawing.R;
|
||||||
import com.paint.ar.drawing.ob.ObManager;
|
import com.paint.ar.drawing.ob.ObManager;
|
||||||
import com.paint.ar.drawing.helper.Utils;
|
import com.paint.ar.drawing.helper.Utils;
|
||||||
|
import com.paint.ar.drawing.topon.AdManager;
|
||||||
|
|
||||||
public class CameraActivity extends AppCompatActivity implements View.OnTouchListener, View.OnClickListener {
|
public class CameraActivity extends AppCompatActivity implements View.OnTouchListener, View.OnClickListener {
|
||||||
private CameraSelector cameraSelector;
|
private CameraSelector cameraSelector;
|
||||||
@ -78,7 +79,7 @@ public class CameraActivity extends AppCompatActivity implements View.OnTouchLis
|
|||||||
Utils.setStatusBarTextColor(this, true);
|
Utils.setStatusBarTextColor(this, true);
|
||||||
Intent intent = getIntent();
|
Intent intent = getIntent();
|
||||||
isMain = intent.getBooleanExtra(MyApp.Key_ISMAIN, false);
|
isMain = intent.getBooleanExtra(MyApp.Key_ISMAIN, false);
|
||||||
|
AdManager.loadAllAd();
|
||||||
|
|
||||||
previewView = findViewById(R.id.preview);
|
previewView = findViewById(R.id.preview);
|
||||||
imageView = findViewById(R.id.image);
|
imageView = findViewById(R.id.image);
|
||||||
|
|||||||
@ -21,6 +21,7 @@ import com.paint.ar.drawing.fragment.FragmentAlbum;
|
|||||||
import com.paint.ar.drawing.fragment.FragmentLike;
|
import com.paint.ar.drawing.fragment.FragmentLike;
|
||||||
import com.paint.ar.drawing.fragment.MainFragment;
|
import com.paint.ar.drawing.fragment.MainFragment;
|
||||||
import com.paint.ar.drawing.helper.Utils;
|
import com.paint.ar.drawing.helper.Utils;
|
||||||
|
import com.paint.ar.drawing.topon.AdManager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -41,7 +42,7 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
Utils.setStatusBarTextColor(this,true);
|
Utils.setStatusBarTextColor(this,true);
|
||||||
binding = ActivityMainBinding.inflate(getLayoutInflater());
|
binding = ActivityMainBinding.inflate(getLayoutInflater());
|
||||||
setContentView(binding.getRoot());
|
setContentView(binding.getRoot());
|
||||||
|
AdManager.loadAllAd();
|
||||||
fragmentAlbum = FragmentAlbum.newInstance();
|
fragmentAlbum = FragmentAlbum.newInstance();
|
||||||
listFragment.add(MainFragment.newInstance());
|
listFragment.add(MainFragment.newInstance());
|
||||||
listFragment.add(fragmentAlbum);
|
listFragment.add(fragmentAlbum);
|
||||||
|
|||||||
@ -15,7 +15,7 @@ import com.paint.ar.drawing.topon.GoMainAction;
|
|||||||
public class WelActivity extends AppCompatActivity {
|
public class WelActivity extends AppCompatActivity {
|
||||||
|
|
||||||
private ActivityWelcomeBinding binding;
|
private ActivityWelcomeBinding binding;
|
||||||
private long time = 1000;
|
private long time = 11000;
|
||||||
private CountDownTimer countDownTimer;
|
private CountDownTimer countDownTimer;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -26,10 +26,17 @@ public class AdManager {
|
|||||||
private static final int type_show_fail = 4;
|
private static final int type_show_fail = 4;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
private static final String place1Id = "";
|
* AR_Inter_3
|
||||||
private static final String place2Id = "";
|
* n67920105f1834
|
||||||
private static final String place3Id = "";
|
* AR_Inter_2
|
||||||
|
* n67920105b46c4
|
||||||
|
* AR_Inter_1
|
||||||
|
* n679201057e60c
|
||||||
|
*/
|
||||||
|
private static final String place1Id = "n67920105f1834";
|
||||||
|
private static final String place2Id = "n67920105b46c4";
|
||||||
|
private static final String place3Id = "n679201057e60c";
|
||||||
|
|
||||||
|
|
||||||
private static boolean place1LoadFail = false;
|
private static boolean place1LoadFail = false;
|
||||||
@ -122,7 +129,7 @@ public class AdManager {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onInterstitialAdShow(ATAdInfo atAdInfo) {
|
public void onInterstitialAdShow(ATAdInfo atAdInfo) {
|
||||||
Log.d(MyApp.TAG, "AdShow " + atAdInfo.getShowId());
|
Log.d(MyApp.TAG, "AdShow " + ad.mPlacementId);
|
||||||
listener.showSuccess();
|
listener.showSuccess();
|
||||||
ad.load();
|
ad.load();
|
||||||
}
|
}
|
||||||
@ -150,15 +157,13 @@ public class AdManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static CountDownTimer showWelcomeAd(
|
public static CountDownTimer showWelcomeAd(
|
||||||
Activity activity,
|
Activity activity,
|
||||||
Long totalTim,
|
Long totalTim,
|
||||||
CountAction countAction,
|
CountAction countAction,
|
||||||
GoMainAction goMain
|
GoMainAction goMain
|
||||||
) {
|
) {
|
||||||
Log.d(MyApp.TAG,"----------alreadyShow="+alreadyShow);
|
Log.d(MyApp.TAG, "----------alreadyShow=" + alreadyShow);
|
||||||
alreadyShow = false;
|
alreadyShow = false;
|
||||||
CountDownTimer timer = new CountDownTimer(totalTim, 100) {
|
CountDownTimer timer = new CountDownTimer(totalTim, 100) {
|
||||||
@Override
|
@Override
|
||||||
@ -198,7 +203,6 @@ public class AdManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private static void showAD(Activity activity, AdStatusAction action) {
|
private static void showAD(Activity activity, AdStatusAction action) {
|
||||||
ATInterstitial readyAd = getReadyAd();
|
ATInterstitial readyAd = getReadyAd();
|
||||||
if (readyAd != null) {
|
if (readyAd != null) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user