修复因为content_padding_10被修改后，货币详情界面出现问题，可能还有其它未知问题；货币详情界面显示的数字调整为2位小数

app/src/main/java/com/sheep/gamegroup/model/entity/OrienteeringDetail.java

@@ -25,7 +25,7 @@ public class OrienteeringDetail implements Serializable{
 
     private String icon;
 
-    private int balance;//可定向消费金额
+    private float balance;//可定向消费金额
 
     private int game_id;
 
@@ -65,10 +65,10 @@ public class OrienteeringDetail implements Serializable{
     public String getIcon(){
         return this.icon;
     }
-    public void setBalance(int balance){
+    public void setBalance(float balance){
         this.balance = balance;
     }
-    public int getBalance(){
+    public float getBalance(){
         return this.balance;
     }
     public void setGame_id(int game_id){

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -385,6 +385,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
 
         if(gettaskAcceptedEty != null){// && taskEty.getTask_type() == 1000) {//连续任务
+            if(!TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots())) {
+                detailTaskTv.setVisibility(View.VISIBLE);
+            }
             switch (gettaskAcceptedEty.getStatus()) {
                 case 1://"已接受任务";
                 case 2:// "正在进行中";
@@ -404,7 +407,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     bottom_btn_layout.setVisibility(View.GONE);
                     break;
                 case 8://任务已经下线
-                    if(TextUtils.isEmpty(taskEty.getScreenshots()) || gettaskAcceptedEty.getLower_num() > 0){//没有提交过截图或者已经提交过一次 下线失败后提交
+                    if(TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots()) || gettaskAcceptedEty.getLower_num() > 0){//没有提交过截图或者已经提交过一次 下线失败后提交
                         break;
                     } else {//提交过一次，但是审核失败或者没有审核就下线了
                         String sr = "重新提交（<font color='#e2271d'><big>最后一次机会</big></font>）";
@@ -482,11 +485,11 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         try {
             switch (view.getId()) {
                 case R.id.detail_task_tv://查看任务截图
-                    if (taskEty == null || TextUtils.isEmpty(taskEty.getScreenshots())) {
+                    if (gettaskAcceptedEty == null || TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots())) {
                         G.showToast("任务截图为空");
                         return;
                     }
-                    Jump2View.getInstance().showImgs(activity, 0, taskEty.getScreenshots());
+                    Jump2View.getInstance().showImgs(activity, 0, gettaskAcceptedEty.getScreenshots());
                     break;
                 case R.id.web_text:
                     break;

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogOrienteeringDetails.java

@@ -41,7 +41,7 @@ public class DialogOrienteeringDetails {
     private int gao;
     public DialogOrienteeringDetails(Activity activity){
         this.activity = activity;
-        gao = SheepApp.getInstance().getResources().getDimensionPixelSize(R.dimen.content_padding_10)*5;
+        gao = SheepApp.getInstance().getResources().getDimensionPixelSize(R.dimen.orienteering_item_gao)+1;
         maxShowCount = Math.max(6, G.HEIGHT*3/4/gao);
     }
     private View empty_view;
@@ -75,7 +75,7 @@ public class DialogOrienteeringDetails {
                     TextView dialog_label = convertView.findViewById(R.id.dialog_label);
                     TextView dialog_value = convertView.findViewById(R.id.dialog_value);
                     ViewUtil.setText(dialog_label, item.getName());
-                    ViewUtil.setText(dialog_value, String.format(Locale.CHINA, "余额%d元", item.getBalance()));
+                    ViewUtil.setText(dialog_value, String.format(Locale.CHINA, "余额%.2f元", item.getBalance()));
                     return true;
                 }
             };

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

@@ -17,7 +17,7 @@
         <com.sheep.gamegroup.view.customview.RefreshLayout
             android:id="@+id/swipe_container"
             android:layout_width="match_parent"
-            android:layout_height="50dp">
+            android:layout_height="@dimen/orienteering_item_gao">
 
             <ListView
                 android:id="@+id/dialog_list_view"
@@ -30,7 +30,33 @@
                 android:listSelector="@null"/>
         </com.sheep.gamegroup.view.customview.RefreshLayout>
     </RelativeLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="10dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/dialog_btn_left"
+            style="@style/style_button"
+            android:layout_width="0dp"
+            android:layout_weight="5"
+            android:layout_margin="1dp"
+            android:text="我知道了" />
+
+        <View
+            android:id="@+id/dialog_btn_center"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
 
-    <include layout="@layout/x_msg_dialog_btn" />
+        <TextView
+            android:id="@+id/dialog_btn_right"
+            style="@style/style_button_stroke"
+            android:layout_width="0dp"
+            android:layout_weight="5"
+            android:layout_margin="1dp"
+            android:text="确认提交" />
+    </LinearLayout>
 
 </LinearLayout>

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

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="50dp"
+    android:layout_height="@dimen/orienteering_item_gao"
     android:gravity="center_vertical"
     android:orientation="horizontal">
     <TextView
         android:id="@+id/dialog_label"
         android:layout_width="0dp"
-        android:layout_height="50dp"
+        android:layout_height="match_parent"
         android:layout_weight="1"
         android:textColor="@color/black_6_3"
         android:gravity="center"
-        android:textSize="16sp"
+        android:textSize="13sp"
         android:text="大圣不取经"/>
     <View
         android:layout_width="1dp"
@@ -20,11 +20,11 @@
     <TextView
         android:id="@+id/dialog_value"
         android:layout_width="0dp"
-        android:layout_height="50dp"
+        android:layout_height="match_parent"
         android:layout_weight="1"
         android:textColor="@color/black_6_3"
         android:gravity="center"
-        android:textSize="16sp"
+        android:textSize="13sp"
         android:text="余额50元"/>
 
 </LinearLayout>

app/src/main/res/values/common.xml

@@ -84,4 +84,5 @@
     <dimen name="view_size_200">200dp</dimen>
 
 
+    <dimen name="orienteering_item_gao">40dp</dimen>
 </resources>