diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index ac4ba08..79580ea 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -141,6 +141,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 3021ec6..d6e4c49 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -20,12 +20,14 @@
+
+
diff --git a/apks/MGMHOTRAM.apk b/apks/MGMHOTRAM.apk
new file mode 100644
index 0000000..2156dee
Binary files /dev/null and b/apks/MGMHOTRAM.apk differ
diff --git a/apks/bantu.apk b/apks/bantu.apk
index ce91e6d..d7fdb05 100644
Binary files a/apks/bantu.apk and b/apks/bantu.apk differ
diff --git a/apks/diriwan888.apk b/apks/diriwan888.apk
new file mode 100644
index 0000000..36571e5
Binary files /dev/null and b/apks/diriwan888.apk differ
diff --git a/apks/live22.apk b/apks/live22.apk
index 23e9ae3..4a29a43 100644
Binary files a/apks/live22.apk and b/apks/live22.apk differ
diff --git a/apks/mg8vipmyr.apk b/apks/mg8vipmyr.apk
new file mode 100644
index 0000000..8bfa822
Binary files /dev/null and b/apks/mg8vipmyr.apk differ
diff --git a/base/src/main/java/com/webclip/base/MainActivity.java b/base/src/main/java/com/webclip/base/MainActivity.java
index 3c153a9..a54dfbe 100644
--- a/base/src/main/java/com/webclip/base/MainActivity.java
+++ b/base/src/main/java/com/webclip/base/MainActivity.java
@@ -660,9 +660,9 @@ public class MainActivity extends AppCompatActivity {
regFcm();
}
}
- facebookUrl = dataInfo.getFbUrl().trim();
- telegramUrl = dataInfo.getTgUrl().trim();
- whatsappUrl = dataInfo.getWsUrl().trim();
+ facebookUrl = dataInfo.getFbUrl() == null ? "" : dataInfo.getFbUrl().trim();
+ telegramUrl = dataInfo.getTgUrl() == null ? "" : dataInfo.getTgUrl().trim();
+ whatsappUrl = dataInfo.getWsUrl() == null ? "" : dataInfo.getWsUrl().trim();
//外链逻辑修改
if (!TextUtils.isEmpty(facebookUrl)) {
diff --git a/diriwan888/build.gradle b/diriwan888/build.gradle
index 9125155..636b247 100644
--- a/diriwan888/build.gradle
+++ b/diriwan888/build.gradle
@@ -3,7 +3,7 @@ plugins {
id 'com.google.gms.google-services'
}
-def appOutPutName = "live22"
+def appOutPutName = "diriwan888"
android {
namespace rootProject.ext.namespace
@@ -15,22 +15,22 @@ android {
versionName rootProject.ext.versionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- applicationId "com.daidn.live22"
+ applicationId "com.exm102.diriwan888"
//app大背景色
- resValue('color', 'windows_color', '#440F6F')
+ resValue('color', 'windows_color', '#FFFFFF')
//底部导航栏颜色 大背景颜色为 windows_color——style_color的上下渐变色
- resValue('color', 'style_color', '#360B58')
+ resValue('color', 'style_color', '#CECECF')
//app 名字
- resValue('string', 'app_name', 'LIVE22')
+ resValue('string', 'app_name', 'diriwan888')
- buildConfigField "String", "BASE_URL", "\"https://live22x.com/\""
- buildConfigField "int", "USERID", "262"
+ buildConfigField "String", "BASE_URL", "\"https://diriwan888.pro/\""
+ buildConfigField "int", "USERID", "265"
buildConfigField "boolean", "IS_WHITE", "false"
buildConfigField "boolean", "IS_ROUND", "true"
buildConfigField "int", "ROUND_RADIUS", "10"
- buildConfigField "boolean", "HAS_CONTACT", "true"
+ buildConfigField "boolean", "HAS_CONTACT", "false"
buildConfigField "boolean", "HAS_HOOK", "false"
}
diff --git a/diriwan888/google-services.json b/diriwan888/google-services.json
index a0a4dbf..21c73ef 100644
--- a/diriwan888/google-services.json
+++ b/diriwan888/google-services.json
@@ -1,21 +1,21 @@
{
"project_info": {
- "project_number": "717557626585",
- "project_id": "live22-997e3",
- "storage_bucket": "live22-997e3.firebasestorage.app"
+ "project_number": "117992635576",
+ "project_id": "diriwan888-aa9e0",
+ "storage_bucket": "diriwan888-aa9e0.firebasestorage.app"
},
"client": [
{
"client_info": {
- "mobilesdk_app_id": "1:717557626585:android:4bd86e3e5e825bb85f70c8",
+ "mobilesdk_app_id": "1:117992635576:android:57d533ed0686783deb484d",
"android_client_info": {
- "package_name": "com.daidn.live22"
+ "package_name": "com.exm102.diriwan888"
}
},
"oauth_client": [],
"api_key": [
{
- "current_key": "AIzaSyBL6vtzuXlVfoSWiKHtk4p-TiLts0faqUQ"
+ "current_key": "AIzaSyDnYD7BFdiooseDh5K6x7Cr-ql6EXfWd78"
}
],
"services": {
diff --git a/diriwan888/src/main/res/mipmap-xxhdpi/app_logo.jpg b/diriwan888/src/main/res/mipmap-xxhdpi/app_logo.jpg
index 6dde113..8f11a80 100644
Binary files a/diriwan888/src/main/res/mipmap-xxhdpi/app_logo.jpg and b/diriwan888/src/main/res/mipmap-xxhdpi/app_logo.jpg differ
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/mg8vipmyr/build.gradle b/mg8vipmyr/build.gradle
index 9125155..7d81a73 100644
--- a/mg8vipmyr/build.gradle
+++ b/mg8vipmyr/build.gradle
@@ -3,7 +3,7 @@ plugins {
id 'com.google.gms.google-services'
}
-def appOutPutName = "live22"
+def appOutPutName = "mg8vipmyr"
android {
namespace rootProject.ext.namespace
@@ -15,22 +15,22 @@ android {
versionName rootProject.ext.versionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- applicationId "com.daidn.live22"
+ applicationId "com.exm1003.mg8vipmyr"
//app大背景色
- resValue('color', 'windows_color', '#440F6F')
+ resValue('color', 'windows_color', '#FAFAF8')
//底部导航栏颜色 大背景颜色为 windows_color——style_color的上下渐变色
- resValue('color', 'style_color', '#360B58')
+ resValue('color', 'style_color', '#D2D3D5')
//app 名字
- resValue('string', 'app_name', 'LIVE22')
+ resValue('string', 'app_name', 'mg8vipmyr')
- buildConfigField "String", "BASE_URL", "\"https://live22x.com/\""
- buildConfigField "int", "USERID", "262"
+ buildConfigField "String", "BASE_URL", "\"https://mg8vipmyr.pro/\""
+ buildConfigField "int", "USERID", "266"
buildConfigField "boolean", "IS_WHITE", "false"
buildConfigField "boolean", "IS_ROUND", "true"
buildConfigField "int", "ROUND_RADIUS", "10"
- buildConfigField "boolean", "HAS_CONTACT", "true"
+ buildConfigField "boolean", "HAS_CONTACT", "false"
buildConfigField "boolean", "HAS_HOOK", "false"
}
diff --git a/mg8vipmyr/google-services.json b/mg8vipmyr/google-services.json
index 21c73ef..3dbe096 100644
--- a/mg8vipmyr/google-services.json
+++ b/mg8vipmyr/google-services.json
@@ -1,21 +1,21 @@
{
"project_info": {
- "project_number": "117992635576",
- "project_id": "diriwan888-aa9e0",
- "storage_bucket": "diriwan888-aa9e0.firebasestorage.app"
+ "project_number": "339195334275",
+ "project_id": "mg8vipmyr-92a41",
+ "storage_bucket": "mg8vipmyr-92a41.firebasestorage.app"
},
"client": [
{
"client_info": {
- "mobilesdk_app_id": "1:117992635576:android:57d533ed0686783deb484d",
+ "mobilesdk_app_id": "1:339195334275:android:d299da845e38e21b5a55b6",
"android_client_info": {
- "package_name": "com.exm102.diriwan888"
+ "package_name": "com.exm1003.mg8vipmyr"
}
},
"oauth_client": [],
"api_key": [
{
- "current_key": "AIzaSyDnYD7BFdiooseDh5K6x7Cr-ql6EXfWd78"
+ "current_key": "AIzaSyBSWrUV2rFn2v1TMh_eg80y38KM__yW42k"
}
],
"services": {
diff --git a/mg8vipmyr/src/main/res/mipmap-xxhdpi/app_logo.jpg b/mg8vipmyr/src/main/res/mipmap-xxhdpi/app_logo.jpg
index 8f11a80..ffd0ff2 100644
Binary files a/mg8vipmyr/src/main/res/mipmap-xxhdpi/app_logo.jpg and b/mg8vipmyr/src/main/res/mipmap-xxhdpi/app_logo.jpg differ
diff --git a/mgmhotram/build.gradle b/mgmhotram/build.gradle
index e5be036..ac08473 100644
--- a/mgmhotram/build.gradle
+++ b/mgmhotram/build.gradle
@@ -3,7 +3,7 @@ plugins {
id 'com.google.gms.google-services'
}
-def appOutPutName = "mgmhotram"
+def appOutPutName = "MGMHOTRAM"
android {
namespace rootProject.ext.namespace
@@ -18,15 +18,15 @@ android {
applicationId "com.examp101.mgmhotram"
//app大背景色
- resValue('color', 'windows_color', '#060000')
+ resValue('color', 'windows_color', '#080001')
//底部导航栏颜色 大背景颜色为 windows_color——style_color的上下渐变色
- resValue('color', 'style_color', '#060000')
+ resValue('color', 'style_color', '#080001')
//app 名字
- resValue('string', 'app_name', 'mgmhotram')
+ resValue('string', 'app_name', 'MGMHOTRAM')
- buildConfigField "String", "BASE_URL", "\"https://live22x.com/\""
- buildConfigField "int", "USERID", "266"
+ buildConfigField "String", "BASE_URL", "\"https://mgmhotram.org/\""
+ buildConfigField "int", "USERID", "264"
buildConfigField "boolean", "IS_WHITE", "false"
buildConfigField "boolean", "IS_ROUND", "true"
buildConfigField "int", "ROUND_RADIUS", "10"
diff --git a/settings.gradle b/settings.gradle
index c7a951e..5eb5509 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -45,7 +45,10 @@ include ':redspin3343' //263
include ':bantuan88' //174
include ':jk123hk' //264
include ':kaki33' //265
-include ':mgmhotram'
+include ':mgmhotram'//264
+include ':diriwan888' //265
+include ':mg8vipmyr' //266
+