[提交人]：王雪伟

[提交简述] ：幸福农场
[实现方案] ：压缩图片

app/src/main/java/com/ym/game/module/HomeInfoEntity.java

@@ -23,6 +23,15 @@ public class HomeInfoEntity {
     private int cloudNum;
     private int boxNum;
     private int acceleratorsNum;
+    private String imgUrl;
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
 
     public int getBoxNum() {
         return boxNum;

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

@@ -437,7 +437,7 @@ object MainDialog {
             recyList?.layoutManager = LinearLayoutManager(context)
             orderListAdapter?.appendToList(str2Obj.farmOrderDataList)
             val str2 =
-                "完成当前订单将获得 <font color=\"#FF9128\"><big><big>${str2Obj.awardCash}</big></big></font> 金币"
+                "完成当前订单将获得 <font color=\"#FF9128\"><big><big>${str2Obj.awardCash}</big></big></font> 元"
             tvtitle.text = Html.fromHtml(str2)
             mDialogView.findViewById<TextView>(R.id.id_img_order_list_title).text =
                 "未完成${str2Obj.orderLevel}级订单"

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

@@ -7,14 +7,14 @@
     <RelativeLayout
         android:id="@+id/id_Rel_order_list_bg"
         android:layout_width="wrap_content"
-        android:layout_height="400dp"
+        android:layout_height="500dp"
         android:layout_centerInParent="true"
         android:background="@mipmap/home_bg">
 
         <LinearLayout
             android:id="@+id/id_order_list_content_rel"
             android:layout_width="wrap_content"
-            android:layout_height="300dp"
+            android:layout_height="400dp"
             android:layout_centerHorizontal="true"
             android:background="@mipmap/icon_content_bg"
             android:gravity="center_horizontal"
@@ -35,7 +35,7 @@
                 android:id="@+id/id_rel_game_order_list"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_5" />
+                android:layout_marginTop="@dimen/dp_15" />
 
         </LinearLayout>
 

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

@@ -2,14 +2,15 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginBottom="@dimen/dp_25"
     android:gravity="center"
     android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/id_item_game_order_img"
         android:layout_width="wrap_content"
-        android:layout_marginRight="20dp"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_marginRight="20dp" />
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -19,30 +20,39 @@
 
         <TextView
             android:id="@+id/id_item_game_order_name"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_10"
+            android:layout_marginBottom="@dimen/dp_9"
             android:text="玉米"
             android:textColor="#8F4C07"
             android:textSize="@dimen/sp_15"
             android:textStyle="bold" />
 
-        <ProgressBar
-            android:id="@+id/id_item_game_order_progress"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="130dp"
-            android:layout_height="10dp"
-            android:max="100"
-            android:progress="40"
-            android:progressDrawable="@drawable/game_order_progress_bg" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ProgressBar
+                android:id="@+id/id_item_game_order_progress"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="130dp"
+                android:layout_height="10dp"
+                android:max="100"
+                android:progress="40"
+                android:progressDrawable="@drawable/game_order_progress_bg" />
+
+            <TextView
+                android:id="@+id/id_item_game_order_desc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="0/0"
+                android:layout_marginLeft="15dp"
+                android:textColor="#FF9128"
+                android:textSize="@dimen/sp_12" />
+        </LinearLayout>
 
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/id_item_game_order_desc"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:text="0/0"
-        android:gravity="bottom"
-        android:textColor="#FF9128" />
 </LinearLayout>
\ No newline at end of file