1.青少年模式弹窗优化

2.高级礼物中奖提示背景修改,UI调整

app/src/main/java/com/yizhuan/erban/MainActivity.java

@@ -5,15 +5,12 @@ import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
-import android.util.LongSparseArray;
-import android.view.GestureDetector;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.animation.LinearInterpolator;
@@ -24,8 +21,6 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
-import com.coorchice.library.utils.LogUtils;
-import com.microquation.linkedme.android.LinkedME;
 import com.netease.nim.uikit.api.NimUIKit;
 import com.netease.nim.uikit.api.model.contact.ContactEventListener;
 import com.netease.nim.uikit.api.model.session.SessionCustomization;
@@ -55,16 +50,12 @@ import com.yizhuan.erban.avroom.ktv.KtvMusicManager;
 import com.yizhuan.erban.base.BaseMvpActivity;
 import com.yizhuan.erban.common.widget.CircleImageView;
 import com.yizhuan.erban.common.widget.DragLayout;
-import com.yizhuan.erban.common.widget.FloatingLiveMiniView;
 import com.yizhuan.erban.community.dynamic.view.DynamicDetailActivity;
 import com.yizhuan.erban.community.holder.DynamicSysHolder;
 import com.yizhuan.erban.community.im.WorldDynamicShareViewHolder;
 import com.yizhuan.erban.community.publish.view.PublishActivity;
 import com.yizhuan.erban.community.square.SquareFragment;
-import com.yizhuan.erban.decoration.view.widgets.ShowCarGuideDialog;
 import com.yizhuan.erban.family.view.activity.FamilyHomeActivity;
-import com.yizhuan.erban.guide.GuideActivity;
-import com.yizhuan.erban.home.dialog.RecommendRoomForNewerDialog;
 import com.yizhuan.erban.home.fragment.ContactsListFragment;
 import com.yizhuan.erban.home.fragment.GameHomeFragment;
 import com.yizhuan.erban.home.fragment.MeFragment;
@@ -153,7 +144,6 @@ import com.yizhuan.xchat_android_core.level.event.CharmLevelUpEvent;
 import com.yizhuan.xchat_android_core.level.event.LevelUpEvent;
 import com.yizhuan.xchat_android_core.linked.LinkedModel;
 import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo;
-import com.yizhuan.xchat_android_core.linked.event.LinkMeInfoUpdateEvent;
 import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
 import com.yizhuan.xchat_android_core.manager.IMBroadcastManager;
 import com.yizhuan.xchat_android_core.manager.IMMessageManager;
@@ -166,7 +156,6 @@ import com.yizhuan.xchat_android_core.patriarch.event.CloseMinRoomEvent;
 import com.yizhuan.xchat_android_core.patriarch.event.ImPushMsgPmLimitTimeEvent;
 import com.yizhuan.xchat_android_core.patriarch.event.PmDismissAllLimitDialogEvent;
 import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitMeAttachment;
-import com.yizhuan.xchat_android_core.recall.RecallModel;
 import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo;
 import com.yizhuan.xchat_android_core.recall.event.CheckLostUserEvent;
 import com.yizhuan.xchat_android_core.redPacket.bean.RedPacketInfoV2;
@@ -174,10 +163,7 @@ import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
 import com.yizhuan.xchat_android_core.statistic.StatisticManager;
 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.InviteUserInfo;
 import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-import com.yizhuan.xchat_android_core.user.bean.UserRecommendRoomInfo;
-import com.yizhuan.xchat_android_core.user.event.CurrentUserInfoCompleteEvent;
 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.NeedBindPhoneEvent;
@@ -200,17 +186,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Single;
 import io.reactivex.SingleObserver;
-import io.reactivex.SingleSource;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.annotations.NonNull;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.BiConsumer;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Function;
 
-import static com.yizhuan.xchat_android_core.Constants.SHOW_CAR_GUIDE;
 import static com.yizhuan.xchat_android_core.channel_page.model.ChannelPageModel.KEY_FLAG_VALID_CHANNEL_PAGE;
 
 /**

app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchModeDialog.java

@@ -40,14 +40,14 @@ public class PatriarchModeDialog extends BaseSdDialog {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.dialog_patriarch_mode);
         ButterKnife.bind(this);
-        setCancelable(false);
+        setCancelable(true);
-        setCanceledOnTouchOutside(false);
+        setCanceledOnTouchOutside(true);
         Window window = getWindow();
         if (window != null) {
             window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
             WindowManager.LayoutParams windowParams = window.getAttributes();
             windowParams.width = UIUtil.dip2px(getContext(), 300);
-//            windowParams.height = UIUtil.dip2px(getContext(), 277);
+            windowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
             windowParams.dimAmount = 0.4f;
             windowParams.gravity = Gravity.CENTER;
             window.setAttributes(windowParams);

app/src/main/res/layout/dialog_patriarch_mode.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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_width="wrap_content"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content"
+    android:layout_gravity="center">
 
     <LinearLayout
         android:layout_width="300dp"
@@ -25,12 +26,12 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="青少年保护"
-            android:textSize="@dimen/sp_16"
-            android:textStyle="bold"
             android:layout_marginTop="@dimen/dp_8"
+            android:text="青少年保护"
             android:textColor="@color/color_333333"
-            />
+            android:textSize="@dimen/sp_16"
+            android:textStyle="bold" />
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -47,14 +48,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_20"
-            android:text="@string/to_set_pm"
-            android:paddingStart="@dimen/dp_31"
-            android:paddingEnd="@dimen/dp_31"
-            android:paddingTop="@dimen/dp_12"
-            android:paddingBottom="@dimen/dp_12"
             android:layout_marginBottom="@dimen/dp_20"
-            android:textColor="@color/white"
             android:background="@drawable/bg_common_confirm_normal_22r"
+            android:paddingStart="@dimen/dp_31"
+            android:paddingTop="@dimen/dp_12"
+            android:paddingEnd="@dimen/dp_31"
+            android:paddingBottom="@dimen/dp_12"
+            android:text="@string/to_set_pm"
+            android:textColor="@color/white"
             android:textSize="@dimen/sp_14" />
     </LinearLayout>
 
@@ -62,9 +63,9 @@
         android:id="@+id/iv_close"
         android:layout_width="@dimen/dp_25"
         android:layout_height="@dimen/dp_25"
-        android:contentDescription="@string/close"
-        android:layout_marginEnd="@dimen/dp_10"
         android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginEnd="@dimen/dp_10"
+        android:contentDescription="@string/close"
         android:scaleType="fitCenter"
         android:src="@drawable/icon_pm_close"
         app:layout_constraintEnd_toEndOf="parent"

app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java

@@ -232,8 +232,8 @@ public class TreasureBoxActivity extends BaseBindingActivity<ActivityTreasureBox
         mBinding.llPrizeHint.removeCallbacks(removeRunnable);
         mBinding.llPrizeHint.postDelayed(removeRunnable, 3000);
         LinearLayout linearLayout = (LinearLayout) LayoutInflater.from(this).inflate(R.layout.item_box_prize_hint, null);
-        ViewGroup.MarginLayoutParams layoutParams = new ViewGroup.MarginLayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ScreenUtil.dip2px(24));
+        ViewGroup.MarginLayoutParams layoutParams = new ViewGroup.MarginLayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ScreenUtil.dip2px(21));
-        layoutParams.setMargins(0, ScreenUtil.dip2px(5), 0, ScreenUtil.dip2px(5));
+        layoutParams.setMargins(0, 0, 0, ScreenUtil.dip2px(5));
         linearLayout.setLayoutParams(layoutParams);
         switch (prizeInfo.getPrizeLevel()) {
             case 3:
@@ -252,7 +252,7 @@ public class TreasureBoxActivity extends BaseBindingActivity<ActivityTreasureBox
             mBinding.llPrizeHint.removeViewAt(0);
         }
         for (int i = 0; i < mBinding.llPrizeHint.getChildCount(); i++) {
-            ObjectAnimator.ofFloat(mBinding.llPrizeHint.getChildAt(i), "translationY", ScreenUtil.dip2px(24), 0)
+            ObjectAnimator.ofFloat(mBinding.llPrizeHint.getChildAt(i), "translationY", ScreenUtil.dip2px(21), 0)
                     .setDuration(200)
                     .start();
         }

app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java

@@ -233,7 +233,7 @@ public class TreasureBoxHonourActivity extends BaseBindingActivity<ActivityTreas
         mBinding.llPrizeHint.removeCallbacks(removeRunnable);
         mBinding.llPrizeHint.postDelayed(removeRunnable, 3000);
         LinearLayout linearLayout = (LinearLayout) LayoutInflater.from(this).inflate(R.layout.item_box_prize_hint, null);
-        ViewGroup.MarginLayoutParams layoutParams = new ViewGroup.MarginLayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ScreenUtil.dip2px(24));
+        ViewGroup.MarginLayoutParams layoutParams = new ViewGroup.MarginLayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ScreenUtil.dip2px(21));
         layoutParams.setMargins(0, ScreenUtil.dip2px(5), 0, ScreenUtil.dip2px(5));
         linearLayout.setLayoutParams(layoutParams);
         switch (prizeInfo.getPrizeLevel()) {
@@ -253,7 +253,7 @@ public class TreasureBoxHonourActivity extends BaseBindingActivity<ActivityTreas
             mBinding.llPrizeHint.removeViewAt(0);
         }
         for (int i = 0; i < mBinding.llPrizeHint.getChildCount(); i++) {
-            ObjectAnimator.ofFloat(mBinding.llPrizeHint.getChildAt(i), "translationY", ScreenUtil.dip2px(24), 0)
+            ObjectAnimator.ofFloat(mBinding.llPrizeHint.getChildAt(i), "translationY", ScreenUtil.dip2px(21), 0)
                     .setDuration(200)
                     .start();
         }

app/src/module_treasure_box/res/drawable/bg_box_prize_hint_v3.xml

@@ -4,6 +4,6 @@
     <corners android:radius="5dp" />
     <gradient
         android:angle="180"
-        android:endColor="#6DE0FF"
+        android:endColor="#155F75"
-        android:startColor="#51DCFF" />
+        android:startColor="#18576B" />
 </shape>

app/src/module_treasure_box/res/drawable/bg_box_prize_hint_v4.xml

@@ -4,6 +4,6 @@
     <corners android:radius="5dp" />
     <gradient
         android:angle="180"
-        android:endColor="#9AA9FF"
+        android:endColor="#5261B5"
-        android:startColor="#7288FF" />
+        android:startColor="#6D77B5" />
 </shape>

app/src/module_treasure_box/res/drawable/bg_box_prize_hint_v5.xml

@@ -4,6 +4,6 @@
     <corners android:radius="5dp" />
     <gradient
         android:angle="180"
-        android:endColor="#CC75FE"
+        android:endColor="#AB58FF"
-        android:startColor="#905AFF" />
+        android:startColor="#CC75FE" />
 </shape>

app/src/module_treasure_box/res/layout/activity_treasure_box.xml

@@ -208,7 +208,7 @@
         <LinearLayout
             android:id="@+id/ll_prize_hint"
             android:layout_width="wrap_content"
-            android:layout_height="170dp"
+            android:layout_height="130dp"
             android:gravity="bottom"
             android:layout_marginStart="7dp"
             android:orientation="vertical"

app/src/module_treasure_box/res/layout/activity_treasure_box_honour.xml

@@ -212,7 +212,7 @@
         <LinearLayout
             android:id="@+id/ll_prize_hint"
             android:layout_width="wrap_content"
-            android:layout_height="170dp"
+            android:layout_height="130dp"
             android:layout_marginStart="7dp"
             android:gravity="bottom"
             android:orientation="vertical"

app/src/module_treasure_box/res/layout/item_box_prize_hint.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
-    android:layout_height="24dp"
+    android:layout_height="21dp"
     android:layout_marginTop="5dp"
     android:layout_marginBottom="5dp"
     android:gravity="center"
@@ -19,8 +19,7 @@
         android:includeFontPadding="false"
         android:lines="1"
         android:textColor="@color/white"
-        android:textSize="14sp"
+        android:textSize="11sp"
-        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -32,8 +31,9 @@
         android:layout_height="wrap_content"
         android:includeFontPadding="false"
         android:lines="1"
+        android:layout_marginStart="5dp"
         android:textColor="@color/white"
-        android:textSize="12sp"
+        android:textSize="11sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/tv_prize_name"