diff --git a/app/src/google_online/google-services.json b/app/src/google_online/google-services.json
index b3aa650c4..4f9023d32 100644
--- a/app/src/google_online/google-services.json
+++ b/app/src/google_online/google-services.json
@@ -1,41 +1,65 @@
 {
   "project_info": {
-    "project_number": "163991854180",
-    "project_id": "poyo-597a0",
-    "storage_bucket": "poyo-597a0.appspot.com"
+    "project_number": "822566078854",
+    "project_id": "pdlvenew",
+    "storage_bucket": "pdlvenew.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:163991854180:android:c6d4c189e941c4b1da9371",
+        "mobilesdk_app_id": "1:822566078854:android:9cafc8bca8f63076bf8407",
         "android_client_info": {
-          "package_name": "com.pdsylive.yo"
+          "package_name": "com.newpdlive.sy"
         }
       },
       "oauth_client": [
         {
-          "client_id": "163991854180-lcd5n8kk2q9pv3bktp0ch2e3s2tl4mhs.apps.googleusercontent.com",
+          "client_id": "822566078854-8c7698l64j66ijng9bq799o5qvbguhdo.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pdsylive.yo",
-            "certificate_hash": "5dda5ab9aee4b4a8d357b6a953cb331c8f34d1cf"
+            "package_name": "com.newpdlive.sy",
+            "certificate_hash": "e059b937bfa49d58f40fddee4c7463e03e2aae47"
           }
         },
         {
-          "client_id": "163991854180-035qp9l27o2s4n3n2v4hbvrog17ufbs5.apps.googleusercontent.com",
+          "client_id": "822566078854-9cej31ie42tgjeimdk691gmvkavrooa7.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.newpdlive.sy",
+            "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
+          }
+        },
+        {
+          "client_id": "822566078854-c63gcmvkn2ctfct9eebuo0r4tiolloel.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.newpdlive.sy",
+            "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
+          }
+        },
+        {
+          "client_id": "822566078854-jfpovcealtjkv6sf0338to2grv4e5i6k.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.newpdlive.sy",
+            "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
+          }
+        },
+        {
+          "client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyBjHYkGdAIx9kh-FQ88eLLL6g6KGa8c7bw"
+          "current_key": "AIzaSyBVlPTRCNLnBNJNei5rHjEqok8CfbJLraI"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "163991854180-035qp9l27o2s4n3n2v4hbvrog17ufbs5.apps.googleusercontent.com",
+              "client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com",
               "client_type": 3
             }
           ]
diff --git a/app/src/google_test/google-services.json b/app/src/google_test/google-services.json
index b3aa650c4..4f9023d32 100644
--- a/app/src/google_test/google-services.json
+++ b/app/src/google_test/google-services.json
@@ -1,41 +1,65 @@
 {
   "project_info": {
-    "project_number": "163991854180",
-    "project_id": "poyo-597a0",
-    "storage_bucket": "poyo-597a0.appspot.com"
+    "project_number": "822566078854",
+    "project_id": "pdlvenew",
+    "storage_bucket": "pdlvenew.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:163991854180:android:c6d4c189e941c4b1da9371",
+        "mobilesdk_app_id": "1:822566078854:android:9cafc8bca8f63076bf8407",
         "android_client_info": {
-          "package_name": "com.pdsylive.yo"
+          "package_name": "com.newpdlive.sy"
         }
       },
       "oauth_client": [
         {
-          "client_id": "163991854180-lcd5n8kk2q9pv3bktp0ch2e3s2tl4mhs.apps.googleusercontent.com",
+          "client_id": "822566078854-8c7698l64j66ijng9bq799o5qvbguhdo.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pdsylive.yo",
-            "certificate_hash": "5dda5ab9aee4b4a8d357b6a953cb331c8f34d1cf"
+            "package_name": "com.newpdlive.sy",
+            "certificate_hash": "e059b937bfa49d58f40fddee4c7463e03e2aae47"
           }
         },
         {
-          "client_id": "163991854180-035qp9l27o2s4n3n2v4hbvrog17ufbs5.apps.googleusercontent.com",
+          "client_id": "822566078854-9cej31ie42tgjeimdk691gmvkavrooa7.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.newpdlive.sy",
+            "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
+          }
+        },
+        {
+          "client_id": "822566078854-c63gcmvkn2ctfct9eebuo0r4tiolloel.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.newpdlive.sy",
+            "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
+          }
+        },
+        {
+          "client_id": "822566078854-jfpovcealtjkv6sf0338to2grv4e5i6k.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.newpdlive.sy",
+            "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
+          }
+        },
+        {
+          "client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyBjHYkGdAIx9kh-FQ88eLLL6g6KGa8c7bw"
+          "current_key": "AIzaSyBVlPTRCNLnBNJNei5rHjEqok8CfbJLraI"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "163991854180-035qp9l27o2s4n3n2v4hbvrog17ufbs5.apps.googleusercontent.com",
+              "client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com",
               "client_type": 3
             }
           ]
diff --git a/app/src/huawei_online/google-services.json b/app/src/huawei_online/google-services.json
index fca7df245..4f9023d32 100644
--- a/app/src/huawei_online/google-services.json
+++ b/app/src/huawei_online/google-services.json
@@ -1,65 +1,66 @@
 {
   "project_info": {
-    "project_number": "292494634914",
-    "project_id": "pdlive-1631521064967",
-    "storage_bucket": "pdlive-1631521064967.appspot.com"
+    "project_number": "822566078854",
+    "project_id": "pdlvenew",
+    "storage_bucket": "pdlvenew.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb",
+        "mobilesdk_app_id": "1:822566078854:android:9cafc8bca8f63076bf8407",
         "android_client_info": {
-          "package_name": "com.pdlive.shayu"
+          "package_name": "com.newpdlive.sy"
         }
       },
       "oauth_client": [
         {
-          "client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com",
+          "client_id": "822566078854-8c7698l64j66ijng9bq799o5qvbguhdo.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pdlive.shayu",
-            "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
+            "package_name": "com.newpdlive.sy",
+            "certificate_hash": "e059b937bfa49d58f40fddee4c7463e03e2aae47"
           }
         },
         {
-          "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com",
+          "client_id": "822566078854-9cej31ie42tgjeimdk691gmvkavrooa7.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pdlive.shayu",
+            "package_name": "com.newpdlive.sy",
             "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
           }
         },
         {
-          "client_id": "292494634914-ejtqvaj86a2lldv0di2pr3d5gngprahd.apps.googleusercontent.com",
+          "client_id": "822566078854-c63gcmvkn2ctfct9eebuo0r4tiolloel.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pdlive.shayu",
+            "package_name": "com.newpdlive.sy",
             "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
           }
         },
         {
-          "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
+          "client_id": "822566078854-jfpovcealtjkv6sf0338to2grv4e5i6k.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.newpdlive.sy",
+            "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
+          }
+        },
+        {
+          "client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU"
+          "current_key": "AIzaSyBVlPTRCNLnBNJNei5rHjEqok8CfbJLraI"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
+              "client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com",
               "client_type": 3
-            },
-            {
-              "client_id": "292494634914-v9j4rei86q2pfh9as4seotb23vr2744a.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "com.live.pd"
-              }
             }
           ]
         }
diff --git a/app/src/huawei_test/google-services.json b/app/src/huawei_test/google-services.json
index fca7df245..4f9023d32 100644
--- a/app/src/huawei_test/google-services.json
+++ b/app/src/huawei_test/google-services.json
@@ -1,65 +1,66 @@
 {
   "project_info": {
-    "project_number": "292494634914",
-    "project_id": "pdlive-1631521064967",
-    "storage_bucket": "pdlive-1631521064967.appspot.com"
+    "project_number": "822566078854",
+    "project_id": "pdlvenew",
+    "storage_bucket": "pdlvenew.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb",
+        "mobilesdk_app_id": "1:822566078854:android:9cafc8bca8f63076bf8407",
         "android_client_info": {
-          "package_name": "com.pdlive.shayu"
+          "package_name": "com.newpdlive.sy"
         }
       },
       "oauth_client": [
         {
-          "client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com",
+          "client_id": "822566078854-8c7698l64j66ijng9bq799o5qvbguhdo.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pdlive.shayu",
-            "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
+            "package_name": "com.newpdlive.sy",
+            "certificate_hash": "e059b937bfa49d58f40fddee4c7463e03e2aae47"
           }
         },
         {
-          "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com",
+          "client_id": "822566078854-9cej31ie42tgjeimdk691gmvkavrooa7.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pdlive.shayu",
+            "package_name": "com.newpdlive.sy",
             "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
           }
         },
         {
-          "client_id": "292494634914-ejtqvaj86a2lldv0di2pr3d5gngprahd.apps.googleusercontent.com",
+          "client_id": "822566078854-c63gcmvkn2ctfct9eebuo0r4tiolloel.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pdlive.shayu",
+            "package_name": "com.newpdlive.sy",
             "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
           }
         },
         {
-          "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
+          "client_id": "822566078854-jfpovcealtjkv6sf0338to2grv4e5i6k.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.newpdlive.sy",
+            "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
+          }
+        },
+        {
+          "client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU"
+          "current_key": "AIzaSyBVlPTRCNLnBNJNei5rHjEqok8CfbJLraI"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
+              "client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com",
               "client_type": 3
-            },
-            {
-              "client_id": "292494634914-v9j4rei86q2pfh9as4seotb23vr2744a.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "com.live.pd"
-              }
             }
           ]
         }
diff --git a/app/src/link_online/google-services.json b/app/src/link_online/google-services.json
index b3aa650c4..fca7df245 100644
--- a/app/src/link_online/google-services.json
+++ b/app/src/link_online/google-services.json
@@ -1,42 +1,65 @@
 {
   "project_info": {
-    "project_number": "163991854180",
-    "project_id": "poyo-597a0",
-    "storage_bucket": "poyo-597a0.appspot.com"
+    "project_number": "292494634914",
+    "project_id": "pdlive-1631521064967",
+    "storage_bucket": "pdlive-1631521064967.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:163991854180:android:c6d4c189e941c4b1da9371",
+        "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb",
         "android_client_info": {
-          "package_name": "com.pdsylive.yo"
+          "package_name": "com.pdlive.shayu"
         }
       },
       "oauth_client": [
         {
-          "client_id": "163991854180-lcd5n8kk2q9pv3bktp0ch2e3s2tl4mhs.apps.googleusercontent.com",
+          "client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pdsylive.yo",
-            "certificate_hash": "5dda5ab9aee4b4a8d357b6a953cb331c8f34d1cf"
+            "package_name": "com.pdlive.shayu",
+            "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
           }
         },
         {
-          "client_id": "163991854180-035qp9l27o2s4n3n2v4hbvrog17ufbs5.apps.googleusercontent.com",
+          "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.pdlive.shayu",
+            "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
+          }
+        },
+        {
+          "client_id": "292494634914-ejtqvaj86a2lldv0di2pr3d5gngprahd.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.pdlive.shayu",
+            "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
+          }
+        },
+        {
+          "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyBjHYkGdAIx9kh-FQ88eLLL6g6KGa8c7bw"
+          "current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "163991854180-035qp9l27o2s4n3n2v4hbvrog17ufbs5.apps.googleusercontent.com",
+              "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
               "client_type": 3
+            },
+            {
+              "client_id": "292494634914-v9j4rei86q2pfh9as4seotb23vr2744a.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "com.live.pd"
+              }
             }
           ]
         }
diff --git a/app/src/link_test/google-services.json b/app/src/link_test/google-services.json
index b3aa650c4..fca7df245 100644
--- a/app/src/link_test/google-services.json
+++ b/app/src/link_test/google-services.json
@@ -1,42 +1,65 @@
 {
   "project_info": {
-    "project_number": "163991854180",
-    "project_id": "poyo-597a0",
-    "storage_bucket": "poyo-597a0.appspot.com"
+    "project_number": "292494634914",
+    "project_id": "pdlive-1631521064967",
+    "storage_bucket": "pdlive-1631521064967.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:163991854180:android:c6d4c189e941c4b1da9371",
+        "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb",
         "android_client_info": {
-          "package_name": "com.pdsylive.yo"
+          "package_name": "com.pdlive.shayu"
         }
       },
       "oauth_client": [
         {
-          "client_id": "163991854180-lcd5n8kk2q9pv3bktp0ch2e3s2tl4mhs.apps.googleusercontent.com",
+          "client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pdsylive.yo",
-            "certificate_hash": "5dda5ab9aee4b4a8d357b6a953cb331c8f34d1cf"
+            "package_name": "com.pdlive.shayu",
+            "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
           }
         },
         {
-          "client_id": "163991854180-035qp9l27o2s4n3n2v4hbvrog17ufbs5.apps.googleusercontent.com",
+          "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.pdlive.shayu",
+            "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
+          }
+        },
+        {
+          "client_id": "292494634914-ejtqvaj86a2lldv0di2pr3d5gngprahd.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.pdlive.shayu",
+            "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
+          }
+        },
+        {
+          "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyBjHYkGdAIx9kh-FQ88eLLL6g6KGa8c7bw"
+          "current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "163991854180-035qp9l27o2s4n3n2v4hbvrog17ufbs5.apps.googleusercontent.com",
+              "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
               "client_type": 3
+            },
+            {
+              "client_id": "292494634914-v9j4rei86q2pfh9as4seotb23vr2744a.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "com.live.pd"
+              }
             }
           ]
         }
diff --git a/app/src/samsung_online/google-services.json b/app/src/samsung_online/google-services.json
index fca7df245..4f9023d32 100644
--- a/app/src/samsung_online/google-services.json
+++ b/app/src/samsung_online/google-services.json
@@ -1,65 +1,66 @@
 {
   "project_info": {
-    "project_number": "292494634914",
-    "project_id": "pdlive-1631521064967",
-    "storage_bucket": "pdlive-1631521064967.appspot.com"
+    "project_number": "822566078854",
+    "project_id": "pdlvenew",
+    "storage_bucket": "pdlvenew.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb",
+        "mobilesdk_app_id": "1:822566078854:android:9cafc8bca8f63076bf8407",
         "android_client_info": {
-          "package_name": "com.pdlive.shayu"
+          "package_name": "com.newpdlive.sy"
         }
       },
       "oauth_client": [
         {
-          "client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com",
+          "client_id": "822566078854-8c7698l64j66ijng9bq799o5qvbguhdo.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pdlive.shayu",
-            "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
+            "package_name": "com.newpdlive.sy",
+            "certificate_hash": "e059b937bfa49d58f40fddee4c7463e03e2aae47"
           }
         },
         {
-          "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com",
+          "client_id": "822566078854-9cej31ie42tgjeimdk691gmvkavrooa7.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pdlive.shayu",
+            "package_name": "com.newpdlive.sy",
             "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
           }
         },
         {
-          "client_id": "292494634914-ejtqvaj86a2lldv0di2pr3d5gngprahd.apps.googleusercontent.com",
+          "client_id": "822566078854-c63gcmvkn2ctfct9eebuo0r4tiolloel.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pdlive.shayu",
+            "package_name": "com.newpdlive.sy",
             "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
           }
         },
         {
-          "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
+          "client_id": "822566078854-jfpovcealtjkv6sf0338to2grv4e5i6k.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.newpdlive.sy",
+            "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
+          }
+        },
+        {
+          "client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU"
+          "current_key": "AIzaSyBVlPTRCNLnBNJNei5rHjEqok8CfbJLraI"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
+              "client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com",
               "client_type": 3
-            },
-            {
-              "client_id": "292494634914-v9j4rei86q2pfh9as4seotb23vr2744a.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "com.live.pd"
-              }
             }
           ]
         }
diff --git a/app/src/samsung_test/google-services.json b/app/src/samsung_test/google-services.json
index 0f0c6af1b..4f9023d32 100644
--- a/app/src/samsung_test/google-services.json
+++ b/app/src/samsung_test/google-services.json
@@ -1,65 +1,66 @@
 {
   "project_info": {
-    "project_number": "292494634914",
-    "project_id": "pdlive-1631521064967",
-    "storage_bucket": "pdlive-1631521064967.appspot.com"
+    "project_number": "822566078854",
+    "project_id": "pdlvenew",
+    "storage_bucket": "pdlvenew.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb",
+        "mobilesdk_app_id": "1:822566078854:android:9cafc8bca8f63076bf8407",
         "android_client_info": {
-          "package_name": "com.pdlive.shayu"
+          "package_name": "com.newpdlive.sy"
         }
       },
       "oauth_client": [
         {
-          "client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com",
+          "client_id": "822566078854-8c7698l64j66ijng9bq799o5qvbguhdo.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pdlive.shayu",
-            "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
+            "package_name": "com.newpdlive.sy",
+            "certificate_hash": "e059b937bfa49d58f40fddee4c7463e03e2aae47"
           }
         },
         {
-          "client_id": "292494634914-ctr3fptp5mkv2qqr4gkgjo9uluq2joqb.apps.googleusercontent.com",
+          "client_id": "822566078854-9cej31ie42tgjeimdk691gmvkavrooa7.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pdlive.shayu",
+            "package_name": "com.newpdlive.sy",
             "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
           }
         },
         {
-          "client_id": "292494634914-ejtqvaj86a2lldv0di2pr3d5gngprahd.apps.googleusercontent.com",
+          "client_id": "822566078854-c63gcmvkn2ctfct9eebuo0r4tiolloel.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pdlive.shayu",
+            "package_name": "com.newpdlive.sy",
             "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
           }
         },
         {
-          "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
+          "client_id": "822566078854-jfpovcealtjkv6sf0338to2grv4e5i6k.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.newpdlive.sy",
+            "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
+          }
+        },
+        {
+          "client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "SSSSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU"
+          "current_key": "AIzaSyBVlPTRCNLnBNJNei5rHjEqok8CfbJLraI"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
+              "client_id": "822566078854-lt8fjmii2f35anh46dquk0mk5qa0hi5f.apps.googleusercontent.com",
               "client_type": 3
-            },
-            {
-              "client_id": "292494634914-v9j4rei86q2pfh9as4seotb23vr2744a.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "com.live.pd"
-              }
             }
           ]
         }
diff --git a/package_config.gradle b/package_config.gradle
index 99152db7d..1234cc581 100644
--- a/package_config.gradle
+++ b/package_config.gradle
@@ -10,9 +10,6 @@ android {
     productFlavors {
         link_test {
             dimension 'packageApk'
-            if (project.getPluginManager().hasPlugin("com.android.application")) {
-                applicationId "com.pdsylive.yo"
-            }
             manifestPlaceholders = [
                     serverHost   : rootProject.ext.manifestPlaceholders.testServerHost,
                     isGooglePlay : 0,
@@ -22,9 +19,6 @@ android {
         }
         link_online {
             dimension 'packageApk'
-            if (project.getPluginManager().hasPlugin("com.android.application")) {
-                applicationId "com.pdsylive.yo"
-            }
             manifestPlaceholders = [
                     serverHost   : rootProject.ext.manifestPlaceholders.serverHost,
                     isGooglePlay : 0,
@@ -53,7 +47,7 @@ android {
         google_test {
             dimension 'packageApk'
             if (project.getPluginManager().hasPlugin("com.android.application")) {
-                applicationId "com.pdsylive.yo"
+                applicationId "com.newpdlive.sy"
             }
             manifestPlaceholders = [
                     serverHost   : rootProject.ext.manifestPlaceholders.testServerHost,
@@ -62,13 +56,13 @@ android {
                     isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel,
                     facebook_app_id  : "938330614686044",
                     facebook_client_token  : "b1b574a2cdf0ced1ae5df7274636f65d",
-                    lineChannelId : "2006124380",
+                    lineChannelId : "2006123567"
             ]
         }
         google_online {
             dimension 'packageApk'
             if (project.getPluginManager().hasPlugin("com.android.application")) {
-                applicationId "com.pdsylive.yo"
+                applicationId "com.newpdlive.sy"
             }
             manifestPlaceholders = [
                     serverHost   : rootProject.ext.manifestPlaceholders.serverHost,
@@ -77,7 +71,7 @@ android {
                     isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel,
                     facebook_app_id  : "938330614686044",
                     facebook_client_token  : "b1b574a2cdf0ced1ae5df7274636f65d",
-                    lineChannelId : "2006124380"
+                    lineChannelId : "2006123567"
             ]
         }
         huawei_test {