diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index f805182..e1859c4 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -228,6 +228,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4400ffb..8ef5245 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -15,7 +15,6 @@
-
@@ -37,6 +36,7 @@
+
diff --git a/420pokies/.gitignore b/420pokies/.gitignore
deleted file mode 100644
index 956c004..0000000
--- a/420pokies/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build
-/release
\ No newline at end of file
diff --git a/420pokies/build.gradle b/420pokies/build.gradle
deleted file mode 100644
index c0717cc..0000000
--- a/420pokies/build.gradle
+++ /dev/null
@@ -1,93 +0,0 @@
-plugins {
- id 'com.android.application'
- id 'com.google.gms.google-services'
-}
-
-def appOutPutName = "pokies420"
-
-android {
- namespace rootProject.ext.namespace
- compileSdk 36
- defaultConfig {
- minSdkVersion 24
- targetSdk 36
- versionCode rootProject.ext.versionCode
- versionName rootProject.ext.versionName
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
- applicationId "com.ahdiiahdaoi.pokies420"
-
- //app大背景色
- resValue('color', 'windows_color', '#0E3500')
- //底部导航栏颜色 大背景颜色为 windows_color——style_color的上下渐变色
- resValue('color', 'style_color', '#326D1D')
- //app 名字
- resValue('string', 'app_name', 'Pokies420')
-
-
- buildConfigField "String", "BASE_URL", "\"https://live22x.com/\""
- buildConfigField "int", "USERID", "277"
- buildConfigField "boolean", "IS_WHITE", "false"
- buildConfigField "boolean", "IS_ROUND", "true"
- buildConfigField "int", "ROUND_RADIUS", "10"
- buildConfigField "boolean", "HAS_CONTACT", "false"
- buildConfigField "boolean", "HAS_HOOK", "false"
-
- }
- buildFeatures {
- buildConfig = true
- }
-
- signingConfigs {
- debug {
- storeFile file('telur33.jks')
- storePassword "android2014"
- keyAlias 'key0'
- keyPassword "android2014"
- }
- release {
- storeFile file('telur33.jks')
- storePassword "android2014"
- keyAlias 'key0'
- keyPassword "android2014"
- }
- }
-
- buildTypes {
- release {
- signingConfig signingConfigs.release
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
- compileOptions {
- sourceCompatibility rootProject.ext.JAVA_VERSION
- targetCompatibility rootProject.ext.JAVA_VERSION
- }
-
- applicationVariants.all { variant ->
- variant.outputs.all {
- def outputDir = new File(rootProject.ext.outputPath)
- outputDir.mkdirs()
- def outputFileName = "${appOutPutName}.apk"
- setOutputFileName(outputFileName)
- def newOutputFile = new File(outputDir, outputFileName)
- newOutputFile.parentFile.mkdirs()
- variant.assemble.doLast {
- try {
- java.nio.file.Files.copy(
- outputFile.toPath(),
- newOutputFile.toPath(),
- java.nio.file.StandardCopyOption.REPLACE_EXISTING
- )
- } catch (java.io.IOException e) {
- }
- }
- }
- }
-
-}
-
-dependencies {
- implementation project(path: ':base')
-}
\ No newline at end of file
diff --git a/420pokies/google-services.json b/420pokies/google-services.json
deleted file mode 100644
index bb47525..0000000
--- a/420pokies/google-services.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "project_info": {
- "project_number": "751863474562",
- "project_id": "pokies-3399b",
- "storage_bucket": "pokies-3399b.firebasestorage.app"
- },
- "client": [
- {
- "client_info": {
- "mobilesdk_app_id": "1:751863474562:android:399376e95b75e497ed879b",
- "android_client_info": {
- "package_name": "com.ahdiiahdaoi.pokies420"
- }
- },
- "oauth_client": [],
- "api_key": [
- {
- "current_key": "AIzaSyCDqHcaZmH6oieFxSQ3JvVDzZWJrMNSPxg"
- }
- ],
- "services": {
- "appinvite_service": {
- "other_platform_oauth_client": []
- }
- }
- }
- ],
- "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/420pokies/justlet.jks b/420pokies/justlet.jks
deleted file mode 100644
index a33b839..0000000
Binary files a/420pokies/justlet.jks and /dev/null differ
diff --git a/420pokies/proguard-rules.pro b/420pokies/proguard-rules.pro
deleted file mode 100644
index 107b7ee..0000000
--- a/420pokies/proguard-rules.pro
+++ /dev/null
@@ -1,32 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
--dontwarn dalvik.**
--dontwarn com.tencent.smtt.**
-
--keep class com.tencent.smtt.** {
- *;
-}
-
--keep class com.tencent.tbs.** {
- *;
-}
\ No newline at end of file
diff --git a/420pokies/src/main/AndroidManifest.xml b/420pokies/src/main/AndroidManifest.xml
deleted file mode 100644
index 7cbc0e0..0000000
--- a/420pokies/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/420pokies/src/main/java/com/webclip/base/IndexActivity.java b/420pokies/src/main/java/com/webclip/base/IndexActivity.java
deleted file mode 100644
index c8e4780..0000000
--- a/420pokies/src/main/java/com/webclip/base/IndexActivity.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.webclip.base;
-
-import android.os.Bundle;
-
-import com.google.firebase.messaging.FirebaseMessaging;
-
-public class IndexActivity extends MainActivity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- initConfig();
- super.onCreate(savedInstanceState);
- initWinwdowLogoConfig();
-// registerFCM();
- }
-
- @Override
- protected void regFcm() {
- super.regFcm();
- registerFCM();
- }
-
- /**
- * 注册FCM
- */
- private void registerFCM() {
- //订阅主题
- LogUtils.i("支持FCM 去注册");
- try {
- FirebaseMessaging.getInstance().subscribeToTopic("demo")
- .addOnCompleteListener(task -> {
- String msg = "Subscribed";
- if (!task.isSuccessful()) {
- msg = "Subscribe failed";
- }else{
- checkNotify();
- }
- LogUtils.i("支持FCM 结果："+msg);
- });
- }catch (Exception e){
- e.printStackTrace();
- LogUtils.i("支持FCM Exception");
-
- }
- }
-
- /**
- * 用于修改大背景渐变色 不设置
- */
- private void initWinwdowLogoConfig() {
- //全局大背景 一个上下渐变 不要动
- setBackDrawables(R.drawable.big_bg);
- setImageView(BuildConfig.IS_ROUND,BuildConfig.ROUND_RADIUS);
- getWindow().getDecorView().setBackgroundResource(R.drawable.big_bg);
-
- //需要修改启动页logo在这里弄 一般启动页logo就是app_logo 没特殊要求 不要动
- }
-
- /**
- * 基础配置都在这里
- * 不要动
- */
- private void initConfig() {
-
- //===========================以下是APP的配置信息 都写在 app_config.xml中==================================
- userId = BuildConfig.USERID;
- saveInt(IndexActivity.this,"user_code",userId);
-
- saveString(this, "base_url",BuildConfig.BASE_URL);
- styleColor = getColor(R.color.style_color);
- windowsColor = getColor(R.color.windows_color);
- isWhite = BuildConfig.IS_WHITE;
- hasContact = BuildConfig.HAS_CONTACT;
- hasHook = BuildConfig.HAS_HOOK;
-
- //===========================以上是APP的配置信息 都写在 app_config.xml中==================================
- }
-
-}
diff --git a/420pokies/src/main/java/com/webclip/base/MyFirebaseMessageingService.java b/420pokies/src/main/java/com/webclip/base/MyFirebaseMessageingService.java
deleted file mode 100644
index 36f2d65..0000000
--- a/420pokies/src/main/java/com/webclip/base/MyFirebaseMessageingService.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.webclip.base;
-
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import androidx.annotation.NonNull;
-import androidx.core.app.NotificationCompat;
-import com.google.firebase.messaging.FirebaseMessagingService;
-import com.google.firebase.messaging.RemoteMessage;
-import com.google.gson.Gson;
-import com.webclip.base.GsonUtils;
-import com.webclip.base.MessageInfo;
-import java.util.Map;
-import java.util.Random;
-
-public class MyFirebaseMessageingService extends FirebaseMessagingService {
-
- public MyFirebaseMessageingService() {
- }
-
- @Override
- public void onMessageReceived(@NonNull RemoteMessage remoteMessage) {
- super.onMessageReceived(remoteMessage);
- Map serviceData = remoteMessage.getData(); //后台推送数据
- if (serviceData != null && serviceData.containsKey("message")) {
- String value = serviceData.get("message");
- Gson gson = new Gson();
- MessageInfo messageInfo = gson.fromJson(value, MessageInfo.class);
- showNotification(messageInfo);
- } else {
- //收到通知 创建notify
- if (remoteMessage.getNotification() != null) {
- showNotification(remoteMessage.getNotification().getTitle(), remoteMessage.getNotification().getBody());
- }
- }
- }
-
- private void showNotification(MessageInfo messageInfo) {
- Intent notifyIntent = new Intent(this, IndexActivity.class);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CUPCAKE) {
- ComponentName launchComponent = null;
- launchComponent = getApplication()
- .getPackageManager()
- .getLaunchIntentForPackage(getApplication().getPackageName())
- .getComponent();
- notifyIntent.setComponent(launchComponent);
- }
- notifyIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
- notifyIntent.setAction(Intent.ACTION_VIEW);
- notifyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); // 必须
- notifyIntent.putExtra("message", messageInfo);
- PendingIntent pendingIntent = PendingIntent.getActivity(this, new Random().nextInt(10000), notifyIntent, PendingIntent.FLAG_IMMUTABLE);
- NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
- NotificationChannel channelwinway = null;
- NotificationCompat.Builder notificationBuilder = null;
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- channelwinway = new NotificationChannel(getString(R.string.app_name), "notify", NotificationManager.IMPORTANCE_DEFAULT);
- channelwinway.enableLights(true);
- channelwinway.enableVibration(true);
- notificationManager.createNotificationChannel(channelwinway);
- notificationBuilder = new NotificationCompat.Builder(this, channelwinway.getId())
- .setSmallIcon(R.mipmap.app_logo)
- .setContentTitle(messageInfo.getTitle())
- .setContentText(messageInfo.getContent())
- .setAutoCancel(true)
- .setContentIntent(pendingIntent);
- } else {
- notificationBuilder = new NotificationCompat.Builder(this, getString(R.string.app_name))
- .setSmallIcon(R.mipmap.app_logo)
- .setContentTitle(messageInfo.getTitle())
- .setContentText(messageInfo.getContent())
- .setAutoCancel(true)
- .setContentIntent(pendingIntent);
- }
- notificationManager.notify(0, notificationBuilder.build());
- }
-
- private void showNotification(String title, String body) {
- Intent notifyIntent = new Intent(this, IndexActivity.class);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CUPCAKE) {
- ComponentName launchComponent = null;
- launchComponent = getApplication()
- .getPackageManager()
- .getLaunchIntentForPackage(getApplication().getPackageName())
- .getComponent();
- notifyIntent.setComponent(launchComponent);
- }
- notifyIntent.putExtra("message", body);
- notifyIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
- notifyIntent.setAction(Intent.ACTION_VIEW);
- notifyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); // 必须
- PendingIntent pendingIntent = PendingIntent.getActivity(this, new Random().nextInt(10000), notifyIntent, PendingIntent.FLAG_IMMUTABLE);
- NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
- NotificationChannel channelwinway = null;
- NotificationCompat.Builder notificationBuilder = null;
- MessageInfo messageInfo = GsonUtils.getObjFromJSON(body, MessageInfo.class);
- if (messageInfo != null) {
- body = messageInfo.getContent();
- }
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- channelwinway = new NotificationChannel(getString(R.string.app_name), "notify", NotificationManager.IMPORTANCE_DEFAULT);
- channelwinway.enableLights(true);
- channelwinway.enableVibration(true);
- notificationManager.createNotificationChannel(channelwinway);
- notificationBuilder = new NotificationCompat.Builder(this, channelwinway.getId())
- .setSmallIcon(R.mipmap.app_logo)
- .setContentTitle(title)
- .setContentText(body)
- .setAutoCancel(true)
- .setContentIntent(pendingIntent);
- } else {
- notificationBuilder = new NotificationCompat.Builder(this, getString(R.string.app_name))
- .setSmallIcon(R.mipmap.app_logo)
- .setContentTitle(title)
- .setContentText(body)
- .setAutoCancel(true)
- .setContentIntent(pendingIntent);
- }
- notificationManager.notify(0, notificationBuilder.build());
- }
-}
diff --git a/420pokies/src/main/java/com/webclip/base/WebApplication.java b/420pokies/src/main/java/com/webclip/base/WebApplication.java
deleted file mode 100644
index 36e2512..0000000
--- a/420pokies/src/main/java/com/webclip/base/WebApplication.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.webclip.base;
-
-import android.app.Application;
-import android.content.Context;
-
-import com.webclip.base.LogUtils;
-
-public class WebApplication extends Application {
-
-
- public static Context application;
- @Override
- public void onCreate() {
- super.onCreate();
-// 设置开启优化方案
- application = this;
- LogUtils.isDebug = BuildConfig.BUILD_TYPE.equals("debug");
- }
-}
diff --git a/420pokies/src/main/res/drawable/big_bg.xml b/420pokies/src/main/res/drawable/big_bg.xml
deleted file mode 100644
index aa44959..0000000
--- a/420pokies/src/main/res/drawable/big_bg.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/420pokies/src/main/res/mipmap-xxhdpi/app_logo.jpg b/420pokies/src/main/res/mipmap-xxhdpi/app_logo.jpg
deleted file mode 100644
index 1159b69..0000000
Binary files a/420pokies/src/main/res/mipmap-xxhdpi/app_logo.jpg and /dev/null differ
diff --git a/420pokies/src/main/res/values/themes.xml b/420pokies/src/main/res/values/themes.xml
deleted file mode 100644
index f1ef249..0000000
--- a/420pokies/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/420pokies/src/main/res/xml/app_updater_paths.xml b/420pokies/src/main/res/xml/app_updater_paths.xml
deleted file mode 100644
index 1254450..0000000
--- a/420pokies/src/main/res/xml/app_updater_paths.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/420pokies/src/main/res/xml/network_security_config.xml b/420pokies/src/main/res/xml/network_security_config.xml
deleted file mode 100644
index dca93c0..0000000
--- a/420pokies/src/main/res/xml/network_security_config.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/420pokies/src/main/res/xml/provider_paths.xml b/420pokies/src/main/res/xml/provider_paths.xml
deleted file mode 100644
index c9a897a..0000000
--- a/420pokies/src/main/res/xml/provider_paths.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/420pokies/telur33.jks b/420pokies/telur33.jks
deleted file mode 100644
index f00434d..0000000
Binary files a/420pokies/telur33.jks and /dev/null differ
diff --git a/apks/420pokies.apk b/apks/420pokies.apk
new file mode 100644
index 0000000..a9ea32e
Binary files /dev/null and b/apks/420pokies.apk differ
diff --git a/pokies420/build.gradle b/pokies420/build.gradle
index 9125155..adf61a9 100644
--- a/pokies420/build.gradle
+++ b/pokies420/build.gradle
@@ -3,7 +3,7 @@ plugins {
id 'com.google.gms.google-services'
}
-def appOutPutName = "live22"
+def appOutPutName = "420pokies"
android {
namespace rootProject.ext.namespace
@@ -15,18 +15,18 @@ android {
versionName rootProject.ext.versionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- applicationId "com.daidn.live22"
+ applicationId "com.ahdiiahdaoi.pokies420"
//app大背景色
- resValue('color', 'windows_color', '#440F6F')
+ resValue('color', 'windows_color', '#0E3500')
//底部导航栏颜色 大背景颜色为 windows_color——style_color的上下渐变色
- resValue('color', 'style_color', '#360B58')
+ resValue('color', 'style_color', '#326D1D')
//app 名字
- resValue('string', 'app_name', 'LIVE22')
+ resValue('string', 'app_name', '420pokies')
- buildConfigField "String", "BASE_URL", "\"https://live22x.com/\""
- buildConfigField "int", "USERID", "262"
+ buildConfigField "String", "BASE_URL", "\"https://420pokies.com/\""
+ buildConfigField "int", "USERID", "277"
buildConfigField "boolean", "IS_WHITE", "false"
buildConfigField "boolean", "IS_ROUND", "true"
buildConfigField "int", "ROUND_RADIUS", "10"
diff --git a/pokies420/google-services.json b/pokies420/google-services.json
index a0a4dbf..bb47525 100644
--- a/pokies420/google-services.json
+++ b/pokies420/google-services.json
@@ -1,21 +1,21 @@
{
"project_info": {
- "project_number": "717557626585",
- "project_id": "live22-997e3",
- "storage_bucket": "live22-997e3.firebasestorage.app"
+ "project_number": "751863474562",
+ "project_id": "pokies-3399b",
+ "storage_bucket": "pokies-3399b.firebasestorage.app"
},
"client": [
{
"client_info": {
- "mobilesdk_app_id": "1:717557626585:android:4bd86e3e5e825bb85f70c8",
+ "mobilesdk_app_id": "1:751863474562:android:399376e95b75e497ed879b",
"android_client_info": {
- "package_name": "com.daidn.live22"
+ "package_name": "com.ahdiiahdaoi.pokies420"
}
},
"oauth_client": [],
"api_key": [
{
- "current_key": "AIzaSyBL6vtzuXlVfoSWiKHtk4p-TiLts0faqUQ"
+ "current_key": "AIzaSyCDqHcaZmH6oieFxSQ3JvVDzZWJrMNSPxg"
}
],
"services": {
diff --git a/pokies420/src/main/res/mipmap-xxhdpi/app_logo.jpg b/pokies420/src/main/res/mipmap-xxhdpi/app_logo.jpg
index 6dde113..1159b69 100644
Binary files a/pokies420/src/main/res/mipmap-xxhdpi/app_logo.jpg and b/pokies420/src/main/res/mipmap-xxhdpi/app_logo.jpg differ
diff --git a/settings.gradle b/settings.gradle
index 2d04765..e03db43 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -58,4 +58,4 @@ include ':xmeth98'//273
include ':xoxau'//274
include ':1xace'//275
include ':vv88aud'//276
-include ':420pokies'//277
+include ':pokies420'//277