V1.1(2)
This commit is contained in:
parent
0050dce01a
commit
e5974d2a33
@ -1,4 +1,6 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
plugins {
|
||||
alias(libs.plugins.android.application) apply false
|
||||
id("com.google.gms.google-services") version "4.4.2" apply false
|
||||
id ("com.google.firebase.crashlytics") version "3.0.2" apply false
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
||||
# Specifies the JVM arguments used for the daemon process.
|
||||
# The setting is particularly useful for tweaking memory settings.
|
||||
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
|
||||
org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8
|
||||
# When configured, Gradle will run in incubating parallel mode.
|
||||
# This option should only be used with decoupled projects. For more details, visit
|
||||
# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
|
||||
|
||||
6
keystore.properties
Normal file
6
keystore.properties
Normal file
@ -0,0 +1,6 @@
|
||||
app_name=Wallpaper Engine
|
||||
package_name=com.wall.engine.wallpaper
|
||||
keystoreFile=app/WallpaperEngine
|
||||
key_alias=WallpaperEnginekey0
|
||||
key_store_password=654321
|
||||
key_password=654321
|
||||
@ -18,6 +18,27 @@ dependencyResolutionManagement {
|
||||
google()
|
||||
mavenCentral()
|
||||
maven { url = uri("https://jitpack.io") }
|
||||
|
||||
//------------------------- TradPlus
|
||||
// Ironsource
|
||||
maven { url = uri("https://android-sdk.is.com/") }
|
||||
// Pangle
|
||||
maven {
|
||||
url = uri("https://artifact.bytedance.com/repository/pangle")
|
||||
}
|
||||
// Chartboost
|
||||
maven { url = uri("https://cboost.jfrog.io/artifactory/chartboost-ads/") }
|
||||
maven {
|
||||
name = "Chartboost Mediation’s maven repo"
|
||||
url = uri("https://cboost.jfrog.io/artifactory/chartboost-mediation")
|
||||
}
|
||||
// Mintegral
|
||||
//Launch GP market application, Android X Version
|
||||
//If you fail to pull the code using gradle, add the maven warehouse configuration to the project root build.gradle file
|
||||
maven {
|
||||
url =
|
||||
uri("https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
19
test2/.gitignore
vendored
19
test2/.gitignore
vendored
@ -1 +1,18 @@
|
||||
/build
|
||||
/build
|
||||
*.iml
|
||||
.gradle
|
||||
/local.properties
|
||||
/.idea/caches
|
||||
/.idea/libraries
|
||||
/.idea/modules.xml
|
||||
/.idea/workspace.xml
|
||||
/.idea/navEditor.xml
|
||||
/.idea/assetWizardSettings.xml
|
||||
.DS_Store
|
||||
/captures
|
||||
.externalNativeBuild
|
||||
.cxx
|
||||
local.properties
|
||||
.idea/
|
||||
.safedk/
|
||||
app/debug/
|
||||
@ -3,6 +3,8 @@ import java.util.Date
|
||||
|
||||
plugins {
|
||||
alias(libs.plugins.android.application)
|
||||
id("com.google.gms.google-services")
|
||||
id("com.google.firebase.crashlytics")
|
||||
}
|
||||
val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date())
|
||||
|
||||
@ -14,8 +16,8 @@ android {
|
||||
applicationId = "com.wall.engine.wallpaper"
|
||||
minSdk = 24
|
||||
targetSdk = 36
|
||||
versionCode = 1
|
||||
versionName = "1.0"
|
||||
versionCode = 2
|
||||
versionName = "1.1"
|
||||
setProperty("archivesBaseName","Wallpaper Engine_v"+versionName+"(${versionCode})_$timestamp")
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
@ -67,4 +69,85 @@ dependencies {
|
||||
|
||||
implementation("androidx.core:core-ktx:1.12.0")
|
||||
implementation("androidx.appcompat:appcompat:1.6.1")
|
||||
|
||||
implementation(files("libs/TradPlusLibrary_11_25_15_02-release.aar"))
|
||||
implementation(files("libs/UpLoadLibrary_12_03_15_13-release.aar"))
|
||||
implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
|
||||
|
||||
implementation(platform("com.google.firebase:firebase-bom:33.7.0"))
|
||||
implementation("com.google.firebase:firebase-crashlytics")
|
||||
implementation("com.google.firebase:firebase-analytics")
|
||||
implementation("com.google.firebase:firebase-config")
|
||||
|
||||
|
||||
// TradPlus
|
||||
implementation("com.tradplusad:tradplus:14.5.0.1")
|
||||
//noinspection GradleCompatible
|
||||
implementation("androidx.legacy:legacy-support-v4:1.0.0")
|
||||
implementation("androidx.appcompat:appcompat:1.3.0-alpha02")
|
||||
// Meta
|
||||
implementation("com.facebook.android:audience-network-sdk:6.20.0")
|
||||
implementation("com.tradplusad:tradplus-facebook:1.14.5.0.1")
|
||||
// Applovin
|
||||
implementation("com.applovin:applovin-sdk:13.3.1")
|
||||
implementation("com.tradplusad:tradplus-applovin:9.14.5.0.1")
|
||||
implementation("com.google.android.gms:play-services-ads-identifier:18.2.0")
|
||||
// Ironsource
|
||||
implementation("com.ironsource.sdk:mediationsdk:8.10.0")
|
||||
implementation("com.tradplusad:tradplus-ironsource:10.14.5.0.1")
|
||||
implementation("com.google.android.gms:play-services-appset:16.0.0")
|
||||
implementation("com.google.android.gms:play-services-ads-identifier:17.0.0")
|
||||
implementation("com.google.android.gms:play-services-basement:17.5.0")
|
||||
// Adcolony
|
||||
implementation("com.adcolony:sdk:4.8.0")
|
||||
implementation("com.tradplusad:tradplus-adcolony:4.14.5.0.1")
|
||||
implementation("com.google.android.gms:play-services-ads-identifier:17.0.0")
|
||||
// Pangle
|
||||
implementation("com.tradplusad:tradplus-pangle:19.14.5.0.1")
|
||||
implementation("com.pangle.global:pag-sdk:7.3.0.3")
|
||||
// UnityAds
|
||||
implementation("com.tradplusad:tradplus-unity:5.14.5.0.1")
|
||||
implementation("com.unity3d.ads:unity-ads:4.15.1")
|
||||
// Chartboost
|
||||
implementation("com.tradplusad:tradplus-chartboostx:15.14.5.0.1")
|
||||
implementation("com.chartboost:chartboost-sdk:9.8.3")
|
||||
implementation("com.google.android.gms:play-services-ads-identifier:17.0.0")
|
||||
implementation("com.google.android.gms:play-services-base:17.4.0")
|
||||
// Inmobi
|
||||
implementation("com.tradplusad:tradplus-inmobix:23.14.5.0.1")
|
||||
implementation("com.inmobi.monetization:inmobi-ads-kotlin:10.8.3")
|
||||
implementation("androidx.core:core-ktx:1.5.0")
|
||||
implementation("com.inmobi.omsdk:inmobi-omsdk:1.5.2.0")
|
||||
// Fyber
|
||||
implementation("com.fyber:marketplace-sdk:8.3.7")
|
||||
implementation("com.tradplusad:tradplus-fyber:24.14.5.0.1")
|
||||
implementation("com.google.android.gms:play-services-ads-identifier:17.0.0")
|
||||
implementation("com.google.android.gms:play-services-base:17.4.0")
|
||||
// Start.io
|
||||
implementation("com.startapp:inapp-sdk:5.2.3")
|
||||
implementation("com.tradplusad:tradplus-startapp:28.14.5.0.1")
|
||||
// Mintegral
|
||||
implementation("com.tradplusad:tradplus-mintegralx_overseas:18.14.5.0.1")
|
||||
implementation("androidx.recyclerview:recyclerview:1.1.0")
|
||||
implementation("com.mbridge.msdk.oversea:mbridge_android_sdk:16.9.71")
|
||||
// Liftoff
|
||||
implementation("com.tradplusad:tradplus-vunglex:7.14.5.0.1")
|
||||
implementation("com.vungle:vungle-ads:7.5.0")
|
||||
// Yandex
|
||||
implementation("com.yandex.android:mobileads:7.13.0") {
|
||||
exclude(group = "com.caverock", module = "androidsvg-aar")
|
||||
}
|
||||
implementation("com.tradplusad:tradplus-yandex:50.14.6.10.1")
|
||||
// Bigo
|
||||
implementation("com.bigossp:bigo-ads:5.4.0")
|
||||
implementation("com.tradplusad:tradplus-bigo:57.14.5.0.1")
|
||||
// Cross Promotion
|
||||
implementation("com.tradplusad:tradplus-crosspromotion:27.14.5.0.1")
|
||||
// TP Exchange
|
||||
// 请注意保持与主包版本同步更新
|
||||
implementation("com.google.code.gson:gson:2.8.6")
|
||||
implementation("com.tradplusad:tp_exchange:40.14.5.0.1")
|
||||
|
||||
// Google UMP
|
||||
implementation ("com.google.android.ump:user-messaging-platform:3.2.0")
|
||||
}
|
||||
29
test2/google-services.json
Normal file
29
test2/google-services.json
Normal file
@ -0,0 +1,29 @@
|
||||
{
|
||||
"project_info": {
|
||||
"project_number": "580373442500",
|
||||
"project_id": "wallpaperengine-f3fac",
|
||||
"storage_bucket": "wallpaperengine-f3fac.firebasestorage.app"
|
||||
},
|
||||
"client": [
|
||||
{
|
||||
"client_info": {
|
||||
"mobilesdk_app_id": "1:580373442500:android:cfa7a056335fbac1b67e91",
|
||||
"android_client_info": {
|
||||
"package_name": "com.wall.engine.wallpaper"
|
||||
}
|
||||
},
|
||||
"oauth_client": [],
|
||||
"api_key": [
|
||||
{
|
||||
"current_key": "AIzaSyBGo5XTtldFVP33fT1b_IoiRdJ1q8dU04M"
|
||||
}
|
||||
],
|
||||
"services": {
|
||||
"appinvite_service": {
|
||||
"other_platform_oauth_client": []
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"configuration_version": "1"
|
||||
}
|
||||
BIN
test2/libs/TradPlusLibrary_11_25_15_02-release.aar
Normal file
BIN
test2/libs/TradPlusLibrary_11_25_15_02-release.aar
Normal file
Binary file not shown.
BIN
test2/libs/UpLoadLibrary_12_03_15_13-release.aar
Normal file
BIN
test2/libs/UpLoadLibrary_12_03_15_13-release.aar
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -11,9 +11,9 @@
|
||||
"type": "SINGLE",
|
||||
"filters": [],
|
||||
"attributes": [],
|
||||
"versionCode": 1,
|
||||
"versionName": "1.0",
|
||||
"outputFile": "Wallpaper Engine_v1.0(1)_11_28_17_11-release.apk"
|
||||
"versionCode": 2,
|
||||
"versionName": "1.1",
|
||||
"outputFile": "Wallpaper Engine_v1.1(2)_12_04_15_00-release.apk"
|
||||
}
|
||||
],
|
||||
"elementType": "File",
|
||||
@ -22,14 +22,14 @@
|
||||
"minApi": 28,
|
||||
"maxApi": 30,
|
||||
"baselineProfiles": [
|
||||
"baselineProfiles/1/Wallpaper Engine_v1.0(1)_11_28_17_11-release.dm"
|
||||
"baselineProfiles/1/Wallpaper Engine_v1.1(2)_12_04_15_00-release.dm"
|
||||
]
|
||||
},
|
||||
{
|
||||
"minApi": 31,
|
||||
"maxApi": 2147483647,
|
||||
"baselineProfiles": [
|
||||
"baselineProfiles/0/Wallpaper Engine_v1.0(1)_11_28_17_11-release.dm"
|
||||
"baselineProfiles/0/Wallpaper Engine_v1.1(2)_12_04_15_00-release.dm"
|
||||
]
|
||||
}
|
||||
],
|
||||
|
||||
@ -1,22 +1,28 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.SET_WALLPAPER" />
|
||||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
||||
<uses-permission
|
||||
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
|
||||
android:maxSdkVersion="32" />
|
||||
|
||||
<application
|
||||
android:name=".App"
|
||||
android:allowBackup="true"
|
||||
android:icon="@mipmap/img"
|
||||
android:label="@string/app_name"
|
||||
android:roundIcon="@mipmap/img"
|
||||
android:supportsRtl="true"
|
||||
android:networkSecurityConfig="@xml/net"
|
||||
tools:replace="networkSecurityConfig"
|
||||
android:theme="@style/Theme.MyApplication">
|
||||
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:screenOrientation="portrait"
|
||||
android:exported="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
@ -26,16 +32,19 @@
|
||||
|
||||
<activity
|
||||
android:name=".MainActivity2"
|
||||
android:screenOrientation="portrait"
|
||||
android:exported="false" />
|
||||
|
||||
<activity
|
||||
android:name=".FullImageActivity"
|
||||
android:exported="false"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/Theme.AppCompat.NoActionBar" />
|
||||
|
||||
<activity
|
||||
android:name=".FavoriteActivity"
|
||||
android:exported="false"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
|
||||
</application>
|
||||
|
||||
|
||||
25
test2/src/main/java/com/wall/engine/wallpaper/App.java
Normal file
25
test2/src/main/java/com/wall/engine/wallpaper/App.java
Normal file
@ -0,0 +1,25 @@
|
||||
package com.wall.engine.wallpaper;
|
||||
|
||||
import android.app.Application;
|
||||
|
||||
import com.up.uploadlibrary.UpLoadManager;
|
||||
|
||||
import kotlin.Unit;
|
||||
import kotlin.jvm.functions.Function2;
|
||||
|
||||
public class App extends Application {
|
||||
|
||||
|
||||
public static String TAG = "===========";
|
||||
@Override
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
|
||||
UpLoadManager.INSTANCE.init(this, TAG, new Function2<String, String, Unit>() {
|
||||
@Override
|
||||
public Unit invoke(String s, String s2) {
|
||||
return null;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -14,9 +14,15 @@ import androidx.core.view.WindowCompat;
|
||||
import androidx.core.view.WindowInsetsControllerCompat;
|
||||
import androidx.recyclerview.widget.GridLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.ad.tradpluslibrary.TPAdManager;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import kotlin.Unit;
|
||||
import kotlin.jvm.functions.Function0;
|
||||
|
||||
public class FavoriteActivity extends AppCompatActivity {
|
||||
|
||||
private RecyclerView rvFavoriteImages;
|
||||
@ -34,6 +40,12 @@ public class FavoriteActivity extends AppCompatActivity {
|
||||
initViews();
|
||||
setupRecyclerView();
|
||||
loadFavoriteData();
|
||||
TPAdManager.INSTANCE.showTPAD(FavoriteActivity.this, new Function0<Unit>() {
|
||||
@Override
|
||||
public Unit invoke() {
|
||||
return null;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void setupStatusBar() {
|
||||
|
||||
@ -26,6 +26,7 @@ import androidx.core.view.WindowCompat;
|
||||
import androidx.core.view.WindowInsetsCompat;
|
||||
import androidx.core.view.WindowInsetsControllerCompat;
|
||||
|
||||
import com.ad.tradpluslibrary.TPAdManager;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.DataSource;
|
||||
import com.bumptech.glide.load.DecodeFormat;
|
||||
@ -43,6 +44,9 @@ import java.io.OutputStream;
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
|
||||
import kotlin.Unit;
|
||||
import kotlin.jvm.functions.Function0;
|
||||
|
||||
// 壁纸设置类型常量
|
||||
interface WallpaperType {
|
||||
int TYPE_HOME = 1; // 桌面
|
||||
@ -85,6 +89,13 @@ public class FullImageActivity extends AppCompatActivity implements WallpaperTyp
|
||||
initClick();
|
||||
// 初始化点赞状态
|
||||
initFavoriteState();
|
||||
|
||||
TPAdManager.INSTANCE.showTPAD(FullImageActivity.this, new Function0<Unit>() {
|
||||
@Override
|
||||
public Unit invoke() {
|
||||
return null;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void initFullScreen() {
|
||||
@ -174,10 +185,23 @@ public class FullImageActivity extends AppCompatActivity implements WallpaperTyp
|
||||
binding.imageviewBack.setOnClickListener(v -> finish());
|
||||
|
||||
// 下载按钮(无需权限)
|
||||
binding.layoutDownload.setOnClickListener(v -> startDownload());
|
||||
binding.layoutDownload.setOnClickListener(v -> TPAdManager.INSTANCE.showTPAD(FullImageActivity.this, new Function0<Unit>() {
|
||||
@Override
|
||||
public Unit invoke() {
|
||||
startDownload();
|
||||
return null;
|
||||
}
|
||||
})
|
||||
);
|
||||
|
||||
// 修正:设置壁纸按钮ID为button_set1(与布局一致)
|
||||
binding.buttonSet1.setOnClickListener(v -> showWallpaperTypeDialog());
|
||||
binding.buttonSet1.setOnClickListener(v -> TPAdManager.INSTANCE.showTPAD(FullImageActivity.this, new Function0<Unit>() {
|
||||
@Override
|
||||
public Unit invoke() {
|
||||
showWallpaperTypeDialog();
|
||||
return null;
|
||||
}
|
||||
}));
|
||||
|
||||
// 点赞按钮
|
||||
binding.imageFavorite.setOnClickListener(v -> toggleFavorite());
|
||||
@ -193,7 +217,7 @@ public class FullImageActivity extends AppCompatActivity implements WallpaperTyp
|
||||
item.setId(imageId);
|
||||
item.setAlt_description(imageDesc);
|
||||
|
||||
Urls urls = new Urls();
|
||||
Urls urls = new Urls();
|
||||
urls.setRegular(imageUrl);
|
||||
urls.setSmall(imageUrl);
|
||||
urls.setFull(imageUrl);
|
||||
|
||||
@ -2,6 +2,7 @@ package com.wall.engine.wallpaper;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.os.CountDownTimer;
|
||||
import android.os.Handler;
|
||||
import android.os.Looper;
|
||||
import android.widget.ProgressBar;
|
||||
@ -12,12 +13,19 @@ import androidx.core.graphics.Insets;
|
||||
import androidx.core.view.ViewCompat;
|
||||
import androidx.core.view.WindowInsetsCompat;
|
||||
|
||||
import com.ad.tradpluslibrary.TPAdManager;
|
||||
|
||||
import kotlin.Unit;
|
||||
import kotlin.jvm.functions.Function0;
|
||||
import kotlin.jvm.functions.Function1;
|
||||
|
||||
public class MainActivity extends AppCompatActivity {
|
||||
|
||||
private ProgressBar progressBar;
|
||||
private int progress = 0;
|
||||
private Handler handler;
|
||||
|
||||
private Handler handler;
|
||||
private long totalTime = 13000;
|
||||
private CountDownTimer countDownTimer;
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
@ -28,39 +36,33 @@ public class MainActivity extends AppCompatActivity {
|
||||
progressBar = findViewById(R.id.progressBar);
|
||||
handler = new Handler(Looper.getMainLooper());
|
||||
|
||||
// 进度条更新逻辑
|
||||
new Thread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
// 循环更新进度,直到100
|
||||
while (progress < 100) {
|
||||
progress += 1; // 每次+1
|
||||
// 切回主线程更新UI
|
||||
handler.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
progressBar.setProgress(progress);
|
||||
}
|
||||
});
|
||||
try {
|
||||
// 控制进度条加载速度(总时长约1.5秒,可调整)
|
||||
Thread.sleep(15);
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
// 进度到100后,跳转到MainActivity2
|
||||
handler.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
Intent intent = new Intent(MainActivity.this, MainActivity2.class);
|
||||
startActivity(intent);
|
||||
finish(); // 关闭启动页,避免返回键回到此页面
|
||||
}
|
||||
});
|
||||
TPAdManager.INSTANCE.init(MainActivity.this, App.TAG, "AA8164DB9D6A35CF63E3DA2B6566D611", "D5E5214E665A8B7F389884D96E888B12", "D3F5AAA6CE3FB2559A14115FE435AE12", "A8EFAD3EA7A59AC823B44C0F53718E12", new Function0<Unit>() {
|
||||
@Override
|
||||
public Unit invoke() {
|
||||
return null;
|
||||
}
|
||||
}).start();
|
||||
});
|
||||
|
||||
countDownTimer = TPAdManager.INSTANCE.showWelcomeAd(MainActivity.this, totalTime, new Function1<Long, Unit>() {
|
||||
@Override
|
||||
public Unit invoke(Long aLong) {
|
||||
int progressPercentage = (int) ((100 * aLong) / totalTime);
|
||||
int countdownPercentage = 100 - progressPercentage;
|
||||
progressBar.setProgress(countdownPercentage);
|
||||
return null;
|
||||
}
|
||||
}, new Function0<Unit>() {
|
||||
@Override
|
||||
public Unit invoke() {
|
||||
Intent intent = new Intent(MainActivity.this, MainActivity2.class);
|
||||
startActivity(intent);
|
||||
finish(); // 关闭启动页,避免返回键回到此页面
|
||||
return null;
|
||||
}
|
||||
});
|
||||
countDownTimer.start();
|
||||
|
||||
|
||||
// 适配系统状态栏(保留原有逻辑)
|
||||
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
|
||||
@ -77,5 +79,9 @@ public class MainActivity extends AppCompatActivity {
|
||||
if (handler != null) {
|
||||
handler.removeCallbacksAndMessages(null);
|
||||
}
|
||||
if (countDownTimer != null) {
|
||||
countDownTimer.cancel();
|
||||
countDownTimer = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -14,27 +14,25 @@
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginTop="150dp"
|
||||
android:text="@string/app_name"
|
||||
android:textColor="#FFDE59"
|
||||
android:layout_marginTop="150dp"
|
||||
android:layout_gravity="center"
|
||||
android:textSize="30sp"
|
||||
android:textStyle="bold"
|
||||
/>
|
||||
android:textStyle="bold" />
|
||||
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/progressBar"
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
android:layout_width="280dp"
|
||||
android:layout_height="10dp"
|
||||
android:progress="0"
|
||||
android:progressTint="#FFDE59"
|
||||
android:backgroundTint="#E0E0E0"
|
||||
android:layout_marginStart="30dp"
|
||||
android:layout_marginEnd="30dp"
|
||||
android:layout_marginTop="500dp"
|
||||
android:layout_gravity="center"
|
||||
/>
|
||||
<ProgressBar
|
||||
android:id="@+id/progressBar"
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
android:layout_width="280dp"
|
||||
android:layout_height="10dp"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginStart="30dp"
|
||||
android:layout_marginTop="500dp"
|
||||
android:layout_marginEnd="30dp"
|
||||
android:backgroundTint="#E0E0E0"
|
||||
android:progress="1"
|
||||
android:progressTint="#FFDE59" />
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
6
test2/src/main/res/xml/net.xml
Normal file
6
test2/src/main/res/xml/net.xml
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<network-security-config xmlns:tools="http://schemas.android.com/tools">
|
||||
<domain-config cleartextTrafficPermitted="true">
|
||||
<domain tools:ignore="NetworkSecurityConfig">mobile-server.lux-ad.com</domain>
|
||||
</domain-config>
|
||||
</network-security-config>
|
||||
Loading…
Reference in New Issue
Block a user