yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊

Browse Source 
# Conflicts:
#	OneToOne/src/main/res/values/strings.xml
This commit is contained in:
zlzw
2023-10-28 09:26:25 +08:00
parent ba456a007b 4a09f629f3
commit f7b6f75865
4 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
View File

@@ -18,8 +18,6 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.shayu.onetoone.bean.UserItemBean;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@@ -38,6 +36,7 @@ import com.shayu.onetoone.activity.setting.SettingActivity;
import com.shayu.onetoone.adapter.MainMeAdapter;
import com.shayu.onetoone.bean.PeopleNum;
import com.shayu.onetoone.bean.SlideBean;
import com.shayu.onetoone.bean.UserItemBean;
import com.shayu.onetoone.manager.OTONetManager;
import com.shayu.onetoone.manager.RouteManager;
import com.shayu.onetoone.utils.MainHttpConsts;
@@ -59,6 +58,7 @@ import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.SVGAViewUtils;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import java.net.MalformedURLException;
@@ -367,13 +367,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
}
String singnature = u.getSignature();
if (TextUtils.equals(singnature, "這個人很懶，什麼也沒留下") || TextUtils.equals(singnature, "这家伙很懒，什么都没留下") || TextUtils.isEmpty(singnature)) {
String ct = Locale.getDefault().getCountry();
ct = TextUtils.equals("CN", ct) ? "HK" : ct;
if (TextUtils.equals(ct, "CN")) {
singnature = "這個人很懶，什麼也沒留下";
} else {
singnature = "The guy was lazy and didn't write anything.";
}
singnature = WordUtil.isNewZh() ? "這個人很懶，什麼也沒留下" : "The guy was lazy and didn't write anything.";
}
signature.setText(getResources().getString(R.string.user_sign) + ":" + singnature);
CommonAppConfig appConfig = CommonAppConfig.getInstance();

6
OneToOne/src/main/java/com/shayu/onetoone/activity/login/ChooseLabelActivity.java
View File

@@ -3,6 +3,7 @@ package com.shayu.onetoone.activity.login;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
@@ -25,6 +26,7 @@ import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.bean.HttpCallbackModel;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.utils.ToastUtil;
import java.util.ArrayList;
import java.util.Arrays;
@@ -172,6 +174,10 @@ public class ChooseLabelActivity extends AbsOTOActivity {
labels.append("," + myLabelList.get(i).getId());
}
}
if (TextUtils.isEmpty(labels)){
ToastUtil.show("請設置標籤");
return;
}
OTONetManager.getInstance(mContext).setLabels(labels.toString(), new HttpCallback<HttpCallbackModel>() {
@Override
public void onSuccess(HttpCallbackModel data) {