From 47ce1c94627c33cd6c6abc4fb5faa8205ca12152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Tue, 30 Sep 2025 19:52:56 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=B0=8F=E6=97=B6?=
 =?UTF-8?q?=E6=A6=9C=E5=85=A5=E5=8F=A3=202=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=B0=8F=E6=97=B6=E6=A6=9C=E5=9B=BE=E7=89=87=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=203=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8D=A2=E9=BA=A6=E5=90=8E?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E9=AD=85=E5=8A=9B=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .run/app.run.xml                              |  45 +++++
 .../activity/BaseAppCompatActivity.java       |  29 +--
 .../moduleutil/activity/BaseMvpActivity.java  |   1 +
 .../service/IMConnectionService.java          |   2 +
 .../xscm/moduleutil/widget/DropHourlView.java | 189 ++++++++++++++++++
 .../src/main/res/anim/slide_in_right.xml      |   9 +
 .../src/main/res/anim/slide_out_right.xml     |   9 +
 .../main/res/layout/item_hourly_floating.xml  |   1 +
 .../src/main/res/mipmap-xxxhdpi/jiks.png      | Bin 0 -> 11226 bytes
 .../src/main/res/mipmap-xxxhdpi/jxz.png       | Bin 0 -> 10903 bytes
 moduleUtil/src/main/res/values/styles.xml     |  18 +-
 .../moduleroom/activity/RoomActivity.kt       |  27 ++-
 .../moduleroom/adapter/RoomHourlyAdapter.java |   9 +-
 .../moduleroom/dialog/HourlyChartDialog.java  |  56 +++++-
 .../moduleroom/fragment/RoomFragment.java     |   7 +-
 .../moduleroom/fragment/SingSongFragment.java |  11 +-
 .../src/main/res/layout/activity_room.xml     |   4 +-
 .../src/main/res/layout/item_hourly.xml       |  23 ++-
 .../main/res/layout/pop_dialog_adapter.xml    |   5 +-
 .../layout/conversation_pop_menu_layout.xml   |   5 +-
 20 files changed, 406 insertions(+), 44 deletions(-)
 create mode 100644 .run/app.run.xml
 create mode 100644 moduleUtil/src/main/java/com/xscm/moduleutil/widget/DropHourlView.java
 create mode 100644 moduleUtil/src/main/res/anim/slide_in_right.xml
 create mode 100644 moduleUtil/src/main/res/anim/slide_out_right.xml
 create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/jiks.png
 create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/jxz.png

diff --git a/.run/app.run.xml b/.run/app.run.xml
new file mode 100644
index 0000000..e243daf
--- /dev/null
+++ b/.run/app.run.xml
@@ -0,0 +1,45 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
+    <module name="秘地.app" />
+    <option name="ANDROID_RUN_CONFIGURATION_SCHEMA_VERSION" value="1" />
+    <option name="DEPLOY" value="true" />
+    <option name="DEPLOY_APK_FROM_BUNDLE" value="true" />
+    <option name="DEPLOY_AS_INSTANT" value="false" />
+    <option name="ARTIFACT_NAME" value="" />
+    <option name="PM_INSTALL_OPTIONS" value="" />
+    <option name="ALL_USERS" value="false" />
+    <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="ALLOW_ASSUME_VERIFIED" value="false" />
+    <option name="CLEAR_APP_STORAGE" value="false" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
+    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
+    <option name="MODE" value="default_activity" />
+    <option name="RESTORE_ENABLED" value="true" />
+    <option name="RESTORE_FILE" value="" />
+    <option name="RESTORE_FRESH_INSTALL_ONLY" value="true" />
+    <option name="CLEAR_LOGCAT" value="true" />
+    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
+    <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
+    <option name="DEBUGGER_TYPE" value="Java" />
+    <Java>
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Java>
+    <Profilers>
+      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
+      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
+      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
+    </Profilers>
+    <option name="DEEP_LINK" value="" />
+    <option name="ACTIVITY" value="" />
+    <option name="ACTIVITY_CLASS" value="" />
+    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
+    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseAppCompatActivity.java b/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseAppCompatActivity.java
index 2422566..9efe7ea 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseAppCompatActivity.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseAppCompatActivity.java
@@ -447,20 +447,14 @@ public abstract class BaseAppCompatActivity<VDB extends ViewDataBinding> extends
                 isHourlyProcessing = false;
                 return;
             }
-            // 最多处理3条数据
-            int processCount = Math.min(3, hourlyMessageQueue.size());
-            messagesToProcess = new ArrayList<>(hourlyMessageQueue.subList(0, processCount));
-            // 从队列中移除已处理的数据
-            for (int i = 0; i < processCount; i++) {
-                hourlyMessageQueue.remove(0);
-            }
+            // 每次只处理1条数据
+            messagesToProcess = new ArrayList<>();
+            messagesToProcess.add(hourlyMessageQueue.remove(0));
         }
 
-        // 同时展示多条数据
-        for (int i = 0; i < messagesToProcess.size(); i++) {
-            HourlyBean bean = messagesToProcess.get(i);
-            showHourlyFloatingMessage(bean, i);
-        }
+        // 只展示一条数据
+        HourlyBean bean = messagesToProcess.get(0);
+        showHourlyFloatingMessage(bean, 0);
     }
 
     private void showHourlyFloatingMessage(HourlyBean hourlyBean, int positionIndex) {
@@ -473,10 +467,9 @@ public abstract class BaseAppCompatActivity<VDB extends ViewDataBinding> extends
                     FrameLayout.LayoutParams.MATCH_PARENT,
                     FrameLayout.LayoutParams.WRAP_CONTENT);
 
-            // 根据位置设置不同的垂直间距
+            // 设置固定的垂直位置
             int baseMargin = com.sunfusheng.marqueeview.DisplayUtil.dip2px(this, 70);
-            int verticalSpacing = com.sunfusheng.marqueeview.DisplayUtil.dip2px(this, 50);
-            layoutParams.topMargin = baseMargin + (positionIndex * verticalSpacing);
+            layoutParams.topMargin = baseMargin;
             layoutParams.gravity = Gravity.TOP | Gravity.CENTER_HORIZONTAL;
             hourlyView.setLayoutParams(layoutParams);
 
@@ -501,10 +494,10 @@ public abstract class BaseAppCompatActivity<VDB extends ViewDataBinding> extends
 
                 // 检查是否还有更多消息需要处理
                 synchronized (hourlyQueueLock) {
-                    if (hourlyMessageQueue.isEmpty() && currentHourlyViews.isEmpty()) {
+                    if (hourlyMessageQueue.isEmpty()) {
                         isHourlyProcessing = false;
-                    } else if (!hourlyMessageQueue.isEmpty() && currentHourlyViews.isEmpty()) {
-                        // 所有当前视图都已消失，处理下一批消息
+                    } else {
+                        // 当前视图消失后处理下一条消息
                         processHourlyMessages();
                     }
                 }
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseMvpActivity.java b/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseMvpActivity.java
index 412e74e..2cbfc5b 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseMvpActivity.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseMvpActivity.java
@@ -137,6 +137,7 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
         public void onConnectSuccess() {//重连成功
             if (CommonAppContext.getInstance().playId!=null){
                 LogUtils.e("@@@", "重连成功");
+                LogUtils.e("@@@", ""+CommonAppContext.getInstance().playId);
                 RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId);
             }
         }
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/service/IMConnectionService.java b/moduleUtil/src/main/java/com/xscm/moduleutil/service/IMConnectionService.java
index 0f334fa..c24d6b3 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/service/IMConnectionService.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/service/IMConnectionService.java
@@ -11,6 +11,7 @@ import android.util.Log;
 
 import androidx.annotation.Nullable;
 
+import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.tencent.imsdk.v2.V2TIMManager;
 import com.tencent.imsdk.v2.V2TIMSDKListener;
@@ -34,6 +35,7 @@ public class IMConnectionService extends Service {
         public void onConnectSuccess() {//重连成功
             Log.d(TAG, "IM connect success");
             if (CommonAppContext.getInstance().playId != null) {
+                LogUtils.e("@@@", ""+CommonAppContext.getInstance().playId);
                 RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId);
             }
         }
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/DropHourlView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/DropHourlView.java
new file mode 100644
index 0000000..d4590d8
--- /dev/null
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/DropHourlView.java
@@ -0,0 +1,189 @@
+package com.xscm.moduleutil.widget;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ObjectAnimator;
+import android.content.Context;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewAnimationUtils;
+import android.widget.LinearLayout;
+import com.blankj.utilcode.util.ScreenUtils;
+
+import static android.opengl.ETC1.getHeight;
+import static androidx.core.view.ViewCompat.setTranslationX;
+import static androidx.core.view.ViewCompat.setTranslationY;
+import static com.xscm.moduleutil.base.CommonAppContext.post;
+import static com.xscm.moduleutil.utils.SystemUtils.getWidth;
+
+public class DropHourlView extends LinearLayout {
+
+    private int rightMargin = 0;
+    private float lastX, lastY;
+    private int screenWidth;
+
+    public DropHourlView(Context context) {
+        super(context);
+        init();
+    }
+
+    public DropHourlView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public DropHourlView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+
+    void init() {
+
+        post(new Runnable() {
+            @Override
+            public void run() {
+                //设置初始位置
+                int sh = ScreenUtils.getScreenHeight();
+                int sw = ScreenUtils.getScreenWidth()-200;
+//                setBackgroundResource(R.drawable.bg_home_drop_view);
+                int y = (int) (0.5f * sh) - getHeight();
+                int x = sw - getWidth();
+                setTranslationX(x);
+                setTranslationY(y);
+            }
+        });
+    }
+
+
+    boolean starDrap = false;
+    float X1;
+    float X2;
+    float Y1;
+    float Y2;
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent event) {
+        if (starDrap) return true;
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                X1 = event.getX();
+                Y1 = event.getY();
+                break;
+
+            case MotionEvent.ACTION_MOVE:
+                X2 = event.getX();//当手指抬起时，再次获取屏幕位置的X值
+                Y2 = event.getY();//同理
+                Action(X1, X2, Y1, Y2);
+                break;
+
+
+        }
+        return starDrap;
+    }
+
+    String TAG = "DropHourlView";
+
+    public boolean Action(float X1, float X2, float Y1, float Y2) {
+        float ComparedX = X2 - X1;//第二次的X坐标的位置减去第一次X坐标的位置，代表X坐标上的变化情况
+        float ComparedY = Y2 - Y1;//同理
+        //当X坐标的变化量的绝对值大于Y坐标的变化量的绝对值，以X坐标的变化情况作为判断依据
+        //上下左右的判断，都在一条直线上，但手指的操作不可能划直线，所有选择变化量大的方向上的量
+        //作为判断依据
+        if (Math.abs(ComparedX) > 30 || Math.abs(ComparedY) > 30) {
+            Log.i(TAG, "Action: 拖动");
+            starDrap = true;
+//            setBackgroundResource(R.drawable.bg_home_drop_view);
+            return true;
+        } else {
+            starDrap = false;
+            return false;
+        }
+    }
+
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        switch (event.getAction()) {
+
+            case MotionEvent.ACTION_MOVE:
+//                setBackgroundResource(R.drawable.bg_home_drop_view);
+                setTranslationX(getX() + (event.getX() - X1));
+                setTranslationY(getY() + (event.getY() - Y1));
+                X2 = event.getX();
+                break;
+            case MotionEvent.ACTION_UP:
+                starDrap = false;
+                int sw = ScreenUtils.getScreenWidth();
+                Log.i(TAG, "onTouchEvent: " + sw + "," + X2);
+                boolean isR = getTranslationX() + getWidth() / 2 >= sw / 2;//贴边方向
+                ObjectAnimator anim = ObjectAnimator.ofFloat(this, "translationX", isR ? sw - getWidth()+10 : 0f).setDuration(200);
+                anim.start();
+
+                break;
+
+        }
+
+        return true;
+    }
+
+
+    public void doRevealAnimation(View mPuppet, boolean flag) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            int[] vLocation = new int[2];
+            getLocationInWindow(vLocation);
+            int centerX = vLocation[0] + getMeasuredWidth() / 2;
+            int centerY = vLocation[1] + getMeasuredHeight() / 2;
+
+            int height = ScreenUtils.getScreenHeight();
+            int width = ScreenUtils.getScreenWidth();
+            int maxRradius = (int) Math.hypot(height, width);
+            Log.e("hei", maxRradius + "");
+
+            if (flag) {
+                mPuppet.setVisibility(VISIBLE);
+                Animator animator = ViewAnimationUtils.createCircularReveal(mPuppet, centerX, centerY, maxRradius, 0);
+                animator.setDuration(600);
+                animator.addListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        super.onAnimationEnd(animation);
+                        mPuppet.setVisibility(View.GONE);
+                    }
+                });
+                animator.start();
+                flag = false;
+            } else {
+                Animator animator = ViewAnimationUtils.createCircularReveal(mPuppet, centerX, centerY, 0, maxRradius);
+                animator.setDuration(1000);
+                animator.addListener(new Animator.AnimatorListener() {
+                    @Override
+                    public void onAnimationStart(Animator animation) {
+                        mPuppet.setVisibility(View.VISIBLE);
+                    }
+
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                    }
+
+                    @Override
+                    public void onAnimationCancel(Animator animation) {
+
+                    }
+
+                    @Override
+                    public void onAnimationRepeat(Animator animation) {
+
+                    }
+                });
+                animator.start();
+                flag = true;
+            }
+        }
+    }
+
+
+}
diff --git a/moduleUtil/src/main/res/anim/slide_in_right.xml b/moduleUtil/src/main/res/anim/slide_in_right.xml
new file mode 100644
index 0000000..c301a7a
--- /dev/null
+++ b/moduleUtil/src/main/res/anim/slide_in_right.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <translate
+        android:duration="200"
+        android:fromXDelta="100%p"
+        android:toXDelta="0" />
+
+</set>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/anim/slide_out_right.xml b/moduleUtil/src/main/res/anim/slide_out_right.xml
new file mode 100644
index 0000000..3bebee9
--- /dev/null
+++ b/moduleUtil/src/main/res/anim/slide_out_right.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <translate
+        android:duration="200"
+        android:fromXDelta="0"
+        android:toXDelta="100%p" />
+
+</set>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/layout/item_hourly_floating.xml b/moduleUtil/src/main/res/layout/item_hourly_floating.xml
index 0a0f55b..7bc63b4 100644
--- a/moduleUtil/src/main/res/layout/item_hourly_floating.xml
+++ b/moduleUtil/src/main/res/layout/item_hourly_floating.xml
@@ -39,6 +39,7 @@
             android:textColor="#FFDE77"
             android:textSize="14sp"
             android:textStyle="bold"
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@id/tv_name"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/jiks.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/jiks.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e8ff70bdc58836212d40da99f46ec31a5a9ad2d
GIT binary patch
literal 11226
zcmW-neLPeB|HnV)?8Y`X&5Ybt!^quAjC5->Y_dYAi_(;|so_$gkTX$H!f@p#H5wI{
zsAiPArMje2L$1nQ<SHq5B{!w=+xPd!Ip=ZyJCAeT@AvEZdc9Ao*EV-`f<6HNpw4D7
zeU#T~<>83KD$jd-qdo&*Rm^5O`|9eU?|a`~rt+7zqGtPtgcDJ@swkr$J6H63BKTO|
z`BQC!$B!m{JVk-YNX700TjxSAw+BG;RZfd@)8}4{Ect!3>DRZ6>AEW;E9RP=-mXZD
zJA7e(#`K>F^)J><+HHD1dTHIrSYyTm!-QV<D#QNGQU7@!348JE_(bEiw&R}9Wh=LR
zwOMCB5=l>BJ{N5Jb9q#FT!Ehb=mk&G7B`M*=Y7L<KASvzvJ6F%Wo?<>CT1Lc{29;A
z3%Vpj<_ya$jC9KA6j!8HhR!Z{cHZn;CNrJ-jU{p@b{7qL8AaBHkCq$69DA^5LUt~Y
z7PtTDvI#*%%>m_o)aQYHm4S!rYhV8zw|_^>-J^lwQLhHp#MB2)JZ|h)kJ&dlzAU^i
ztRkj9?pfd5Y-sr1n25Ral>>oulAW~|pH;+EJ!|-MY&>Ci`{(t~YDWEzyh*5Ryf9X?
zZuP5~d((B{bKN7;GanwzeEW6p?dGPF>rd8Wd0_t2!XbESe96rXLv6iX4+@9FM(SD)
zM9sDgxL>nfN6>KW3)d53tii5a0O<Q%Ude%?%tp9IuUkscgIv*aqJ=h42lN1rBAnq`
zgF(XV(V`CjTnP;(3JU01um>ZPPtG*cKWk<r5KH`aF^B={6{ZlU>r;r_m<<_WxZpf*
z?I~t-Dq8;!hHXElN8KhsD5$Rhk#{54Z+|`<DeUSaMDER4UiH_KL6gDWTPYDQ+9DD!
z=}}T%T=|l^Bx8KKprLW`@?1tk^YB99+6eCErUR3AB8MJ+({OBCehhVHOVmq{Nlk^1
z1|oVCKjI%B$-*!-WyR5;^fI7B+Y-pQ2XON9dDwIZk-52Rr@5Lx$=SJvm*PWEmwF|M
zah=i|UYx?DWZrdfBaQ4zR}~U~%!=GoMmI;2qEVTi#of$a9cxg{qUHw}QhS~ZMd|{L
zGWLm)d#hetyPUV+2UZWBq>c>h&40d=P@g>)2VdC?q3ECqp8EN3%S>1T2)f)5gmjJG
zZhVK{eU$30Qrmk^U3h`o<-6;=CtUrM8;ob5Q}D`%))IG80YDqDy{svjI@LH=O9*E3
zq#Yl3otLFa*>Lh-Own~;Q#>N`(C$WaOmeY3o$4m&av^0)sWl^wS{i&f--vSxX5m?7
zkCHH%PYiPa!^*wKtv5aRo{(ACo^JpCLujXi`-|zLmv@6H`EdK?D#I%Gs+|iLGB&Tz
zSn<hyKD9~?ET;0eUx`oT3_N$5*&e&;ZCpQo<DZvORYp$rTP=<5e)Qq6hH#;*cezHY
zT;4uW>5XNof^&F<<?9q=pHO(SlPN<SD*aIk9-hp6>M5>-t6x+1b(YZ5O0N6LswpMx
zKoZ8QhrsL=dEs0nObcL)#*%?TvIn`309coC)tIQjS>v#k*19p>J_HoE1}|ULMyBMq
z2>WlG5{L%w-hAr6?b;^N6#T*G^8BE|z(CXcA5(EZvCTim1q&Dyy?OBI#ntgC&F|JG
zHfFc>)=sHUz1$QtdFR!+{5vZ{|7$VaiS(Wi5yeGRPJC*)?+B##swK7$xT=qV9Vq~M
z?em0%1|*T00>;@hQFs}T#0Cm}g#g3$AXB_?1ZNDs5}{-G9k2l3=~a#=`l19`X}7&7
zoxX)!;(CO&BP*}^wW+{25Yy?~%3BLk%Xa*$b}o~tE(cpn>;PC>*I|}WqcAKo5k5UI
zadkPEigY41#i`6M8(itMdF2%+I|kv(mn)mU41L*u<rTU~7}Mm`c>Kti)m#v?ni~}z
z^%4`3v0NqcneYKqCA>ggQgB$VFt;W_uJ|-&idhk5!y)I2Q(|)h9>=YvUe}>u1h8EQ
zN>kw=)=f<!B5;q#Sqdl9jct4uaJD4VwFw-k0}Ej!e0_5<nrpB6`X)2f&BVq8WBsoO
zSx0eLH&x9A0&0r0@9(Wu<z?rqe|CJ$HgoUyyx<ZQov|Uv&>e2gH>{d{aArvp^b^GY
z?0WlEyU7MP4KKzw{Af;?`CJw6RJ%CA`vn<J`^OGBVm7W?x+?O`rSZz54Rh*!;e8LS
zKZyBy>DIP*z^KRc<0^fC7su0Ch(Sa^u=Q|0o(3aWL1#%lCCid!O!V#bl}cGS1c>>3
zb}}go=Cg|VITB5X4bj+4Z@(0A0sfFHAyr1WA?u~ucfiDU-Sexi2ILF7KfyYGF-d~J
zE$i(K9|S)^`Yra?7D;#4)gf1R&V~;)_2&O|Z6OQDr{h!;e-5vHU$Md|Xc;&;+v`;H
zWhVQ|$#?EQXSV(RIWpJM_yY7@yu75rv1nV}kZ8+o_xtMdn=J#ocKsF7BY>jyY(j~c
zej*?<jDc1`vaf<Hl7x{c5J1d{7AQuitQ<1U^8E+Uc&Y*A-W*D)uWulu%aW4jpl(`9
z?M|1|*``d}4%{u%tT0%W<5`^Be>(*WR39^_J5;5%D9Jvaw&<bg@a?WWl^p+U3qzGm
zGZ6W%#Skx_u$tTWq-!Q7p>_IAQvwUw`{n=VDzf)y%hGswzT@~$Mf2OYUw>a%B1ctU
zJW<^UYm~v`%krc)N4OH$?u<XBpRr-jGf*7}#2||*AgrNjzbT=q^B{?jy0pN^NDHkG
z(-mO~2WJexWqMKAUa2Cp4wz!83CtPJAdT>toE8S|<%aRg$LT)2WGNF7;(Qb=wWFvC
zU|p@M>jA7&t-}r6YR3<csrNmjYRFQDj|Q(?cfSplcl_Jy<h65KnxMhn$-t9e@ivTU
zyOTd-wZZ(Em=y^N|9m-N)zEN!<Le!cf^RK`ZEg{c$oPlI*NwMGoU-~_rq%(q9`&)?
zKr0oX`b)e0gNx6Z0Yt1x&==Hnb0bXe)&dV9S=~ZJbjhNM^KU-FDP$tRW1l?@GJS<q
z20o3%_o(SeCmHA>=FqZKj=gJ%Jc)|Iz&@2VAq0L;xQ?C>V)#R9>9X~CZ$d}_>1}Tp
zjxT#H5I&vIUeZu^EoJ(PT0^7h)bH(D^J$ASPB%3&f4^A#x&QaDQ_+yse0#*e#D6n~
zhXxKJD_4K;S+xUNx<mM%xnmtv{qb-p;-*#<a@rS&IK3~A%9Hd&W_+`cVP%>aAWbG^
z5~Q3g+$atJlB<`L1qmuDkJ`CaCb3FrxfCJM9410MqECUuyPFP$B-^TEwpx~vI<$9i
zP+L16zrH}Va4tqz%9-TaMJ3pCUIHD28GTE#@3kLdCNxkn>;sNVxRcQncb3EswtYGA
z?L^I#%3$qVWUjU{@%us4)Z*{n#5b$=g87b&%kB%Y3p$P;DqoB!;iBkHAhdF2bZ`2-
z@bMypi3d<#7W4KF4Nw^x$RhJP`6A16p#+BfuQt|N<@}MP%XRV|QqVke3JLB(ccW9o
z02@y8-=FDUlZz(Pa$KaCG=IL(V@ppN9^lK>985EL*#Ts?JH?bNhh?7sPCPNEqUqJF
zGH20*ZT@Z28;m}NcTCwFfZCO>er`)`kzva8!}g*(D+g!Zz213YT6=yF<#>5AWkq80
z-h{YqzrXKYYzOhbzF(YwcBOg6_umEbnad5AX?+<7W2e6!ozxzr*Cq|4ryUCnH(jk3
z1oJDfk6Gm?<R&~CAft3Jf!r3j@imPBry$H#wHGF^I9|S6o$vIM75)-L=34&Jtr)@+
zOW8bOC%RHbb@4)A4+*;~DIF9Crb&gJif9i;1^W)5r0ua+&#4AJZ01@u)f@?|IEzuk
zVv$COVfJPqUr=@K>G;Q7!8@VK+%NNp*dH2oZ=2r#{JrJ=cBi3=#D%3;uo*S@{ddNt
zw>_<aQOn1_ocP>pkWsrfLuL6`5QLx>?sW}7D(#^kY#yeU_Sf+p#>+_NYd{{iri4&U
z+g0O=^QNUBIU*J*FB#wI&p)h*115R^a?t|mJX--B5PW@&C>SEC#{<XT+C{;c?s0wM
zC8qL?2@k|*iG@AL(LL;J9Cwh7;jP8Ule#6u0(0aM7=3Ab=azKe<8253Yx>iUFMO&j
z?=LOqT2Vl$bI9AN&sFkfTgLFxrud=B#QLXuzi)UI2agmXD=){cDSUP*WmCwBYiA5c
zp!M&tW3;0hK%aAM{3SR4KCBjKsYE3%NlQ$20SEv*g90W`y+V<U{FTcxy5T~WBzp)t
z(}_f{vr>efMvzkZs#GJKs|h_7&<lNdH3aK!aQ*bI9N+se&?@$}CejN$4<b@M`6>Y9
zunqOe&?mDE?>`_~*Sh#t0Icrof>-Q*F>CS@$X8zZIo)gnPJWm^`1|KYlNHOIX2*Z-
zNCfe5Dh*%0N{>WeOK4oR^uxdH9iL&jy5TN{)!))~9JMg0G8j4qJ*IPxp~SlD+jTG`
zJckE~#cU(QpUtI|z~UW#JOgiMs-_1QN5e2m%JCRnx-0~S08QT`m#&TY8g;YJGE8z^
zZfhDbSZEO$Hn%Jd#WE}v+k$T)Of^u?FvfnA$;TN7kI2=>`tEKsBOF<QQEJny_F(;I
z+VRawjB6g5S@V7L+7+NibXs_`^yjaLn4#mpOq3Sk`OdgWJ1`gY<=q!Y&ij^c7qWZP
zQS@>3x(>h7>&DdOYM^@8Gqe@o76q&uyYT6!$>($+bC)jZjnIlrR$)Mov?3i&Woc$H
zdwHb+u4%A|F|)$e^|~1kj~DUIoi6inMT>AeeRT-OM;ojAEJNUaTVf@Q!7v!~!Vp4?
zv|mz41gtV(!wP}w3)lg|_M<WP@>^y#E`d6r<ck)A!Ba<iYHK5opNv?MC~f}zWar*r
zv#t3MdGqj##C0&3Tyb||^2<>BbldQ_dMwDk(`B{v`MJ9pQ7A{Cqw;ruuUPXsnu|pP
z8IT(5nlY>}O0!zt$@qwalUzHgXhsD=;V%-AG{N7UK4f#DLW)CcTPEeu_4!KJfLtwH
zi^=6TuxX_0e2E_LutuZtpi;KO{DMbGJ6S~5Y5xaqd#MO3w=t=t?$EH#V~e6YTaMk*
z&KrR0CUxSG$(x+P@hxA+U$<P_enk%C|Nr_S5IeG<75g<7)bCt%vF%M;M>@<X=o<vU
zj#2JKQ;XIsc(RH@&NSauexse@MFHlTkoh03f^+s-%yTecIQLQn+AK>WBQK%?##5vO
zOev#K<RS7xD9O0=WJYN@CI<%6&QHnbebUJ^kXqf7exO#j?KHnf4O^)%?%zfFLw+-C
z?VHFAq16)$|C-sXBWN|w{jG&;5-o%!jKnvn{00qgwWhRn!O0=jcsOE2XK-V{ih+j4
zFD(NH8$q2M6NLk{s6G%L3Akz?6p7w|LM){v49Pe-0CU}f%8>x#sHdC?JhTWU0wxTL
z0N%2=!w29v#z+{6o__i;aCPZq1k$~Dgi=syLu_L*P+sa@Y?NuGM4ypK2bsZU+=~I}
z4m(&OOTm_k)JR7S+qV8U4ma9^4OIZ>-O#!_f5AM~rt8G;N$RVL1Qjr4g+TM~mu^n{
z@FMYhvv9=z_{oLhs)PS?GFRk=J7e=ZwB)H>>0=$tWhxpVT!V2ny&41vQ}pU>$o&c=
zxwrsN!O5{bQhfjdbK!5{SE1`3KHYGV4Dq3$ccn6O5D7g?X2B^viZd?8P}q1&R)Iq)
zo{Z}+;nyNLk4O|wFS%zF05K={JkV(m1(i|**0D@h3I7nQdmvzRTWjcrTNP`gugUS;
zsBb|Dvl_8OkCfO}krL7L{p>VPcx9?PV?~vQ{Dsr>d)36n-bC|;qQp<V3zNqier3+Z
zT)6mLx}+iK((<6yvYoP>WicP>Y-`u^ChH<>jyQ%o0v<-3%_yl?1KbNXSADMk(^(d%
zua1Yj0GVT2`47_`q!KBB%Fw0?v21Ao0r<ISy9TJ^AfC4}3?M@(bV=nyx`c_dg-}IF
zeh5=mT_DYZ0oSO@xZ77R^P^az&8x{Z<Cki(%K8FEKb<%H*Aw0?i!mGbzmPTk5QW@b
zo`AYEU7R>L_ZB)i)4j6!*Po$aaQa~UJ7p^IB7&AUKdbJzR=EFpP~N4YO9^q8iVPc9
z&DIS!{W&NXT#Q?qcT1JAp+>$Bo5w}^e<vmlhK^i#@I>Qd&$Uk{siqxXhZP!0%Xx~&
z)YZlAuT(=`XG>J{>2Mu>LmL0f$VtD02Wify)v_Gc2fN&}zyP6{kF&nOC0HW2aW=Yv
zrkVl_!8I3m>ON0fN=`EK(dR(=1SF|5C#M_>bDb?19klCa5Hqc;c-JW^+a8Tz#r+{}
zCg<IRh=K``1iijpqwi$4Y}@yL6~T^3TL(Yt-96!g|B~5QrKvui6mgSt;eX{O@4ZM<
zqx>9;Nc?qU^GWp7SBK*XGO)d`Yas4@eB`C5p?h_amkl+FOf(GpY-;xd)mr8bjzfp6
zjl0x~flS=K?o-JSQ1n5Wq?Bx4jR6t}fB-)w{W0wOC4^LFGO-6o!*`N1Nm4&`3y7d;
zAq4<cl4Yhv=?EwK<Vk4f-J&l-B!Z7FwQE9u?B>yI9Ok^64&Zls+*vnbqpkXMdH83C
z=)kq$;?w6v)AC2RY+qenvU+)tAtx3U6eLns;)=$^ZCr8M-k+nZn?Jl*u{n17_2#O#
zsEmvMZR}YvvKtSF<19Qe+r}zE{imj78aleVB8fJutOy+q0fl|$4LU<j?01?89ZqI?
zNYQy{1sDy72q_?yfu@KRj61<K0j7MHV!n$ix&%YbBBtxGvT+R9X4frsV@_9iF0V~@
zhkkC0#DymcVBjf7p=!&l6wg4&zrx)|$C^~r7q>QFU;M^qmkNa=i*X#iHHe;#Z%?S*
zcw86(nieMFswPh^iGR3varhGh?X)nn^Y`?y`&3l;mA%cMU#;F96V>qPxS1X8nT1Wq
zsJ2c1LQ=1<qx{)W(CmkSTxqJq?X9((0F=DN__iXwtkMe$jQj``ZH_an)_WUNo52)9
z&sk{zKv*OaY(o<MWhn;0H_4?V#}{S=(u^tkI;b6og}^eUhK@Psx|7|Dcu5J})WYcf
zY*X)#H<`5zOU`~b6F_W%b*oSB<{0)NT5`TJ6_Ec)otyditLN)K>&B<Q%ckbPCJdd*
z`2BVDLG0jS{EsWg7bh&^7s9_bn5~X*YTYn+awDp~3VPjmTYF@*MY3s|=&Hf{=t;p`
zD3?>p0bHOQMubpC$&*#No^CsrY7%`R95+81LW(V<43fBjMJZ3`)}&ctFcfE#j<Yfn
zz0$4I7&g}zlf42=aaaWQ<D|LS1)oQIZ!uP5b-D!{NL3I=>G`27X%<8T+*^{a`)X}u
zWr6;&BfNj~Kl9zIcHEtK`u^PvJlDVcAUrahe<*w5{h^x+M+V;?c6wJec~e8Y`1#j0
zxZ!)l3@UQtTb&E9F2Wll8*Pt7m&ASkrt$6H+2_7yJ5Va;_EWoL0@Lmgl#Z&kJd-8r
zNkJZRtxYw}#W`eSKRV`#QVemffog9M0*ipx)C4u=iqppBkQi@%orJ^X0vluXZXMM;
z0y{g|0W$B!a69y+gd5m4(AkNR6I2<!%AOj>M)TJyJYt^k0=dgtgZseqX{oo$HLd@B
zi0+n|o*zHDHz*l!V^#8!-`c1tyWij5KU<RM2(R8-`=V-m`2C^5AmN#%Ra3yR=(QBI
zdA|;~?hB>%A9b*!_7HB{JmVrq_g56j)KQp9vr1oJoQEhBtg9@OfPECQK7zx9J(Bu)
z6NDvcK6)l@g-H@dRvNHi5Q~Ad<SaEErdTj475;($O9cK6@zn~E_!#9%px0sG6m(P%
z(OUy3-Uzc$M-KXW($^Vs8HI-@<;V8OqTWS)acrOYXaxqxdus=K+InLWam~jU=9GhJ
zadv3r_jrGIV$=8i&5heGzxprkZCpZAWv$^=U~_RIXedgkHD)xvEYk1-1a9}3iPng_
zr8{&b1)dzLfei)l@02=NJ5*Y(q0;=cWoMc90&~RttG<CC3qE`OtYs<V>`haqR)-En
zSVp5uC_bhvR1zXO?E={f9E=!Vm6q_~osw$PELydyZ!(!?%54K}FK-60*8{{qfKA$B
zo6>K=sDJZO*guQ)yb!hi&ylfFbnmNY{S)5{hO^{5_ugOE+j>#w=T0v8wPHmge(}=_
z<#hTXeEUmd;N3}F1I%?>SClvK=bv@XQPN&`EX+<&D#&*5)-~xLgVUvOAg10+Gu5^8
zp)_BV#-IsEP;e3^6ebr7D9$*RN0Ps))kjv2%vZceI|rQ!Q>hfoN|!)|C7MRVpy`(7
zDKJ~YxlZaj?~A&T#06)u6zE@D8=Y~iE+1uD%_2wNq8o6XOXNuYe{u<D@|jWOw<qu4
zX)n28lK<IzP<`OU=H6-E&|3L5Wlw|on8i_(L6y}J*{xfn-lj%uzr1lu?jQX=>TV=-
zVg=`dET&Uk1v#3{6CJI|jV7GVo3Q06>8{{rigRh858itZDCeh^Ab(Y+h}CcfU>8Ca
zNlE}rRZF_=!geVPV+P7Bl#;>ZS;}R2DG#vzaP~~Wr=_}i9LnAX>GKZ}3nXT&4sd-<
zPdX&Bpc*{b2ZLueTk3D^3Qa}<)js()IBsvF1^|POTCu39iK5Tj8b;jX6SfUB*RN+x
zKV2RF<7xhire(s5Rg30Rk3Jt#eI-?PL+H1Msc-&m^9P1!1RIVh#}G>r;1+840CrRI
zIN!L^VU!Cq+^}sF9*GQ5DL$E4gs*BNmUhda>q%6Pts%Yyyg*wF(<$YamR?51S!paL
zL7eWnb(g7vF6*QxcN}IJdB67QbdZ%Z!Py$!=u&m-6IN;g7-WyN9ZIb}z(Cg~{BVHE
z9rsCt$Ri_ThWMpbVEf#mh4!^0cN!<Fj-NavT#*3OGJoXHB{u$ek@)i#nEDYP*tGsb
z=}10U($JHuTAeLt2C~V3l3$P|RZ~^nRs9r1t1`58JAk=YIkHMXqT6#Q7VXCRifHE=
z?UI14_FFR1FsQWkP)fEjhAIWl1{5(mARS94QpzxgQ_0tTyrjxpf1gVQa8`N|RZ)(;
zO<%2xu?^VLDJ%H6ib%8G^>=i3(L`VV^v6;3xc1Vxvnq4aDR`hRNE8!$JUjkZ!~3;U
zlZ%DW{M6Id-=nLQu2lH;<nVFM<-NVFPhVYXEo_;_Z?CGVip}fLT59ILXY9|F-g$zR
zg^$))TO0PI7Z<tRQGEtdb-5JdmLw))mui5R*yH=OEX5&knfDDJH3m^T)z`t2B!GyT
zogWDuxi~VjgraT<yQ-SgiN+i+3mk(`0|9d`u;<_kq?I*XEQKJ3+-zwGl=)bvR1+n+
zhlGfz%Wj~tk-BY1`$Gd?4{LyD3IAHj&;2iDJs$sR`2EwVs~MYrJZ-+Dhh#V<;(ksq
z3KD;2T|A-+rr;nYuLtcFYVCG7xI|@bb#`QRZJeHbg67R~$a-G=bd_nP4CaI_mBKRa
zQwlX$6X57+!K4ZimV-5dFp7udo-`n4IC~tB5(wAH60rrt#VFH1z=NPD0UyoiXft1w
zD_+$Du#Qo0pDQK^j8Y&8VH^uSi0OWSrS%{{5GU^o_(K{MXxGLaQG1qfv}EO_Na21h
zfQ)nm&5dkqir*W%@by|#;@l1u9@y-(s56g7K5v^y_(v7kO`b4}3SKfKZH&5lL?yJh
zR~@V`qy__D*p6W#A@u)qp5hIGkQ^Pa9GFF@gw2gXxzP=>NM^3-C&1uxlg*{75CN^P
z?_0nmo8rZ=7n6}GO*!4cviLiV3?ss_WK+#zzt^Vbq@JW22Ab=wthg}|PS^UBUi2|T
zQcB2rbWh0ar`hM2LG+~$oeSZ|zoG|PmLl5+e;xTc`m{=q@@w+Sz{vmb)amCCuHmj(
z{1Umr&5HM<d3PF;w03Xve0l7Ye>6!Kgj^F8hWiMvb-;2E3Zr>^w3?0c(j=J4GJ(x7
z2Y_DB0fvVGM}bD;L{df|g(;*Y1J|=T3SWD?CWgr)^8-=<iDl&H%HClLxYpNwQ08j7
zWFuFSoVT{Tf=ldT&i#{VE-hg7I>3XvK%TVFWV$2IFr`x7=N`QM&9FU~(w^H24>Y$%
z0PJ9M<KoNhdr!7IEq-Z*<;NRnQ|~rv*}U3a_3YA&V|zk$+(FCM;~)~Hx(itA>m4QS
zlEcvzpk6X&t>j}rz$5$71U{NN=T@<A2j+-8R8<2iEkP1BO}QFK_8}0uldyzxKhWKY
z=Ab|U-S5UD7SsHV1ICMJkVRCb7KZHq-(uS;-@z89uv|ZSSb@qiC9~&+gHBm)X{&Sn
z8?)XGAT@k4cJO{*#=!K)BAvn5rty&%^Ju3ZA5C<{-!W4UR{UNbyRLTi+(`WQub8Q$
zyJ^p6uB+^BxZRrD-l1Am3p+a696@~L;D*cqaqev4n(d?B(9>@#<HSHnCe!Sr(isD9
zT}=zc1q4lCxl*#I7|C@HoJX#|5uSBc%oeAXnTipXM9K%C;B=Y=*~VxKK)<AST7se!
zX$sIz@p7xji@RNEUM^4%$BNS%W?Mrga36olT-XehdYjLS!vyX9LWqSU1|qjDeEn)a
z($UnkuxaYPO5(4K3Y5fY_}Z2E5vPfk>4J?JlRskF&#%6JbdfXIZB-R{Z};qG)r^m+
zW8RSug6IAvRNTqOa8<TeR7%;8_uco<_d_JYF!(PJ7_#Gr7c6$EgeiZxl5^b%)(WYB
zr(leh+qgMvNnMLm$^g*^_;&eG{q%tk&&NSb5L;U0B;73YPVqP3*9btSWJ?$8o)9Ln
z%hph?Vs#DkVQObM(jm|@G~7S>XP=>C<lg9v@X6h;rArW%$c>_fr*^N*UX1hx#lSy5
znEXFdgOk6sk&Dv{%9f7*)pC60#>NJ@DyX`sHPSY#F=kY>0n81M)-4f~)rTQ&*bXz1
zd5#%eeGW$uY&a_grDR_V4#emb<>MG#dK8!ISju(SM-yc2s|?B1VKd8Nyho`kpCodT
zq%ufs2ENla`96u8<wb=l625UJtNavIAR!+1D5rOY=#TlAMBCrvJ%Z1<URCf)BHwPc
zwT?Tqc8lZD-Zxh_w0YXDE4Wl-0=?!mL^jJ_HIRdXnm#OXUvO+*?eqhgn>_gmv^OWr
z-&I!F1^M)kO>Yxk^v3LV|7>8>)xz9V7rDo?XF2@lszTaosNcBM(cMwaM^Hn0jllw&
z>a8IcJwVtUb3X>tmFf%$T!h$NI=rp;@?ZiHDrb^%{?#RNSRH497em76av=Cw`0mgb
zJG%s0V_^bRsj(~7cL!aaZUFgUO3R66$VX3x@jbQ=c>GxH1~oMWvMbqRbB1|wLWV-7
zL#(P}RI}Yj!ejPM!-EwgcYck<ZHBG{$!xshf6j0H{q&3-c>8>O<gIWzEB3*3+r*&@
z>*}=~*PMy$3A}r3f?8nKXASx-tkur*f=^5KNW+4yb!{FbyIJwCp%A<W$@d)a+E?M@
z0W6&<u!Aep&%WCWu>Z!8N<A2aZh#<egk&9<z+ng_7_=XIN4kR-oK{v)#;;iK(en?}
zn5YS)2HLy>kRaPq*CmGiQpCCqJ*HMl46vx4<fn(@_ACt_&+Wq7zKR9gr`p#=oM@)L
z`n7K0K}3^siQDwEK*&m*y|cLR#d1D<ZN$ovj+R$d^Z%%ZE-x|}(!Qn|x3_;lcsIk$
zJ#a`?6oo)QDhk)B-YQB~^SnjU_QND`)pd-tWMV&}1><Tlnn(Z=MsXLD!Zt~#^!Q&T
zdjw+2F$`^vz8BDBFp7y{BvZGBQqt+ghIH+<i}l$|p7!AzF3^*|juPZ!YMDF}?k$ED
zs862wWSlRf8RoG;v}m13=~ITES3FIqZ8bZx>BL6S+JQQU<7XzDQ1czV%@M(1{?T@)
zFE0}Ne$D>+ueX)fu=%Y{!%)HO>xWh&!%$h&<!f)Et=3IQW4OVC*ve{3hp)QglUjYw
zs!nnM8x55UjJ5v}%MjcROP;f(Db@><B<71@;9-EPbRi*{qWMM4ea;2Rt790s<J<v%
z`$T<Xs#Ku6JaU4=8|_IRG1P^VPpi4mvix$t_Ya?CT0%YM=n@9(EHoF>gq<bjj1p()
z6bbR-@(WodVl~lAGy?#vH}~LDB!p0{G!of-cX>+~sqXK79b3HTHq#>yg2q2<)|G9l
z{qIEIg2ue#l@oD`O-;~mlrH0U(%zHzFRl)n?0q$9_H(d)5(LTZ#~(b{tZh~s{^)N0
z$C+dlcHAt>j{0P<lOU&PB9Iimp#w`t0pq%F2n=8n$O>RcY(N%)tSBc4b0~0fH38G%
zL6oo&4^{1QFR50E@gICkj#5wrYvp8_GRlz?p{*53nRFQe;Fd`Z48SRoZ%?{W2c%>(
zsezKv+Q=8yWFzO^bd6;9AFOITwhfM)%{sGWb(LJubMZ56vF@bmRK<%GTDpv(kt^T7
z{91%3YiWyL8wTEK4LFUN)#DFiWG}`_yQ~89FD<8jGE}Jy+G=&$LFmT456ty+L-M#c
zT#VTSF-2HHkccr}oU0w+Tc>{@jRqGxr29i@mV%n~Zhv={vxGTh3XUqkqkSF|Pm9xF
zkoH<aDDP1QQl+lOf8QK~0o}I^mO#8~#pxP8`~z8pqmphWWF0wP+P}Mg6{BnY6y4<D
z<^0b_s{)6<a4*lDSe*Lt<Vg10KR3|kM^{eOE+#~S!KFW^XEG8JJvT3$UxBQB-awvM
zEx!~pm!JAvvo1K}aL$8cLwW1O9YKXM4B~maK0v5Qq3zMx3cc*cGFZH0S)PCaQ#zSI
zl*KYmO-@d-)ytId#MG?hYX7Zt1&+5x8&7ALdYgOkmkRu}oB^XuQ4ZKFLKbY*$+MM~
zn_OiRQpLH(+?}>GeNNdr10F^O@@lsF7w4L-I|w{QAtypFsh$zsZj7q$|M<u2pg&uS
z7K$1-wVa!a312a;gmaF(Dt@NBdGQqu_4vvcyZKKuO}{=E{C@xC%Z<o!_n@Gu`@fzC
ztth&yJ=@tf>NeLo>k)@pb#c#g8`ja&khCj&gIz#TFl3j->UvB^pY?Tqv#L^}Cq0Li
zm1>`bfr5pqgnb^L#t5!*>|M0AZQX1w(}ABioa3Ph!%&GPj%S}k=QyujlPto6YOV#%
z)k<#3FEsOWg^8g`(f1MV*(W!qcQ|jrpcp;3%hUNi@a|QsxUz)JP&nn{2{7GoaY<wx
z`(z?YzWslAq9z_(dNSTg_-f?8_Z}0gBcRyLfw3D0C%(ict$T5}%JV%ITo`8E%mFBI
zcZeOgy;@aGXAc7{a6M!uenT~OwoV42)Kpc=99Nj(XP?z+jJ;aqLP}y1A)56bFO0Dz
zU6@HX$0&b6qoflddLdS1@sM|{!@nmdnPH5VoRZ|9_toQ{s!pRyJ+dwS-lwhx6i;AM
zjV|{?-72xehrBny(X*%MKP=M5-)T0tIWoNM*!I{t>=orMU~e;wntBy+Wm@(3_aCkB
zys*_hE>7A|*G~eD?z4|~*G^n^xd0-EIzQc%!I_>r*k#<{XF!=nShIY0`D%6LSpsLM
zJa8F+0>rel3_3)!(&SaRY9quwWVRNs=B!AE=HcusbUC081Y-RImObS5G8R=o%grc9
zvn#BGp9_LRp(i-=l7~L$xr`Xo^$0UNTH(<Zp!PXRL&Sa<q<itv(7r;%AaIBuhmmDG
z>x<hISSNtre*bT{aYpat%;*7C)YO$L%`+ocgmbMAGvvQazogm`fX$K5yMH8~GI%u&
z8@wMx?2c-W{dsIZZ*BFiLrecj3ez3~6pD|c+mfNlIz@%6X&|#hq6o`|@mqFULKHOF
zazCTcm_!C}t|ggFE(R=efylw~x<tQF;o;}!V$>a~WdUmTcogb0#k?I{`$AB_*?>Wq
zVvbIxS>`s{Qj(yCy{pwxMdeJ}=<JhmP&f-A<0c~=o3H&s4>UBGMI`oq&92R89+{4D
ziUHrRG{=v>U7Y>9YVWV1B@GP%r-7!);dsm4N}x@J`>Gq?wcX9SG~iyxFn(pL@|RJE
zZ*lfBuJ9H%^*RDUENV6|F>&=Q#t|xM>DyWW;G<FjQhwgeh@DdI!ro=2$3BJ4B8dr^
zbW6TI%NLavR>97ur~_4Qmp3(w>`}m}=w=vW_GeLb{BV?<EKjJDe_P1ps;Y6Zs}$jC
ztvpQUtTK_`BR~9kUld_`<dHKA%lal)-;9GJklyc2Bij!Sc0IlFV|;F}E%JNrO7nlc
zleIs4FRmUq+57d)5~s-Kfv*ju$rXch2UU+KC-p3@Z}6Y@ysELwQH+XeuC(wx9e$$|
z$_lx~^YO+>!1eI@J=UgY)q$qv8l#eeeprD)uozmkF+txo)x(^z)X2y8YPu*BNJ=`%
z9+J`|rm=tk^a1yd)^#R<Ya@PYY)sGU?>>vm!+Pu*$NJY8;ND<dg0r5iGF++#dN7V>
zP91qH+t9Wy_G<$&n!D-6RQ1B+nZqxJgMt!TT3fIEp6zY!OI&pS-rd`Z{=H%g?!mf9
Se2LQ80Kj(L#=PmmP5M6~wE@fk

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/jxz.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/jxz.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7185e21e681c651f200bd91b626e6c437301d00
GIT binary patch
literal 10903
zcmW-nc~leE`^N8NvH&3gMOjQ(sx6|{fD0iALhPblT(ANvK?o|KkbxkwXb>h~)m8+o
z3tB*EZP}DXkRi&JfI`a>Py_;D38a{>A_+((AWMGfFXv<?=S=>(^W67-p67jk^4h<L
zVzkBx06_Wno3DP*-^=x1mH|<JJ?4F80)UMH-+r~r+tLazX)FDFAn0D-bVqTO_DRO^
zuY`EsAHjAxQ=iSaC)#Y=SDk8^VYlM<vy6p@#q*)5U`eZ6)+H?d=%`zmpPcYaSo%0U
zKcVVt$*ixf2^5T^%a!3X;~pPhCb*gess({rj&Ite_1Fb|{mH-r$BxYY!;|YS+}&B>
z-EmZVL?yZ%?dMy0L%?;fD3%r7`qi5A@U3j8>Xp6kq@umV^-q>xKBCGVhz<KB_PhLd
z?P;&FA6A*QZrQV+A;11|^xmrP^^ev+KYsbv{s_3vrMg=%F}73P`)74+b;RJCeQ`6s
zadP?7w-H0rY1+5QP<)v>UW4hcy>5cC=#HVmw^cD6$Ld1k+^TC;gNP>Hu}}JZL0S^6
z8FH&T95)-GiijxC#;TvjRcl>UF(aD3>=9{yfxMtw^)z?-X=KCBiRkp1H%rTlll7jS
zHmaG-zKNOs%#nKC+}vPwWUlVxOj6>qZQ#9J5_1`sG<LbKY~jN+r(Q{mwH3r9tCa74
zYEjqrDR~NZ<=9i!XxC{U3*fJ4d`;&&f*pm2Cg`T}adq<Ait+Le%$q}L*<k9FXWYoW
zDm!Ut06hrVDps3%hp=c|&L^W09FPZ!#mqy7L4V?ckaeg7(jAKf`LPA7Ei8|lp#wv|
zJ~0J+-qCWOa3GHjqw?uK1=l+I{n6?k8<Wzfn}?r<=f;WKCT7OXJl$<mG{AG-aB(_a
z_fMd1_A>RRWMp|cdU@0Y)Q`1Uc!079e&<ZraJBgPF^d{P92jha(AAkuKM5T9X)7%G
z)v;wk|M1zM7<$#bx{(KOo5W$lPYMZyhsVX20GkFKzxagf(0yr_Gr*9G#!R0I#HWkP
zk#{xP%QJR0S_3&wbP2wAO#iEVhm*vW!pPVE73DkuJb4LgkigfxnN|$P@T%IHdflOW
z3b>)xdPJmsG$VgtyJT?Bw&CBv<q4fioZo;G9}rhZCe#ljalp}W*wIF;%yt#;3WXV#
zVKv_S2+~oU4_~~ScR#0bMQfu^5PF^LB_@Ilg4d%5#=l<N!psD%5~EezW^OO|gcp8;
z65RO1H=oLRX7UhkIde2E41d!S_zi$7#k<yf(JoU++3ie@7mZ6S?EkI=hr%odDo?Jw
zMhNSXp4Pai9zReYtA*mhfrPPX{)Oj<>z7BL1STzQ)`>@!n<E<*Mey@LvFALzXppef
zsy^Z20TRyQ8cImR!y>nWqCcsx)OBC<NU&G>JL(OC-On3$i0#w5nK1s)eHoB3W2ko~
zF9PeVzbX*RACOIJ{beVO*=C0*zYB|qpu&k3Qne4~{elNr=<(YS;2~xJu(=$&w(n|g
z{hU1j>_oiNStUafKR#qZRmb!KKvfL)^wwRSoQ~IjJU}EjeOvCo=e5%b?-D!~W+!_V
zY8+?cJdzg9@wv*fxy9MGWoyuNj?}rnbLc|i@MQM6$1a0oct3v7pKH|C#yp9ziKh){
z#vHs-+$ICo_TRSVwi7p6T_%4mQ4{!=d+Z%f*d4?O{gzDN1YZ3`OocxA>SqX)uQmv|
zVqoaMjdvrTQsnf70iO??_MqhaA<C&6LnZ$t-->m#pqK9le86Bxqd4JFgIBv5*!W=1
zfa|qnmw?Fl^B!Psj@#Md5vWNZBtGl3ZTK)fez`tDcbU3Malk!s*&HOe+Y0K2k<haJ
zovLoLDOPBDG|_?qjux0p|0WdnkMaBQ$K~Ki*m~HKS7YwA0nj+oPvHLn`koUL&q^nW
zc8ZIu2cEa?x`VF8@IWlag|D-;^JbPCf%bM{0p1V=D=qkV5x|~aN=ZrX{@Xf}GSCiD
zq@!Y^J40mgZ@on&I|_2DdLt&p$M{qd0JS@9r{34E57@E3aL?34btIa*IILM(jvLWb
z2QFVADIBL9b?-c<h8Eh?3(j+sF84ZHfMUpSSi5c5pN%l@#8z{|4R}SnNQKGKR1jAg
zQ;lAWVmVs?1r7nA<_@&&>Wk}4@uiM1-XCTNL%vc>Y%~4_HS~J8TCXSC>g_Oa{eg>G
zg-6RC2Q~kcdMSJjiUjxf5|7u2f6Hr>5-Zi4yNDgYcc`s5;sK&9^#j!XDJ92hrxOEJ
z*^o(@OZm{bopl}%s!52^L@)ktX{j2b%cd-r7YjTWMlY8w{Cz;G+6LkqB5mW{)tH-R
zd}*qlFwEbVvnG2D-+JG^5~Qz+%*%>8#?C(R_Zr@6e|7Hw$Pj>@+mxGxzZuUUf73iP
zMJU{tLFBRzLEBu>{^nE60n~xk#9nhJ^=^=eXy6TRx|o0Ek&n5hHT&`Nki&P)0ORFm
z060Z|N+INdZ%l8tQic(+A@Y&wSa)~vXgw5J6^}a*FPz*dvMsxy+qw8`M3}U+Y+{Wz
zEZ<66&P*bv2YSA@o+8u@OV$r-<YqQ;wdWM#tRBfwvOrj}-99ra4F<3LLEhxOFRR*#
z>>WHVACeCoDeqwCf8`|q?h_0<ILsmRTjS)oPd>FY0$YnJtq4YzG)RIGwi*~`<BTsu
zV4$MoVF`Bnn|IQD1p0&d<VF+zdy9<N{gud_5-Y$9mwO{aHKNk*WA?*{{LOF-C!OTA
zUSkFl&Yw$k-&Gc8+u4!;CpP{kbz9y1_qu=E8Z-d>C-udTo2JeUOO#Qw(7j>pY`lBC
zyE`^?wdGqm;Y!MoPX|}@O4PdFmCEsI1~I2M{XpEl4Op2{Epi~jUZgh!eqwKr&yroj
zsO6tJ-MDr4*A9D2%by?`05E2SM=du7G3}}h@!ZtB9^a#K0Hu)&?X&rR?=L|}{u>xR
ztjnJPkS6G7szg0eAhU*AoD&`A4tQ}klTm(}td{QR(6Ua8DT!)g$hEWng5bm4hjnvH
zntEHh!@`heS=Q1w@?m*&V)3ucbQM?o=s@jA^#M>j5;;|>I2A`I=-~6$^brbqQM{+!
ze!qvAm5cLXwu&`s7Z&ZP;$j3j<uTN6g!_YdXRqDw+(TH!_Kedfcq@$02$8Ifc)%`N
zwITz`K)wv)JSV0=4&0c1>9H<3A!qIU?H{<k9E6k+2$>ZEdqsEiIQ%HOzdx1VD;^&{
zGe8&=RMZG825Y$TS(aezg9nt5h)aMq8V_xgHgGmlH(RCvA7^rPElZ2Dxv*!HP1#(2
zpPQ^spr*!3<EMyJo}061lZXR(wXWg2mLoJC%@p2`Xn%!79Eq&eb@2Nl-`l$@&79UB
zvD*dg?*n;$h0%)gzm3?mHcK{vW(<H6t@7v{ATv;#%G=kj6Z7(z#~=K<`H>r`XMZz)
zpKJej?3`nOkM=l!A2rG<eb8G3f$RZS5uxNAReJhxPIv9_aCQ8-x<HS6?$bY|n<x_9
zUmvz<Nc>0h9}3{9V%=h{&N=C0WlQJCdu95fQQ+jf&Ds5BTElya4mgtT?a%P{=hB=i
zhf02neoSnE#LcH@d47agM@u~VE5+}JBUQqFYfED%;2=+3UEXFN$MZ_1h;I_vzxr%i
zB{L`XGrwpA;M0c#FIQ665mQ&v!YUEY_WL)kmM~Vy)PR?>26l?k;1~uQ6+2`DLjy)?
zb5fT`(WpGj(P(3Mig^WeppzueNnbx@nB5r{sGFiME>3d*$!TtGp%a=@3q}%V#@j49
zhj!Y8-V-kj+oY2~roduPK@@mcyf&<$WPlMa@dKa3I9@pIg=-pdxAScy47!2HQKPP#
zSC2ufU?#F@0}Tk*UNO#E@f%ZSPGeWG^R`~W$wAj`V#;5ifsO4BJVLq@0EL*iR=b}D
zoe_^6hn=0Gg;%c@A9_F($8bLP>Umw^oOV@90|5b%Z}GNs_`nPE@$WJN=hQWh3!^h_
z3VH4_24^X3b)%Q-lIC_KHagaSd^_`@biaZy^>1P>pwk~$D9&bA@g2EWo8CV42dC)t
z#_uL0Aj{}uWG;tGTg52%ej|QGgz|~vkd5odzQ`UxiA>^&t82xN42usk%S-OIpUT>v
zMfnss$ncdc<1Q>{JB)@O3GQN|TY>6k$`(r!w*S5*2Sh{Q)Q}*`Roov7sR>jQcN@Bi
ze&IlFS!SQAZM_Fy)44F|4kzMt)42`*I_lo1TZ1|INRoPb(R^<86m2ST#Qj{5N<A&A
zr1+<WOybo1(jgzpDh8sW_i*JrAyXvlE!ri+?;)@1VneE~UgKEERAJ`=_**5b<Y53@
z!Qluz3+U25=nLY*wL*}!ft#{U*ql#!XnJ%Fd-Zkl%Od`xpS~1T3W|;qw2hByvUlUz
zD!`I4!_$9;ORqMKXTPQ^aN5#|O6|fV^dAu1Q_N4}bLT#eUljzpsd~!N(-W8H)-2|-
zK+-%pS2xu(tecJT)LqonlLQ{ve}WN{QKM297Kvr5eR<mdau6N!S3GmQtk|k}_@m$r
z-H6Yp@Du?XX?}9d&-r4|CT{e%9fS-wCij!(Rzp)~q}&+$`a2#Q`;`!EP>3)O?mqgb
z6Ow!tdBlz0?PY%)z}y%4{g<{|St_^_D4j<Wk&S^iIfd+1LJXZ`MNH5cyp-qxB&Rz*
z9>k~gEsQJY@gDQy>Je71MtwnDqgBnBH0XvpQ{W#PmPb7F#GbCIP6Q28x1?^iw!@k%
zivtG^0I{pd)cG==1<{zlfnOx?i{p{ewN$FAT!8q5XiAN6*-dq5_-2NE;Xyv>tYQps
z%y8R{#nxQj(H90?6;ZzJJhI;j__J2un?bks$z{Go5EjDTR5`Fp{Y@ScSDuI2mm*Lm
zFq?cD66+UJ@kmkxu}HxCSf)TSREz_KF^`-h(>j!+)!O&*3IgW#|6nFP*K&9ysq=s*
zq}Pxqp5&A?IwLm`=%yw>f>Jqu=YUOmrAle6KdurT<Fh-)#~w$aER_Mr8Y^+b#=F+=
zXe<)C*+NlBDVA^vVu+rxuK#h#5oEnx$W15+fY|F0$fs2K1R(<qJJ8sA8wum~6EWed
zQ^dS>qr%2NC|N=)1@}}rSs1p;($1_Pe{3w`=j0kfxj;hT$)i}rg4tmKP$!o_gXZxK
zJ8j|)OyOhBU#L$=d|$N(jMUeCoZgc-x7-G(dQ50gsB#;~i>)eEO=s@NbWw!fFnQeT
zyT23kWw~S!E(s<XM8#KpXq=9c@6=EjTo}VSoM6-VM{n%1a^hHx1-x-$-v;<sKN&ih
z;(g@|^!Pf^zB23-uiMz*pgoL}J3WQVA@;W$K;H)34zTAo1vT3wy5Aphu-TPXDEV4-
z>Y6Z`DrZ5DD<~|g0!U9&#Z42GDg4y5<Unr2=!3uuGao!!(id}*@N~<i_an<~9`(zE
z8mL~WR6g1{^1#eJj;Ni9sU69tNYAm-UDC)5h6>&4r36PN?g)gwKm|ztcMl?_%oTd;
zS@n~Uj>q4OGL-)XPNbw-p%i1{51;PaMYy@TBp7bLU5HQNtyxK=3pengX0H6%r3xrj
z#<1}BYW^gT$$9k>+Be84-^@a*(!6W5FV8rZ)>I8ZEIDCtp}4n>JRDy)?5=pO9H05{
z{#mS6n7%L&SO1Z)_|Nn-C#gyIF_3OBlB8=`Se$Jd_Drw_XKf@C1ijHams@K)T#b@S
zwo|DVmy5s0^f(yjZPkP7?eJTAE00b}VKy^wHA4MPcdiyuuqs3L^UY2NWskqV3%8ky
z+le3xS@T!3-${<?^AMteDSESt*mHB&uCKf-g0h^L;WvK%mV<0!z%2AZKj9Boc2)H6
z1LkawkAhAwXpY&$Cl8z%=v4&Rq+eFeK=JQi&$HypcOP~@Q<R1|LrtgSf}Uzdk`@{g
z--;Dwi}MFi+xZWN>o4f#E}NC<>FoT7f{;EtJIkV>RYSov)*r~ElcJFLrPURIBiO_#
z7wD3b6%neHB~INF@hZPSpGivd*1vAAbglTOiLcB2f_mW>-#v}ExRjv2PQRJIExA~j
z#RD{oddpbMO%WFD<MYNGPOz-{Q3UXVgdhan{@ikf?8v5m^RMi%EgRRd?NSE5*z&!h
zU7=Y!(=;oXM`#|v#+>rju!nM@*}rmt*8U(uW)wdjyqa9~1X%csLiy4iqUvc(Fe`FN
zFPMC{R4?$b{gCjlvNq1sX6fJV1Brw=Jpui*;MnjMom$YzZFMv0XyANuXYTy+Qcd5m
zph0sly?f%r`-^dvltGvBSZZiiR5-|lK%d{EjZ|>v81NEfc?gWI;h#2K%{OKH1Nak=
zv2_vvdzjr}gxy^y-#gSp<ZZP~-uE?ei=8QI44iPO9S$j531UK6O=-n8F-0~e>#d92
zZk`1Jx65Q6`5_{I<jQLko-yZ5WD|hNRM!)smhA3%57W+`H<6~R66b#`3-o;Ll92H6
z93P$1Cp?Q2JC~P{<yn_{AlNzkZpGr%`vebR3uRbddRdTVM33k@9YeElqK47!uu0&c
z03|soYzF%KY8L5v5QVp??RiEUtJMx)$O{XHTe-j(MX{sa$MBe$3otWhL$VO>XD5L%
z4;+Ut9?xpUy0;v8C4_=-fRjv43wk6(qeH$WJPgb0d0V^?(X;>RBv1@vRRUV=Q;C@-
zS|v&EyK2ks+ygw9@QX{CnuW`Ox>q_eL`+Orc%tphP3hExj&#jjH?c|Yj-5R}T_2Y%
zbW!o86)g<)IE$W#eQB>9Fn^4lE}6h_rLDJ}wQIO(l>|OL>;X!ad6&c49lvc*Btz^g
z1CQ^1LjqPbIOBGQY?Z+YwsW}^DEuz9ee14puYD+DxW(xkbi(Lp9OL3dDuf@~%DS^j
z_Ua(e=HEq1UQhuVi(%uCzl_M2;#5MCX7+rO*#X<m0-NgdkL%(z_ZOz$>apnk_#sc-
zzZ>Qb>oQ@mc)dY!xZ(Ze^nj{UkN$DC@g9LY3S7h~0u4$QN#6z>;S9C^cz+<K#OE~-
z?`9D>k`R3PGhd2Jc@NPSLvVjJ%3@7H7^p<P{yXG0x@+}Ia|2wk8Oq^u@-9*g<YIf=
zx)PYWj<P#7uQ)_nc<oW}WdvCCNAzLkuCGLYZ8?R7!{}$S-dp5yBH+}N5hD%>qhXPD
za$2mMWsQFrTl%3or?PKiV(y=obDG6?O?IE6ED4%RvX;#?*@A}AwuL=Y$`(NaX-IA&
zRu46u&+fiIb~Z9)Lt40U;5TgBQJB-R3v2|q;vjkPvok|}+fd}teeC5*Ls3SU#S=Td
z+ZtpbmN#!fmU0;r{YiLNFBJe*(YBp@M&!~aTYYg~89T|CIF8T~i7_TSq-|FmhoYfA
zLLL$Hq`9)X&bWpmCAZ<Wqh6F+2-DKyM=0(x>C<Y}%=ey&3EC*z`9-V1#g381rbxg7
z4J6&zv^H|#<A;U%#PQ)hxgHmAZlU6CWwzpiW;o8R3#Uld>-z+qSXxo}Boo0X##Q`6
z%nBT-NCr$^Z$(GDIrqUfkWWPKJ}WoM5}Q--pS_`;JY<S)V8XzXX@uLo;)dkm2|LjL
z#}_={!jg*18EiMI)yXXo%K!ofU3&?K8H|XI(czNbI*YDBBA?%fo_ALWT{_oCf;mWf
z&LpwX)7|5><Kld05{~q<C+dl7_;|}Pa4uCd(mzqxqI^vNk$_97h!PLIW)h9HI40=~
z+eav}EVnk^!rnHj&rn<JeT=vmt@5dC#be%QO@%1q(yyDZghiiPU;a}Ew))$Ys#Wa0
z*l`-h3#Q%Q=RL66E?Q<FHy{}Q^Yll2IPjMn`mSRT0X&vnp+5_pS+BX_DgdOA;$aFR
zah=GH0kzX&@?w15y9?Dhl9mhq$Xyx|mfqGU;Tx7FHDcku1`<euN9rYUQ;E43+=bdY
zI1-2n)Qhc0Io3b08l`?@`eVqF#4me#_|g3V?oS;A-Yy9NlhE5YlbF<}#Be9Ethrrk
z_Y!#(!g=zLXi&J-lJac#rE3Shg1ocxzG)3Xk`V_xvE@44KpG^8+Cutg2h1f^RVGIR
zH`e19(z|zEdvS$-K8O0A$M}JArp<7q8mW{tH7RdebhdQ2%oMd4CMJ4(oL1HeY=;hX
z&aM8hq~obKq1vS7!AxyI;>Y(lI&=Har5;eUkmIw>OwwDLl-YFYQ44i2ffS(>rH&r2
z@d;l6zzH(=reD;Rx|T};t9<W9Uq4amz=*|X^veL?%1?7Dw%P#zg|w#TUpGV%*a66n
z;2dBmSx7-1=`&&{-(97&0sWrLHpC)mO_0Bq*%cLu1DB(DS<VcGJWW|Dbg}4*iIlIY
zU0pjec|qe2$y`%x1)ZVNbDC^bed3Zw!)SHGlC@sniwn9J4U01k@rz4x{eyZvRy3gM
z`{%Xs+2{Y$xDDS(Q9mM;xJGpFsbN)L62${triGHu9zBERoXEQF+!~w$Q86S6bo>uj
zk|x~ebdmD4Z~*n{0lO7@yNUMTmwn}*6El7{!cJy=Ckdf}Lz{nth*fvFtioP%GTorX
z$~WWn*2@D&oueIjp*e>(Dp9_V@=V!ADmCqpkbES?52zl(@i8;;@pbWafnt-lzUk@<
z&qB5JI8-NuX}W1!-AKTQu0~(oVK60GxDcnFKwG-ySppJ6H4P56MAbxGYl2p(x(JNJ
zrR35Rn^KxOT+bE(I_VWLY-3)OmD7MLPfR_YAF}3Wt{L+6mTl6my&&R}5y}PlLs@!2
z*e4e=IcH&X8%B`)3>obPZl>VU-KTd_Qc})3aujDEhBgA5Rwo-$Er4D=t4J1TB{y6;
z2}<4KJ%s5wJ8chm228yl=nv53%-Cel3@j|ILz9+Oy0>6)p+VQV{P9C}%SglI()gjk
z`YB4TqD3#Bl9rz`_qe2!dKQLVT|}AckeIvyhyiPjz;Stq^{eJCOIc8sC3?b_OD=3A
zeDSAXL)9De8xA;o(-Q>W&98~AsRMa3Y8cEVCT|J0TbcTE>Z$G!GfOY<I%9=}SHwl~
zW?<LFQY3F^W>#@3*Jcn8vp_7Bb&BlY+Z-EC4<#$OoZ(u|@RWkW9tzN8rmy$7=b?bn
zPHn$(dW+(Khfd`=2^Rmg)v1=>xOi$4FHFk&H2O-pX=IKXFCpIxn2Lx5p%$SNbal-!
zSudhJb47?i+0bciz^jl|Y;Ca<-TxaJB<G1Cafk}t)*j*vBThu{m}^Ipp@!RhgT5qw
zVr&2d*)!tCm1g2q{$k@`m}(iFN3q*Yi}_?Ak6B8_VXTnd|FGzmcMu=#7#c>RTJ(*B
zIEosv=y8vKc#bbMw6TfR9~*O$mYEkz@gF8@XUE$L&=Dd0+;%E3X?|hxwe3=>{^U&{
zdU$xeyD&Sw2s+nK$%r*^Ei^QmUKrbp0p20y8E!9*REPtzke7Au&=O`*(M{yZR}bum
z$UnG%cLt`&2{E?2@+9MPFESN@ewNsOBR@rfXkNVP&6Zgk`|XH;n034YcM3D);)8oF
z8RcUj)H^Kn>xxIE6NRv|elz(X@-X>nsHLbF%C4k}cM7V}YL{WZ&~qL;r9}~mU`qMn
zUZlQbGV3zcr&|uzw;uW$mM8xMo0gewh5NmQ)EsR<nKrNfdD{e`7RoU*@y{X5o|Ue6
zOTBV?bK0MrQgYgfOQS&MY9}M^E$q0x25s6ZuYdq#QMJMAfdjoKH4I{xGoL)%4Vqgm
zp-Ou;ige#?mObNbl;Mr>Mi;N1hFbv|%v+DMOX(S8iA%N|0(9=Cp7uJw@YMya7y`9m
z`^k#l-ZSR$O1;aa=!5(?`CSt+i7yr8dU^`nJ&1a1oBOf*fKCMeZ)AD0Q?l@(&N0w~
z&~@R}%nDwpI}$nw{M86H$yDH2M16<tH!B`(Q1IN~qTtQ%PD)(6m`er~l2e?$NK3{(
zU!J7bf!2pTdueZH|0Qipzwy9Y6!G~A!9j%J>l<$m0JNmo@RFqcB*ffRwdGd_w=~y?
zkg=`Y@)(TEgw;qMahnt(DQ$qoptC4k8^CQFjpt03Lh+wR#=nm*mQS>_nan|h>3b4K
z+cFP8Nn=T8^4^&w0h=TpRu<UMc^K9Fx8xDE@lAJK6nyE+?;tSPL{KW|jBrTo>IG7q
z8MGfJn~S#sXWFm5;I}orHZEuc{mdZ;8ND2V?Dt}S-(*9k1AD_S34i;o;&l170b-u<
zZR9GSB!mEtGsJ}s4<#G2Lhgb*<C71gjes|x_b^0YKY9N|cFF`O-F7*;_xZxoY@&<e
z`NH^zdV%}?&Ik{WC)yYD(}Rw4dUQcY=Eoy-H88C~x6?LPSFfE2SCGs5PIN|0ozImh
z2ani@>mn_xwJ4c;<VUM8(8J|;BfKgoyCmnnDfMv(khr43*Kk(sDjJ}}f3f?`GZ?@7
z?UkAOmqX}2=(F#E*qjLtJz4<__Wt-N*cmq1ZRH>ZT?1GVtSAoQAQkf0{9S320U*x`
zWW#(BU-JAIoJQsgwOP@<`XlyHJZ$1|PaI3k^_+gA?9s;|%ecjfhBIJMnDnuuQ<CYJ
zi~HaFDL42){CUV`b@mLOkLhvdYZ=pW=sOBMZ;c$|Zd$|6goyg?|0>32F9auho4Osw
zRc;B&r<A7{?q-58JECdTE~_RKhu^d@A7O6k=hDJU-toSCwcEg<-@wu(?^cyBKZU~b
z$F@e5?8u9-C<M2QC3TTnoImhSM;JHduZrKq`f;MONctX?iTk-GvsdftQ#79U7RD_U
zn!pB4nQo~~!5%l6Qzk9HP|gPjHYD1L)B6N5`d2b_z79lckn}?g3(PuuwJ1{_wxLJL
zM5~y{_k#jx9f&oMpRy($nWU@##8Ja9Ayv?;*b`}`68kT3XwY#3r&Xs??ALY3s9P(c
zOHMc^@Ezo|W}{aY<2rT_5Dx(?2dYFKV2_c5;^3aIucbUGKf&Q){mCKnF;*xQn+%{U
zA|{5(+6ZZdk4ySxj$7!EfHZZ!VH)Qd;3ycW3(!cCbdz<0!2cHe<9u5|VuDV<2MXm(
z14W;B3)5Bi|KHfgrmU~+v{B)yc~86YC$dk3_6+soHltyR00mpPnw|NHcg?^rm^v#O
zbooDq?!r=53hp5Bs4@6!C6Zweqru5RB5>ql$f*#vY1i&n6o@6*FGtJ24HctI{!iRu
z+SZosNTm>QlNq*BPo7q-@>crc7^i$<q>r#@o1J{jH5=Avc_gH6Bs2PbB5d<trs)AX
zRV6k{AC)g$HA@%u8`C6lL9Q?H@{c?9_3^WYd6Gt(o-l9tuC{OHg)-{=WNLwS=ZvUM
zGqeyfNEMGKD~BHlkoCYo;T0PsDi<=*l3$8)Qtn#;8S%%>W<1<4Pob=LIMh%tU|H|y
z_t!jsOz8Icc^_M0f70~$D34|a*vumnYqKEJ$}jLtiElKq|J^%FBditY!WKQG8%zv$
z^kOUkdNJoyF&ZB=!HZw6cda~{Tn@Y2o{cQiUR8CI<^8kw4ovk|Ys!QpQz}p0-vznL
zQ6#WDo_kI=|6lct9Z8y$S4Tcg*B6~(O-<ibm6^iWUGc7dgr#R~v5;(83f%^U(NrVe
z(V?qI_H&WQAGPv@jvVsNxH`&OM>~lmpJoEk!}NhIt@7A(xh~L@{_e<e>(^Efb%XMq
zpRWGfi698V8)TG>=)O(nQQ~j>X#66>;g_a2^{Vez1Ba9oP9W`t{c+q^&sKSH3?V##
z4ZxEZyZtTr*C}EvaOYcSGW!P@l=^`1B7fN_{agojwQnL;dj8$J?D2Z{+|YnfeSUre
zo=OmW1PKZCv&*yZ>OE5elNK=Bq{Yg}hNTiXc*<g~+fz6buWrk9RLm#*oA5q<(8Kdw
zHqB)U=WZiX6O7YbvB|BC5a3HCu@Yj~fOMC$^V#3%Aa4y%|IUEFi>URVo53f<0Noc%
z<)Kij<ns#aU~ah(Y^QAekuE2``kWmdR(YJ=Zc5|=%apB~|B9s_@>k#h{s<odUG0A&
z7IX{DRZL)^l@F0l$%nD$t_2>R??w8p4-_dbbBf_TBOZzU+L4)|IL*@3w2fFunLF&B
zxO8Fa!zOLw?6TA&@IiN0f$GKq5U&_xQdwQ&z~>4CUZ)Dml!}#YAcB&o;KG{>xbVtC
zkcU;C=%vaB!iG4--Vto$hyJ1r!*9$i*V<WL^OGCd8G$RU`PM{c3Bie-ifaWd1@PS@
zN3U)I+b3{f=o&Es0!n)L<`kqx`-MMA5pYxf7)$oE@qahZEUP^5FKhZ)!GT<{yv9*8
z^*pjc;%E~&GCSj$NTZ`VvhH~&s;O6It2{gcC*}<lAD+U)v#3R%^^s^1gD=D+_T_}0
z2wrHB(#cP_nFF#!Qgh?H*L0&cV?eCfe60T|8^MB_nDS!gMws*Y-c!*bDDHJ*-seX*
z(YSdOV0Ng;Cxt27{wWHW_)jhTaasFZ8l#}l7R<LlzxjBYSMua{&hb2-aKtUjCuehN
z3M{pG<Vr3cl4G%vCl(fK&wY-n;CuJxz{ukAB#ott4s58O{IDcQTAU3}TGAv92**Z7
z1LsCBJ6_P9*VNxzN>gvL6{{xH(<~$|;a?oRAo{lN&ne2aqQ8oxgfOpIt{=z%zP;sP
z-?oqT7UN`R9v$Sgo$@v87coS!#7ma=JIqaTjNJjs&s?{X*~@$@PV2|WQmyo@#nkJc
z3IR+b9wKg$;SZYv9vCcqZ44-uRAu&#5cF^yM-n4(C3(YLPZ_O9`R0H;b4PZHda`@{
z|Dtd#)gx_n=bSWdq)s~#88|z$V6rgdsVjjmC8-?a7e6lOO&B&aH)v7Y&@e-Ew{<D(
zo`}iEkwjG~u#!Hg4+g>IHQR4l`)9&pB>EsX>jmFeo=<TimHX_I^JAGUt4QrQhUH!C
zV8zQz5#qZMCybG<+m^QoTMvZ*Zx}sE%hyl!5HD4*Us^(^XkES~Od?mseY?Xl6?p=2
z9^$#?B>a)FBNKTgf-;W07aFXKrStgV;x9`|a%RlqN1sdYT9il6UOJB-@d!|Enj2jh
zSy1ZcJajkU`?|$WTaqUX>Mtxbw_NU<P)CPOJyS+icEF+lE=C>=kQV>Q6Y-wVVX+_W
z3d}J!FsSYbHZ#cZi7s#b<6X12+d2wsFDmTV?pv`<5g=d726nP`h`SP?y!^ahWV`Lm
zfiwhl#rsn3bImGCww+pc#_8(1E89ca*O=(_*vJ~0IVynmII}oa$Hezr)N9C6->T@|
zUd3=t3!F|6cekht)D)~woav~(F#BPmdfv@*>EFXiOP&qyz+zd_;wyR5;#1qixnDei
zt!-IdLqkf75)T4G6@+T#D4n5rs%BP49lJyadPwsP4nE@JW(L|JFQWae)0?`OH}6V>
z+aF|w1!G@*4Gn++OFb_8ZoATW?C2dRJjnbY;D+Gy5$;Wga!T+W>_^#d{a9M%ovotd
z{+ZZmMRRL!|8YhHr4Z)wU=jnZ!G0$D>8t6VL@krGSpnG;*l3&A%O=#ylynoZrol}W
zUDmf}`B}Q>dsWi%m!#Ijg%Mp@y65t`Bwd#6qOh#CZs*5YN_?Ffc#K8~vdu)HTC9@b
zZ<3y4gzfvwANcN)8=IzL))Cj>RuMN;3Y_Hz=xW~EFZ_a-R5{MMf&$C8`fL+&nZX9B
zPFYv(ex2Og$V~z0XZL^Re93#g#sNHrI0S>rjU6ZPDE!N3*)NFIL_Xl<T{A5ts_1+_
zsvdC}uj)F?S+8&+ZFFs|dUi*sK24#;pBE_S6YzXZrRVY+q+xj$(FeA4r+Qs_QdZLZ
z;dE8pLXRVuo&UAkCB4P)?JPdDOrV0qCD5J#S8?5z6;$WTVWEdUlM1(;89jrEUK*qP
z9$$>jK^Wj~G5VVbTtqhVzZ7F9Gj`*hK&5@<^}#J1;VwV~pK`N8AW*DNUNVq~qLNe?
ze~ME~xw9=b7_=nA=0HX`*62sq2B^e7H1UJOp%cTg(jB0;S3TewBgL5nl+_%Ff2o{>
u(1lrp#N~xOo(Z*D{Y=1zhNONSsp4e9;aP863w<OBzWsXtSEXNYlm8D_g?%sp

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/values/styles.xml b/moduleUtil/src/main/res/values/styles.xml
index 1307cfe..6173f63 100644
--- a/moduleUtil/src/main/res/values/styles.xml
+++ b/moduleUtil/src/main/res/values/styles.xml
@@ -115,6 +115,13 @@
         <item name="android:windowExitAnimation">@anim/dialog_exit</item>
     </style>
 
+    <style name="DialogSlideRightAnimation" parent="android:Animation">
+        <!-- 右侧滑入动画 -->
+        <item name="android:windowEnterAnimation">@anim/slide_in_right</item>
+        <!-- 右侧滑出动画 -->
+        <item name="android:windowExitAnimation">@anim/slide_out_right</item>
+    </style>
+
     <!--全屏dialog-->
     <style name="Dialog_Fullscreen">
         <item name="android:windowFullscreen">true</item>
@@ -270,5 +277,14 @@
     </style>
 
 
-
+    <style name="FullScreenDialogStyle" parent="Theme.AppCompat.Dialog">
+        <!-- 去掉标题栏 -->
+        <item name="windowNoTitle">true</item>
+        <!-- 对话框背景透明 -->
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <!-- 去掉对话框默认的边距和阴影 -->
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt
index dd4c50e..f67e7d9 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt
+++ b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt
@@ -685,6 +685,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         override fun onConnectSuccess() { //重连成功
             if (CommonAppContext.getInstance().playId != null) {
                 LogUtils.e("@@@", "重连成功")
+                LogUtils.e("@@@", ""+CommonAppContext.getInstance().playId)
                 RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId)
             }
         }
@@ -1563,7 +1564,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                     mRoomInfoResp!!.room_info.type_id == "4" || mRoomInfoResp!!.room_info.type_id == "8"
                 ) {
                     if (mRoomInfoResp!!.room_info.label_id == "1") {
-                        roomFragment!!.SingSongEvent(messageEvent)
+//                        roomFragment!!.SingSongEvent(messageEvent)
                     } else {
                         roomFragment!!.KtvFragmentEvent(messageEvent)
                     }
@@ -1748,6 +1749,30 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         messageEvent: RoomMessageEvent
     ) {
         mRoomInfoResp!!.user_info.pit_number = Integer.parseInt(toPitNumber)
+
+
+//        if (messageEvent.text.user_id .equals(SpUtil.getUserId().toString()) && "9" == toPitNumber) {
+//            if (customMusicFloatingView != null) {
+//                customMusicFloatingView!!.destroy()
+//                AgoraManager.getInstance(this@RoomActivity).desMusic()
+//                isMusic = false
+//            }
+//            mBinding!!.roomTop.rl.visibility = View.GONE
+//            ivSoundEffects(false)
+//        }
+
+        if ("9" == toPitNumber && messageEvent.text.user_id .equals(SpUtil.getUserId().toString())) {
+            mBinding!!.roomTop.rl.visibility = View.VISIBLE
+            ivSoundEffects(true)
+        }else{
+            if (customMusicFloatingView != null) {
+                customMusicFloatingView!!.destroy()
+                AgoraManager.getInstance(this@RoomActivity).desMusic()
+                isMusic = false
+            }
+            mBinding!!.roomTop.rl.visibility = View.GONE
+            ivSoundEffects(false)
+        }
 //        if (TextUtils.isEmpty(fromPitNumber) || TextUtils.isEmpty(toPitNumber)) {
 //            return
 //        }
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomHourlyAdapter.java b/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomHourlyAdapter.java
index e09e061..3550afc 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomHourlyAdapter.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomHourlyAdapter.java
@@ -41,12 +41,17 @@ public class RoomHourlyAdapter extends BaseQuickAdapter<RoomHourBean.RoomListBea
         ImageUtils.loadHeadCC(roomListBean.getRoom_cover(), baseViewHolder.getView(R.id.room_tx));
         if (roomListBean.getXlh_status()==1){
             baseViewHolder.getView(R.id.im_xlh).setVisibility(View.VISIBLE);
-            baseViewHolder.setImageResource(R.id.im_xlh, com.xscm.moduleutil.R.mipmap.hourly_xlh_status);
+            baseViewHolder.getView(R.id.tv_sta).setVisibility(View.VISIBLE);
+            baseViewHolder.setText(R.id.tv_sta, "进行中");
+            baseViewHolder.setBackgroundRes(R.id.tv_sta, com.xscm.moduleutil.R.mipmap.jxz);
         }else if (roomListBean.getXlh_status()==2){
             baseViewHolder.getView(R.id.im_xlh).setVisibility(View.VISIBLE);
-            baseViewHolder.setImageResource(R.id.im_xlh, com.xscm.moduleutil.R.mipmap.hourly_xlh_sta);
+            baseViewHolder.getView(R.id.tv_sta).setVisibility(View.VISIBLE);
+            baseViewHolder.setText(R.id.tv_sta, "即将开始");
+            baseViewHolder.setBackgroundRes(R.id.tv_sta, com.xscm.moduleutil.R.mipmap.jiks);
         }else {
             baseViewHolder.getView(R.id.im_xlh).setVisibility(View.GONE);
+            baseViewHolder.getView(R.id.tv_sta).setVisibility(View.GONE);
         }
         baseViewHolder.setText(R.id.room_name, roomListBean.getRoom_name());
         ImageUtils.loadHeadCC(roomListBean.getLabel_icon(), baseViewHolder.getView(R.id.iv_type));
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/HourlyChartDialog.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/HourlyChartDialog.java
index 4302e1f..30c80ec 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/HourlyChartDialog.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/HourlyChartDialog.java
@@ -1,10 +1,12 @@
 package com.example.moduleroom.dialog;
 
+import android.app.Dialog;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
-import android.view.Gravity;
-import android.view.ViewGroup;
+import android.os.Bundle;
+import android.view.*;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import com.example.moduleroom.R;
 import com.example.moduleroom.adapter.RoomHourlyAdapter;
@@ -16,8 +18,10 @@ import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.adapter.CirleListAdapter;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
+import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.base.RoomManager;
 import com.xscm.moduleutil.bean.room.RoomHourBean;
+import com.xscm.moduleutil.dialog.RoomAuctionWebViewDialog;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -31,6 +35,9 @@ public class HourlyChartDialog extends BaseMvpDialogFragment<HourlyChartPresente
     private int  page;
 
     private RoomHourlyAdapter roomHourlyAdapter;
+    
+    // 添加标志，控制对话框从右侧显示
+    protected boolean mGravityRight = true;
 
     @Override
     protected HourlyChartPresenter bindPresenter() {
@@ -47,17 +54,35 @@ public class HourlyChartDialog extends BaseMvpDialogFragment<HourlyChartPresente
     protected void initData() {
 
     }
+
+    @NonNull
+    @Override
+    public @NotNull Dialog onCreateDialog(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
+        Dialog dialog = new Dialog(requireContext(), com.xscm.moduleutil.R.style.FullScreenDialogStyle);
+        return dialog;
+
+    }
+
     @Override
     public void onStart() {
         super.onStart();
         if (getDialog() != null && getDialog().getWindow() != null) {
+            // 设置为全屏高度，并去掉状态栏
             getDialog().getWindow().setLayout(
                     ViewGroup.LayoutParams.MATCH_PARENT,
                     ViewGroup.LayoutParams.MATCH_PARENT
             );
-            getDialog().getWindow().setGravity(Gravity.END);
+            // 添加全屏标志，去掉状态栏
+            getDialog().getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,WindowManager.LayoutParams.FLAG_FULLSCREEN);
+            getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            if (mGravityRight) {
+                getDialog().getWindow().setGravity(Gravity.END);
+            } else {
+                getDialog().getWindow().setGravity(Gravity.BOTTOM);
+            }
         }
     }
+    
     @Override
     public void onResume() {
         super.onResume();
@@ -70,7 +95,11 @@ public class HourlyChartDialog extends BaseMvpDialogFragment<HourlyChartPresente
         // 设置dialog的窗口属性
         if (getDialog() != null && getDialog().getWindow() != null) {
             getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-            getDialog().getWindow().setGravity(Gravity.END); // 保持右侧显示
+            if (mGravityRight) {
+                getDialog().getWindow().setGravity(Gravity.END);
+            } else {
+                getDialog().getWindow().setGravity(Gravity.BOTTOM);
+            }
         }
         mBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         roomHourlyAdapter = new RoomHourlyAdapter();
@@ -108,6 +137,12 @@ public class HourlyChartDialog extends BaseMvpDialogFragment<HourlyChartPresente
         });
 
         mBinding.viewBackground.setOnClickListener(v -> dismiss());
+        mBinding.imHourlyWf.setOnClickListener(v -> {
+            Bundle bundle = new Bundle();
+            bundle.putString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "api/Page/page_show?id=24");
+            RoomAuctionWebViewDialog dialog = new RoomAuctionWebViewDialog(getActivity(), bundle);
+            dialog.show();
+        });
     }
 
     @Override
@@ -141,4 +176,15 @@ public class HourlyChartDialog extends BaseMvpDialogFragment<HourlyChartPresente
         mBinding.smartRefreshLayout.finishLoadMore() ;
         mBinding.smartRefreshLayout.finishRefresh();
     }
-}
+    
+    @Override
+    protected void initDialogStyle(Window window) {
+        if (mGravityRight) {
+            window.setGravity(Gravity.END);
+            window.setWindowAnimations(com.xscm.moduleutil.R.style.DialogSlideRightAnimation);
+        } else {
+            window.setGravity(Gravity.BOTTOM);
+            window.setWindowAnimations(com.xscm.moduleutil.R.style.CommonShowDialogBottom);
+        }
+    }
+}
\ No newline at end of file
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
index 6ae3991..482acc9 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
@@ -27,6 +27,7 @@ import com.example.moduleroom.dialog.WheatFeedingDialogFragment;
 import com.example.moduleroom.presenter.RoomPresenter;
 import com.hjq.toast.ToastUtils;
 import com.xscm.moduleutil.base.BaseMvpFragment;
+import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.RoomCharmRankBean;
 import com.xscm.moduleutil.bean.RoomMessageEvent;
 import com.xscm.moduleutil.bean.UserOnlineStatusBean;
@@ -795,8 +796,10 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
         setview();
 
         if (mRoomInfoResp.getUser_info().getPit_number() != 0) {
-            AgoraManager.getInstance(getActivity()).muteLocalAudioStream(false);
-            ((RoomActivity) getActivity()).switchMic(2);
+            if (!CommonAppContext.getInstance().isMai) {
+                AgoraManager.getInstance(getActivity()).muteLocalAudioStream(false);
+                ((RoomActivity) getActivity()).switchMic(2);
+            }
         } else {
             AgoraManager.getInstance(getActivity()).muteLocalAudioStream(true);
         }
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/SingSongFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/SingSongFragment.java
index f8b3d1a..3bdc6fb 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/SingSongFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/SingSongFragment.java
@@ -297,7 +297,8 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
             return false;
         } else {
             if (roomInfoResp.getRoom_info().getPit_list().size() > 8) {
-                if (roomInfoResp.getRoom_info().getPit_list().get(8).getUser_id().equals(SpUtil.getUserId() + "") && !pitNumber.equals("10")) {
+//                if (roomInfoResp.getRoom_info().getPit_list().get(8).getUser_id().equals(SpUtil.getUserId() + "") && !pitNumber.equals("10")) {
+                if (roomInfoResp.getUser_info().getPit_number()==9 && !pitNumber.equals("10")) {
                     return true;
                 }
                 return false;
@@ -383,7 +384,8 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
         wheatLayoutSingManager.setOnWheatClickListener(new WheatLayoutSingManager.OnWheatClickListener() {
             @Override
             public void onWheatClick(RoomSingSongWheatView view, int pitNumber1) {
-                RoomPitBean pitBean = roomInfoResp.getRoom_info().getPit_list().get(pitNumber1 - 1);
+//                RoomPitBean pitBean = roomInfoResp.getRoom_info().getPit_list().get(pitNumber1 - 1);
+                RoomPitBean pitBean = view.pitBean;
 
                 // 可选：点击事件处理
                 Log.d("Wheat", "Clicked pit: " + pitNumber1);
@@ -1338,7 +1340,9 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
             }
         }
         if (roomInfoRespPk == null || roomInfoRespPk.getPk_info() == null) {
-            wheatLayoutSingManager.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number()!=null ? roomPitBean.getPit_number() : "0"));
+            if (roomInfoResp!=null) {
+                wheatLayoutSingManager.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number() != null ? roomPitBean.getPit_number() : "0"));
+            }
         } else {
             wheatLayoutManager1.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number()));
         }
@@ -1349,6 +1353,7 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
 //            for (int i = 0; i < roomInfoResp.getRoom_info().getPit_list().size(); i++) {
 //                wheatLayoutSingManager.updateSingleWheat(roomInfoResp.getRoom_info().getPit_list().get(i), i + 1);
 //            }
+
             wheatLayoutSingManager.setUpData(message);
         } else {
             for (int i = 0; i < roomInfoResp.getRoom_info().getPit_list().size(); i++) {
diff --git a/moduleroom/src/main/res/layout/activity_room.xml b/moduleroom/src/main/res/layout/activity_room.xml
index bcc2130..70b7941 100644
--- a/moduleroom/src/main/res/layout/activity_room.xml
+++ b/moduleroom/src/main/res/layout/activity_room.xml
@@ -521,7 +521,7 @@
         </com.xscm.moduleutil.widget.DropViewRoom>
 
 
-        <com.xscm.moduleutil.widget.DropViewRoom
+        <com.xscm.moduleutil.widget.DropHourlView
                 android:id="@+id/cl_xsb"
                 android:layout_width="@dimen/dp_60"
                 android:layout_height="@dimen/dp_25"
@@ -548,7 +548,7 @@
                     android:textSize="11sp"/>
 
 
-        </com.xscm.moduleutil.widget.DropViewRoom>
+        </com.xscm.moduleutil.widget.DropHourlView>
 
 
         <com.xscm.moduleutil.widget.floatingView.Floa
diff --git a/moduleroom/src/main/res/layout/item_hourly.xml b/moduleroom/src/main/res/layout/item_hourly.xml
index 506098c..2038e77 100644
--- a/moduleroom/src/main/res/layout/item_hourly.xml
+++ b/moduleroom/src/main/res/layout/item_hourly.xml
@@ -44,14 +44,29 @@
 
     <ImageView
             android:id="@+id/im_xlh"
-            android:layout_width="@dimen/dp_44"
-            android:layout_height="@dimen/dp_48"
-            android:src="@mipmap/hourly_xlh_status"
+            android:layout_width="@dimen/dp_50"
+            android:layout_height="@dimen/dp_50"
+            android:src="@mipmap/xlh_rk_bj"
             android:scaleType="fitCenter"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginBottom="@dimen/dp_15"
             android:layout_marginEnd="@dimen/dp_8"
-            android:layout_marginTop="@dimen/dp_8"/>
+            />
+    
+    <TextView
+            android:id="@+id/tv_sta"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="@+id/im_xlh"
+            app:layout_constraintTop_toBottomOf="@+id/im_xlh"
+            app:layout_constraintEnd_toEndOf="@+id/im_xlh"
+            android:textColor="@color/white"
+            android:background="@mipmap/jxz"
+            android:gravity="center"
+            tools:text="进行中"
+            android:textSize="@dimen/sp_10"/>
 
     <TextView
             android:id="@+id/room_name"
diff --git a/timcommon/src/main/res/layout/pop_dialog_adapter.xml b/timcommon/src/main/res/layout/pop_dialog_adapter.xml
index 98378e6..10f638b 100644
--- a/timcommon/src/main/res/layout/pop_dialog_adapter.xml
+++ b/timcommon/src/main/res/layout/pop_dialog_adapter.xml
@@ -2,16 +2,15 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="11.52dp">
+    android:padding="5dp">
 
     <TextView
         android:id="@+id/pop_dialog_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAlignment="viewStart"
         android:layout_gravity="start"
         android:layout_alignParentStart="true"
-        android:gravity="start"
+        android:gravity="center"
         android:lines="1"
         android:maxLines="1"
         android:textColor="@color/text_color_gray"
diff --git a/tuiconversation/src/main/res/layout/conversation_pop_menu_layout.xml b/tuiconversation/src/main/res/layout/conversation_pop_menu_layout.xml
index a83bbf6..baca9ea 100644
--- a/tuiconversation/src/main/res/layout/conversation_pop_menu_layout.xml
+++ b/tuiconversation/src/main/res/layout/conversation_pop_menu_layout.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:cardBackgroundColor="@color/transparent"
     app:cardUseCompatPadding="true"
     app:cardElevation="10dp">
 
     <ListView
         android:id="@+id/pop_menu_list"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:background="@color/transparent"