游戏详情

app/src/main/AndroidManifest.xml

@@ -104,6 +104,7 @@
         <activity
             android:name=".page.InputWXAccountActivity"
             android:screenOrientation="portrait"/>
+        <activity android:name=".page.GameDetailActivity"/>
     </application>
 
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/GameDetailActivity.java

@@ -0,0 +1,30 @@
+package com.sheep.jiuyan.samllsheep.page;
+
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+
+/**
+ * Created by kemllor on 2018/1/16.
+ * 游戏详情
+ */
+
+public class GameDetailActivity extends BaseActivity {
+    @Override
+    protected int getLayoutId() {
+        return 0;
+    }
+
+    @Override
+    public void initView() {
+
+    }
+
+    @Override
+    public void initListener() {
+
+    }
+
+    @Override
+    public void initData() {
+
+    }
+}

app/src/main/java/com/sheep/jiuyan/samllsheep/page/TaskRecordActivity.java

@@ -178,7 +178,7 @@ public class TaskRecordActivity extends BaseActivity {
                             String time = tmp1[1] + "/" + tmp1[2].split(" ")[0] + "\n" + tmp2[0] + ":" + tmp2[1];
                             viewHolder.setText(R.id.tv_time, time);
                             getState(viewHolder.<TextView>getView(R.id.tv_state), item.getStatus());
-                            viewHolder.setText(R.id.txt_baseactivity_title, "完成试玩->" + item.getTask().getTitle());
+                            viewHolder.setText(R.id.txt_baseactivity_title, item.getTask().getTitle());
                             Glide.with(TaskRecordActivity.this)
                                     .load(item.getTask().getIcon())
                                     .placeholder(R.drawable.icon)

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

@@ -0,0 +1,143 @@
+<?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="match_parent"
+              android:orientation="vertical">
+
+    <include
+        layout="@layout/title"/>
+
+    <RelativeLayout
+        android:id="@+id/dingwei1"
+        android:layout_width="match_parent"
+        android:layout_height="70dp"
+        android:layout_margin="@dimen/content_padding"
+        android:background="@color/backgroud">
+
+        <ImageView
+            android:id="@+id/img_icon"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="@dimen/content_padding"
+            android:src="@drawable/icon"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/content_padding_small"
+            android:layout_marginLeft="@dimen/content_padding_small"
+            android:layout_marginTop="@dimen/content_padding_small"
+            android:layout_toRightOf="@id/img_icon"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/txt_baseactivity_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:text="title"
+                android:textColor="@color/black_text_deep"
+                android:textSize="@dimen/text_size_4"/>
+
+
+            <TextView
+                android:id="@+id/tv_count"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/content_padding_small"
+                android:gravity="center_vertical"
+                android:text="250/250"
+                android:textColor="@color/black_text_gray"
+                android:textSize="@dimen/text_size_2"/>
+
+            <TextView
+                android:id="@+id/tv_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/content_padding_small"
+                android:gravity="center_vertical"
+                android:text="截止时间：2018-1-1"
+                android:textColor="@color/black_text_gray"
+                android:textSize="@dimen/text_size_2"/>
+        </LinearLayout>
+
+
+        <TextView
+            android:id="@+id/tv_bouns"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="10dp"
+            android:text="5.00"
+            android:textColor="@color/orange_text_light"
+            android:textSize="@dimen/text_size_5"
+            android:textStyle="bold"
+            />
+
+        <TextView
+            android:id="@+id/tv_text1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/tv_money"
+            android:layout_centerVertical="true"
+            android:layout_marginBottom="3dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="3dp"
+            android:layout_toLeftOf="@id/tv_bouns"
+            android:gravity="bottom"
+            android:text="+"
+            android:textColor="@color/orange_text_light"
+            android:textSize="@dimen/text_size_4"/>
+
+        <TextView
+            android:id="@+id/tv_money"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerVertical="true"
+            android:layout_toStartOf="@+id/tv_text1"
+            android:text="5.00"
+            android:textColor="@color/orange_text_light"
+            android:textSize="@dimen/text_size_5"
+            android:textStyle="bold"/>
+
+        <TextView
+            android:layout_alignRight="@id/tv_money"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@id/tv_money"
+            android:text="任务\n奖励"
+            android:textColor="@color/black_text_gray"
+            android:textSize="@dimen/text_size_2"/>
+
+        <TextView
+            android:layout_alignRight="@id/tv_bouns"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@id/tv_money"
+            android:text="邀请\n奖励"
+            android:textColor="@color/black_text_gray"
+            android:textSize="@dimen/text_size_2"/>
+
+    </RelativeLayout>
+
+    <Button
+        android:id="@+id/btn_task_item"
+        style="@style/style_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:layout_marginBottom="20dp"
+        android:layout_marginRight="@dimen/content_padding"
+        android:text="下载游戏"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/content_padding"
+        android:layout_below="@id/btn_task_item"
+        android:background="@color/background_light_gray"/>
+
+</LinearLayout>

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

@@ -1,15 +1,15 @@
 <?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="wrap_content"
-    android:background="@color/white"
-    android:orientation="vertical">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:orientation="vertical">
 
     <RelativeLayout
         android:id="@+id/dingwei1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/content_padding_big"
+        android:layout_margin="@dimen/content_padding"
         android:background="@color/backgroud">
 
         <ImageView
@@ -19,7 +19,7 @@
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
             android:layout_marginLeft="@dimen/content_padding"
-            android:src="@drawable/icon" />
+            android:src="@drawable/icon"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -37,7 +37,7 @@
                 android:gravity="center_vertical"
                 android:text="title"
                 android:textColor="@color/black_text_deep"
-                android:textSize="@dimen/text_size_4" />
+                android:textSize="@dimen/text_size_4"/>
 
 
             <TextView
@@ -48,7 +48,7 @@
                 android:gravity="center_vertical"
                 android:text="250/250"
                 android:textColor="@color/black_text_gray"
-                android:textSize="@dimen/text_size_2" />
+                android:textSize="@dimen/text_size_2"/>
 
             <TextView
                 android:id="@+id/tv_time"
@@ -58,7 +58,7 @@
                 android:gravity="center_vertical"
                 android:text="截止时间：2018-1-1"
                 android:textColor="@color/black_text_gray"
-                android:textSize="@dimen/text_size_2" />
+                android:textSize="@dimen/text_size_2"/>
         </LinearLayout>
 
 
@@ -73,7 +73,7 @@
             android:text="5.00"
             android:textColor="@color/orange_text_light"
             android:textSize="@dimen/text_size_5"
-            android:textStyle="bold" />
+            android:textStyle="bold"/>
 
         <TextView
             android:id="@+id/tv_text1"
@@ -88,7 +88,7 @@
             android:gravity="bottom"
             android:text="+"
             android:textColor="@color/orange_text_light"
-            android:textSize="@dimen/text_size_4" />
+            android:textSize="@dimen/text_size_4"/>
 
         <TextView
             android:id="@+id/tv_money"
@@ -99,7 +99,7 @@
             android:text="5.00"
             android:textColor="@color/orange_text_light"
             android:textSize="@dimen/text_size_5"
-            android:textStyle="bold" />
+            android:textStyle="bold"/>
 
     </RelativeLayout>
 
@@ -110,7 +110,7 @@
         android:layout_alignParentRight="true"
         android:layout_marginRight="@dimen/content_padding_small"
         android:layout_marginTop="@dimen/content_padding_small"
-        android:src="@drawable/completed" />
+        android:src="@drawable/completed"/>
 
     <TextView
         android:id="@+id/tv_guide"
@@ -122,7 +122,7 @@
         android:gravity="center_vertical"
         android:text="任务详情  >"
         android:textColor="@color/black_text_gray"
-        android:textSize="@dimen/text_size_2" />
+        android:textSize="@dimen/text_size_2"/>
 
     <Button
         android:id="@+id/btn_task_item"
@@ -134,11 +134,11 @@
         android:layout_below="@id/dingwei1"
         android:layout_marginBottom="20dp"
         android:layout_marginRight="@dimen/content_padding"
-        android:text="下载游戏" />
+        android:text="下载游戏"/>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/content_padding"
         android:layout_below="@id/btn_task_item"
-        android:background="@color/background_light_gray" />
+        android:background="@color/background_light_gray"/>
 </RelativeLayout>

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

@@ -29,7 +29,7 @@
             android:layout_width="45dp"
             android:layout_height="45dp"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="25dp"
+            android:layout_marginLeft="@dimen/content_padding"
             android:layout_toRightOf="@id/tv_time"
             android:scaleType="centerInside"
             />
@@ -68,10 +68,10 @@
 
             <TextView
                 android:id="@+id/tv_state"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="60dp"
+                android:layout_height="20dp"
                 android:layout_gravity="right"
-                android:padding="@dimen/content_padding"
+                android:gravity="center"
                 android:textColor="@color/white"
                 android:textSize="12dp"/>
 
@@ -81,8 +81,8 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginTop="5dp"
-                android:textColor="@color/sheep_red"
-                android:textSize="10dp"
+                android:textColor="@color/orange_text_light"
+                android:textSize="@dimen/text_size_2"
                 android:visibility="gone"/>
 
         </LinearLayout>