xuhuixiang/yuliao_and
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

注册和登录放开国际区号选择

Browse Source
This commit is contained in:
guozhen
2024-12-13 15:46:28 +08:00
committed by xuhuixiang
parent cb05dda558
commit 1439e4c23c
8 changed files with 40 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/build.gradle.kts
View File

@@ -47,12 +47,12 @@ android {
applicationId = "com.dskj.rbchat" applicationId = "com.dskj.rbchat"
minSdk = 24 minSdk = 24
targetSdk = 34 targetSdk = 34
versionCode = 192 versionCode = 193
versionName = "1.9.2" versionName = "1.9.3"
multiDexEnabled = true multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
// manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式 //manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式
manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" //测试 //manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" //测试
manifestPlaceholders["JPUSH_PKGNAME"] = "com.dskj.rbchat" manifestPlaceholders["JPUSH_PKGNAME"] = "com.dskj.rbchat"
manifestPlaceholders["JPUSH_APPKEY"] = "9041bc22de91e3d9af3cfd23" manifestPlaceholders["JPUSH_APPKEY"] = "9041bc22de91e3d9af3cfd23"
@@ -102,7 +102,7 @@ android {
) )
//正式服 //正式服
manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式 manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式
// manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" //manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a"
} }
@@ -126,8 +126,8 @@ android {
"\"AIzaSyB7P1o1EIA02eWoNP_7QJ9XwWe3WkSZb9k\"" "\"AIzaSyB7P1o1EIA02eWoNP_7QJ9XwWe3WkSZb9k\""
) )
//测试APPKEY //测试APPKEY
manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a"
// manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" // manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f"
} }

32
app/src/main/java/com/dskj/rbchat/login/PhoneLoginActivity.java
View File

@@ -95,22 +95,22 @@ public class PhoneLoginActivity extends BaseActivity {
setPrivacyContent(activityWelcomeBinding.mobileTipsTv); setPrivacyContent(activityWelcomeBinding.mobileTipsTv);
countryBean = DataUtils.getLocCountry(PhoneLoginActivity.this); countryBean = DataUtils.getLocCountry(PhoneLoginActivity.this);
// changeArea(); changeArea();
// activityWelcomeBinding.areaTv.setOnClickListener(new View.OnClickListener() { activityWelcomeBinding.areaTv.setOnClickListener(new View.OnClickListener() {
// @Override @Override
// public void onClick(View v) { public void onClick(View v) {
// SelectCountryDialog selectCountryDialog = new SelectCountryDialog(PhoneLoginActivity.this); SelectCountryDialog selectCountryDialog = new SelectCountryDialog(PhoneLoginActivity.this);
// selectCountryDialog.setOnToVipListener(new SelectCountryDialog.OnToTypeListener() { selectCountryDialog.setOnToVipListener(new SelectCountryDialog.OnToTypeListener() {
// @Override @Override
// public void toType(CountryBean type) { public void toType(CountryBean type) {
// countryBean = type; countryBean = type;
// changeArea(); changeArea();
// DataUtils.set(PhoneLoginActivity.this, IMUIKitConfig.LOC_COUNTRY_CODE, type.getAreaCodeName()); DataUtils.set(PhoneLoginActivity.this, IMUIKitConfig.LOC_COUNTRY_CODE, type.getAreaCodeName());
// } }
// }); });
// selectCountryDialog.show(); selectCountryDialog.show();
// } }
// }); });
activityWelcomeBinding.nextIv.setOnClickListener(new View.OnClickListener() { activityWelcomeBinding.nextIv.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

26
app/src/main/java/com/dskj/rbchat/login/RegisterActivity.java
View File

@@ -157,19 +157,19 @@ public class RegisterActivity extends BaseActivity {
setPrivacyContent(activityWelcomeBinding.mobileTipsTv); setPrivacyContent(activityWelcomeBinding.mobileTipsTv);
countryBean = DataUtils.getLocCountry(RegisterActivity.this); countryBean = DataUtils.getLocCountry(RegisterActivity.this);
// changeArea(); changeArea();
// activityWelcomeBinding.areaTv.setOnClickListener(v -> { activityWelcomeBinding.areaTv.setOnClickListener(v -> {
// SelectCountryDialog selectCountryDialog = new SelectCountryDialog(RegisterActivity.this); SelectCountryDialog selectCountryDialog = new SelectCountryDialog(RegisterActivity.this);
// selectCountryDialog.setOnToVipListener(new SelectCountryDialog.OnToTypeListener() { selectCountryDialog.setOnToVipListener(new SelectCountryDialog.OnToTypeListener() {
// @Override @Override
// public void toType(CountryBean type) { public void toType(CountryBean type) {
// countryBean = type; countryBean = type;
// changeArea(); changeArea();
// DataUtils.set(RegisterActivity.this, IMUIKitConfig.LOC_COUNTRY_CODE, type.getAreaCodeName()); DataUtils.set(RegisterActivity.this, IMUIKitConfig.LOC_COUNTRY_CODE, type.getAreaCodeName());
// } }
// }); });
// selectCountryDialog.show(); selectCountryDialog.show();
// }); });
activityWelcomeBinding.nextIv.setOnClickListener(v -> { activityWelcomeBinding.nextIv.setOnClickListener(v -> {
if(lastTime>0){ if(lastTime>0){
if(System.currentTimeMillis()-lastTime<2000){ if(System.currentTimeMillis()-lastTime<2000){

1
app/src/main/res/layout/activity_phone_login.xml
View File

@@ -57,6 +57,7 @@
android:id="@+id/area_tv" android:id="@+id/area_tv"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_50" android:layout_height="@dimen/dp_50"
android:drawableRight="@mipmap/select_county_img"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="+86" android:text="+86"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"

1
app/src/main/res/layout/activity_register.xml
View File

@@ -60,6 +60,7 @@
android:id="@+id/area_tv" android:id="@+id/area_tv"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_50" android:layout_height="@dimen/dp_50"
android:drawableRight="@mipmap/select_county_img"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="+86" android:text="+86"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"

5
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

5
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

4
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java
View File

@@ -49,12 +49,12 @@ public interface ApiService {
/** /**
* 正式环境 * 正式环境
*/ */
String URL = "https://api.letschat2023.com/"; String URL = "https://api.letschat2023.com/";
/** /**
* 测试环境 * 测试环境
*/ */
//String URL = "https://api-test.letschat2023.com/"; // String URL = "https://api-test.letschat2023.com/";
String SUBSTATIONID = "1703655363476242434"; String SUBSTATIONID = "1703655363476242434";