[Modify]修改google,facebook的登录配置

app/google-services.json

@@ -1,41 +1,33 @@
 {
   "project_info": {
-    "project_number": "766987211654",
-    "project_id": "fluid-keyword-363108",
-    "storage_bucket": "fluid-keyword-363108.appspot.com"
+    "project_number": "656602722869",
+    "project_id": "pekolive-30f9e",
+    "storage_bucket": "pekolive-30f9e.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:766987211654:android:e22efc16d8ba608189d207",
+        "mobilesdk_app_id": "1:656602722869:android:dac206f8aae0ba9021f77c",
         "android_client_info": {
-          "package_name": "com.vele.peko"
+          "package_name": "com.vele.pekolive"
         }
       },
       "oauth_client": [
         {
-          "client_id": "766987211654-oe8kjt7rserq31d1rdulqj2aao5b96a7.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.vele.peko",
-            "certificate_hash": "a8ac3327a1144cf1b566ca7702338e471f143469"
-          }
-        },
-        {
-          "client_id": "766987211654-oe8kjt7rserq31d1rdulqj2aao5b96a7.apps.googleusercontent.com",
+          "client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyBLTgRb9tTIGjUvIaGl0WoLJjVFSQlEEOA"
+          "current_key": "AIzaSyDDoTSpY3wxOefVDVKRmE9cDiT1iv8Ra-4"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "766987211654-oe8kjt7rserq31d1rdulqj2aao5b96a7.apps.googleusercontent.com",
+              "client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
               "client_type": 3
             }
           ]

app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java

@@ -45,7 +45,7 @@ import me.shihao.library.XRadioGroup;
 
 /**
  * @author jack
- * @Description
+ * @Description 新用戶注冊
  * @Date 2018/11/23
  */
 public class AddUserInfoFragment extends BaseFragment

core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/KeyInfo.java

@@ -11,7 +11,7 @@ public class KeyInfo implements Serializable {
 
     private int keyPrice;
     private int keyNum;
-    private int goldNum;//用户余额
+    private double goldNum;//用户余额
     private int sendMessageSwitchLevel;
 
     public int getKeyPrice() {
@@ -30,11 +30,11 @@ public class KeyInfo implements Serializable {
         this.keyNum = keyNum;
     }
 
-    public int getGoldNum() {
+    public double getGoldNum() {
         return goldNum;
     }
 
-    public void setGoldNum(int goldNum) {
+    public void setGoldNum(double goldNum) {
         this.goldNum = goldNum;
     }
 

gradle.properties

@@ -24,11 +24,14 @@ only_arm64=false
 
 channel_file=channel.txt
 
-CRASHLYTICS_COLLECTION_ENABLED=false
+CRASHLYTICS_COLLECTION_ENABLED=true
 
 COMPILE_SDK_VERSION=32
 MIN_SDK_VERSION=21
 TARGET_SDK_VERSION=32
 
-version_name=1.6.2
-version_code=162
+version_name=1.6.9
+version_code=169
+
+systemProp.https.proxyHost=127.0.0.1
+systemProp.https.proxyPort=9999

mob.gradle

@@ -3,10 +3,6 @@ apply plugin: 'com.mob.sdk'
 MobSDK {
     appKey "36b91eeac7469"
     appSecret "63ec0702513aca17e20615dd5dfdc03f"
-    MobLink {
-        uriScheme "pekoapp://sharesdk"
-        appLinkHost "cebg.t4m.cn"
-    }
     appBundleMode true
     MobLink {
         uriScheme "pekoapp://sharesdk"
@@ -25,7 +21,7 @@ MobSDK {
             }
 
             GooglePlus {
-                appId "766987211654-oe8kjt7rserq31d1rdulqj2aao5b96a7.apps.googleusercontent.com"
+                appId "797840604753-7odpvo802kh6u57261vpd0gv7jrv5h5l.apps.googleusercontent.com"
                 callbackUri "http://localhost"
                 officialVersion "default"
                 enable true
@@ -40,7 +36,11 @@ MobSDK {
     }
 
     permissions {
-        exclude "android.permission.READ_PHONE_STATE", "android.permission.ACCESS_FINE_LOCATION", "android.permission.ACCESS_COARSE_LOCATION", "android.permission.QUERY_ALL_PACKAGES"
+        exclude "android.permission.READ_PHONE_STATE", "android.permission.ACCESS_FINE_LOCATION",
+                "android.permission.ACCESS_COARSE_LOCATION", "android.permission.QUERY_ALL_PACKAGES",
+                "android.permission.GET_ACCOUNTS", "android.permission.ACCESS_WIFI_STATE",
+                "android.permission.READ_SMS", "android.permission.RECEIVE_SMS",
+                "android.permission.READ_CONTACTS"
     }
 
 }

tmpmob/ShareSDK/assets/ShareSDK.xml

@@ -10,7 +10,7 @@
 <Twitter Enable="false" />
 <Evernote Enable="false" />
 <FourSquare Enable="false" />
-<GooglePlus OfficialVersion="default" Enable="true" ClientID="766987211654-oe8kjt7rserq31d1rdulqj2aao5b96a7.apps.googleusercontent.com" RedirectUrl="http://localhost" />
+<GooglePlus OfficialVersion="default" Enable="true" ClientID="797840604753-7odpvo802kh6u57261vpd0gv7jrv5h5l.apps.googleusercontent.com" RedirectUrl="http://localhost" />
 <Instagram Enable="false" />
 <LinkedIn Enable="false" />
 <Tumblr Enable="false" />