diff --git a/app/build.gradle b/app/build.gradle
index 85f4248cd..d73a8b669 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,4 @@
apply plugin: 'com.android.application'
-apply plugin: 'com.google.gms.google-services'
-//apply plugin: 'com.google.firebase.crashlytics'
apply plugin: 'kotlin-android'
apply plugin: 'com.tencent.vasdolly'
apply from: '../mob.gradle'
@@ -81,19 +79,19 @@ android {
signingConfigs {
v2 {
- storeFile file('../pekolive.jks')
- storePassword "peko2023"
- keyAlias "pekolive"
- keyPassword "peko2023"
+ storeFile file('../pikolive.jks')
+ storePassword "pikolive2023"
+ keyAlias "pikolive"
+ keyPassword "pikolive2023"
v2SigningEnabled true
v1SigningEnabled true
}
v1 {
- storeFile file('../pekolive.jks')
- storePassword "peko2023"
- keyAlias "pekolive"
- keyPassword "peko2023"
+ storeFile file('../pikolive.jks')
+ storePassword "pikolive2023"
+ keyAlias "pikolive"
+ keyPassword "pikolive2023"
v2SigningEnabled false
v1SigningEnabled true
}
diff --git a/app/google-services.json b/app/google-services.json
deleted file mode 100644
index e64004dc1..000000000
--- a/app/google-services.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "project_info": {
- "project_number": "656602722869",
- "project_id": "pekolive-30f9e",
- "storage_bucket": "pekolive-30f9e.appspot.com"
- },
- "client": [
- {
- "client_info": {
- "mobilesdk_app_id": "1:656602722869:android:dac206f8aae0ba9021f77c",
- "android_client_info": {
- "package_name": "com.vele.pekolive"
- }
- },
- "oauth_client": [
- {
- "client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
- "client_type": 3
- }
- ],
- "api_key": [
- {
- "current_key": "AIzaSyDDoTSpY3wxOefVDVKRmE9cDiT1iv8Ra-4"
- }
- ],
- "services": {
- "appinvite_service": {
- "other_platform_oauth_client": [
- {
- "client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
- "client_type": 3
- }
- ]
- }
- }
- }
- ],
- "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/core/build.gradle b/core/build.gradle
index 0ec9dccc1..43633b4a6 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -90,9 +90,9 @@ dependencies {
//firebase推送、统计
// implementation 'com.google.firebase:firebase-messaging:23.1.1'
- implementation 'com.google.android.gms:play-services-base:18.1.0'
+// implementation 'com.google.android.gms:play-services-base:18.1.0'
// implementation 'com.google.firebase:firebase-core:19.0.0'
- implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
+// implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
//googleplay内购
api 'com.google.android.gms:play-services-wallet:19.2.1'
diff --git a/mob.gradle b/mob.gradle
index 3e3f6bd08..d57a5d280 100644
--- a/mob.gradle
+++ b/mob.gradle
@@ -22,7 +22,7 @@ MobSDK {
}
GooglePlus {
- appId "797840604753-7odpvo802kh6u57261vpd0gv7jrv5h5l.apps.googleusercontent.com"
+ appId "695864439005-jqts2e0ij0e7i4i597m6fc210433bc6g.apps.googleusercontent.com"
callbackUri "http://localhost"
officialVersion "default"
enable true
diff --git a/pikolive.jks b/pikolive.jks
new file mode 100644
index 000000000..9a991c44c
Binary files /dev/null and b/pikolive.jks differ
diff --git a/tmpmob/ShareSDK/assets/ShareSDK.xml b/tmpmob/ShareSDK/assets/ShareSDK.xml
index 8f36789c4..28d1f1793 100644
--- a/tmpmob/ShareSDK/assets/ShareSDK.xml
+++ b/tmpmob/ShareSDK/assets/ShareSDK.xml
@@ -10,7 +10,7 @@
-
+