diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c764762..7afae17 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -47,8 +47,8 @@ android { applicationId = "com.dskj.rbchat" minSdk = 24 targetSdk = 34 - versionCode = 196 - versionName = "1.9.6" + versionCode = 198 + versionName = "1.9.8" multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式 @@ -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 6de8cda..e368dd9 100644 --- a/app/src/main/java/com/dskj/rbchat/login/PhoneLoginActivity.java +++ b/app/src/main/java/com/dskj/rbchat/login/PhoneLoginActivity.java @@ -96,21 +96,21 @@ public class PhoneLoginActivity extends BaseActivity { 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(); - } - }); +// 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 86fad16..68934d3 100644 --- a/app/src/main/java/com/dskj/rbchat/login/RegisterActivity.java +++ b/app/src/main/java/com/dskj/rbchat/login/RegisterActivity.java @@ -158,18 +158,18 @@ public class RegisterActivity extends BaseActivity { 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(); - }); +// 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/java/com/dskj/rbchat/main/mine/ChangePhoneActivity.java b/app/src/main/java/com/dskj/rbchat/main/mine/ChangePhoneActivity.java index a6e8b76..0813741 100644 --- a/app/src/main/java/com/dskj/rbchat/main/mine/ChangePhoneActivity.java +++ b/app/src/main/java/com/dskj/rbchat/main/mine/ChangePhoneActivity.java @@ -203,15 +203,15 @@ public class ChangePhoneActivity extends BaseActivity { countryBean = DataUtils.getLocCountry(ChangePhoneActivity.this); changeArea(); - binding.areaTv.setOnClickListener(v -> { - SelectCountryDialog selectCountryDialog = new SelectCountryDialog(ChangePhoneActivity.this); - selectCountryDialog.setOnToVipListener(type -> { - countryBean = type; - changeArea(); - DataUtils.set(ChangePhoneActivity.this, IMUIKitConfig.LOC_COUNTRY_CODE, type.getAreaCodeName()); - }); - selectCountryDialog.show(); - }); +// binding.areaTv.setOnClickListener(v -> { +// SelectCountryDialog selectCountryDialog = new SelectCountryDialog(ChangePhoneActivity.this); +// selectCountryDialog.setOnToVipListener(type -> { +// countryBean = type; +// changeArea(); +// DataUtils.set(ChangePhoneActivity.this, IMUIKitConfig.LOC_COUNTRY_CODE, type.getAreaCodeName()); +// }); +// selectCountryDialog.show(); +// }); myCountDownTimer = new MyCountDownTimer(60000, 1000); myCountDownTimer1 = new MyCountDownTimer1(60000, 1000); diff --git a/app/src/main/java/com/dskj/rbchat/utils/DataUtils.java b/app/src/main/java/com/dskj/rbchat/utils/DataUtils.java index 2a367df..3cd937a 100644 --- a/app/src/main/java/com/dskj/rbchat/utils/DataUtils.java +++ b/app/src/main/java/com/dskj/rbchat/utils/DataUtils.java @@ -150,18 +150,18 @@ public class DataUtils { * @return */ public static CountryBean getLocCountry(Context context) { - String areaCode; - try { - areaCode = DataUtils.get(context, IMUIKitConfig.LOC_COUNTRY_CODE, "+86"); - } catch (Exception e) { - areaCode = "+" + DataUtils.get(context, IMUIKitConfig.LOC_COUNTRY_CODE, 86); //兼容老版本 - } - List countryBeans = getCountry(context); - for (CountryBean country : countryBeans) { - if (country.getAreaCodeName().equals(areaCode)) { - return country; - } - } +// String areaCode; +// try { +// areaCode = DataUtils.get(context, IMUIKitConfig.LOC_COUNTRY_CODE, "+86"); +// } catch (Exception e) { +// areaCode = "+" + DataUtils.get(context, IMUIKitConfig.LOC_COUNTRY_CODE, 86); //兼容老版本 +// } +// List countryBeans = getCountry(context); +// for (CountryBean country : countryBeans) { +// if (country.getAreaCodeName().equals(areaCode)) { +// return country; +// } +// } return new CountryBean("+86", context.getString(R.string.zhongguo_txt)); } diff --git a/app/src/main/res/layout/activity_change_phone.xml b/app/src/main/res/layout/activity_change_phone.xml index 8b19781..83c0a9c 100644 --- a/app/src/main/res/layout/activity_change_phone.xml +++ b/app/src/main/res/layout/activity_change_phone.xml @@ -152,9 +152,8 @@ 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="台湾 +886" + android:text="+86" android:textColor="@color/color_333333" android:textSize="18sp" /> @@ -272,7 +271,6 @@ android:layout_width="match_parent" android:layout_height="50dp" android:layout_marginRight="@dimen/dp_10" - android:drawableRight="@mipmap/select_county_img" android:gravity="center_vertical" android:paddingLeft="15dp" android:text="CHINA +86" diff --git a/app/src/main/res/layout/activity_phone_login.xml b/app/src/main/res/layout/activity_phone_login.xml index 94fa7a8..e381958 100644 --- a/app/src/main/res/layout/activity_phone_login.xml +++ b/app/src/main/res/layout/activity_phone_login.xml @@ -57,7 +57,6 @@ 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 5e41abe..34e87be 100644 --- a/app/src/main/res/layout/activity_register.xml +++ b/app/src/main/res/layout/activity_register.xml @@ -60,7 +60,6 @@ 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/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/common/TeamNotificationHelper.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/common/TeamNotificationHelper.java index f47cacc..46720ec 100644 --- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/common/TeamNotificationHelper.java +++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/common/TeamNotificationHelper.java @@ -53,11 +53,13 @@ public class TeamNotificationHelper { break; case KickMember: case SUPER_TEAM_KICK: - text = buildKickMemberNotification(tid, ((MemberChangeAttachment) attachment), fromUser); + // text = buildKickMemberNotification(tid, ((MemberChangeAttachment) attachment), fromUser); + text = ""; break; case LeaveTeam: case SUPER_TEAM_LEAVE: - text = buildLeaveTeamNotification(tid, fromUser); + // text = buildLeaveTeamNotification(tid, fromUser); + text = ""; break; case DismissTeam: case SUPER_TEAM_DISMISS: 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 f617b44..71ef985 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";