chore: 更新firebase配置并修复部分代码问题
1. 更新安卓端google-services.json配置,新增第三方登录客户端信息 2. 修复Firebase登录时错误日志打印不详细的问题,添加完整错误信息输出 3. 完善第三方绑定流程,保存当前登录邮箱 4. 修复ConnectDevice页面的代码缩进和语法问题
This commit is contained in:
parent
3796d0ce33
commit
8972a69e86
@ -1,10 +1,11 @@
|
|||||||
<?xml version='1.0' encoding='utf-8'?>
|
<?xml version='1.0' encoding='utf-8'?>
|
||||||
<resources xmlns:tools="http://schemas.android.com/tools" tools:keep="@string/gcm_defaultSenderId,@string/google_storage_bucket,@string/project_id,@string/google_api_key,@string/google_crash_reporting_api_key,@string/google_app_id,@string/default_web_client_id">
|
<resources xmlns:tools="http://schemas.android.com/tools" tools:keep="@string/gcm_defaultSenderId,@string/google_storage_bucket,@string/project_id,@string/google_api_key,@string/google_crash_reporting_api_key,@string/google_app_id,@string/default_android_client_id,@string/default_web_client_id">
|
||||||
<string name="gcm_defaultSenderId" translatable="false">785438724947</string>
|
<string name="gcm_defaultSenderId" translatable="false">785438724947</string>
|
||||||
<string name="google_storage_bucket" translatable="false">photonmatrix-ac0b5.firebasestorage.app</string>
|
<string name="google_storage_bucket" translatable="false">photonmatrix-ac0b5.firebasestorage.app</string>
|
||||||
<string name="project_id" translatable="false">photonmatrix-ac0b5</string>
|
<string name="project_id" translatable="false">photonmatrix-ac0b5</string>
|
||||||
<string name="google_api_key" translatable="false">AIzaSyAntcCsZGurbXg7TFbPMPx5aek6HDYYVxk</string>
|
<string name="google_api_key" translatable="false">AIzaSyAntcCsZGurbXg7TFbPMPx5aek6HDYYVxk</string>
|
||||||
<string name="google_crash_reporting_api_key" translatable="false">AIzaSyAntcCsZGurbXg7TFbPMPx5aek6HDYYVxk</string>
|
<string name="google_crash_reporting_api_key" translatable="false">AIzaSyAntcCsZGurbXg7TFbPMPx5aek6HDYYVxk</string>
|
||||||
<string name="google_app_id" translatable="false">1:785438724947:android:352ede76bb25311f51c7a6</string>
|
<string name="google_app_id" translatable="false">1:785438724947:android:352ede76bb25311f51c7a6</string>
|
||||||
|
<string name="default_android_client_id" translatable="false">785438724947-1ln4va945bulvago2p5rmis3v47q69mp.apps.googleusercontent.com</string>
|
||||||
<string name="default_web_client_id" translatable="false">785438724947-kpjbqi43hbj6eddianbjsgkgkkclkfmd.apps.googleusercontent.com</string>
|
<string name="default_web_client_id" translatable="false">785438724947-kpjbqi43hbj6eddianbjsgkgkkclkfmd.apps.googleusercontent.com</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@ -13,6 +13,22 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"oauth_client": [
|
"oauth_client": [
|
||||||
|
{
|
||||||
|
"client_id": "785438724947-1ln4va945bulvago2p5rmis3v47q69mp.apps.googleusercontent.com",
|
||||||
|
"client_type": 1,
|
||||||
|
"android_info": {
|
||||||
|
"package_name": "com.photonmatrix.photonmatrix",
|
||||||
|
"certificate_hash": "57eec536956e93404a93e6c0548ce312a2fb25ff"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"client_id": "785438724947-tn234msinh5t30d8j4hjm330rb0tkqnd.apps.googleusercontent.com",
|
||||||
|
"client_type": 1,
|
||||||
|
"android_info": {
|
||||||
|
"package_name": "com.photonmatrix.photonmatrix",
|
||||||
|
"certificate_hash": "40dced4580e8d4ac62e0b77b5a210bfb4cd43cc8"
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"client_id": "785438724947-kpjbqi43hbj6eddianbjsgkgkkclkfmd.apps.googleusercontent.com",
|
"client_id": "785438724947-kpjbqi43hbj6eddianbjsgkgkkclkfmd.apps.googleusercontent.com",
|
||||||
"client_type": 3
|
"client_type": 3
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: d7664919531ad8848b3832a934c32835
|
guid: 914ba5889714dbb4cb7dd23e9a1f2ebd
|
||||||
TextScriptImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName:
|
||||||
|
|||||||
@ -253,6 +253,8 @@ namespace Kill.Managers
|
|||||||
|
|
||||||
if (task.IsFaulted)
|
if (task.IsFaulted)
|
||||||
{
|
{
|
||||||
|
var errorMsg = task.Exception?.InnerException?.Message ?? task.Exception?.Message ?? "未知错误";
|
||||||
|
Debug.LogError($"Firebase {providerId} 登录失败详情: {errorMsg}");
|
||||||
MainThread.Enqueue(() => onError?.Invoke($"{providerId} 登录失败"));
|
MainThread.Enqueue(() => onError?.Invoke($"{providerId} 登录失败"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -78,17 +78,21 @@ public class ConnectDevicePageCtrl : MonoBehaviour
|
|||||||
qrCodePlane.GetComponent<ScanQRcode>().Close();
|
qrCodePlane.GetComponent<ScanQRcode>().Close();
|
||||||
foreach(var d in DataManager.Instance.OwnedDevices)
|
foreach(var d in DataManager.Instance.OwnedDevices)
|
||||||
{
|
{
|
||||||
if(d.ble_mac==result)
|
if (d.ble_mac == result)
|
||||||
ToastUI.Show("100287");
|
{
|
||||||
qrCodePlane.GetComponent<ScanQRcode>().OnQRCodeScanned+=GetQrResult;
|
ToastUI.Show("100287");
|
||||||
return;
|
qrCodePlane.GetComponent<ScanQRcode>().OnQRCodeScanned += GetQrResult;
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
foreach(var d in DataManager.Instance.SharedDevices)
|
foreach(var d in DataManager.Instance.SharedDevices)
|
||||||
{
|
{
|
||||||
if(d.ble_mac==result)
|
if (d.ble_mac == result)
|
||||||
ToastUI.Show("100287");
|
{
|
||||||
qrCodePlane.GetComponent<ScanQRcode>().OnQRCodeScanned+=GetQrResult;
|
ToastUI.Show("100287");
|
||||||
return;
|
qrCodePlane.GetComponent<ScanQRcode>().OnQRCodeScanned += GetQrResult;
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
isconnecting=true;
|
isconnecting=true;
|
||||||
BluetoothManager.Instance.Connect(result);
|
BluetoothManager.Instance.Connect(result);
|
||||||
|
|||||||
@ -51,6 +51,8 @@ namespace Kill.UI.Pages
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
// 保存邮箱到登录控制器
|
||||||
|
LoginPageCtrl.Instance.SetCurrentEmail(email);
|
||||||
// 设置验证码页面为注册场景
|
// 设置验证码页面为注册场景
|
||||||
var verifyPanel = GetSubPage(LoginPageCtrl.SubPageType.VerificationCode) as VerificationCodePanel;
|
var verifyPanel = GetSubPage(LoginPageCtrl.SubPageType.VerificationCode) as VerificationCodePanel;
|
||||||
if (verifyPanel != null)
|
if (verifyPanel != null)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user