From 4b570318a64a928ba5a8699f195197af690f1279 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Fri, 10 Feb 2023 19:02:23 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E4=B8=AA=E4=BA=BA=E9=A1=B5=E5=A4=B4?= =?UTF-8?q?=E5=83=8F=E5=92=8C=E7=BC=96=E8=BE=91=E8=B5=84=E6=96=99=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=BF=98=E6=9C=89=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recommendcard/RecommendCardFragment.java | 1 - .../erban/ui/user/UserInfoModifyActivity.kt | 1 + .../ui/user/view/UserInfoGiftWallFragment.kt | 2 - .../ui/user/view/UserInfoInfoFragment.kt | 2 - .../drawable-xhdpi/ic_avatar_auditing.webp | Bin 3694 -> 930 bytes .../drawable-xhdpi/ic_avatar_auditing_me.webp | Bin 0 -> 1008 bytes .../main/res/drawable/bg_common_cancel.xml | 4 +- .../main/res/layout/activity_user_info.xml | 3 +- .../res/layout/activity_user_info_modify.xml | 35 ++++++--- app/src/main/res/layout/fragment_me.xml | 27 +++++-- .../layout/fragment_userinfo_gift_wall.xml | 74 ++++++++++-------- .../res/layout/fragment_userinfo_userinfo.xml | 22 +++--- .../res/layout/user_info_bottom_layout.xml | 2 - app/src/main/res/values/strings.xml | 1 + .../dynamic/view/DynamicDetailActivity.java | 9 --- .../module_hall/hall/bean/ClanInfo.java | 2 - 16 files changed, 102 insertions(+), 83 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/ic_avatar_auditing_me.webp diff --git a/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardFragment.java index 895a9f74e..89e3207e8 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardFragment.java @@ -37,7 +37,6 @@ import io.reactivex.Single; * 推荐位的fragment * Created by lvzebiao on 2019/1/30. */ - public class RecommendCardFragment extends BaseFragment implements IRecyclerListener { private RefreshRecyclerView refreshRecyclerView; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt index 191f57071..e976ede90 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt @@ -111,6 +111,7 @@ class UserInfoModifyActivity : BaseViewBindingActivity() { override fun init() { diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoInfoFragment.kt b/app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoInfoFragment.kt index f329b788a..dbc2dd9ca 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoInfoFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoInfoFragment.kt @@ -39,8 +39,6 @@ import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import java.util.* - -@ActLayoutRes(R.layout.fragment_userinfo_userinfo) class UserInfoInfoFragment : BaseViewBindingFragment() { private val vm: UserInfoViewModel by activityViewModels() diff --git a/app/src/main/res/drawable-xhdpi/ic_avatar_auditing.webp b/app/src/main/res/drawable-xhdpi/ic_avatar_auditing.webp index b72e78972902480c553de761502e8491e644121d..064cdd89f98f12670b54772f0a0a5af7a43105e6 100644 GIT binary patch delta 635 zcmaDSvxr?Q$kWYj7Bd4wxT{k@Sb#+Y7Xt%>0T4$sFvv16cse@=oL~fU85mDY)atHR zDT;`U0&+xvA|mM!wg!lu1Yz5N*ySY!B|tR+Aa+qmkTZ~-0%U8XBe9c^*vSP&AoV>! zH8#09rO7}V1VGmEq~?VN18EK*mSHGnV+dk!XKix)}4He zQDZU_lSBO)pl1DO2X=w$2Uql}xSJ+^-#LT-?Zg`aCeP*vN_+NY9eP)6D1S?N<3f?` zxzg^+)-UhwlTzTAe}4b`)UA)N7#!QSbKUaFzRPWb=b3$OI;V6@QJpLFatiCe&q5p; zF3i?PCQOrj2Do0WjT4F*q+1{FrPzR;bxwR@d%m3n#c`Dnji3!cVB{hD;)#!ln5FTFRe>25cC*}UC*Zp^1I zd#>^S>9&rmd8z(%wQ>EmO<&lju2v3PvR`9v?1z|1|5WNZ?m5T(n*GEmW4h2lUd|TR&$WH*8Znd=NB1+N}_w?B8c jKkj&AemQabv*T;;tY-iKQrGyW delta 3298 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/bg_common_cancel.xml b/app/src/main/res/drawable/bg_common_cancel.xml index 760a11915..6e0d8aa2b 100644 --- a/app/src/main/res/drawable/bg_common_cancel.xml +++ b/app/src/main/res/drawable/bg_common_cancel.xml @@ -4,8 +4,8 @@ \ No newline at end of file diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml index 4c02cdc60..030c1a084 100644 --- a/app/src/main/res/layout/activity_user_info.xml +++ b/app/src/main/res/layout/activity_user_info.xml @@ -483,7 +483,6 @@ android:layout_marginStart="@dimen/dp_15" android:layout_marginTop="@dimen/dp_5" android:layout_marginEnd="@dimen/dp_15" - android:layout_marginBottom="@dimen/dp_60" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> @@ -491,7 +490,7 @@ diff --git a/app/src/main/res/layout/activity_user_info_modify.xml b/app/src/main/res/layout/activity_user_info_modify.xml index 0a32bc0e0..aad469684 100644 --- a/app/src/main/res/layout/activity_user_info_modify.xml +++ b/app/src/main/res/layout/activity_user_info_modify.xml @@ -37,23 +37,36 @@ - + + android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index d2a6a2a58..6cbcd1fb5 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -54,9 +54,9 @@ + + - - + android:layout_height="wrap_content"> - - - + android:layout_height="wrap_content" + android:background="@drawable/bg_ffffff_8" + android:orientation="vertical" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + - + - + + + + + + + diff --git a/app/src/main/res/layout/fragment_userinfo_userinfo.xml b/app/src/main/res/layout/fragment_userinfo_userinfo.xml index ffcbd2069..42f83ecb9 100644 --- a/app/src/main/res/layout/fragment_userinfo_userinfo.xml +++ b/app/src/main/res/layout/fragment_userinfo_userinfo.xml @@ -5,9 +5,10 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:layout_height="wrap_content" + android:orientation="vertical"> + android:visibility="gone" + tools:text="@string/no_room_has_been_added_yet" /> @@ -152,14 +152,16 @@ + android:overScrollMode="never" + android:scrollbars="none" + android:nestedScrollingEnabled="false" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - + diff --git a/app/src/main/res/layout/user_info_bottom_layout.xml b/app/src/main/res/layout/user_info_bottom_layout.xml index 91f98e12d..4f337b79a 100644 --- a/app/src/main/res/layout/user_info_bottom_layout.xml +++ b/app/src/main/res/layout/user_info_bottom_layout.xml @@ -3,7 +3,6 @@ android:id="@+id/bottom_view_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="20dp" android:background="@color/transparent" android:gravity="center" android:orientation="horizontal"> @@ -33,5 +32,4 @@ android:textColor="@color/white" android:textSize="@dimen/sp_16" /> - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3bc275a21..c3eddda0c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5055,5 +5055,6 @@ 默認動態不能點贊 默認動態不能評論 正在上麥中，不能錄音 + 審核中 \ No newline at end of file diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java index a9bad1b6c..454e6a0d2 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java @@ -205,13 +205,6 @@ public class DynamicDetailActivity extends BaseViewBindingActivity