From 277684b8e022c1bf18ca36c8fb6bcf4f393aa19c Mon Sep 17 00:00:00 2001
From: Martin <13046765170@163.com>
Date: Fri, 13 Sep 2024 09:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=BC=80=E6=92=AD=E9=97=AE=E9=A2=98=20=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=96=87=E6=A1=88=E7=BF=BB=E8=AF=91=EF=BC=8C?=
 =?UTF-8?q?+=20=E4=BF=AE=E5=A4=8D=E6=A3=80=E7=B4=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E7=9B=B4=E6=92=ADitemUI=E9=97=AE=E9=A2=98=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=9B=B4=E6=92=AD=E9=97=B4=E6=8E=A5=E8=A7=A6=E7=A6=81?=
 =?UTF-8?q?=E8=A8=80=EF=BC=8C=E6=8E=A5=E8=A7=A6=E6=8B=89=E9=BB=91=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_launcher.xml |   1 +
 .../com/yunbao/common/http/LiveHttpUtil.java  |   4 +--
 .../com/yunbao/main/dialog/SigninDialog.java  |   2 +-
 .../yunbao/main/views/MainHomeViewHolder.java |   2 ++
 .../SearchRecommendBodyItemViewHolder.java    |  12 +++----
 .../main/res/layout/item_main_home_lives.xml  |   8 +++--
 .../main/res/layout/item_main_home_lives2.xml |  32 +++++++++++-------
 main/src/main/res/layout/signin_dialog.xml    |   3 +-
 main/src/main/res/layout/view_main_home.xml   |   2 +-
 .../src/main/res/mipmap-xxhdpi/icon_cange.png | Bin 4348 -> 0 bytes
 main/src/main/res/values-zh/strings.xml       |   2 ++
 main/src/main/res/values/strings.xml          |   2 ++
 12 files changed, 42 insertions(+), 28 deletions(-)
 delete mode 100644 main/src/main/res/mipmap-xxhdpi/icon_cange.png

diff --git a/app/src/main/res/layout/activity_launcher.xml b/app/src/main/res/layout/activity_launcher.xml
index 365ce7035..bf7eb2188 100644
--- a/app/src/main/res/layout/activity_launcher.xml
+++ b/app/src/main/res/layout/activity_launcher.xml
@@ -63,6 +63,7 @@
         android:scaleType="centerCrop" />
 
     <ImageView
+        android:visibility="gone"
         android:layout_gravity="bottom|center_horizontal"
         android:layout_width="84dp"
         android:src="@mipmap/logo"
diff --git a/common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java b/common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java
index adac07904..898b7edff 100644
--- a/common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java
+++ b/common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java
@@ -186,7 +186,7 @@ public class LiveHttpUtil {
      * 直播间解除禁言
      */
     public static void liveCancelShutUp(String liveUid, String toUid, HttpCallback callback) {
-        HttpClient.getInstance().get("Livemanage.cancelShut", LiveHttpConsts.LIVE_CANCEL_SHUT_UP)
+        HttpClient.getInstance().get("jiechujinyan", LiveHttpConsts.LIVE_CANCEL_SHUT_UP)
                 .params("liveuid", liveUid)
                 .params("touid", toUid)
                 .execute(callback);
@@ -206,7 +206,7 @@ public class LiveHttpUtil {
      * 直播间解除拉黑
      */
     public static void liveCancelBlack(String liveUid, String toUid, HttpCallback callback) {
-        HttpClient.getInstance().get("Livemanage.cancelKick", LiveHttpConsts.LIVE_CANCEL_BLACK)
+        HttpClient.getInstance().get("jiechutichu", LiveHttpConsts.LIVE_CANCEL_BLACK)
                 .params("liveuid", liveUid)
                 .params("touid", toUid)
                 .execute(callback);
diff --git a/main/src/main/java/com/yunbao/main/dialog/SigninDialog.java b/main/src/main/java/com/yunbao/main/dialog/SigninDialog.java
index 28dcbfcf9..b9d8fd928 100644
--- a/main/src/main/java/com/yunbao/main/dialog/SigninDialog.java
+++ b/main/src/main/java/com/yunbao/main/dialog/SigninDialog.java
@@ -63,7 +63,7 @@ public class SigninDialog extends AbsDialogFragment {
         if (bundle == null) {
             return;
         }
-        gold.setText(bundle.getString("send_gold") + "金豆+" + bundle.getString("send_exp") + "經驗值");
+        gold.setText(bundle.getString("send_gold") + mContext.getString(R.string.golden_beans) +"+"+ bundle.getString("send_exp") + mContext.getString(R.string.new_exp));
     }
 
     @Override
diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
index 6d52fa03e..29e38cf5f 100644
--- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
@@ -16,6 +16,7 @@ import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.NotificationCompat;
+import androidx.fragment.app.FragmentActivity;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -85,6 +86,7 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
     @Override
     public void init() {
         super.init();
+        mProcessResultUtil = new ProcessResultUtil((FragmentActivity) mContext);
         findViewById(R.id.btn_start_live).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/main/src/main/java/com/yunbao/main/views/SearchRecommendBodyItemViewHolder.java b/main/src/main/java/com/yunbao/main/views/SearchRecommendBodyItemViewHolder.java
index 1e66d228c..6c300730c 100644
--- a/main/src/main/java/com/yunbao/main/views/SearchRecommendBodyItemViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/SearchRecommendBodyItemViewHolder.java
@@ -59,7 +59,7 @@ public class SearchRecommendBodyItemViewHolder extends RecyclerView.ViewHolder {
     public void showData(AnchorRecommendItemModel model, int height) {
         Context mContext = itemView.getContext();
         liveType.setImageDrawable(null);
-        if (model.getContentPicSizeTwo() != null && !model.getContentPicSizeTwo().equals("") && height <= 1920) {
+        /*if (model.getContentPicSizeTwo() != null && !model.getContentPicSizeTwo().equals("") && height <= 1920) {
             Picasso.with(mContext)
                     .load(model.getContentPicSizeTwo())
                     .into(liveType);
@@ -67,7 +67,7 @@ public class SearchRecommendBodyItemViewHolder extends RecyclerView.ViewHolder {
             Picasso.with(mContext)
                     .load(model.getContentPicSizeThree())
                     .into(liveType);
-        }
+        }*/
         ImgLoader.display(itemView.getContext(), model.getThumb(), mCover);
         bgs.setVisibility(View.VISIBLE);
         pkico.setVisibility(View.GONE);
@@ -95,22 +95,22 @@ public class SearchRecommendBodyItemViewHolder extends RecyclerView.ViewHolder {
         mNum.setText(formatBigNum.formatBigNum(String.valueOf(model.getHotNum())));
         views.setVisibility(View.GONE);
         if (TextUtils.equals("1", model.getIslive())) {
-            views.setVisibility(View.VISIBLE);
+            //views.setVisibility(View.VISIBLE);
             //直播中
             mType.setImageResource(MainIconUtil.getLiveTypeIcon(Integer.parseInt(model.getType())));
             mType.setVisibility(View.VISIBLE);
             mLiveIco.setImageResource(R.mipmap.icon_main_rest_work);
             mNum.setVisibility(View.VISIBLE);
-            liveType.setVisibility(View.VISIBLE);
+            //liveType.setVisibility(View.VISIBLE);
             mLiveState.setText(mContext.getString(R.string.lives_state));
         } else {
-            views.setVisibility(View.VISIBLE);
+            //views.setVisibility(View.VISIBLE);
             //休息中
             mType.setImageResource(MainIconUtil.getLiveTypeIcon(Constants.LIVE_TYPE_RESTING));
             mType.setVisibility(View.GONE);
             mLiveIco.setImageResource(R.mipmap.icon_main_rest_spot);
             mLiveState.setText(mContext.getString(R.string.rest_state));
-            liveType.setVisibility(View.GONE);
+            //liveType.setVisibility(View.GONE);
             mNum.setVisibility(View.GONE);
         }//防抖
         RxView.clicks(mCover)
diff --git a/main/src/main/res/layout/item_main_home_lives.xml b/main/src/main/res/layout/item_main_home_lives.xml
index 9b09c5855..a01aae16d 100644
--- a/main/src/main/res/layout/item_main_home_lives.xml
+++ b/main/src/main/res/layout/item_main_home_lives.xml
@@ -121,14 +121,16 @@
                         android:textSize="10sp"
                         android:background="@drawable/bg_main_live_item_title" />
 
-                    <RelativeLayout
+                    <LinearLayout
                         android:layout_width="match_parent"
+                        android:gravity="center_vertical"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="5dp">
 
                         <TextView
                             android:id="@+id/name"
-                            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
                             android:layout_height="wrap_content"
                             android:ellipsize="end"
                             android:singleLine="true"
@@ -150,7 +152,7 @@
                             app:dt_left_height="12dp"
                             app:dt_left_width="10dp" />
 
-                    </RelativeLayout>
+                    </LinearLayout>
 
                 </LinearLayout>
 
diff --git a/main/src/main/res/layout/item_main_home_lives2.xml b/main/src/main/res/layout/item_main_home_lives2.xml
index feb152592..3ef64054d 100644
--- a/main/src/main/res/layout/item_main_home_lives2.xml
+++ b/main/src/main/res/layout/item_main_home_lives2.xml
@@ -49,6 +49,7 @@
                 android:layout_width="46dp"
                 android:layout_height="16dp"
                 android:layout_alignParentRight="true"
+                android:visibility="gone"
                 android:layout_marginTop="8dp"
                 android:layout_marginRight="8dp"
                 android:background="@mipmap/live_zt">
@@ -93,29 +94,34 @@
 
                 <TextView
                     android:id="@+id/title"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_height="15dp"
                     android:layout_marginTop="5dp"
+                    android:paddingStart="5dp"
+                    android:paddingEnd="5dp"
+                    android:gravity="center_vertical"
                     android:ellipsize="end"
                     android:includeFontPadding="false"
                     android:maxLines="1"
                     android:textColor="#fff"
-                    android:textSize="13sp"
-                    android:textStyle="bold" />
+                    android:textSize="10sp"
+                    android:background="@drawable/bg_main_live_item_title" />
 
-                <RelativeLayout
+                <LinearLayout
                     android:layout_width="match_parent"
+                    android:gravity="center_vertical"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="5dp">
 
                     <TextView
                         android:id="@+id/name"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:singleLine="true"
                         android:textColor="#fff"
-                        android:textSize="10sp" />
+                        android:textSize="12sp" />
 
                     <com.yunbao.common.custom.DrawableTextView
                         android:id="@+id/num"
@@ -125,14 +131,14 @@
                         android:drawablePadding="4dp"
                         android:gravity="center"
                         android:singleLine="true"
-                        android:textColor="#B3ffffff"
-                        android:textSize="10sp"
+                        android:textColor="@color/white"
+                        android:textSize="12sp"
                         android:textStyle="bold"
-                        app:dt_left_drawable="@mipmap/icon_main_live_num"
-                        app:dt_left_height="14dp"
-                        app:dt_left_width="14dp" />
+                        app:dt_left_drawable="@mipmap/icon_main_live_num_new"
+                        app:dt_left_height="12dp"
+                        app:dt_left_width="10dp" />
 
-                </RelativeLayout>
+                </LinearLayout>
 
             </LinearLayout>
 
diff --git a/main/src/main/res/layout/signin_dialog.xml b/main/src/main/res/layout/signin_dialog.xml
index 476e1092b..ff751f209 100644
--- a/main/src/main/res/layout/signin_dialog.xml
+++ b/main/src/main/res/layout/signin_dialog.xml
@@ -16,7 +16,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="170dp"
-            android:text="簽到成功"
+            android:text="@string/sign_in_successful"
             android:textColor="#FF000000"
             android:textSize="24sp"
             android:textStyle="bold" />
@@ -34,7 +34,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:text="200 金豆 + 2000 EXP"
             android:textColor="#FFFF2D73"
             android:textSize="14sp"
             android:textStyle="bold" />
diff --git a/main/src/main/res/layout/view_main_home.xml b/main/src/main/res/layout/view_main_home.xml
index a460aa44c..2a6352a87 100644
--- a/main/src/main/res/layout/view_main_home.xml
+++ b/main/src/main/res/layout/view_main_home.xml
@@ -98,7 +98,7 @@
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
-        android:layout_marginTop="80dp"
+        android:layout_marginTop="78dp"
         android:layout_height="match_parent"
         android:overScrollMode="never"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
diff --git a/main/src/main/res/mipmap-xxhdpi/icon_cange.png b/main/src/main/res/mipmap-xxhdpi/icon_cange.png
deleted file mode 100644
index cee731aa87bc26c9bf82707b00d1c8083e5497a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4348
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

diff --git a/main/src/main/res/values-zh/strings.xml b/main/src/main/res/values-zh/strings.xml
index 2f92b4a0e..83f473118 100644
--- a/main/src/main/res/values-zh/strings.xml
+++ b/main/src/main/res/values-zh/strings.xml
@@ -46,4 +46,6 @@
     <string name="main_tab_main">遇見</string>
     <string name="main_tab_yule">娛樂</string>
     <string name="main_tab_guangchang">廣場</string>
+    <string name="new_exp">經驗值</string>
+    <string name="sign_in_successful">簽到成功</string>
 </resources>
\ No newline at end of file
diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
index 4d7f0171e..0f3bae05f 100644
--- a/main/src/main/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -46,4 +46,6 @@
     <string name="main_tab_main">Meet</string>
     <string name="main_tab_yule">Game</string>
     <string name="main_tab_guangchang">Moment</string>
+    <string name="new_exp">EXP</string>
+    <string name="sign_in_successful">Sign in successful</string>
 </resources>