yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

搜索用户直播中

Browse Source
This commit is contained in:
oujunhui
2020-05-09 20:08:10 +08:00
parent 555aa5947d
commit f2e65c622c
6 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/yizhuan/erban/MainActivity.java
View File

@@ -103,6 +103,7 @@ import com.yizhuan.erban.ui.im.chat.SignInNoticeMsgViewHolder;
import com.yizhuan.erban.ui.im.chat.SysMsgV2ViewHolder;
import com.yizhuan.erban.ui.im.chat.SysMsgViewHolder;
import com.yizhuan.erban.ui.login.BinderPhoneActivity;
import com.yizhuan.erban.ui.login.LoginPhoneActivity;
import com.yizhuan.erban.ui.patriarch.help.LimitEnterRoomHelper;
import com.yizhuan.erban.ui.patriarch.help.PmDialogShowMrg;
import com.yizhuan.erban.ui.user.UserInfoActivity;
@@ -690,7 +691,8 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
* 检查是否绑定手机
*/
private void checkBindPhone() {
BinderPhoneActivity.start(context, true);
// BinderPhoneActivity.start(context, true);
LoginPhoneActivity.start(this);
}
@Subscribe(threadMode = ThreadMode.MAIN)

4
app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java
View File

@@ -35,8 +35,8 @@ import io.reactivex.functions.BiConsumer;
public abstract class BaseLoginAct extends BaseActivity {
protected TextView tvProtocol;
protected ImageView wxLogin;
protected ImageView qqLogin;
protected TextView wxLogin;
protected TextView qqLogin;
protected TextView tvLoginTip;
protected TextView tvDesc;

2
app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java
View File

@@ -49,7 +49,7 @@ public class SearchAdapter extends BaseQuickAdapter<SearchRoomInfo,SearchAdapter
holder.tvOnlineNum.setVisibility(View.GONE);
if (mType == SearchDetailFragment.TYPE_SEARCH_USER){
holder.userName.setText(item.getNick() != null ? item.getNick().replaceAll(RegexUtil.getNotPrintableStringReg(), "?"):"");
holder.ivLive.setVisibility(View.VISIBLE);
holder.ivLive.setVisibility(item.getRoomUid() == 0?View.GONE:View.VISIBLE);
holder.container.setOnClickListener(v -> {
UserInfoActivity.Companion.start(context, item.getUid());
});

2
app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java
View File

@@ -73,7 +73,7 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
private TextView tvLoginQuickPass;
private QuickLogin login;// BUSINESS_ID为从易盾官网申请的业务id
private ImageView phoneLogin;
private TextView phoneLogin;
public static void start(Context context) {
Intent intent = new Intent(context, QuickPassLoginAct.class);

2
app/src/module_quick_pass/res/layout/act_quick_pass.xml
View File

@@ -44,7 +44,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/container_third_part"
android:layout_marginBottom="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_30"
tools:ignore="SpUsage"
/>

2
core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java
View File

@@ -31,6 +31,8 @@ public class RoomInfo implements Parcelable,Serializable {
private long roomId;
private long roomUid;
public String title;
//头像
private String avatar;