From 8923c4b517e689be8ecf8a09e5e2251300176f6a Mon Sep 17 00:00:00 2001
From: huangjian <547527489@qq.com>
Date: Wed, 13 May 2020 11:09:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=92=BB=E7=9F=B3=E5=AE=9D=E7=AE=B1=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E9=99=90=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChooseTreasureBoxDialogFragment.java      | 29 -------------------
 .../fragment_choose_treasure_box_dialog.xml   | 15 +---------
 .../xchat_android_core/UriProvider.java       |  2 +-
 .../xchat_android_core/user/UserModel.java    |  4 +--
 4 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java
index e83d2f6c5..e41ba06ef 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java
@@ -30,7 +30,6 @@ import io.reactivex.disposables.Disposable;
 
 public class ChooseTreasureBoxDialogFragment extends DialogFragment implements View.OnClickListener {
 
-    private TextView honourLimitTip;
     private ConstraintLayout clBoxNormal, clBoxHonour;
 
     private OnTreasureBoxChooseListener onTreasureBoxChooseListener;
@@ -51,7 +50,6 @@ public class ChooseTreasureBoxDialogFragment extends DialogFragment implements V
         super.onViewCreated(view, savedInstanceState);
         clBoxNormal = view.findViewById(R.id.cl_box_normal);
         clBoxHonour = view.findViewById(R.id.cl_box_honour);
-        honourLimitTip = view.findViewById(R.id.tv_honour_box_limit);
         view.findViewById(R.id.iv_close).setOnClickListener(this);
         clBoxNormal.setOnClickListener(this);
         clBoxHonour.setOnClickListener(this);
@@ -72,33 +70,6 @@ public class ChooseTreasureBoxDialogFragment extends DialogFragment implements V
             }
         }
 
-        // 钻石宝箱的限时时长以及是否可以点击 由接口控制
-        BoxModel.get().getBoxOpenStatusInfo(BoxModel.BOX_TYPE_HONOUR)
-                .subscribe(new SingleObserver<BoxOpenStatusInfo>() {
-                    @Override
-                    public void onSubscribe(Disposable d) {
-
-                    }
-
-                    @Override
-                    public void onSuccess(BoxOpenStatusInfo boxOpenStatusInfo) {
-                        if (boxOpenStatusInfo != null) {
-                            clBoxHonour.setEnabled(boxOpenStatusInfo.isOpening());
-                            String startTime = TextUtils.isEmpty(boxOpenStatusInfo.getStartTime()) ? "" : boxOpenStatusInfo.getStartTime();
-                            String endTime = TextUtils.isEmpty(boxOpenStatusInfo.getEndTime()) ? "" : boxOpenStatusInfo.getEndTime();
-                            honourLimitTip.setText(String.format("限时：%s - %s", startTime, endTime));
-                        } else {
-                            clBoxHonour.setEnabled(false);
-                            honourLimitTip.setVisibility(View.GONE);
-                        }
-                    }
-
-                    @Override
-                    public void onError(Throwable e) {
-                        clBoxHonour.setEnabled(false);
-                        honourLimitTip.setVisibility(View.GONE);
-                    }
-                });
     }
 
     @Override
diff --git a/app/src/module_treasure_box/res/layout/fragment_choose_treasure_box_dialog.xml b/app/src/module_treasure_box/res/layout/fragment_choose_treasure_box_dialog.xml
index 55c5f21a1..c7e9f7c56 100644
--- a/app/src/module_treasure_box/res/layout/fragment_choose_treasure_box_dialog.xml
+++ b/app/src/module_treasure_box/res/layout/fragment_choose_treasure_box_dialog.xml
@@ -133,19 +133,6 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <TextView
-            android:id="@+id/tv_honour_box_limit"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:textColor="#CCFFFFFF"
-            android:textSize="14sp"
-            app:layout_constraintEnd_toEndOf="@id/cl_box_honour"
-            app:layout_constraintStart_toStartOf="@id/cl_box_honour"
-            app:layout_constraintTop_toBottomOf="@id/cl_box_honour"
-            tools:ignore="SmallSp"
-            tools:text="限时：22:00 - 02:00" />
 
         <LinearLayout
             android:id="@+id/ll_get_key"
@@ -155,7 +142,7 @@
             android:orientation="horizontal"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_honour_box_limit">
+            app:layout_constraintTop_toBottomOf="@id/cl_box_honour">
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java
index 634e60b6d..085091b1a 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java
@@ -106,7 +106,7 @@ public class UriProvider {
      * 帮助页
      */
     public static String getHelp() {
-        return IM_SERVER_URL.concat("/accompany/modules/rank/index.html#/wishingWellHelp");
+        return IM_SERVER_URL.concat("/accompany/modules/rule/guide.html");
     }
 
     /**
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java
index 9a70b2dac..ee7a9e851 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java
@@ -130,9 +130,7 @@ public final class UserModel extends BaseModel implements IUserModel {
      */
     @SuppressLint("CheckResult")
     private void onLogin(final long uid) {
-        api.requestUserInfo(
-                String.valueOf(uid)
-        )
+        api.requestUserInfo(String.valueOf(uid))
                 .compose(RxHelper.handleSchedulers())
                 .flatMap((Function<UserResult, SingleSource<UserInfo>>) userResult -> {
                     if (userResult == null || !userResult.isSuccess() || userResult.getData() == null) {