diff --git a/app/agconnect-services.json b/app/agconnect-services.json deleted file mode 100644 index cc0ff618d..000000000 --- a/app/agconnect-services.json +++ /dev/null @@ -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":"890086000300337421", - "product_id":"736430079244645870", - "client_id":"458482081706542080", - "client_secret":"3573E319CDA06E85137A91CF68CF90BA850A639BCA6655A5310B2BCD81BC7213", - "project_id":"736430079244645870", - "app_id":"102953045", - "api_key":"DAEDAN1bqknzqRuvualUo98vO7U9uXBJtBZ0rNQHgSo03bXgkl98tD4sytVBCBB1Y7ha0NcY++dSp9JLsws9BzDN+/fS3v8J9We3nA==", - "package_name":"cn.nn.voice" - }, - "oauth_client":{ - "client_id":"102953045", - "client_type":1 - }, - "app_info":{ - "app_id":"102953045", - "package_name":"cn.nn.voice" - }, - "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":"cn.nn.voice", - "client":{ - "app_id":"102953045" - }, - "app_info":{ - "package_name":"cn.nn.voice", - "app_id":"102953045" - }, - "oauth_client":{ - "client_type":1, - "client_id":"102953045" - } - } - ] -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index bfb88dc35..14f5eca3f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { compileSdkVersion COMPILE_SDK_VERSION.toInteger() defaultConfig { - applicationId "cn.nn.voice" + applicationId "app.yinm.chat" minSdkVersion MIN_SDK_VERSION.toInteger() targetSdkVersion TARGET_SDK_VERSION.toInteger() versionCode Integer.valueOf(version_code) @@ -46,7 +46,7 @@ android { if (abi == null) { abi = "universal" } - outputFileName = "yinmeng_${variant.flavorName}_${buildType.name}_v${defaultConfig.versionName}_${defaultConfig.versionCode}_${abi}_${date}.apk" + outputFileName = "yinm_${variant.flavorName}_${buildType.name}_v${defaultConfig.versionName}_${defaultConfig.versionCode}_${abi}_${date}.apk" } } @@ -72,23 +72,13 @@ android { signingConfigs { v2 { - storeFile file('../yinmeng.jks') - storePassword "yinmeng2023" - keyAlias "yinmeng" - keyPassword "yinmeng2023" + storeFile file('../yinm.jks') + storePassword "yinm2023" + keyAlias "yinm" + keyPassword "yinm2023" v2SigningEnabled true v1SigningEnabled true } - - v1 { - storeFile file('../yinmeng.jks') - storePassword "yinmeng2023" - keyAlias "yinmeng" - keyPassword "yinmeng2023" - v2SigningEnabled false - v1SigningEnabled true - } - } sourceSets { @@ -143,8 +133,8 @@ android { buildTypes { release { - buildConfigField "String", "BASE_URL", "\"https://api.nnbc123.cn/\"" - buildConfigField "String", "WEB_URL", "\"https://h5.nnbc123.cn/\"" + buildConfigField "String", "BASE_URL", "\"https://api.yinm.chat/\"" + buildConfigField "String", "WEB_URL", "\"https://h5.yinm.chat/\"" buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL" buildConfigField "String", "BASE_URL_STAGING", "BASE_URL" buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL" @@ -159,8 +149,8 @@ android { buildConfigField "String", "BASE_URL", "\"http://beta.api.yinm.chat/\"" buildConfigField "String", "WEB_URL", "\"http://beta.api.yinm.chat\"" buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL" - buildConfigField "String", "BASE_URL_STAGING", "\"https://api.nnbc123.cn/\"" - buildConfigField "String", "BASE_URL_RELEASE", "\"https://api.nnbc123.cn/\"" + buildConfigField "String", "BASE_URL_STAGING", "\"https://api.yinm.chat/\"" + buildConfigField "String", "BASE_URL_RELEASE", "\"https://api.yinm.chat/\"" minifyEnabled false shrinkResources false signingConfig signingConfigs.v2 diff --git a/app/google-services.json b/app/google-services.json index 6bf2109e6..35ae92786 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -1,33 +1,33 @@ { "project_info": { - "project_number": "1111", - "project_id": "-", - "storage_bucket": "-.appspot.com" + "project_number": "2", + "project_id": "-1", + "storage_bucket": "om" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1::android:", + "mobilesdk_app_id": "1:::", "android_client_info": { - "package_name": "cn.nn.voice" + "package_name": "app.yinm.chat" } }, "oauth_client": [ { - "client_id": "-.apps.googleusercontent.com", + "client_id": "-...com", "client_type": 3 } ], "api_key": [ { - "current_key": "-4" + "current_key": "2" } ], "services": { "appinvite_service": { "other_platform_oauth_client": [ { - "client_id": "-.apps.googleusercontent.com", + "client_id": "-...com", "client_type": 3 } ] diff --git a/app/src/main/java/com/nnbc123/app/support/LevelIconHelper.kt b/app/src/main/java/com/nnbc123/app/support/LevelIconHelper.kt index 7dad746a6..82d297577 100644 --- a/app/src/main/java/com/nnbc123/app/support/LevelIconHelper.kt +++ b/app/src/main/java/com/nnbc123/app/support/LevelIconHelper.kt @@ -72,8 +72,6 @@ object LevelIconHelper : ILog { if (levelIconUrl == null) { return null } - // https://image.nnbc123.cn/charm_20.png - // https://image.nnbc123.cn/charm_20_1.png val separatorIndex = levelIconUrl.lastIndexOf('/') if (separatorIndex == -1) { return null diff --git a/app/src/main/java/com/nnbc123/app/ui/login/fragment/AddUserInfoFragment.java b/app/src/main/java/com/nnbc123/app/ui/login/fragment/AddUserInfoFragment.java index 782345268..bd7562133 100644 --- a/app/src/main/java/com/nnbc123/app/ui/login/fragment/AddUserInfoFragment.java +++ b/app/src/main/java/com/nnbc123/app/ui/login/fragment/AddUserInfoFragment.java @@ -52,7 +52,7 @@ public class AddUserInfoFragment extends BaseFragment private int gender = -1; private XRadioGroup rgGender; private RadioButton rbMale; - private String avatarUrl = "https://image.nnbc123.cn/default_avatar.png"; + private String avatarUrl = "https://image.yinm.chat/default_avatar_yinm.png"; public static String INVITE_USER_CODE = ""; diff --git a/channel.txt b/channel.txt deleted file mode 100644 index 4ca0531d5..000000000 --- a/channel.txt +++ /dev/null @@ -1,6 +0,0 @@ -official -yingyongbao -vivo -oppo -xiaomi -huawei diff --git a/core/src/diff_src_erban/java/com/nnbc123/core/UriProvider.java b/core/src/diff_src_erban/java/com/nnbc123/core/UriProvider.java index 6930ce68a..f630c1d92 100644 --- a/core/src/diff_src_erban/java/com/nnbc123/core/UriProvider.java +++ b/core/src/diff_src_erban/java/com/nnbc123/core/UriProvider.java @@ -14,8 +14,8 @@ public class UriProvider { /** * 默认以下生产环境地址 */ - public static String WEB_URL = "https://h5.nnbc123.cn/"; - public static String API_URL = "https://api.nnbc123.cn/"; + public static String WEB_URL = "https://h5.yinm.chat/"; + public static String API_URL = "https://api.yinm.chat/"; /** * 初始化URL diff --git a/gradle.properties b/gradle.properties index 042334b2d..52ef576e2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,12 +21,11 @@ MobSDK.spEdition=FP with_flutter_aar=true with_jenkins=false -only_arm64=false COMPILE_SDK_VERSION=33 MIN_SDK_VERSION=21 TARGET_SDK_VERSION=33 -version_name=2.0.0 -version_code=2000 \ No newline at end of file +version_name=10.0.0 +version_code=10000 \ No newline at end of file diff --git a/magic.jks b/magic.jks deleted file mode 100644 index 077c72d38..000000000 Binary files a/magic.jks and /dev/null differ diff --git a/mob.gradle b/mob.gradle index 59449b1d7..0c4348fdd 100644 --- a/mob.gradle +++ b/mob.gradle @@ -13,15 +13,15 @@ MobSDK { gui false devInfo { GooglePlus { - appId "-.apps.googleusercontent.com" + appId "m" callbackUri "http://localhost" officialVersion "default" enable true } Line { - appId "16529" - appSecret "903d01" + appId "" + appSecret "" enable true } } diff --git a/tmpmob/assets/ShareSDK.xml b/tmpmob/assets/ShareSDK.xml index 2c2a960ab..06dc43c31 100644 --- a/tmpmob/assets/ShareSDK.xml +++ b/tmpmob/assets/ShareSDK.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/yinm.jks b/yinm.jks new file mode 100644 index 000000000..e0a980c04 Binary files /dev/null and b/yinm.jks differ diff --git a/yinmeng.jks b/yinmeng.jks deleted file mode 100644 index 68eb765c3..000000000 Binary files a/yinmeng.jks and /dev/null differ