Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/src/main/java/com/kfzs/duanduan/ActGameDetails.java

@@ -159,7 +159,9 @@ public class ActGameDetails extends BaseCompatActivity {
 //        mImgBg.setLayoutParams(new RelativeLayout.LayoutParams(HelperUtils.W, height));
 
         setSupportActionBar((Toolbar) findViewById(R.id.toolbar_act_game_details));
-        mFragmentGameDetail = new FgtGameDetail();
+        if(mFragmentGameDetail == null){
+            mFragmentGameDetail = new FgtGameDetail();
+        }
         AdpViewPagerDetail adpViewPagerDetail = new AdpViewPagerDetail(getSupportFragmentManager());
         adpViewPagerDetail.add(mFragmentGameDetail, getString(R.string.app_details_details));
 //        adpViewPagerDetail.add(new FgtGift(), getString(R.string.app_details_user_gift));//小绵羊中注释掉用户礼包

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -573,14 +573,14 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         //请求正在运行中的任务
         CommonUtil.getInstance()
                 .getRunTask(tryMakeMoneyPresenter,
-                        0);
+                        3);
     }
 
     @Override
     public void failReleaseTask2View(Object o) {
         CommonUtil.getInstance()
                 .getRunTask(tryMakeMoneyPresenter,
-                        0);
+                        3);
     }
 
     @Override

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -207,7 +207,7 @@ public class CommonUtil {
     }
     /**
      * 任务传送数据组装
-     * is_succession:0:不是连续  1:联系任务
+     * is_succession:0:不是连续  1:联系任务 3 全部显示
      */
     public HashMap<String, String> setHashMap(int page, int per_page,
                                               int platform, int is_hot,

app/src/main/java/com/sheep/gamegroup/view/adapter/AdpHomeListGrideview.java

@@ -57,7 +57,7 @@ public class AdpHomeListGrideview extends BaseAdapter {
             holder.gridview_item_icon_iv = convertView.findViewById(R.id.gridview_item_icon_iv);
             // 获取屏幕宽度
             int W = G.WIDTH <G.HEIGHT ? G.WIDTH : G.HEIGHT;
-            int cricleRadius = W / 2  -50;
+            int cricleRadius = W / 2 - 40;
             int h = cricleRadius  / 2;
             convertView.setLayoutParams(new AbsListView.LayoutParams(cricleRadius, h));
             convertView.setTag(holder);

app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -328,7 +328,8 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
                 if(is_succession == 1
                         &&  (etyList.get(i).getChild_task_id() > 1
-                                || (etyList.get(i).getChild_task_id() == 1 && etyList.get(i).getStatus() == 9))
+                                || (etyList.get(i).getChild_task_id() == 1
+                        && (etyList.get(i).getStatus() == 6 || etyList.get(i).getStatus() == 9)))
                         ){
                     viewHolder.itemView.findViewById(R.id.detail_task_tv).setVisibility(View.GONE);
                 }else {

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

@@ -5,10 +5,11 @@
     android:orientation="horizontal"
     android:gravity="center"
     android:layout_gravity="center_vertical"
-    android:padding="@dimen/content_padding_10"
-    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-    android:layout_marginRight="@dimen/content_padding_small"
-    android:layout_marginBottom="@dimen/content_padding_15">
+    android:paddingLeft="@dimen/content_padding_15"
+    android:paddingRight="@dimen/content_padding_10"
+    android:paddingTop="@dimen/content_padding_10"
+    android:paddingBottom="@dimen/content_padding_10"
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

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

@@ -1,47 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/view_size_130">
-    <RelativeLayout
+    android:layout_height="@dimen/view_size_136">
+
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/view_size_100"
-        android:background="@mipmap/home_blue_bg"
-        android:layout_marginBottom="@dimen/content_padding_40">
-        <ImageView
-            android:id="@+id/icon_img_iv"
-            android:layout_width="@dimen/view_size_60"
-            android:layout_height="@dimen/view_size_60"
-            android:src="@drawable/icon"
-            android:layout_centerVertical="true"/>
-        <LinearLayout
+        android:layout_height="@dimen/view_size_110"
+        android:orientation="vertical"
+        android:background="@mipmap/home_blue_bg">
+
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_toRightOf="@+id/icon_img_iv"
-            android:layout_centerVertical="true">
-            <TextView
-                android:id="@+id/name_tv"
-                android:layout_width="wrap_content"
+            android:layout_height="@dimen/view_size_100"
+            android:layout_marginBottom="@dimen/content_padding_small">
+            <ImageView
+                android:id="@+id/icon_img_iv"
+                android:layout_width="@dimen/view_size_60"
+                android:layout_height="@dimen/view_size_60"
+                android:src="@drawable/icon"
+                android:layout_centerVertical="true"/>
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/content_padding_small"
-                android:layout_marginLeft="@dimen/content_padding_10"
-                android:layout_marginTop="@dimen/content_padding_small"
-                android:text="aaaa"
-                android:textColor="@color/txt_white"
-                android:textSize="@dimen/text_size_12"/>
+                android:orientation="vertical"
+                android:layout_toRightOf="@+id/icon_img_iv"
+                android:layout_centerVertical="true">
+                <TextView
+                    android:id="@+id/name_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/content_padding_small"
+                    android:layout_marginLeft="@dimen/content_padding_10"
+                    android:layout_marginTop="@dimen/content_padding_small"
+                    android:text="aaaa"
+                    android:textColor="@color/txt_white"
+                    android:textSize="@dimen/text_size_12"/>
 
-            <TextView
-                android:id="@+id/sheep_num_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/name_tv"
-                android:layout_marginBottom="@dimen/content_padding_small"
-                android:layout_marginLeft="@dimen/content_padding_10"
-                android:text="绵羊号："
-                android:textColor="@color/txt_white"
-                android:textSize="@dimen/text_size_10"/>
-        </LinearLayout>
-    </RelativeLayout>
+                <TextView
+                    android:id="@+id/sheep_num_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/name_tv"
+                    android:layout_marginBottom="@dimen/content_padding_small"
+                    android:layout_marginLeft="@dimen/content_padding_10"
+                    android:text="绵羊号："
+                    android:textColor="@color/txt_white"
+                    android:textSize="@dimen/text_size_10"/>
+            </LinearLayout>
+        </RelativeLayout>
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/personalcenter_price_layout"

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

@@ -4,7 +4,9 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-    android:layout_margin="@dimen/content_padding_15">
+    android:layout_marginTop="@dimen/content_padding_15"
+    android:layout_marginLeft="@dimen/content_padding_15"
+    android:layout_marginRight="@dimen/content_padding_15">
     <RelativeLayout
         android:id="@+id/account_detail_layout"
         android:layout_width="match_parent"

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

@@ -6,7 +6,10 @@
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
     android:orientation="vertical"
     android:minHeight="@dimen/view_size_80"
-    android:padding="@dimen/content_padding_10"
+    android:paddingLeft="@dimen/content_padding_18"
+    android:paddingRight="@dimen/content_padding_10"
+    android:paddingTop="@dimen/content_padding_10"
+    android:paddingBottom="@dimen/content_padding_10"
     android:layout_margin="@dimen/content_padding_10">
     <LinearLayout
         android:layout_width="wrap_content"

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

@@ -18,6 +18,7 @@
         android:numColumns="2"
         android:listSelector="@color/transparent"
         android:verticalSpacing="@dimen/content_padding_8"
+        android:horizontalSpacing="@dimen/content_padding_8"
         android:layout_marginBottom="@dimen/content_padding_8"/>
 
     <com.sheep.gamegroup.util.MyListview
@@ -28,6 +29,7 @@
         android:divider="@null"
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:padding="@dimen/content_padding_10"
-        android:listSelector="@color/transparent"/>
+        android:listSelector="@color/transparent"
+        android:visibility="gone"/>
 
 </LinearLayout>

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

@@ -106,7 +106,8 @@
                     android:listSelector="@color/transparent"
                     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
                     android:padding="@dimen/content_padding_10"
-                    android:layout_margin="@dimen/content_padding_10"/>
+                    android:layout_margin="@dimen/content_padding_10"
+                    android:visibility="gone"/>
 
                 <LinearLayout
                     android:id="@+id/detail_item_layout_2"

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

@@ -45,10 +45,12 @@
     <dimen name="content_padding_10">10dp</dimen>
     <dimen name="content_padding_13">13dp</dimen>
     <dimen name="content_padding_15">15dp</dimen>
+    <dimen name="content_padding_18">18dp</dimen>
     <dimen name="content_padding_20">20dp</dimen>
     <dimen name="content_padding_30">30dp</dimen>
     <dimen name="content_padding_35">35dp</dimen>
     <dimen name="content_padding_40">40dp</dimen>
+    <dimen name="content_padding_46">46dp</dimen>
     <dimen name="content_padding_65">65dp</dimen>
     <dimen name="content_padding_80">80dp</dimen>
     <dimen name="content_padding_100">100dp</dimen>
@@ -71,7 +73,10 @@
     <dimen name="view_size_80">80dp</dimen>
     <dimen name="view_size_90">90dp</dimen>
     <dimen name="view_size_100">100dp</dimen>
+    <dimen name="view_size_110">110dp</dimen>
     <dimen name="view_size_130">130dp</dimen>
+    <dimen name="view_size_136">136dp</dimen>
+    <dimen name="view_size_140">140dp</dimen>
     <dimen name="view_size_150">150dp</dimen>
     <dimen name="view_size_200">200dp</dimen>
     <dimen name="view_size_250">250dp</dimen>