From 06a742d4f342e25632e3fcdde9f7f984b5283cc9 Mon Sep 17 00:00:00 2001 From: huangjian Date: Thu, 8 Apr 2021 18:49:08 +0800 Subject: [PATCH] =?UTF-8?q?1.UI=E4=BF=AE=E6=94=B9:=E5=90=84=E7=A7=8D?= =?UTF-8?q?=E5=B0=8F=E7=BB=86=E8=8A=82=202.=E8=81=94=E7=B3=BB=E4=BA=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E8=B5=9B=E4=BA=8B=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E9=A2=84=E8=A7=88=203.=E5=8E=BB=E6=8E=89=E6=9A=97?= =?UTF-8?q?=E5=8F=B7=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/ActivityLifeManager.java | 2 +- .../erban/home/fragment/MeFragment.java | 57 - .../erban/ui/im/chat/MsgViewHolderMatch.java | 10 +- .../ui/im/recent/holder/RecentViewHolder.java | 8 +- .../ui/user/UserModifyPhotosAdapter.java | 2 +- .../main/res/drawable-xhdpi/arrow_right.png | Bin 0 -> 222 bytes .../main/res/drawable-xhdpi/arrow_right.webp | Bin 350 -> 0 bytes .../main/res/drawable-xhdpi/arrow_right_2.png | Bin 200 -> 0 bytes .../drawable-xhdpi/icon_erban_grid_empty.png | Bin 0 -> 13078 bytes .../drawable-xhdpi/icon_erban_grid_empty.webp | Bin 7410 -> 0 bytes .../main/res/layout/activity_family_info.xml | 4 +- .../main/res/layout/activity_modify_pwd.xml | 2 +- app/src/main/res/layout/fragment_me.xml | 1178 ++++++++--------- app/src/main/res/layout/item_family_list.xml | 2 +- app/src/main/res/layout/layout_edit_eyes.xml | 9 +- .../layout/layout_msg_view_holder_match.xml | 11 + .../layout/list_item_user_photos_modify.xml | 6 +- .../erban/community/publish/ImageAdapter.java | 23 +- .../res/drawable-xhdpi/icon_dy_add_image.png | Bin 146 -> 2167 bytes .../drawable/shape_bg_mini_world_added.xml | 17 + .../res/drawable/shape_bg_mini_world_name.xml | 2 +- .../res/layout/activity_publish.xml | 86 +- .../res/layout/item_publish_image.xml | 8 +- .../income/IncomeDetailActivity.java | 2 +- .../income/adapter/IncomeDetailAdapter.java | 4 +- .../res/layout/item_mini_world_main_title.xml | 2 +- .../im/custom/bean/MatchAttachment.java | 20 +- .../res/layout/nim_read_recipt_layout.xml | 2 +- 28 files changed, 678 insertions(+), 779 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/arrow_right.png delete mode 100644 app/src/main/res/drawable-xhdpi/arrow_right.webp delete mode 100644 app/src/main/res/drawable-xhdpi/arrow_right_2.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_erban_grid_empty.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_erban_grid_empty.webp create mode 100644 app/src/main/res/layout/layout_msg_view_holder_match.xml create mode 100644 app/src/module_community/res/drawable/shape_bg_mini_world_added.xml diff --git a/app/src/main/java/com/yizhuan/erban/application/ActivityLifeManager.java b/app/src/main/java/com/yizhuan/erban/application/ActivityLifeManager.java index d2830d254..d334ab44e 100644 --- a/app/src/main/java/com/yizhuan/erban/application/ActivityLifeManager.java +++ b/app/src/main/java/com/yizhuan/erban/application/ActivityLifeManager.java @@ -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); diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java index 307a8fb63..6ae272d13 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java @@ -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 { - 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 -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() { - @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); diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderMatch.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderMatch.java index 80c0b754c..be7caea77 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderMatch.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderMatch.java @@ -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 args = new HashMap(); - args.put(RouterConstants.FLUTTER_PAGE_ARG_MATCH_ID, String.valueOf(matchAttachment.matchId)); + if (matchAttachment != null && matchAttachment.isNeedForwardToMatchDetail()) { + HashMap args = new HashMap<>(); + args.put(RouterConstants.FLUTTER_PAGE_ARG_MATCH_ID, matchAttachment.getMatchId()); FlutterBoost.instance().open(RouterConstants.FLUTTER_PAGE_MATCH_DETAIL, args); } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/RecentViewHolder.java b/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/RecentViewHolder.java index ead701493..3ae92a086 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/RecentViewHolder.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/RecentViewHolder.java @@ -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 RecyclerViewHolderGOU`n%#gTmgUun2;27Z1VBkV z%(LwPd3-dOn&#Z6pdFBh;6^gWP9$#sN%T%|B9fhF~GxG)ym&c2FB&YK55$rOT-?i4qtc=1@W#vpxP6C Y1OIQcufTzT%m4rY07*qoM6N<$f-^K+;s5{u literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/arrow_right.webp b/app/src/main/res/drawable-xhdpi/arrow_right.webp deleted file mode 100644 index e1e9e6d6d206d68b0150392e8bd2c783d82c5ed4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 350 zcmV-k0ipg|`har)K*+4T4>v){$??)3(EN44Wlu#r|fT93mB-^H~^=#X={rw*&|Devk zzv@R2(f@e8(bOZg8t zBrIj$;FPkIKEuvK=He;$4#%WX_=J5z?$S4GV{%u1VI7gXc7tVD?#2V=LAhH`mb{06vjAm`A0fBB3w{0I(7XX#fM^ z^T-CT(Gk)uTw6JDQnr7Wqtqv0CNVJ7ytkO diff --git a/app/src/main/res/drawable-xhdpi/arrow_right_2.png b/app/src/main/res/drawable-xhdpi/arrow_right_2.png deleted file mode 100644 index 9b01cb960e78955dd854b129660439d2636758ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^JU}eM!3HFEez+qDr20Kw978Pp=U(>aYgOQ34Oq83 zA-|`mF?RzG)3KAMZ>yO~n09?y*;AcynZJWWkwr9FCHagzL+7dHVn4o?`T60dK(t&Z>*NUly=uEV|TlZx_46-ZYI=&8Do` zpC?5b|GanY+Ie@?KUWj<`4flg!aboFyt=akR{07hL; AuK)l5 diff --git a/app/src/main/res/drawable-xhdpi/icon_erban_grid_empty.png b/app/src/main/res/drawable-xhdpi/icon_erban_grid_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..4a1b97ff4d765616ddcd0b1d8fe80a5af3aaefc0 GIT binary patch literal 13078 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 J<)V;){{#1W*>V5? literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_erban_grid_empty.webp b/app/src/main/res/drawable-xhdpi/icon_erban_grid_empty.webp deleted file mode 100644 index e242c60ebb440b1d8989bf8378c019078bcddd77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7410 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 A9smFU diff --git a/app/src/main/res/layout/activity_family_info.xml b/app/src/main/res/layout/activity_family_info.xml index 040680d91..70ac98995 100644 --- a/app/src/main/res/layout/activity_family_info.xml +++ b/app/src/main/res/layout/activity_family_info.xml @@ -50,7 +50,7 @@ + android:src="@drawable/arrow_right" /> @@ -87,7 +87,7 @@ + android:src="@drawable/arrow_right" />