moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
huangjian
2021-02-27 14:10:51 +08:00
parent cc16adf397
commit d905792165
9 changed files with 214 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/yizhuan/erban/home/adapter/HomeAddFriendsAdapter.java
View File

@@ -62,7 +62,6 @@ public class HomeAddFriendsAdapter extends BaseQuickAdapter<HomePlayInfo, BaseVi
loadAvatar(userThree, item.getMicUsers().get(2).getAvatar());
loadAvatar(userFour, item.getMicUsers().get(3).getAvatar());
loadAvatar(userFive, item.getMicUsers().get(4).getAvatar());
helper.getView(R.id.root_view).setOnClickListener(v -> {
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_HOME_INTO_JYKL_ROOM_CLICK, "点击交友扩列项进入房间");
AVRoomActivity.startForFromType(mContext, item.getUid(), AVRoomActivity.FROM_TYPE_RECOMMEND);

12
app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
View File

@@ -32,6 +32,7 @@ import com.amap.api.location.AMapLocationListener;
import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
import com.bumptech.glide.request.RequestOptions;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.coorchice.library.utils.LogUtils;
import com.scwang.smartrefresh.layout.internal.ProgressDrawable;
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
@@ -83,6 +84,7 @@ import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent;
import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent;
import com.yizhuan.xchat_android_core.user.event.ShowMeEvent;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_core.utils.TextUtils;
@@ -695,6 +697,16 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
AVRoomActivity.start(mContext, Long.parseLong(data));
}
/**
* 用户信息更新
*
* @param event
*/
@Subscribe(threadMode = ThreadMode.MAIN)
public void loadLoginUserInfoEvent(LoginUserInfoUpdateEvent event) {
refreshData();
}
/**
* 用户信息更新
*

4
app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
View File

@@ -49,7 +49,7 @@ public class AddUserInfoFragment extends BaseFragment
private int gender = -1;
private XRadioGroup rgGender;
private RadioButton rbMale;
private String avatarUrl = "https://image.zhongjialx.com/default_avatar.png";
private String avatarUrl = "https://image.zhongjialx.com/yinyou_default_avatar.png";
public static String INVITE_USER_CODE = "";
@@ -107,7 +107,7 @@ public class AddUserInfoFragment extends BaseFragment
public void onClick(View v) {
switch (v.getId()) {
case R.id.ok_btn:
if (TextUtils.isEmpty(tvNick.getText())) {
if (TextUtils.isEmpty(tvNick.getText().toString().trim())) {
toast("昵称不能为空！");
return;
}

66
app/src/main/java/com/yizhuan/erban/ui/widget/ParentClickHorizontalScrollView.java Normal file
View File

@@ -0,0 +1,66 @@
package com.yizhuan.erban.ui.widget;
import android.content.Context;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
import android.widget.HorizontalScrollView;
/**
* 兼容父容器点击事件的HorizontalScrollView
*
* created by yc on 2018-12-27
*/
public class ParentClickHorizontalScrollView extends HorizontalScrollView {
private View parentView;
public ParentClickHorizontalScrollView(Context context) {
super(context);
}
public ParentClickHorizontalScrollView(Context context, AttributeSet attrs) {
super(context, attrs);
}
public ParentClickHorizontalScrollView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
public View getParentView() {
return parentView;
}
public void setParentView(View parentView) {
this.parentView = parentView;
}
@Override
public boolean onTouchEvent(MotionEvent ev) {
//注意 getParent() 是 ViewParent 但不一定是 View
if (parentView == null
&& getParent() != null
&& getParent() instanceof View) {
parentView = (View) getParent();
}
if (parentView != null) {
switch (ev.getAction()) {
case MotionEvent.ACTION_DOWN:
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
parentView.onTouchEvent(ev); //使父容器也能响应本次按下事件
break;
case MotionEvent.ACTION_MOVE: //当触发滑动时，将父容器的按下响应失效
//修改动作为ACTION_CANCEL
ev.setAction(MotionEvent.ACTION_CANCEL);
parentView.onTouchEvent(ev);
//父容器响应后恢复事件原动作
ev.setAction(MotionEvent.ACTION_MOVE);
break;
}
}
return super.onTouchEvent(ev); //无论如何 本身都响应事件
}
}

65
app/src/main/res/layout/include_mic_charm_layout.xml
View File

@@ -1,65 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:id="@+id/cl_parent_gift_value"
xmlns:app="http://schemas.android.com/apk/res-auto">
<View
android:id="@+id/view_center"
android:layout_width="1dp"
android:layout_height="1dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/view_center_of_charm"
android:layout_width="1dp"
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:layout_marginTop="15.5dp"
app:layout_constraintStart_toEndOf="@id/view_center"
app:layout_constraintTop_toBottomOf="@id/view_center"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/ll_charm_click"
android:paddingTop="@dimen/dp_5"
android:paddingBottom="@dimen/dp_5"
app:layout_constraintBottom_toBottomOf="@id/view_center_of_charm"
app:layout_constraintEnd_toEndOf="@id/view_center_of_charm"
app:layout_constraintStart_toStartOf="@id/view_center_of_charm"
app:layout_constraintTop_toTopOf="@id/view_center_of_charm"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="15dp"
android:background="@drawable/shape_bg_of_mic_charm"
android:orientation="horizontal">
<ImageView
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="4dp"
android:scaleType="fitCenter"
android:src="@drawable/icon_gift_value" />
<TextView
android:id="@+id/tv_charm_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="3dp"
android:layout_marginEnd="5dp"
android:gravity="center"
android:text="0"
android:textColor="@color/white"
android:textSize="9dp" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

5
app/src/main/res/layout/item_home_add_friends.xml
View File

@@ -69,7 +69,8 @@
app:layout_constraintTop_toTopOf="@id/iv_room_avatar"
tools:text="231" />
<HorizontalScrollView
<com.yizhuan.erban.ui.widget.ParentClickHorizontalScrollView
android:id="@+id/hsv"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="11dp"
@@ -136,6 +137,6 @@
</LinearLayout>
</HorizontalScrollView>
</com.yizhuan.erban.ui.widget.ParentClickHorizontalScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>

67
app/src/main/res/layout/list_item_micro.xml
View File

@@ -139,8 +139,69 @@
</LinearLayout>
<include
android:id="@+id/include_mic_charm_layout"
layout="@layout/include_mic_charm_layout" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:id="@+id/cl_parent_gift_value"
>
<View
android:id="@+id/view_center"
android:layout_width="1dp"
android:layout_height="1dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/view_center_of_charm"
android:layout_width="1dp"
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:layout_marginTop="15.5dp"
app:layout_constraintStart_toEndOf="@id/view_center"
app:layout_constraintTop_toBottomOf="@id/view_center"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/ll_charm_click"
android:paddingTop="@dimen/dp_5"
android:paddingBottom="@dimen/dp_5"
app:layout_constraintBottom_toBottomOf="@id/view_center_of_charm"
app:layout_constraintEnd_toEndOf="@id/view_center_of_charm"
app:layout_constraintStart_toStartOf="@id/view_center_of_charm"
app:layout_constraintTop_toTopOf="@id/view_center_of_charm"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="15dp"
android:background="@drawable/shape_bg_of_mic_charm"
android:orientation="horizontal">
<ImageView
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="4dp"
android:scaleType="fitCenter"
android:src="@drawable/icon_gift_value" />
<TextView
android:id="@+id/tv_charm_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="3dp"
android:layout_marginEnd="5dp"
android:gravity="center"
android:text="0"
android:textColor="@color/white"
android:textSize="9dp" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</RelativeLayout>

69
app/src/main/res/layout/list_item_micro_king.xml
View File

@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
<FrameLayout
@@ -154,7 +155,69 @@
</LinearLayout>
<include
android:id="@+id/include_mic_charm_layout"
layout="@layout/include_mic_charm_layout" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:id="@+id/cl_parent_gift_value"
>
<View
android:id="@+id/view_center"
android:layout_width="1dp"
android:layout_height="1dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/view_center_of_charm"
android:layout_width="1dp"
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:layout_marginTop="15.5dp"
app:layout_constraintStart_toEndOf="@id/view_center"
app:layout_constraintTop_toBottomOf="@id/view_center"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/ll_charm_click"
android:paddingTop="@dimen/dp_5"
android:paddingBottom="@dimen/dp_5"
app:layout_constraintBottom_toBottomOf="@id/view_center_of_charm"
app:layout_constraintEnd_toEndOf="@id/view_center_of_charm"
app:layout_constraintStart_toStartOf="@id/view_center_of_charm"
app:layout_constraintTop_toTopOf="@id/view_center_of_charm"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="15dp"
android:background="@drawable/shape_bg_of_mic_charm"
android:orientation="horizontal">
<ImageView
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="4dp"
android:scaleType="fitCenter"
android:src="@drawable/icon_gift_value" />
<TextView
android:id="@+id/tv_charm_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="3dp"
android:layout_marginEnd="5dp"
android:gravity="center"
android:text="0"
android:textColor="@color/white"
android:textSize="9dp" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</RelativeLayout>

22
app/src/module_public_chat_hall/res/layout/nim_msg_fragment.xml
View File

@@ -148,27 +148,7 @@
</com.yizhuan.erban.common.widget.DragLayout>
</RelativeLayout>
<!--<RelativeLayout-->
<!--android:minHeight="35dp"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content">-->
<!--<include layout="@layout/nim_message_activity_bottom_layout"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"/>-->
<!--<TextView-->
<!--android:text="禁言中，快找管理员解除禁言吧!"-->
<!--android:textColor="@color/white"-->
<!--android:background="@color/gray7"-->
<!--android:textSize="15dp"-->
<!--android:gravity="center"-->
<!--android:layout_alignParentBottom="true"-->
<!--android:layout_alignParentTop="true"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content" />-->
<!--</RelativeLayout>-->
<include
android:id="@+id/nim_message_activity_bottom_layout"
layout="@layout/nim_message_activity_bottom_layout" />
<include layout="@layout/nim_message_activity_bottom_layout" />
</LinearLayout>