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

1.UI修改:各种小细节 2.联系人列表显示赛事消息预览 3.去掉暗号检测

Browse Source
This commit is contained in:
huangjian
2021-04-08 18:49:08 +08:00
parent 5677e957c7
commit 06a742d4f3
28 changed files with 678 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/application/ActivityLifeManager.java
View File

@@ -28,7 +28,7 @@ public class ActivityLifeManager implements Application.ActivityLifecycleCallbac
if (count == 0) {
//应用回到前台了
//这里进行暗号的判断
PwdCodeMgr.get().handlePopPwdCodeWindow(activity);
//PwdCodeMgr.get().handlePopPwdCodeWindow(activity);
if (AuthModel.get().isImLogin()) {
//签到弹窗
// SignDialogTimeManager.checkSignDialog(activity, true);

57
app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java
View File

@@ -39,7 +39,6 @@ import com.yizhuan.erban.ui.widget.higuide.TuTuGuideHelper;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.certification.CertificationModel;
import com.yizhuan.xchat_android_core.customer_server.CustomerServerModel;
import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo;
import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeConcernsInfo;
@@ -74,8 +73,6 @@ import java.util.Date;
import java.util.List;
import java.util.Locale;
import io.reactivex.functions.BiConsumer;
import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_FORCE;
import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_GUIDE;
import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_NONE;
@@ -96,8 +93,6 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
private UserInfo mUserInfo;
private FragmentMeBinding mBinding;
private ObservableScrollView scrollView;
@Override
public int getRootLayoutId() {
return R.layout.fragment_me;
@@ -114,24 +109,6 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
if (mBinding != null) {
mBinding.setClick(this);
}
if (mBinding != null) {
scrollView = mBinding.scrollView;
scrollView.setScrollViewListener((view, scrollX, scrollY, oldScrollX, oldScrollY) -> {
if (scrollY == 0) {// 目前的（滑动后）的Y轴坐标
mBinding.tvCenterTitle.setAlpha(0);
mBinding.viewToolbarBg.setAlpha(0);
} else {
if (scrollY > 180) {
mBinding.tvCenterTitle.setAlpha(1);
mBinding.viewToolbarBg.setAlpha(1);
} else {
float alpha = scrollY / 180f;
mBinding.tvCenterTitle.setAlpha(alpha);
mBinding.viewToolbarBg.setAlpha(alpha);
}
}
});
}
}
@Override
@@ -154,7 +131,6 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
requestUpdateUserInfo();
} else if (second == CUSTOM_MESS_SUB_HADEXPIRE) {
mBinding.ivUserNobleLevel.setVisibility(View.GONE);
// mBinding.tvNobleRemainTime.setVisibility(View.GONE);
mBinding.ivAvatarHeadWear.setVisibility(View.GONE);
}
});
@@ -217,14 +193,6 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
mBinding.tvUserId.setText(String.format(Locale.getDefault(),
getString(R.string.text_user_id), String.valueOf(mUserInfo.getErbanNo())));
// int nobleExpire = mUserInfo.getRemainDay();
// if (nobleExpire > -1) {
// mBinding.tvNobleRemainTime.setVisibility(View.VISIBLE);
// } else {
// mBinding.tvNobleRemainTime.setVisibility(View.GONE);
// }
// mBinding.tvNobleRemainTime.setText(getString(R.string.noble_remain_time, nobleExpire));
NobleInfo nobleInfo = mUserInfo.getNobleInfo();
HeadWearInfo headWearInfo = mUserInfo.getUserHeadwear();
if (headWearInfo != null) {
@@ -234,7 +202,6 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
NobleUtil.loadResource(NobleUtil.getBadgeByLevel(nobleInfo.getLevel()), mBinding.ivUserNobleLevel);
} else {
mBinding.ivUserNobleLevel.setVisibility(View.GONE);
// mBinding.tvNobleRemainTime.setVisibility(View.GONE);
}
NobleUtil.loadHeadWear(headWearInfo.getEffect() != null ? headWearInfo.getEffect() : headWearInfo.getPic(), mBinding.ivAvatarHeadWear);
@@ -246,7 +213,6 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
} else {
mBinding.ivAvatarHeadWear.setImageDrawable(null);
mBinding.ivUserNobleLevel.setVisibility(View.GONE);
// mBinding.tvNobleRemainTime.setVisibility(View.GONE);
}
String star = StarUtils.getConstellation(new Date(mUserInfo.getBirth()));
@@ -357,29 +323,6 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
case R.id.me_item_invite:
CommonWebViewActivity.start(mContext, UriProvider.getGameShareUrl());
break;
case R.id.ll_kf:
getDialogManager().showOkCancelDialog("点击确认后将发起客户对话框，确认联系客服吗？",
new DialogManager.OkCancelDialogListener() {
@Override
public void onCancel() {
}
@Override
public void onOk() {
CustomerServerModel.getInstance().contactCustomerServer("", "我的页面", null)
.subscribe(new BiConsumer<String, Throwable>() {
@Override
public void accept(String s, Throwable throwable) throws Exception {
if (throwable != null) {
toast(throwable.getMessage());
}
}
});
}
});
break;
case R.id.match_mall:
FlutterBoost.instance().open(RouterConstants.FLUTTER_PAGE_MALL, null);

10
app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderMatch.java
View File

@@ -28,7 +28,7 @@ public class MsgViewHolderMatch extends MsgViewHolderBase {
@Override
protected int getContentResId() {
return R.layout.im_customer_msg_text;
return R.layout.layout_msg_view_holder_match;
}
@Override
@@ -42,16 +42,16 @@ public class MsgViewHolderMatch extends MsgViewHolderBase {
MsgAttachment attachment = message.getAttachment();
if (attachment instanceof MatchAttachment) {
matchAttachment = (MatchAttachment) attachment;
text = matchAttachment.content;
text = matchAttachment.getContent();
}
mTvMsg.setText(text);
}
@Override
protected void onItemClick() {
if (matchAttachment != null && matchAttachment.isNeedForwardToMatchDetail) {
HashMap<String, String> args = new HashMap();
args.put(RouterConstants.FLUTTER_PAGE_ARG_MATCH_ID, String.valueOf(matchAttachment.matchId));
if (matchAttachment != null && matchAttachment.isNeedForwardToMatchDetail()) {
HashMap<String, String> args = new HashMap<>();
args.put(RouterConstants.FLUTTER_PAGE_ARG_MATCH_ID, matchAttachment.getMatchId());
FlutterBoost.instance().open(RouterConstants.FLUTTER_PAGE_MATCH_DETAIL, args);
}
}

8
app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/RecentViewHolder.java
View File

@@ -33,6 +33,7 @@ import com.yizhuan.erban.ui.im.recent.adapter.RecentContactAdapter;
import com.yizhuan.xchat_android_core.im.custom.bean.AssistantAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.ImTipAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.MatchAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.NewbieHelloAttachment;
import java.util.ArrayList;
@@ -238,7 +239,7 @@ public abstract class RecentViewHolder extends RecyclerViewHolder<BaseQuickAdapt
recent.getFromAccount(),
(NotificationAttachment) recent.getAttachment());
case robot:
return "[机器人消息]";
return "你收到一条消息...";
case custom:
if (attachment instanceof CustomAttachment) {
CustomAttachment customAttachment = (CustomAttachment) attachment;
@@ -260,11 +261,14 @@ public abstract class RecentViewHolder extends RecyclerViewHolder<BaseQuickAdapt
case CustomAttachment.CUSTOM_MSG_NEWBIE:
NewbieHelloAttachment newbieHelloAttachment = (NewbieHelloAttachment) attachment;
return newbieHelloAttachment.getNewbieHelloInfo().message;
case CustomAttachment.CUSTOM_MSG_MATCH:
MatchAttachment matchAttachment = (MatchAttachment) attachment;
return matchAttachment.getContent();
}
}
default:
return "[自定义消息] ";
return "你收到一条消息...";
}
}
}

2
app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosAdapter.java
View File

@@ -84,7 +84,7 @@ public class UserModifyPhotosAdapter extends BaseAdapter{
});
if (position == 0) {
holder.imageView.setImageResource(R.drawable.icon_add_photo);
holder.imageView.setImageResource(R.drawable.icon_dy_add_image);
holder.imageDelete.setVisibility(View.GONE);
} else {
UserPhoto userPhoto = photoUrls.get(position-1);

BIN
app/src/main/res/drawable-xhdpi/arrow_right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 222 B

BIN
app/src/main/res/drawable-xhdpi/arrow_right.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 350 B

BIN
app/src/main/res/drawable-xhdpi/arrow_right_2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 200 B

BIN
app/src/main/res/drawable-xhdpi/icon_erban_grid_empty.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_erban_grid_empty.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.2 KiB

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

@@ -50,7 +50,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/arrow_right_2" />
android:src="@drawable/arrow_right" />
</LinearLayout>
@@ -87,7 +87,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/arrow_right_2" />
android:src="@drawable/arrow_right" />
</LinearLayout>
<View

2
app/src/main/res/layout/activity_modify_pwd.xml
View File

@@ -127,7 +127,7 @@
android:gravity="center"
android:onClick="@{click}"
android:text="忘记密码?"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_secondary_4f516a"
android:textSize="13sp" />
<Button

126
app/src/main/res/layout/fragment_me.xml
View File

@@ -16,21 +16,17 @@
<import type="android.view.View" />
</data>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_normal_1c1b22">
<com.yizhuan.erban.ui.widget.ObservableScrollView
android:id="@+id/scroll_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_normal_1c1b22"
android:overScrollMode="never">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="35dp"
android:layout_marginTop="@dimen/dp_25"
android:orientation="vertical">
<LinearLayout
@@ -112,13 +108,39 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:id="@+id/me_item_setting"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="end"
android:layout_marginEnd="@dimen/dp_10"
android:gravity="center_vertical"
android:onClick="@{click}"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="UseCompoundDrawables">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_me_text_padding_to_icon"
android:gravity="center_vertical"
android:src="@mipmap/icon_setting"
android:text="@string/menu_setting"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" />
</LinearLayout>
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_user_head"
avatarUrl="@{userInfo.avatar}"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginStart="20dp"
android:layout_marginTop="30dp"
android:layout_marginTop="@dimen/dp_35"
android:onClick="@{click}"
android:src="@drawable/default_avatar"
app:layout_constraintStart_toStartOf="parent"
@@ -602,94 +624,4 @@
</com.yizhuan.erban.ui.widget.ObservableScrollView>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_gravity="top"
android:visibility="gone">
<View
android:id="@+id/view_toolbar_bg"
android:layout_width="match_parent"
android:layout_height="45dp"
android:alpha="0"
android:background="#FAFAFA"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_center_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:alpha="0"
android:text="@string/main_me"
android:textColor="@color/text_primary"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/ll_kf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:gravity="center_vertical"
android:onClick="@{click}"
android:orientation="horizontal"
android:padding="14dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="RelativeOverlap,UseCompoundDrawables">
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@drawable/ic_customer_service"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="@string/me_customer_server"
android:textColor="#444444"
android:textSize="14sp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/me_item_setting"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="end"
android:layout_marginTop="35dp"
android:layout_marginEnd="@dimen/dp_10"
android:gravity="center_vertical"
android:onClick="@{click}"
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_me_text_padding_to_icon"
android:gravity="center_vertical"
android:src="@mipmap/icon_setting"
android:text="@string/menu_setting"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" />
</LinearLayout>
</FrameLayout>
</layout>

2
app/src/main/res/layout/item_family_list.xml
View File

@@ -65,6 +65,6 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/arrow_right_2" />
android:src="@drawable/arrow_right" />
</LinearLayout>

9
app/src/main/res/layout/layout_edit_eyes.xml
View File

@@ -2,7 +2,8 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/dp_20"
android:paddingTop="@dimen/dp_10"
android:paddingBottom="10dp"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:paddingLeft="@dimen/dp_25"
@@ -11,6 +12,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_40"
android:layout_gravity="center_vertical"
android:orientation="vertical">
<TextView
@@ -27,7 +30,6 @@
android:layout_height="wrap_content"
android:gravity="start|center_vertical"
android:inputType="textPassword"
android:paddingBottom="20dp"
android:textColor="@color/color_333333"
android:textColorHint="@color/color_b3b3b3"
android:textSize="@dimen/dp_14"
@@ -41,8 +43,7 @@
android:id="@+id/iv_eyes"
android:layout_width="40dp"
android:layout_height="@dimen/dp_40"
android:layout_gravity="end|bottom"
android:layout_marginBottom="@dimen/dp_10"
android:layout_gravity="end|center_vertical"
android:scaleType="centerInside"
android:src="@drawable/ic_eyes_close" />
</FrameLayout>

11
app/src/main/res/layout/layout_msg_view_holder_match.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/tv_msg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxWidth="215dp"
android:padding="@dimen/dp_5"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="恭喜您，获得抽奖机会，点我抽奖>>" />

6
app/src/main/res/layout/list_item_user_photos_modify.xml
View File

@@ -18,12 +18,12 @@
<ImageView
android:id="@+id/iv_photo_delete"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginTop="5dp"
android:layout_marginRight="5dp"
android:src="@drawable/icon_photo_delete" />
android:src="@drawable/ic_nick_delete" />
</com.yizhuan.erban.ui.widget.SquareLayout>
</RelativeLayout>

23
app/src/module_community/java/com/yizhuan/erban/community/publish/ImageAdapter.java
View File

@@ -1,10 +1,8 @@
package com.yizhuan.erban.community.publish;
import android.content.Context;
import android.widget.ImageView;
import androidx.annotation.Nullable;
import android.view.ViewGroup;
import android.widget.ImageView;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
@@ -14,43 +12,28 @@ import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.xchat_android_core.community.bean.PublishItem;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
import java.util.List;
public class ImageAdapter extends BaseQuickAdapter<PublishItem, BaseViewHolder> {
private final int itemHeight;
public ImageAdapter(int layoutResId, @Nullable List<PublishItem> data) {
super(layoutResId, data);
Context context = BasicConfig.INSTANCE.getAppContext();
itemHeight = (UIUtil.getScreenWidth(context) - UIUtil.dip2px(context, 40)) / 3;
}
@Override
protected void convert(BaseViewHolder helper, PublishItem item) {
helper.addOnClickListener(R.id.iv_delete);
helper.setVisible(R.id.iv_delete, !item.isAddItem());
ViewGroup.LayoutParams layoutParams = helper.itemView.getLayoutParams();
layoutParams.height = itemHeight;
helper.itemView.setLayoutParams(layoutParams);
ImageView ivPhoto = helper.getView(R.id.iv_photo);
if (item.getButtonType() == PublishItem.BUTTON_TYPE_ADD_ITEM) {
GlideApp.with(ivPhoto.getContext())
.load(R.drawable.icon_dy_add_image)
.transforms(new CenterCrop(),
new RoundedCorners(UIUtil.dip2px(ivPhoto.getContext(), 8)))
.into(ivPhoto);
ivPhoto.setImageResource(R.drawable.icon_dy_add_image);
} else {
// RequestOptions option = new RequestOptions()
// .diskCacheStrategy(DiskCacheStrategy.NONE)
// .skipMemoryCache(true);
// ImageLoadUtilsV2.loadImage(ivPhoto, item.getPath(), false, 8, option);
GlideApp.with(ivPhoto.getContext())
.asBitmap()
.load(item.getPath())
.transforms(new CenterCrop(),
.transform(new CenterCrop(),
new RoundedCorners(UIUtil.dip2px(ivPhoto.getContext(), 8)))
.placeholder(R.drawable.default_cover)
.error(R.drawable.default_cover)

BIN
app/src/module_community/res/drawable-xhdpi/icon_dy_add_image.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 146 B

After

Width:  |  Height:  |  Size: 2.1 KiB

17
app/src/module_community/res/drawable/shape_bg_mini_world_added.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="180"
android:endColor="@color/color_218eff"
android:startColor="@color/color_7727e4"
android:type="linear"
android:useLevel="true" />
<corners
android:bottomLeftRadius="9dp"
android:bottomRightRadius="9dp"
android:topLeftRadius="9dp"
android:topRightRadius="4dp" />
</shape>

2
app/src/module_community/res/drawable/shape_bg_mini_world_name.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#3D3D53" />
<solid android:color="@color/bg_secondary_2a2a39" />
<corners android:radius="@dimen/dp_12" />
</shape>

80
app/src/module_community/res/layout/activity_publish.xml
View File

@@ -8,22 +8,22 @@
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_marginTop="25dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_publish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingEnd="@dimen/dp_20"
android:paddingStart="@dimen/dp_20"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:enabled="false"
android:gravity="center"
android:maxLength="500"
android:paddingStart="@dimen/dp_20"
android:paddingTop="5dp"
android:paddingEnd="@dimen/dp_20"
android:paddingBottom="5dp"
android:text="@string/dy_publish"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_13"
@@ -38,14 +38,14 @@
android:background="@color/transparent"
android:gravity="top"
android:hint="@string/dy_say_something"
android:maxLength="500"
android:paddingStart="@dimen/dp_20"
android:paddingTop="@dimen/dp_10"
android:paddingEnd="@dimen/dp_20"
android:paddingBottom="@dimen/dp_10"
android:maxLength="500"
android:textSize="@dimen/sp_13"
android:textColor="@color/white"
android:textColorHint="@color/text_secondary_4f516a"
android:textSize="@dimen/sp_13"
app:layout_constraintTop_toBottomOf="@id/title_bar" />
@@ -57,18 +57,18 @@
android:text="0/500"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_13"
app:layout_constraintTop_toBottomOf="@id/et_content"
app:layout_constraintEnd_toEndOf="parent"/>
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/et_content" />
<View
android:id="@+id/view"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="10dp"
android:layout_marginEnd="@dimen/dp_20"
android:background="@color/line_353548"
app:layout_constraintTop_toBottomOf="@id/tv_input_limit"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginTop="10dp"
/>
@@ -79,10 +79,10 @@
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_25"
android:gravity="center"
android:text="@string/dy_publish_user_tips"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/sp_11"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
@@ -112,29 +112,28 @@
<RelativeLayout
android:id="@+id/rl_choose_group"
android:layout_marginTop="@dimen/dp_10"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_25" >
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10">
<LinearLayout
android:id="@+id/ll_miniworld"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
android:layout_height="wrap_content"
android:background="@drawable/shape_bg_mini_world_added"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible"
android:background="@drawable/shape_bg_mini_world_name"
>
tools:visibility="visible">
<TextView
android:id="@+id/tv_mini_world_name"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:paddingStart="@dimen/dp_11"
android:paddingEnd="10dp"
android:layout_gravity="center"
android:gravity="center"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="@dimen/dp_10"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
tools:text="话题名称" />
@@ -142,30 +141,25 @@
<ImageView
android:id="@+id/iv_close"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:textSize="@dimen/dp_12"
android:paddingEnd="10dp"
android:paddingStart="0dp"
android:layout_height="18dp"
android:layout_marginEnd="5dp"
android:src="@drawable/ic_room_main_entrance_close"
/>
android:textSize="@dimen/dp_12" />
</LinearLayout>
<TextView
android:id="@+id/tv_choose"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="12sp"
android:layout_height="18dp"
android:background="@drawable/shape_bg_mini_world_name"
android:gravity="center"
android:layout_marginEnd="20dp"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="@dimen/dp_10"
android:paddingTop="@dimen/dp_3"
android:paddingBottom="@dimen/dp_3"
tools:visibility="gone"
android:background="@drawable/shape_bg_mini_world_name"
android:text="添加话题"/>
android:text="添加话题"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12sp"
tools:visibility="gone" />
<LinearLayout
@@ -181,11 +175,11 @@
android:id="@+id/tv_label_re_choose"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="13sp"
android:textColor="@color/color_999999"
android:layout_marginEnd="7.5dp"
android:visibility="gone"
android:text="重新选择"/>
android:text="重新选择"
android:textColor="@color/text_secondary_4f516a"
android:textSize="13sp"
android:visibility="gone" />
</LinearLayout>
@@ -196,12 +190,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
app:alignItems="flex_start"
app:dividerDrawable="@drawable/divider_flexlayout"
app:flexDirection="row"
app:flexWrap="wrap"
app:justifyContent="flex_start"
app:showDivider="end|middle"
app:alignItems="flex_start"
app:dividerDrawable="@drawable/divider_flexlayout"/>
app:showDivider="end|middle" />
<View
android:layout_width="match_parent"

8
app/src/module_community/res/layout/item_publish_image.xml
View File

@@ -2,13 +2,15 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv_photo"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />
android:layout_height="0dp"
android:scaleType="centerCrop"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_delete"

2
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/IncomeDetailActivity.java
View File

@@ -69,7 +69,7 @@ public class IncomeDetailActivity extends BaseMvpActivity<IIncomeDetailView, Inc
setContentView(R.layout.activity_income_detail);
ButterKnife.bind(this);
initTitleBar("收入明细");
initWhiteTitleBar("收入明细");
mIncomeDetailAdapter = new IncomeDetailAdapter(null);
recyclerView.setAdapter(mIncomeDetailAdapter);

4
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeDetailAdapter.java
View File

@@ -38,8 +38,8 @@ public class IncomeDetailAdapter extends BaseQuickAdapter<IncomeGiftInfo, BaseVi
private SpannableString formatGold(long total) {
SpannableString spannableString;
ForegroundColorSpan first = new ForegroundColorSpan(ContextCompat.getColor(mContext, R.color.appColor));
ForegroundColorSpan second = new ForegroundColorSpan(ContextCompat.getColor(mContext, R.color.color_999999));
ForegroundColorSpan first = new ForegroundColorSpan(ContextCompat.getColor(mContext, R.color.app_248cfe));
ForegroundColorSpan second = new ForegroundColorSpan(ContextCompat.getColor(mContext, R.color.text_normal_c6c6e9));
if (total > 10000) {
double d = (double) total;

2
app/src/module_mini_world/res/layout/item_mini_world_main_title.xml
View File

@@ -4,7 +4,7 @@
android:layout_height="wrap_content"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:drawableEnd="@drawable/arrow_right_2"
android:drawableEnd="@drawable/arrow_right"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:textColor="#ff333333"

20
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MatchAttachment.java
View File

@@ -8,9 +8,9 @@ import com.alibaba.fastjson.JSONObject;
*/
public class MatchAttachment extends CustomAttachment {
public String content;
public long matchId;
public boolean isNeedForwardToMatchDetail;
private String content;
private String matchId;
private boolean isNeedForwardToMatchDetail;
public MatchAttachment(int second) {
super(CUSTOM_MSG_MATCH, second);
@@ -24,7 +24,7 @@ public class MatchAttachment extends CustomAttachment {
content = data.getString("content");
}
if (data.containsKey("matchId")) {
matchId = data.getLongValue("matchId");
matchId = data.getString("matchId");
}
if (data.containsKey("isNeedForwardToMatchDetail")) {
isNeedForwardToMatchDetail = data.getBooleanValue("isNeedForwardToMatchDetail");
@@ -40,4 +40,16 @@ public class MatchAttachment extends CustomAttachment {
jsonObject.put("isNeedForwardToMatchDetail", isNeedForwardToMatchDetail);
return jsonObject;
}
public String getContent() {
return content;
}
public String getMatchId() {
return matchId;
}
public boolean isNeedForwardToMatchDetail() {
return isNeedForwardToMatchDetail;
}
}

2
nim_uikit/res/layout/nim_read_recipt_layout.xml
View File

@@ -7,6 +7,6 @@
android:layout_marginBottom="3dip"
android:background="@color/transparent"
android:text="@string/readed"
android:textColor="#666666"
android:textColor="@color/text_hint_555574"
android:textSize="12sp"
android:visibility="gone"/>