Merge remote-tracking branch 'origin/develop_dd_garden_1.0.1' into develop_dd_garden_1.0.1

app/src/main/java/com/ym/game/adapter/CashExchangeAdapter.kt

@@ -75,16 +75,16 @@ class CashExchangeAdapter :
                     } else {
                         when (bean.id) {
                             1 -> {
-                                EventUtils.onEvent("click_baicai", "白菜" + bean.cash)
+                                EventUtils.onEvent("click_hongmeigui", "红玫瑰" + bean.cash)
                             }
                             2 -> {
-                                EventUtils.onEvent("click_fanqie", "番茄" + bean.cash)
+                                EventUtils.onEvent("click_zimeigui", "紫玫瑰" + bean.cash)
                             }
                             3 -> {
-                                EventUtils.onEvent("click_nangua", "南瓜" + bean.cash)
+                                EventUtils.onEvent("click_linglan", "铃兰" + bean.cash)
                             }
                             4 -> {
-                                EventUtils.onEvent("click_luobo", "萝卜" + bean.cash)
+                                EventUtils.onEvent("click_juhua", "菊花" + bean.cash)
                             }
                         }
                     }

app/src/main/java/com/ym/game/view/MainDialog.kt

@@ -467,16 +467,16 @@ object MainDialog {
                         when (id) {
                             1 -> {
                                 Log.e("MXL","show_baicai")
-                                EventUtils.onEvent("show_baicai", "白菜" + jine)
+                                EventUtils.onEvent("show_hongmeigui", "红玫瑰" + jine)
                             }
                             2 -> {
-                                EventUtils.onEvent("show_fanqie", "番茄" + jine)
+                                EventUtils.onEvent("show_zimeigui", "紫玫瑰" + jine)
                             }
                             3 -> {
-                                EventUtils.onEvent("show_nangua", "南瓜" + jine)
+                                EventUtils.onEvent("show_linglan", "铃兰" + jine)
                             }
                             4 -> {
-                                EventUtils.onEvent("show_luobo", "萝卜" + jine)
+                                EventUtils.onEvent("show_juhua", "菊花" + jine)
                             }
                         }
                     }

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

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -58,6 +59,8 @@
 
 
                 <androidx.recyclerview.widget.RecyclerView
+                    tools:itemCount="20"
+                    tools:listitem="@layout/item_layout_warehouse"
                     android:id="@+id/rl_record"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

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

@@ -2,8 +2,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="@dimen/dp_100"
     android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
     android:gravity="center"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:layout_marginBottom="@dimen/dp_12">
 
     <LinearLayout
         android:layout_width="@dimen/dp_42"
@@ -13,14 +15,15 @@
         <ImageView
             android:id="@+id/id_img_item"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            tools:src="@mipmap/icon_zhongzi_one"/>
     </LinearLayout>
 
     <TextView
         android:id="@+id/id_tv_ownnum"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text=""
+        tools:text="11"
         android:textColor="#8F4C07"
         android:textSize="@dimen/sp_16"
         android:textStyle="bold" />