d

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>

.idea/gradle.xml

@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -20,6 +21,7 @@
             <option value="$PROJECT_DIR$/user" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -293,7 +293,7 @@
     <option name="priority" value="Medium" />
     <option name="excludeFilter" value="" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/build.gradle

@@ -12,7 +12,7 @@ android {
     buildToolsVersion "30.0.3"
 
     defaultConfig {
-        applicationId "com.swago.app"
+        applicationId "com.swagolite.app"
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 1131
@@ -47,10 +47,10 @@ android {
 
     signingConfigs {
         release {
-            keyAlias 'swago'
-            keyPassword 'swago0455com06'
-            storeFile file('swago.jks')
-            storePassword 'swago0455com06'
+            keyAlias 'swagolite'
+            keyPassword 'swlite0933com06'
+            storeFile file('swagolite.jks')
+            storePassword 'swlite0933com06'
             v1SigningEnabled true
             v2SigningEnabled true
         }

app/google-services.json

@@ -1,41 +1,33 @@
 {
   "project_info": {
-    "project_number": "513792265744",
-    "project_id": "swago-chat-1636168047427",
-    "storage_bucket": "swago-chat-1636168047427.appspot.com"
+    "project_number": "231641723395",
+    "project_id": "swago-lite",
+    "storage_bucket": "swago-lite.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:513792265744:android:5754dd85acc9b8a8c28495",
+        "mobilesdk_app_id": "1:231641723395:android:cbb535674a127d6bc09436",
         "android_client_info": {
-          "package_name": "com.swago.app"
+          "package_name": "com.swagolite.app"
         }
       },
       "oauth_client": [
         {
-          "client_id": "513792265744-jkinp70slusjpt8b63i0jl3na0o5vtfk.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.swago.app",
-            "certificate_hash": "ff29a161380ad6ce465848bede4450e864862259"
-          }
-        },
-        {
-          "client_id": "513792265744-3fevv3crpsstn0ggt247hcob119c9f6n.apps.googleusercontent.com",
+          "client_id": "231641723395-dqikns97vb6516tnu39um2cor276eus6.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyCWUVjaUCiQ5YMAefVQ3kRbr7u08SfAT98"
+          "current_key": "AIzaSyBjusNyXJBTdA7VB7w4bYomza2jAO1MSKo"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "513792265744-3fevv3crpsstn0ggt247hcob119c9f6n.apps.googleusercontent.com",
+              "client_id": "231641723395-dqikns97vb6516tnu39um2cor276eus6.apps.googleusercontent.com",
               "client_type": 3
             }
           ]

baseswago/src/main/java/com/swago/baseswago/inter/LoginApi.kt

@@ -12,7 +12,7 @@ import retrofit2.http.POST
 interface LoginApi {
 
     @FormUrlEncoded
-    @POST("/v1/user/login")
+    @POST("/v1/user/live/login")
     suspend fun login(@Field("login_source")source:String,@Field("secret")token:String): LoginModel
 
 

baseswago/src/main/java/com/swago/baseswago/inter/PayApi.kt

@@ -34,7 +34,7 @@ interface PayApi {
      * 1:消费新订单 2:支付失败 3:取消支付 4:上次未被消费的订单
      */
     @FormUrlEncoded
-    @POST("/v1/order/pay/callback")
+    @POST("/v1/order/pay/live/callback")
     suspend fun payOrderToServer(@Field("receipt") receipt:String,
                                  @Field("signature") signature:String,
                                  @Field("pay_type") pay_type:Int,

baseswago/src/main/java/com/swago/baseswago/inter/RoomApi.kt

@@ -148,7 +148,7 @@ interface RoomApi {
     /**
      * 获取分享配置
      */
-    @POST("/v1/rtc/broadcast/share/link")
+    @POST("/v1/rtc/broadcast/live/share/link")
     suspend fun getShareConfig(): ShareConfig
 
     /**

baseswago/src/main/java/com/swago/baseswago/libpay/PayManager.kt

@@ -19,7 +19,7 @@ object PayManager {
 
     val listener = ArrayList<IPayCallback>()
     private const val publicKey =
-        "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA184P/HXDtDi+3NgrxRkwIRU6tI2tiodETDzIyA/uwqgKwl/9JgXw2fZEFlsbEv1rUCVvvFGLGo7Z1GrUoR7WUAPktIuMWF330BurThfiwkpkSamzHEe+Pk/98/1YjZ8ltF2xaunUHZhRuE2WonrTy/rFvv/9PZtYd0xNFN5yOQwzFmT5nJvtpfCDWe2OhHXxuswG1bBn+faCcE0Rg1ZkSi36+0gDVvGjX/zQDgsXhwGJqFdVaJu7E7iR4zEGZLHquA931M0gYgGuF/tO9h8ppcaP1N7yR/ibek6KLcs969P47ENlRaL1QnrB3MSbomhhrtAzDLlV8YEIlukzsLrR7wIDAQAB"
+        "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAte27P9rNKgmkq7re77YpJi2f8wdr/Lullm02zJFCvQTyr0IKdAaRkDkW+2NagoKjpaVrBeF3RYr+a1NneUWeKL7u9S6ihXBOje+/+XgPbQ57HsB8s6bQcKK99Qw1aBRgnPKYm9ETnQ36v9i70MtFWxLY7OYoraIZN36hfYAELwJYZtSSbO8aLabKdEZYzikNGkUUNYALiX14BnH2O70N0NQxddR+OhG1IcnyUyTQimx/Wf/IaBVz9ere0xf4uP7HJaJhVxW32mg9Tyk9n851oJupuaPEn9n6jD2Dirmx3jzzQTWneD8IM5IVGrfak9zirrGz8CYynX7sU6ih0GKpFwIDAQAB"
 
     private var isConnected = false
     private var billingClient: BillingClient? = null

baseswago/src/main/java/com/swago/baseswago/util/SwagoInfo.kt

@@ -17,7 +17,7 @@ object SwagoInfo {
     private var languageCode = "en"
     var languageId = 0
     private var appClient = "android"
-    private var channel = "DDD01"
+    private var channel = "DDD04"
     private var imei = ""
 
     fun isGooglePackage():Boolean{

baseswago/src/main/res/values/strings.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="facebook_app_id" translatable="false">4494801737250774</string>
-    <string name="google_id" translatable="false">513792265744-3fevv3crpsstn0ggt247hcob119c9f6n.apps.googleusercontent.com</string>
-    <string name="fb_login_protocol_scheme" translatable="false">fb4494801737250774</string>
+    <string name="facebook_app_id" translatable="false">1012246616115104</string>
+    <string name="google_id" translatable="false">231641723395-dqikns97vb6516tnu39um2cor276eus6.apps.googleusercontent.com</string>
+    <string name="fb_login_protocol_scheme" translatable="false">fb1012246616115104</string>
     <string name="user_agreement">User agreement</string>
     <string name="privacy_policy">Privacy policy</string>
     <string name="and">&amp;</string>