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

只能+86登录注册

Browse Source 
去掉退群通知
This commit is contained in:
guozhen
2025-01-02 16:27:02 +08:00
committed by xuhuixiang
parent 5bd7185d47
commit ba8e40323d
10 changed files with 59 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/build.gradle.kts
View File

@@ -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"
}

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

@@ -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) {

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

@@ -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){

18
app/src/main/java/com/dskj/rbchat/main/mine/ChangePhoneActivity.java
View File

@@ -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);

24
app/src/main/java/com/dskj/rbchat/utils/DataUtils.java
View File

@@ -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<CountryBean> 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<CountryBean> countryBeans = getCountry(context);
// for (CountryBean country : countryBeans) {
// if (country.getAreaCodeName().equals(areaCode)) {
// return country;
// }
// }
return new CountryBean("+86", context.getString(R.string.zhongguo_txt));
}

4
app/src/main/res/layout/activity_change_phone.xml
View File

@@ -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"

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

@@ -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"

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

@@ -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"

6
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/common/TeamNotificationHelper.java
View File

@@ -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:

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";