zhaoyi лет назад: 8
Родитель
Сommit
4986f0cef9

+ 6 - 0
app/src/main/res/drawable/start_hook.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/started_hangup"  />
+    <item android:drawable="@drawable/started_hangup_click"  android:state_pressed="true"/>
+
+</selector>

+ 16 - 16
app/src/main/res/layout/fgt_main_page_offline_empty.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:background="@color/white"
+              android:orientation="vertical">
 
 
     <RelativeLayout
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_width="wrap_content"
@@ -14,16 +14,16 @@
         <ImageView
         <ImageView
             android:layout_width="140dp"
             android:layout_width="140dp"
             android:layout_height="140dp"
             android:layout_height="140dp"
-            android:src="@drawable/sp_start_offline"
-            android:text="dfgsdfgdsfgdfg" />
+            android:src="@drawable/start_hook"
+            />
 
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:text="开始挂机"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_size_6" />
+        <!-- <TextView
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_centerInParent="true"
+             android:text="开始挂机"
+             android:textColor="@color/white"
+             android:textSize="@dimen/text_size_6" />-->
     </RelativeLayout>
     </RelativeLayout>
 
 
     <TextView
     <TextView
@@ -33,7 +33,7 @@
         android:layout_marginTop="40dp"
         android:layout_marginTop="40dp"
         android:text="免费云端挂机,平台自动做任务"
         android:text="免费云端挂机,平台自动做任务"
         android:textColor="@color/black_text_deep"
         android:textColor="@color/black_text_deep"
-        android:textSize="@dimen/text_size_4" />
+        android:textSize="@dimen/text_size_4"/>
 
 
     <TextView
     <TextView
         android:layout_width="wrap_content"
         android:layout_width="wrap_content"
@@ -42,7 +42,7 @@
         android:layout_marginTop="20dp"
         android:layout_marginTop="20dp"
         android:text="云端挂机无需下载,任务奖金一分不少"
         android:text="云端挂机无需下载,任务奖金一分不少"
         android:textColor="@color/black_text_light"
         android:textColor="@color/black_text_light"
-        android:textSize="@dimen/text_size_2" />
+        android:textSize="@dimen/text_size_2"/>
 
 
     <TextView
     <TextView
         android:layout_width="wrap_content"
         android:layout_width="wrap_content"
@@ -51,5 +51,5 @@
         android:layout_marginTop="@dimen/content_padding_small"
         android:layout_marginTop="@dimen/content_padding_small"
         android:text="使用不常用微信小号,随时随地离线做任务"
         android:text="使用不常用微信小号,随时随地离线做任务"
         android:textColor="@color/black_text_light"
         android:textColor="@color/black_text_light"
-        android:textSize="@dimen/text_size_2" />
+        android:textSize="@dimen/text_size_2"/>
 </LinearLayout>
 </LinearLayout>

+ 21 - 19
app/src/main/res/layout/fgt_main_page_task.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
     android:background="@color/white"
     android:orientation="vertical">
     android:orientation="vertical">
@@ -32,7 +33,7 @@
             android:text="1218"
             android:text="1218"
             android:textColor="@color/orange_text_light"
             android:textColor="@color/orange_text_light"
             android:textSize="@dimen/text_size_3"
             android:textSize="@dimen/text_size_3"
-            app:layout_constraintLeft_toRightOf="@id/txt_fgt_main_page_task_income"
+            app:layout_constraintLeft_toRightOf="@+id/txt_fgt_main_page_task_income"
             app:layout_constraintRight_toLeftOf="@+id/txt_fgt_main_page_task_remain"
             app:layout_constraintRight_toLeftOf="@+id/txt_fgt_main_page_task_remain"
             app:layout_constraintTop_toTopOf="parent" />
             app:layout_constraintTop_toTopOf="parent" />
 
 
@@ -44,7 +45,7 @@
             android:text="128"
             android:text="128"
             android:textColor="@color/orange_text_light"
             android:textColor="@color/orange_text_light"
             android:textSize="@dimen/text_size_3"
             android:textSize="@dimen/text_size_3"
-            app:layout_constraintLeft_toRightOf="@id/txt_fgt_main_page_task_succ"
+            app:layout_constraintLeft_toRightOf="@+id/txt_fgt_main_page_task_succ"
             app:layout_constraintRight_toLeftOf="@+id/txt_fgt_main_page_task_history"
             app:layout_constraintRight_toLeftOf="@+id/txt_fgt_main_page_task_history"
             app:layout_constraintTop_toTopOf="parent" />
             app:layout_constraintTop_toTopOf="parent" />
 
 
@@ -56,7 +57,7 @@
             android:text="128"
             android:text="128"
             android:textColor="@color/orange_text_light"
             android:textColor="@color/orange_text_light"
             android:textSize="@dimen/text_size_3"
             android:textSize="@dimen/text_size_3"
-            app:layout_constraintLeft_toRightOf="@id/txt_fgt_main_page_task_remain"
+            app:layout_constraintLeft_toRightOf="@+id/txt_fgt_main_page_task_remain"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
             app:layout_constraintTop_toTopOf="parent" />
 
 
@@ -68,9 +69,9 @@
             android:text="今日收入"
             android:text="今日收入"
             android:textColor="@color/black_text_gray"
             android:textColor="@color/black_text_gray"
             android:textSize="@dimen/text_size_2"
             android:textSize="@dimen/text_size_2"
-            app:layout_constraintLeft_toLeftOf="@id/txt_fgt_main_page_task_income"
-            app:layout_constraintRight_toRightOf="@id/txt_fgt_main_page_task_income"
-            app:layout_constraintTop_toBottomOf="@id/txt_fgt_main_page_task_income" />
+            app:layout_constraintLeft_toLeftOf="@+id/txt_fgt_main_page_task_income"
+            app:layout_constraintRight_toRightOf="@+id/txt_fgt_main_page_task_income"
+            app:layout_constraintTop_toBottomOf="@+id/txt_fgt_main_page_task_income" />
 
 
         <TextView
         <TextView
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
@@ -79,9 +80,9 @@
             android:text="今日完成"
             android:text="今日完成"
             android:textColor="@color/black_text_gray"
             android:textColor="@color/black_text_gray"
             android:textSize="@dimen/text_size_2"
             android:textSize="@dimen/text_size_2"
-            app:layout_constraintLeft_toLeftOf="@id/txt_fgt_main_page_task_succ"
-            app:layout_constraintRight_toRightOf="@id/txt_fgt_main_page_task_succ"
-            app:layout_constraintTop_toBottomOf="@id/txt_fgt_main_page_task_income" />
+            app:layout_constraintLeft_toLeftOf="@+id/txt_fgt_main_page_task_succ"
+            app:layout_constraintRight_toRightOf="@+id/txt_fgt_main_page_task_succ"
+            app:layout_constraintTop_toBottomOf="@+id/txt_fgt_main_page_task_income" />
 
 
         <TextView
         <TextView
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
@@ -90,9 +91,9 @@
             android:text="剩余次数"
             android:text="剩余次数"
             android:textColor="@color/black_text_gray"
             android:textColor="@color/black_text_gray"
             android:textSize="@dimen/text_size_2"
             android:textSize="@dimen/text_size_2"
-            app:layout_constraintLeft_toLeftOf="@id/txt_fgt_main_page_task_remain"
-            app:layout_constraintRight_toRightOf="@id/txt_fgt_main_page_task_remain"
-            app:layout_constraintTop_toBottomOf="@id/txt_fgt_main_page_task_income" />
+            app:layout_constraintLeft_toLeftOf="@+id/txt_fgt_main_page_task_remain"
+            app:layout_constraintRight_toRightOf="@+id/txt_fgt_main_page_task_remain"
+            app:layout_constraintTop_toBottomOf="@+id/txt_fgt_main_page_task_income" />
 
 
         <TextView
         <TextView
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
@@ -101,16 +102,17 @@
             android:text="任务记录"
             android:text="任务记录"
             android:textColor="@color/black_text_gray"
             android:textColor="@color/black_text_gray"
             android:textSize="@dimen/text_size_2"
             android:textSize="@dimen/text_size_2"
-            app:layout_constraintLeft_toLeftOf="@id/txt_fgt_main_page_task_history"
-            app:layout_constraintRight_toRightOf="@id/txt_fgt_main_page_task_history"
-            app:layout_constraintTop_toBottomOf="@id/txt_fgt_main_page_task_income" />
+            app:layout_constraintLeft_toLeftOf="@+id/txt_fgt_main_page_task_history"
+            app:layout_constraintRight_toRightOf="@+id/txt_fgt_main_page_task_history"
+            app:layout_constraintTop_toBottomOf="@+id/txt_fgt_main_page_task_income" />
 
 
         <LinearLayout
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="8dp"
+            android:layout_height="0dp"
             android:orientation="horizontal"
             android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintTop_toTopOf="parent"
+            tools:layout_editor_absoluteX="8dp">
 
 
             <Space
             <Space
                 android:layout_width="0dp"
                 android:layout_width="0dp"

+ 1 - 1
app/src/main/res/layout/task_item.xml

@@ -110,7 +110,7 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentRight="true"
         android:layout_marginRight="@dimen/content_padding_small"
         android:layout_marginRight="@dimen/content_padding_small"
         android:layout_marginTop="@dimen/content_padding_small"
         android:layout_marginTop="@dimen/content_padding_small"
-        android:src="@drawable/completed"/>
+        android:src="@drawable/received"/>
 
 
     <TextView
     <TextView
         android:id="@+id/tv_guide"
         android:id="@+id/tv_guide"