diff --git a/app/google-services.json b/app/google-services.json new file mode 100644 index 0000000..6cc0973 --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,29 @@ +{ + "project_info": { + "project_number": "321336299306", + "project_id": "yijianlian-3e318", + "storage_bucket": "yijianlian-3e318.firebasestorage.app" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:321336299306:android:572d539bef07b6718b9853", + "android_client_info": { + "package_name": "com.jsq.wufu" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyABfmUvnqxSjzg6KAmDiRdvzfPC6f3zO-w" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt b/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt index 1044772..a71ed79 100644 --- a/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt +++ b/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt @@ -252,8 +252,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc } 3->{ -// startActivity(Intent(requireContext(), ActivityActivity::class.java)) - throw RuntimeException("Crashlytics test") + startActivity(Intent(requireContext(), ActivityActivity::class.java)) } 4->{ mainAtyVM.vipSign() diff --git a/app/src/main/java/com/yingmao/clash/webview/CustomerServiceWebView.kt b/app/src/main/java/com/yingmao/clash/webview/CustomerServiceWebView.kt index c52b9db..dff2e29 100644 --- a/app/src/main/java/com/yingmao/clash/webview/CustomerServiceWebView.kt +++ b/app/src/main/java/com/yingmao/clash/webview/CustomerServiceWebView.kt @@ -111,11 +111,11 @@ class CustomerServiceWebView:BaseActivity() { .encode(BZYConstants.MMKV_KEY_KEFU_HOST, str) } customerServiceHost = str - csWebView.loadUrl(str+"&app_account=${enName}"+"&app_t=${resources.getString(R.string.yijianlian)}"+"&app_v=${BuildConfig.VERSION_NAME}."+BuildConfig.productId) + csWebView.loadUrl(str+"&app_account=${enName}"+"&app_t=${resources.getString(R.string.yijianlianCustom)}"+"&app_v=${BuildConfig.VERSION_NAME}."+BuildConfig.productId) } } } else { - csWebView.loadUrl(customerServiceHost + "&app_account=${enName}"+"&app_t=${resources.getString(R.string.yijianlian)}"+"&app_v=${BuildConfig.VERSION_NAME}."+BuildConfig.productId) + csWebView.loadUrl(customerServiceHost + "&app_account=${enName}"+"&app_t=${resources.getString(R.string.yijianlianCustom)}"+"&app_v=${BuildConfig.VERSION_NAME}."+BuildConfig.productId) } initKeyboardListener() } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 94ae3be..aabba04 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -422,6 +422,7 @@ 应用初始化中,请等待1~2秒后重试 启动中 一键连 + 二建连客服 支付成功 支付失败: \u3000\u3000您的支付订单已成功完成,目前平台正在处理中。通常情况下到账会有几秒钟的延迟,请您稍作等待。如您已返回应用首页,建议等待片刻后手动刷新页面以便更新状态。若几分钟后仍未到账,请及时联系客服人员为您处理。感谢您的支持与信任!