From 1439e4c23c20137dfdabdcdf4cc048cddc82993a Mon Sep 17 00:00:00 2001 From: guozhen <878631970@qq.com> Date: Fri, 13 Dec 2024 15:46:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=92=8C=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=94=BE=E5=BC=80=E5=9B=BD=E9=99=85=E5=8C=BA=E5=8F=B7=E9=80=89?= =?UTF-8?q?=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 14 ++++---- .../dskj/rbchat/login/PhoneLoginActivity.java | 32 +++++++++---------- .../dskj/rbchat/login/RegisterActivity.java | 26 +++++++-------- .../main/res/layout/activity_phone_login.xml | 1 + app/src/main/res/layout/activity_register.xml | 1 + .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 --- .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 --- .../kit/chatkit/ui/network/ApiService.java | 4 +-- 8 files changed, 40 insertions(+), 48 deletions(-) delete mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml delete mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4a3ca9f..372a423 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -47,12 +47,12 @@ android { applicationId = "com.dskj.rbchat" minSdk = 24 targetSdk = 34 - versionCode = 192 - versionName = "1.9.2" + versionCode = 193 + versionName = "1.9.3" multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" -// manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式 - manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" //测试 + //manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式 + //manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" //测试 manifestPlaceholders["JPUSH_PKGNAME"] = "com.dskj.rbchat" manifestPlaceholders["JPUSH_APPKEY"] = "9041bc22de91e3d9af3cfd23" @@ -102,7 +102,7 @@ android { ) //正式服 manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式 - // manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" + //manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" } @@ -126,8 +126,8 @@ android { "\"AIzaSyB7P1o1EIA02eWoNP_7QJ9XwWe3WkSZb9k\"" ) //测试APPKEY - manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" - // manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" + manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" + // manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" } diff --git a/app/src/main/java/com/dskj/rbchat/login/PhoneLoginActivity.java b/app/src/main/java/com/dskj/rbchat/login/PhoneLoginActivity.java index 6a93b08..6de8cda 100644 --- a/app/src/main/java/com/dskj/rbchat/login/PhoneLoginActivity.java +++ b/app/src/main/java/com/dskj/rbchat/login/PhoneLoginActivity.java @@ -95,22 +95,22 @@ public class PhoneLoginActivity extends BaseActivity { setPrivacyContent(activityWelcomeBinding.mobileTipsTv); countryBean = DataUtils.getLocCountry(PhoneLoginActivity.this); -// changeArea(); -// activityWelcomeBinding.areaTv.setOnClickListener(new View.OnClickListener() { -// @Override -// public void onClick(View v) { -// SelectCountryDialog selectCountryDialog = new SelectCountryDialog(PhoneLoginActivity.this); -// selectCountryDialog.setOnToVipListener(new SelectCountryDialog.OnToTypeListener() { -// @Override -// public void toType(CountryBean type) { -// countryBean = type; -// changeArea(); -// DataUtils.set(PhoneLoginActivity.this, IMUIKitConfig.LOC_COUNTRY_CODE, type.getAreaCodeName()); -// } -// }); -// selectCountryDialog.show(); -// } -// }); + changeArea(); + activityWelcomeBinding.areaTv.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + SelectCountryDialog selectCountryDialog = new SelectCountryDialog(PhoneLoginActivity.this); + selectCountryDialog.setOnToVipListener(new SelectCountryDialog.OnToTypeListener() { + @Override + public void toType(CountryBean type) { + countryBean = type; + changeArea(); + DataUtils.set(PhoneLoginActivity.this, IMUIKitConfig.LOC_COUNTRY_CODE, type.getAreaCodeName()); + } + }); + selectCountryDialog.show(); + } + }); activityWelcomeBinding.nextIv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/com/dskj/rbchat/login/RegisterActivity.java b/app/src/main/java/com/dskj/rbchat/login/RegisterActivity.java index dc3c7bb..86fad16 100644 --- a/app/src/main/java/com/dskj/rbchat/login/RegisterActivity.java +++ b/app/src/main/java/com/dskj/rbchat/login/RegisterActivity.java @@ -157,19 +157,19 @@ public class RegisterActivity extends BaseActivity { setPrivacyContent(activityWelcomeBinding.mobileTipsTv); countryBean = DataUtils.getLocCountry(RegisterActivity.this); -// changeArea(); -// activityWelcomeBinding.areaTv.setOnClickListener(v -> { -// SelectCountryDialog selectCountryDialog = new SelectCountryDialog(RegisterActivity.this); -// selectCountryDialog.setOnToVipListener(new SelectCountryDialog.OnToTypeListener() { -// @Override -// public void toType(CountryBean type) { -// countryBean = type; -// changeArea(); -// DataUtils.set(RegisterActivity.this, IMUIKitConfig.LOC_COUNTRY_CODE, type.getAreaCodeName()); -// } -// }); -// selectCountryDialog.show(); -// }); + changeArea(); + activityWelcomeBinding.areaTv.setOnClickListener(v -> { + SelectCountryDialog selectCountryDialog = new SelectCountryDialog(RegisterActivity.this); + selectCountryDialog.setOnToVipListener(new SelectCountryDialog.OnToTypeListener() { + @Override + public void toType(CountryBean type) { + countryBean = type; + changeArea(); + DataUtils.set(RegisterActivity.this, IMUIKitConfig.LOC_COUNTRY_CODE, type.getAreaCodeName()); + } + }); + selectCountryDialog.show(); + }); activityWelcomeBinding.nextIv.setOnClickListener(v -> { if(lastTime>0){ if(System.currentTimeMillis()-lastTime<2000){ diff --git a/app/src/main/res/layout/activity_phone_login.xml b/app/src/main/res/layout/activity_phone_login.xml index e381958..94fa7a8 100644 --- a/app/src/main/res/layout/activity_phone_login.xml +++ b/app/src/main/res/layout/activity_phone_login.xml @@ -57,6 +57,7 @@ android:id="@+id/area_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_50" + android:drawableRight="@mipmap/select_county_img" android:gravity="center_vertical" android:text="+86" android:textColor="@color/color_333333" diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml index 34e87be..5e41abe 100644 --- a/app/src/main/res/layout/activity_register.xml +++ b/app/src/main/res/layout/activity_register.xml @@ -60,6 +60,7 @@ android:id="@+id/area_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_50" + android:drawableRight="@mipmap/select_county_img" android:gravity="center_vertical" android:text="+86" android:textColor="@color/color_333333" diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 036d09b..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 036d09b..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java index 5a4c656..47d09b9 100644 --- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java +++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java @@ -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";