yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加第三方登录可以正常登录了

Browse Source
This commit is contained in:
18142669586 2023-10-19 15:15:18 +08:00
parent 9e68f35627
commit f22ad82d84
11 changed files with 93 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OneToOne/build.gradle
View File

@ -11,7 +11,7 @@ android {
defaultConfig {
applicationId "com.shayu.onetoone"
applicationId "com.shayu.onetoonenew"
minSdkVersion rootProject.ext.android.minSdkVersion
targetSdkVersion rootProject.ext.android.targetSdkVersion
versionCode rootProject.ext.android.versionCode

63
OneToOne/google-services.json Normal file
View File

@ -0,0 +1,63 @@
{
"project_info": {
"project_number": "903482201540",
"project_id": "onetoone-71170",
"storage_bucket": "onetoone-71170.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:903482201540:android:132978cdf497f4d8634091",
"android_client_info": {
"package_name": "com.shayu.onetoonenew"
}
},
"oauth_client": [
{
"client_id": "903482201540-ddno3ro8fp0lqqoeodbhbnpqf7f8d439.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.shayu.onetoonenew",
"certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
}
},
{
"client_id": "903482201540-e9ua9huoejtubp7pgsbu3iq76tqkoorp.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.shayu.onetoonenew",
"certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
}
},
{
"client_id": "903482201540-k3cffuuhsed23kkiuopufhf54ano7do4.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.shayu.onetoonenew",
"certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
}
},
{
"client_id": "903482201540-s2j96h6k7go0ah51ksi7es8mt7qhankh.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCrhj-7WjwdYUHBMzz9Ntie_S474slGjVY"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "903482201540-s2j96h6k7go0ah51ksi7es8mt7qhankh.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}

2
OneToOne/src/main/java/com/shayu/onetoone/activity/login/EntryActivity.java
View File

@ -337,7 +337,7 @@ public class EntryActivity extends AbsOTOActivity {
// App-to-app login
Intent loginIntent = LineLoginApi.getLoginIntent(
view.getContext(),
"1656399535",
"2001228692",
new LineAuthenticationParams.Builder()
.scopes(Arrays.asList(Scope.PROFILE))
// .nonce("<a randomly-generated string>") // nonce can be used to improve security

1
OneToOne/src/main/res/layout/activity_entry.xml
View File

@ -50,7 +50,6 @@
android:layout_marginBottom="21dp">
<LinearLayout
android:id="@+id/lt_btn_facebook"
android:layout_width="match_parent"
android:layout_height="54dp"
android:layout_marginLeft="42dp"

92
app/agconnect-services.json
View File

@ -1,92 +0,0 @@
{
"agcgw":{
"backurl":"connect-drcn.hispace.hicloud.com",
"url":"connect-drcn.dbankcloud.cn",
"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
},
"agcgw_all":{
"CN":"connect-drcn.dbankcloud.cn",
"CN_back":"connect-drcn.hispace.hicloud.com",
"DE":"connect-dre.dbankcloud.cn",
"DE_back":"connect-dre.hispace.hicloud.com",
"RU":"connect-drru.hispace.dbankcloud.ru",
"RU_back":"connect-drru.hispace.dbankcloud.cn",
"SG":"connect-dra.dbankcloud.cn",
"SG_back":"connect-dra.hispace.hicloud.com"
},
"websocketgw_all":{
"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
"DE":"connect-ws-dre.hispace.dbankcloud.cn",
"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
"RU":"connect-ws-drru.hispace.dbankcloud.ru",
"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
"SG":"connect-ws-dra.hispace.dbankcloud.cn",
"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
},
"client":{
"cp_id":"30086000612391734",
"product_id":"99536292102564216",
"client_id":"964994320723627840",
"client_secret":"6D5FE29D85B967D3A66BDCD473641E4C7B5524F7F4935CA0EF4A842730C3402D",
"project_id":"99536292102564216",
"app_id":"106936673",
"api_key":"DAEDADYGta/0O4ZSdrnug52NgC67/w/RIyTq9A8LyAY0+mp6g6XeJDbxugpluFPLAhaqjaMs5c0PLnRx14UzWbPPADgi1EqihbWLoA==",
"package_name":"com.pdlive.shayu"
},
"oauth_client":{
"client_id":"106936673",
"client_type":1
},
"app_info":{
"app_id":"106936673",
"package_name":"com.pdlive.shayu"
},
"service":{
"analytics":{
"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
"resource_id":"p1",
"channel_id":""
},
"search":{
"url":"https://search-drcn.cloud.huawei.com"
},
"cloudstorage":{
"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
"storage_url_de":"https://ops-dre.agcstorage.link",
"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
"storage_url_sg":"https://ops-dra.agcstorage.link",
"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
},
"ml":{
"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
}
},
"region":"CN",
"configuration_version":"3.0",
"appInfos":[
{
"package_name":"com.pdlive.shayu",
"client":{
"app_id":"106936673"
},
"app_info":{
"package_name":"com.pdlive.shayu",
"app_id":"106936673"
},
"oauth_client":{
"client_type":1,
"client_id":"106936673"
}
}
]
}

59
app/google-services.json
View File

@ -1,65 +1,58 @@
{
"project_info": {
"project_number": "292494634914",
"project_id": "pdlive-1631521064967",
"storage_bucket": "pdlive-1631521064967.appspot.com"
"project_number": "903482201540",
"project_id": "onetoone-71170",
"storage_bucket": "onetoone-71170.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:292494634914:android:d8db197d7e7a6c3a3a4cfb",
"mobilesdk_app_id": "1:903482201540:android:132978cdf497f4d8634091",
"android_client_info": {
"package_name": "com.pdlive.shayu"
"package_name": "com.shayu.onetoonenew"
}
},
"oauth_client": [
{
"client_id": "292494634914-8nuhhoeo061ki1jevbcsrl7dfdl6dlm0.apps.googleusercontent.com",
"client_id": "903482201540-ddno3ro8fp0lqqoeodbhbnpqf7f8d439.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.pdlive.shayu",
"certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
}
},
{
"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",
"package_name": "com.shayu.onetoonenew",
"certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
}
},
{
"client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
"client_id": "903482201540-e9ua9huoejtubp7pgsbu3iq76tqkoorp.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.shayu.onetoonenew",
"certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
}
},
{
"client_id": "903482201540-k3cffuuhsed23kkiuopufhf54ano7do4.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.shayu.onetoonenew",
"certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
}
},
{
"client_id": "903482201540-s2j96h6k7go0ah51ksi7es8mt7qhankh.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU"
"current_key": "AIzaSyCrhj-7WjwdYUHBMzz9Ntie_S474slGjVY"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "292494634914-ha2kbgtclkv20hl3a1l8r7861a1a0m5i.apps.googleusercontent.com",
"client_id": "903482201540-s2j96h6k7go0ah51ksi7es8mt7qhankh.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "292494634914-v9j4rei86q2pfh9as4seotb23vr2744a.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "com.live.pd"
}
}
]
}

2
common/src/main/res/values-en-rUS/string.xml
View File

@ -787,8 +787,6 @@
<string name="only_open_anchor">For the time being, it is only open to the anchor</string>
<string name="facebook_app_id">2011402032399020</string>
<string name="facebook_client_token">959584e054a33614996361f0044e5253</string>
<string name="twitter_key">ui10vIggex2F043HnztYNuA3g</string>
<string name="twitter_secret">J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ</string>

2
common/src/main/res/values-zh-rHK/strings.xml
View File

@ -828,8 +828,6 @@
<string name="only_open_anchor">暫時只對主播開放</string>
<string name="facebook_app_id">2011402032399020</string>
<string name="facebook_client_token">959584e054a33614996361f0044e5253</string>
<string name="twitter_key">ui10vIggex2F043HnztYNuA3g</string>
<string name="twitter_secret">J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ</string>

2
common/src/main/res/values-zh-rTW/strings.xml
View File

@ -828,8 +828,6 @@
<string name="only_open_anchor">暫時只對主播開放</string>
<string name="facebook_app_id">2011402032399020</string>
<string name="facebook_client_token">959584e054a33614996361f0044e5253</string>
<string name="twitter_key">ui10vIggex2F043HnztYNuA3g</string>
<string name="twitter_secret">J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ</string>

2
common/src/main/res/values-zh/strings.xml
View File

@ -828,8 +828,6 @@
<string name="only_open_anchor">暫時只對主播開放</string>
<string name="facebook_app_id">2011402032399020</string>
<string name="facebook_client_token">959584e054a33614996361f0044e5253</string>
<string name="twitter_key">ui10vIggex2F043HnztYNuA3g</string>
<string name="twitter_secret">J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ</string>

4
common/src/main/res/values/strings.xml
View File

@ -787,8 +787,8 @@
<string name="only_open_anchor">For the time being, it is only open to the anchor</string>
<string name="facebook_app_id">2011402032399020</string>
<string name="facebook_client_token">959584e054a33614996361f0044e5253</string>
<string name="facebook_app_id">391137926073929</string>
<string name="facebook_client_token">64dbc61681a4492544be268eb1084c3e</string>
<string name="twitter_key">ui10vIggex2F043HnztYNuA3g</string>
<string name="twitter_secret">J8jvBBeJoZbVojbkWUrvsj0K0UUkuV69CqQ7CEobhJn6tvAKpQ</string>