xuhuixiang/fenghzuang_new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复空值问题

Browse Source
This commit is contained in:
kang
2026-04-07 11:25:13 +08:00
parent e76ec1b335
commit 348ed78fe6
17 changed files with 72 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
.idea/deploymentTargetSelector.xml generated
View File

@@ -141,6 +141,35 @@
</SelectionState>
<SelectionState runConfigName="mgmhotram">
<option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2026-03-31T01:28:57.909708Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="PhysicalDevice" identifier="serial=huovhmt4ay6p6xby" />
</handle>
</Target>
</DropdownSelection>
<DialogSelection />
</SelectionState>
<SelectionState runConfigName="diriwan888">
<option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2026-03-31T01:28:57.909708Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="PhysicalDevice" identifier="serial=huovhmt4ay6p6xby" />
</handle>
</Target>
</DropdownSelection>
<DialogSelection />
</SelectionState>
<SelectionState runConfigName="mg8vipmyr">
<option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2026-03-31T01:28:57.909708Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="PhysicalDevice" identifier="serial=huovhmt4ay6p6xby" />
</handle>
</Target>
</DropdownSelection>
<DialogSelection />
</SelectionState>
</selectionStates>

2
.idea/gradle.xml generated
View File

@@ -20,12 +20,14 @@
<option value="$PROJECT_DIR$/bng1au" />
<option value="$PROJECT_DIR$/cosmojack" />
<option value="$PROJECT_DIR$/cucislot365" />
<option value="$PROJECT_DIR$/diriwan888" />
<option value="$PROJECT_DIR$/fight996" />
<option value="$PROJECT_DIR$/gk9" />
<option value="$PROJECT_DIR$/jk123hk" />
<option value="$PROJECT_DIR$/kaki33" />
<option value="$PROJECT_DIR$/live22" />
<option value="$PROJECT_DIR$/lorongjudi33" />
<option value="$PROJECT_DIR$/mg8vipmyr" />
<option value="$PROJECT_DIR$/mgmhotram" />
<option value="$PROJECT_DIR$/pantas3342" />
<option value="$PROJECT_DIR$/powercuci" />

BIN
apks/MGMHOTRAM.apk Normal file
View File

Binary file not shown.

BIN
apks/bantu.apk
View File

Binary file not shown.

BIN
apks/diriwan888.apk Normal file
View File

Binary file not shown.

BIN
apks/live22.apk
View File

Binary file not shown.

BIN
apks/mg8vipmyr.apk Normal file
View File

Binary file not shown.

6
base/src/main/java/com/webclip/base/MainActivity.java
View File

@@ -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)) {

16
diriwan888/build.gradle
View File

@@ -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"
}

12
diriwan888/google-services.json
View File

@@ -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": {

BIN
diriwan888/src/main/res/mipmap-xxhdpi/app_logo.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 77 KiB

0
gradlew vendored Normal file → Executable file
View File

16
mg8vipmyr/build.gradle
View File

@@ -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"
}

12
mg8vipmyr/google-services.json
View File

@@ -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": {

BIN
mg8vipmyr/src/main/res/mipmap-xxhdpi/app_logo.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 42 KiB

12
mgmhotram/build.gradle
View File

@@ -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"

5
settings.gradle
View File

@@ -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