Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

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

@@ -2,17 +2,21 @@ package com.sheep.gamegroup.util;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.util.glide.GlideCircleTransformWithBorder;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
+import com.sheep.jiuyan.samllsheep.utils.FileUtil;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.FileCallBack;
@@ -230,4 +234,53 @@ public class GlideImageLoader {
                     .into(iconImgIv);
         }
     }
+
+    /**
+     * 通过下载到本地的方式来加载图片并设置圆角与宽高，需要传入显示的宽度
+     * @param name
+     * @param link
+     * @param imageView
+     * @param width
+     * @param radius
+     */
+    public static void downloadAndRoundedImage(String name, String link, final ImageView imageView, final int width, final int radius) {
+        GlideImageLoader.downLoadImage(name, link, new Action1<File>() {
+            @Override
+            public void call(File file) {
+                BitmapFactory.Options options = FileUtil.getImageOptions(file);
+                int w = options.outWidth;
+                int h = options.outHeight;
+//                int w = width;
+//                int h = width * options.outHeight / options.outWidth;
+                Glide.with(SheepApp.getInstance())
+                        .load(file)
+                        .apply(new RequestOptions().override(w, h).fitCenter().transform(new RoundedCorners(radius)))
+                        .into(imageView);
+            }
+        });
+    }
+    /**
+     * 通过下载到本地的方式来加载图片并设置圆角与宽高
+     * @param name
+     * @param link
+     * @param imageView
+     * @param radius
+     */
+    public static void downloadAndRoundedImage(String name, String link, final ImageView imageView, final int radius, final RequestListener<Drawable> listener) {
+        GlideImageLoader.downLoadImage(name, link, new Action1<File>() {
+            @Override
+            public void call(File file) {
+                BitmapFactory.Options options = FileUtil.getImageOptions(file);
+                int w = options.outWidth;
+                int h = options.outHeight;
+//                int w = width;
+//                int h = width * options.outHeight / options.outWidth;
+                Glide.with(SheepApp.getInstance())
+                        .load(file)
+                        .listener(listener)
+                        .apply(new RequestOptions().override(w, h).transform(new RoundedCorners(radius)))
+                        .into(imageView);
+            }
+        });
+    }
 }

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

@@ -3,6 +3,7 @@ package com.sheep.gamegroup.view.activity;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -15,15 +16,13 @@ import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
-import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestListener;
-import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
 import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
@@ -207,26 +206,65 @@ public class ActInvitation extends BaseActivity {
         for (final PictureInvitationEntity item : mPictureList) {
             View itemView = LayoutInflater.from(SheepApp.getInstance()).inflate(R.layout.item_image2, null);
 
+            View image_container = itemView.findViewById(R.id.image_container);
             ImageView image_full = itemView.findViewById(R.id.image_full);
+            View image_bottom_top = itemView.findViewById(R.id.image_bottom_top);
             ImageView image_bottom = itemView.findViewById(R.id.image_bottom);
-            Glide.with(SheepApp.getInstance())
-                    .load(item.getPicture())
-                    .listener(new RequestListener<Drawable>() {
-                        @Override
-                        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
-                            item.setLoaded(false);
-                            return false;
-                        }
+            ImageView image_logo = itemView.findViewById(R.id.image_logo);
+            TextView image_tip = itemView.findViewById(R.id.image_tip);
+            RequestListener<Drawable> listener = new RequestListener<Drawable>() {
+                @Override
+                public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
+                    item.setLoaded(false);
+                    return false;
+                }
 
-                        @Override
-                        public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
-                            item.setLoaded(true);
-                            return false;
-                        }
-                    })
-                    .apply(new RequestOptions().transform(new RoundedCorners((int) getResources().getDimension(R.dimen.content_padding_8))).fitCenter())
-                    .into(image_full);
-            GlideImageLoader.saveAndSetRqImage(image_bottom, item.getLink(), 800);
+                @Override
+                public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
+                    item.setLoaded(true);
+                    return false;
+                }
+            };
+            if(item.getPicture() != null)
+                GlideImageLoader.downloadAndRoundedImage(String.valueOf(item.getPicture().hashCode()), item.getPicture(), image_full, getResources().getDimensionPixelSize(R.dimen.content_padding_8), listener);
+            //之前的方法实际上没有实现圆角效果
+//            Glide.with(SheepApp.getInstance())
+//                    .load(item.getPicture())
+//                    .listener(listener)
+//                    .apply(new RequestOptions().transform(new RoundedCorners((int) getResources().getDimension(R.dimen.content_padding_8))).fitCenter())
+//                    .into(image_full);
+            int vWidth = viewPager.getWidth();
+            float containerWidthRadius = 60 / 216F;
+            float containerHeightRadius = 70 / 216F;
+            float rqRadius = 53 / 216F;
+            float tipRadius = 5 / 216F;
+            float radius = 4 / 216F;
+            float topRadius = 2 / 216F;
+            float logoRadius = rqRadius * 16 / 68;
+            GlideImageLoader.saveAndSetRqImage(image_bottom, item.getLink(), (int) (vWidth * rqRadius));
+            //重新设置logo的宽高
+            ViewGroup.LayoutParams layoutParams = image_logo.getLayoutParams();
+            layoutParams.width = (int) (vWidth * logoRadius);
+            layoutParams.height = (int) (vWidth * logoRadius);
+            image_logo.setLayoutParams(layoutParams);
+            //重新设置二维码上部的距离
+            ViewGroup.LayoutParams layoutParamsTop = image_bottom_top.getLayoutParams();
+            layoutParamsTop.height = (int) (vWidth * topRadius);
+            image_bottom_top.setLayoutParams(layoutParamsTop);
+            //重新设置《扫我开始赚钱》的高度
+            ViewGroup.LayoutParams layoutParamsTip = image_tip.getLayoutParams();
+            layoutParamsTip.height = (int) (vWidth * (tipRadius + topRadius * 3 / 2));
+            image_tip.setLayoutParams(layoutParamsTip);
+            image_tip.setTextSize(vWidth * tipRadius / G.DENSITY);
+            //重新设置整个二维码外容器的高度
+            ViewGroup.LayoutParams layoutParamsContainer = image_container.getLayoutParams();
+            layoutParamsContainer.width = (int) (vWidth * containerWidthRadius);
+            layoutParamsContainer.height = (int) (vWidth * containerHeightRadius);
+            image_container.setLayoutParams(layoutParamsContainer);
+            Drawable bg = image_container.getBackground();
+            if (bg instanceof GradientDrawable) {
+                ((GradientDrawable) bg).setCornerRadius(vWidth * radius);
+            }
             viewArrayList.add(itemView);
             viewList.put(size, itemView);
             size++;

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

@@ -23,7 +23,6 @@ import rx.functions.Action1;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_CLEAN;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_CLEAN_SURE;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_UPGRADE;
 
 /**
  * Created by realicing on 2018/04/.
@@ -56,12 +55,15 @@ public class ActSetting extends BaseActivity {
         initCacheSize();
     }
 
-    @OnClick({R.id.abourt_us_layout, R.id.clear_layout, R.id.tv_submit})
+    @OnClick({R.id.abourt_us_layout, R.id.clear_layout, R.id.tv_submit, R.id.change_layout})
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.abourt_us_layout://关于我们
                 Jump2View.getInstance().goNewAboutUs(activity);
                 break;
+            case R.id.change_layout://新功能介绍
+                Jump2View.getInstance().goVersionChange(activity, ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance()));
+                break;
             case R.id.clear_layout://清除缓存
                 ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("清除缓存").setMsg("所有本地的缓存都会被清理").setBtnRightText("取消")
                         .setBtnLeftText("确定").setBtnLeftOnClickListener(new View.OnClickListener() {

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

@@ -1,6 +1,5 @@
 package com.sheep.gamegroup.view.activity;
 
-import android.os.Bundle;
 import android.support.design.widget.TextInputEditText;
 
 import com.alibaba.fastjson.JSONObject;
@@ -43,7 +42,6 @@ public class FeedbackAct extends BaseActivity {
 
     @Override
     public void initView() {
-
         TitleBarUtils.getInstance()
                 .setTitle(this, "意见反馈")
                 .setTitleFinish(this);
@@ -59,13 +57,6 @@ public class FeedbackAct extends BaseActivity {
 
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-//        this.bind = ButterKnife.bind(this);
-    }
-
     @OnClick(R.id.tv_submit)
     public void onViewClicked() {
         USER_FEEDBACK_COMMIT.onEvent();
@@ -89,12 +80,12 @@ public class FeedbackAct extends BaseActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(this) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        G.showToast(baseMessage.getMsg() + "");
+                        G.showToast(baseMessage);
                     }
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        G.showToast(baseMessage.getMsg() + "");
+                        G.showToast(baseMessage);
                         finish();
                     }
                 });

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

@@ -110,7 +110,7 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
         if(TextUtils.isEmpty(descEntity.getAmount())){
             holder.title_item_layout.setVisibility(View.GONE);
             holder.item_show_layout.setPadding(10,3,3,3);
-            holder.item_detail_show_layout.setBackgroundResource(R.drawable.x_shap_shadow_bg_rectgangle_white);
+//            holder.item_detail_show_layout.setBackgroundResource(R.drawable.x_shap_shadow_bg_rectgangle_white);
         }else {
             holder.title_item_layout.setVisibility(View.VISIBLE);
             holder.num_item_textview.setText(position + 1+"");
@@ -276,17 +276,8 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
             ar_code_layout.setVisibility(View.GONE);
         }else {
             if(taskReleaseEty.isIs_running()){
-                GlideImageLoader.downLoadImage(taskReleaseEty.getTask().getTask_name(), taskReleaseEty.getTask().getQr_code(), new Action1<File>() {
-                    @Override
-                    public void call(File file) {
-                        BitmapFactory.Options options = FileUtil.getImageOptions(file);
-                        int width = context.getResources().getDimensionPixelSize(R.dimen.content_padding_150);
-                        Glide.with(SheepApp.getInstance())
-                                .load(file)
-                                .apply(new RequestOptions().override(width, width * options.outHeight / options.outWidth).transform(new RoundedCorners(context.getResources().getDimensionPixelSize(R.dimen.content_padding_8))))
-                                .into((ImageView) qr_code_iv);
-                    }
-                });
+                GlideImageLoader.downloadAndRoundedImage(taskReleaseEty.getTask().getTask_name(), taskReleaseEty.getTask().getQr_code(), (ImageView) qr_code_iv,
+                        context.getResources().getDimensionPixelSize(R.dimen.content_padding_150), context.getResources().getDimensionPixelSize(R.dimen.content_padding_8));
                 btn_task_item.setVisibility(View.VISIBLE);
                 qr_code_notice_tv.setVisibility(View.GONE);
                 btn_task_item.setOnClickListener(new View.OnClickListener() {

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoney.java

@@ -68,6 +68,8 @@ public class FgtAskGetMoney extends BaseFragment {
     ViewPagerAutoHeigh pager;
     @BindView(R.id.my_invitation_tv)
     TextView my_invitation_tv;
+    @BindView(R.id.ask_act_code)
+    TextView ask_act_code;
     @BindView(R.id.copy_my_invitation_tv)
     TextView copy_my_invitation_tv;
 
@@ -107,10 +109,10 @@ public class FgtAskGetMoney extends BaseFragment {
 //                "</html>";
 //        ask_bg.getSettings().setDefaultTextEncodingName("UTF-8");
 //        ask_bg.loadData(content, "text/html", "UTF-8");
-        GlideImageLoader.setImage(ask_bg, "http://cdngame.kuaifazs.com/yaoqingzq2_bg.png");
+        GlideImageLoader.setImage(ask_bg, "http://cdngame.kuaifazs.com/yaoqingzq_bg_3.png");
 //                16,18,19
         LinearLayout.LayoutParams layoutParams1 = (LinearLayout.LayoutParams) ask_top_1.getLayoutParams();
-        layoutParams1.height = G.WIDTH * 560 / 625;
+        layoutParams1.height = G.WIDTH * 600 / 625;
         ask_top_1.setLayoutParams(layoutParams1);
         LinearLayout.LayoutParams layoutParams2 = (LinearLayout.LayoutParams) ask_top_2.getLayoutParams();
         layoutParams2.height = G.WIDTH * 112 / 625;
@@ -120,6 +122,8 @@ public class FgtAskGetMoney extends BaseFragment {
         ask_top_3.setLayoutParams(layoutParams3);
         ViewUtil.setDefaultText(tvSize);
         ViewUtil.setDefaultText(tvMoney);
+        ViewUtil.setDefaultText(my_invitation_tv);
+        ViewUtil.setDefaultText(ask_act_code);
         showViewPager();
         initData(true);
 
@@ -188,6 +192,7 @@ public class FgtAskGetMoney extends BaseFragment {
                 if (result != null) {
                     userEntity = result;
                     String audit_total_audit = String.format(activity.getResources().getString(R.string.my_invitation_str), userEntity.getInvitation_code());
+                    ask_act_code.setText(audit_total_audit);
                     my_invitation_tv.setText(audit_total_audit);
                 }
             }
@@ -209,10 +214,11 @@ public class FgtAskGetMoney extends BaseFragment {
         CommonUtil.getInstance().reflex(indicator, activity);
     }
 
-    @OnClick({R.id.copy_my_invitation_tv, R.id.ask_invite_tv, R.id.refresh, R.id.ask_act_rule})
+    @OnClick({R.id.copy_my_invitation_tv, R.id.ask_invite_tv, R.id.refresh, R.id.ask_act_rule, R.id.ask_act_code_copy})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.copy_my_invitation_tv:
+            case R.id.ask_act_code_copy:
                 if (TextUtils.isEmpty(my_invitation_tv.getText().toString()))
                     return;
                 QR_COPY.onEvent();

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java

@@ -306,8 +306,8 @@ public class FgtPersonalCenter extends BaseFragment {
 
     @OnClick({R.id.icon_img_iv, R.id.account_detail_layout, R.id.personalcenter_price_layout,
             R.id.account_task_layout, R.id.proxy_service_layout, R.id.feedbook_layout,
-            R.id.recommend_friend_layout, R.id.faq_layout, R.id.reservation_layout, R.id.version_layout,
-            R.id.change_layout, R.id.order_layout, R.id.proxy_game_account_layout,
+            R.id.recommend_friend_layout, R.id.faq_layout, R.id.reservation_layout,
+            R.id.version_layout, R.id.order_layout, R.id.proxy_game_account_layout,
             R.id.iv_redpackage, R.id.ibtn_baseactivity_message
     })
     public void onViewClicked(View view) {
@@ -375,9 +375,6 @@ public class FgtPersonalCenter extends BaseFragment {
                 SysAppUtil.showVersionInfo(activity, null);
                 USER_UPGRADE.onEvent();
                 break;
-            case R.id.change_layout://新功能介绍
-                Jump2View.getInstance().goVersionChange(activity, ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance()));
-                break;
             case R.id.order_layout://订单管理
                 Jump2View.getInstance().goGameTaskOrderList(activity);
                 break;

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/G.java

@@ -32,7 +32,7 @@ public class G {
     public static int HEIGHT = 1280;//屏幕高
     public static int WIDTH = 720;//屏幕宽
     public static float DENSITY = 2;//屏幕的Density
-    public static int DENSITY_DPI = 2;//屏幕的Density
+    public static int DENSITY_DPI = 320;//屏幕的Density
     public static int BAR_HEIGHT = 50;//状态栏高度
 
     /**

app/src/main/res/drawable/shape_white_solid_rectangle_2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="2dp" />
+    <corners android:radius="5dp" />
     <solid android:color="#ffffff" />
 </shape>

app/src/main/res/drawable/sp_bg_purple_right_radius_12.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:bottomRightRadius="12dp"
+        android:topRightRadius="12dp"/>
+    <solid
+        android:color="#814CDE"/>
+</shape>

app/src/main/res/drawable/sp_bg_rectangle_orange_10.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#FF6600"/>
+    <corners
+        android:radius="10dp"/>
+
+</shape>

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="@color/bg_gray">
+    android:background="@color/white">
 
     <include
         layout="@layout/title"/>

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

@@ -32,6 +32,20 @@
         <View style="@style/style_item_line" />
 
         <LinearLayout
+            android:id="@+id/change_layout"
+            style="@style/style_item_container">
+
+            <TextView
+                style="@style/style_item_label"
+                android:text="新版本介绍" />
+
+            <TextView style="@style/style_item_end_next" />
+
+        </LinearLayout>
+
+        <View style="@style/style_item_line" />
+
+        <LinearLayout
             android:id="@+id/clear_layout"
             style="@style/style_item_container">
 
@@ -47,7 +61,6 @@
         </LinearLayout>
     </LinearLayout>
 
-
     <TextView
         android:id="@+id/tv_submit"
         style="@style/style_button"

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

@@ -108,6 +108,7 @@
         android:gravity="center_vertical"
         android:layout_gravity="center_horizontal"
         android:background="@drawable/button_full_nomal_yellow_click"
+        android:visibility="gone"
         android:padding="@dimen/dp_10">
         <TextView
             android:id="@+id/my_invitation_tv"

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

@@ -113,22 +113,4 @@
 
     </LinearLayout>
 
-    <View style="@style/style_item_line_new" />
-
-    <LinearLayout
-        android:id="@+id/change_layout"
-        style="@style/style_item_container">
-
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/personalc_ic_change" />
-
-        <TextView
-            style="@style/style_item_label"
-            android:text="新版本介绍" />
-
-        <TextView style="@style/style_item_end_next" />
-
-    </LinearLayout>
-
 </LinearLayout>

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

@@ -4,7 +4,8 @@
     android:layout_height="match_parent"
     android:paddingBottom="@dimen/content_padding_10"
     android:paddingEnd="4dp"
-    android:paddingStart="4dp">
+    android:paddingStart="4dp"
+    android:background="@color/white">
 
     <include
         android:id="@+id/empty_view"

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

@@ -11,20 +11,21 @@
         android:layout_centerHorizontal="true" />
 
     <LinearLayout
-        android:layout_width="70dp"
-        android:layout_height="80dp"
+        android:id="@+id/image_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:background="@drawable/shape_white_solid_rectangle_2"
+        android:background="@drawable/shape_white_solid_rectangle_5"
         android:orientation="vertical">
-
+        <View
+            android:id="@+id/image_bottom_top"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"/>
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_gravity="center_horizontal"
-            android:layout_marginLeft="4dp"
-            android:layout_marginTop="4dp"
-            android:layout_marginRight="4dp"
             android:layout_weight="1">
 
             <ImageView
@@ -35,6 +36,7 @@
                 android:src="@drawable/loading_01" />
 
             <ImageView
+                android:id="@+id/image_logo"
                 android:layout_width="10dp"
                 android:layout_height="10dp"
                 android:layout_centerInParent="true"
@@ -42,11 +44,10 @@
         </RelativeLayout>
 
         <TextView
+            android:id="@+id/image_tip"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="1dp"
-            android:layout_marginBottom="3dp"
-            android:gravity="center"
+            android:gravity="top|center"
             android:text="扫我开始赚钱"
             android:textColor="#ff999999"
             android:textSize="8sp" />

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/bg_gray"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <include

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

@@ -2,125 +2,121 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/content_padding_10"
-    android:paddingBottom="@dimen/content_padding_10">
+    android:paddingTop="@dimen/content_padding_15">
 
     <ImageView
         android:id="@+id/icon_iv"
         android:layout_width="@dimen/view_size_60"
         android:layout_height="@dimen/view_size_60"
-        android:src="@mipmap/icon"
-        android:layout_centerVertical="true"/>
-    <LinearLayout
-        android:id="@+id/content_tv"
-        android:layout_width="match_parent"
+        android:layout_centerVertical="true"
+        android:layout_marginBottom="@dimen/content_padding_15"
+        android:src="@mipmap/icon" />
+
+    <RelativeLayout
+        android:id="@+id/task_list_item_end"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_toRightOf="@+id/icon_iv"
+        android:layout_alignParentEnd="true"
+        android:layout_marginBottom="@dimen/content_padding_15"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="@dimen/content_padding">
-        <RelativeLayout
-            android:id="@+id/name_date_layout"
-            android:layout_width="0dp"
-            android:layout_weight="1"
+        android:layout_gravity="center_vertical">
+
+        <TextView
+            android:id="@+id/price_tv"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical">
-            <TextView
-                android:id="@+id/name_tv"
-                style="@style/nomal_txt_style"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="完成试玩任务无敌大航"
-                android:lines="2"
-                android:ellipsize="end"
-                android:layout_marginTop="@dimen/content_padding_small"/>
+            android:layout_centerHorizontal="true"
+            android:text="+1.5元"
+            android:textColor="@color/txt_red"
+            android:textSize="@dimen/text_size_15" />
 
+        <TextView
+            android:id="@+id/detail_task_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/price_tv"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/content_padding_small"
+            android:gravity="center"
+            android:minWidth="@dimen/view_size_73"
+            android:padding="@dimen/content_padding_3"
+            android:text="任务截图"
+            android:textColor="@color/black_444444"
+            android:textSize="@dimen/text_size_12"
+            android:visibility="visible" />
+    </RelativeLayout>
 
-            <LinearLayout
-                android:id="@+id/tag_layout"
-                android:layout_below="@+id/name_tv"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
+    <LinearLayout
+        android:id="@+id/name_date_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginEnd="@dimen/content_padding"
+        android:layout_marginStart="@dimen/content_padding_12"
+        android:layout_toEndOf="@+id/icon_iv"
+        android:layout_toStartOf="@+id/task_list_item_end"
+        android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/item_num_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text=""
-                    android:textColor="#cc8e8e8e"
-                    android:textSize="10sp" />
+        <TextView
+            android:id="@+id/name_tv"
+            style="@style/nomal_txt_style"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:text="完成试玩任务无敌大航" />
+
+        <LinearLayout
+            android:id="@+id/tag_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
-                <TextView
-                    android:id="@+id/item_num_tv1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/content_padding"
-                    android:text=""
-                    android:textColor="#cc8e8e8e"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
-                <TextView
-                    android:id="@+id/item_num_tv2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/content_padding"
-                    android:text=""
-                    android:textColor="#cc8e8e8e"
-                    android:textSize="10sp"
-                    android:visibility="gone" />
-            </LinearLayout>
             <TextView
-                android:id="@+id/date_tv"
+                android:id="@+id/item_num_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="2018/02/14 14:41"
-                android:layout_below="@+id/tag_layout"
-                android:textSize="@dimen/text_size_2"
-                android:textColor="@color/txt_black_818181"
-                android:layout_marginBottom="@dimen/content_padding_small"/>
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/content_padding"
-            android:layout_gravity="center_vertical">
+                android:text=""
+                android:textColor="#cc8e8e8e"
+                android:textSize="10sp" />
 
             <TextView
-                android:id="@+id/price_tv"
+                android:id="@+id/item_num_tv1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="+1.5元"
-                android:textColor="@color/txt_red"
-                android:textSize="@dimen/text_size_15"
-                android:layout_centerHorizontal="true"/>
+                android:layout_marginStart="@dimen/content_padding"
+                android:text=""
+                android:textColor="#cc8e8e8e"
+                android:textSize="10sp"
+                android:visibility="gone" />
+
             <TextView
-                android:id="@+id/detail_task_tv"
+                android:id="@+id/item_num_tv2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="任务截图"
-                android:minWidth="@dimen/view_size_73"
-                android:textColor="@color/black_444444"
-                android:textSize="@dimen/text_size_12"
-                android:gravity="center"
-                android:padding="@dimen/content_padding_3"
-                android:layout_below="@+id/price_tv"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="@dimen/content_padding_small"
-                android:visibility="visible"/>
-        </RelativeLayout>
+                android:layout_marginStart="@dimen/content_padding"
+                android:text=""
+                android:textColor="#cc8e8e8e"
+                android:textSize="10sp"
+                android:visibility="gone" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/date_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="2018/02/14 14:41"
+            android:textColor="@color/txt_black_818181"
+            android:textSize="@dimen/text_size_2" />
     </LinearLayout>
 
     <TextView
         android:id="@+id/desc_tv"
-        android:layout_marginTop="@dimen/content_padding_10"
-        android:layout_below="@+id/icon_iv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
         android:text=""
-        android:textSize="@dimen/text_size_2"
         android:textColor="@color/txt_black_818181"
-        android:visibility="gone"/>
+        android:textSize="8sp"
+        android:visibility="gone" />
 </RelativeLayout>

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

@@ -8,30 +8,19 @@
     android:layout_marginLeft="@dimen/content_padding_10"
     android:layout_marginRight="@dimen/content_padding_10"
     android:layout_marginTop="@dimen/content_padding_10"
-    android:visibility="gone">
+    android:visibility="visible">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingRight="@dimen/content_padding_small"
         android:paddingTop="@dimen/content_padding_small"
-        android:paddingBottom="@dimen/content_padding_15"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
-
-        <TextView
-            android:layout_width="4dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/content_padding_3"
-            android:background="@color/blue_FF53BBF2"
-            android:text="1"
-            android:textColor="@color/blue_FF53BBF2"
-            android:textSize="@dimen/text_size_2" />
+        android:paddingBottom="@dimen/content_padding_15">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_marginLeft="@dimen/content_padding_15">
+            android:orientation="vertical">
             <TextView
                 android:id="@+id/item_exlpain_title"
                 style="@style/txt_style_15_323232"

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

@@ -65,31 +65,18 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:background="@drawable/sp_bg_white_solid_bottom"
             android:orientation="vertical"
-            android:paddingBottom="@dimen/content_padding_15"
             android:paddingTop="@dimen/dp_10">
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/content_padding_15">
-
-                <TextView
-                    android:layout_width="4dp"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:background="@color/blue_FF53BBF2"
-                    android:text="1"
-                    android:textColor="@color/blue_FF53BBF2"
-                    android:textSize="@dimen/text_size_2" />
+                android:layout_height="wrap_content">
 
                 <TextView
                     style="@style/txt_style_15_323232"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:layout_marginStart="@dimen/content_padding_15"
                     android:text="任务详情" />
 
                 <TextView
@@ -103,13 +90,16 @@
                     android:text="剩余试玩时间：00:28:12"
                     android:textSize="@dimen/text_size_12" />
             </RelativeLayout>
-
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginBottom="12dp"
+                android:background="#F1F0F0"/>
             <com.sheep.gamegroup.util.MyListview
                 android:id="@+id/item_detail_listview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/content_padding_15"
-                android:layout_marginStart="@dimen/content_padding_15"
                 android:divider="@null"
                 android:listSelector="@color/transparent"
                 android:scrollbars="none" />
@@ -119,43 +109,39 @@
             android:id="@+id/ar_code_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/content_padding_15"
             android:layout_marginBottom="@dimen/content_padding_15"
-            android:visibility="gone">
+            android:visibility="visible">
 
-            <TextView
-                android:id="@+id/qr_code_blue_line"
-                android:layout_width="4dp"
-                android:layout_height="wrap_content"
-                android:background="@color/blue_FF53BBF2"
-                android:text="1"
-                android:textColor="@color/blue_FF53BBF2"
-                android:textSize="@dimen/text_size_2"
-                app:layout_constraintBottom_toBottomOf="@+id/qr_code_tv"
-                app:layout_constraintTop_toTopOf="@+id/qr_code_tv" />
 
             <TextView
                 android:id="@+id/qr_code_tv"
                 style="@style/txt_style_15_323232"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/content_padding_15"
-                android:text="二维码"
-                app:layout_constraintStart_toEndOf="@+id/qr_code_blue_line" />
+                android:text="二维码"/>
 
+            <View
+                android:id="@+id/qr_code_line"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="12dp"
+                android:background="#F1F0F0"
+                app:layout_constraintTop_toBottomOf="@+id/qr_code_tv"/>
             <ImageView
                 android:id="@+id/qr_code_iv"
-                android:layout_width="150dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/content_padding_18"
+                android:layout_marginTop="12dp"
                 android:src="@mipmap/qr_code_taskdetail_zhanwei"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/qr_code_tv" />
+                app:layout_constraintTop_toBottomOf="@+id/qr_code_line" />
 
             <TextView
                 android:id="@+id/btn_task_item"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/content_padding_15"
+                android:layout_marginTop="@dimen/content_padding_15"
                 android:background="@drawable/selector_button_full_main"
                 android:gravity="center"
                 android:paddingBottom="@dimen/content_padding_3"
@@ -165,19 +151,19 @@
                 android:text="保存二维码"
                 android:textColor="@color/white"
                 android:textSize="@dimen/text_size_12"
-                app:layout_constraintBottom_toBottomOf="@+id/qr_code_iv"
-                app:layout_constraintStart_toEndOf="@+id/qr_code_iv" />
+                app:layout_constraintTop_toBottomOf="@+id/qr_code_iv"
+                app:layout_constraintStart_toStartOf="parent" />
 
             <TextView
                 android:id="@+id/qr_code_notice_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/content_padding_15"
+                android:layout_marginTop="@dimen/content_padding_15"
                 android:text="领取任务后可获得二维码"
                 android:textColor="@color/gray"
                 android:textSize="@dimen/text_size_12"
-                app:layout_constraintStart_toEndOf="@+id/qr_code_iv"
-                app:layout_constraintTop_toTopOf="@+id/qr_code_iv" />
+                app:layout_constraintTop_toBottomOf="@+id/qr_code_iv"
+                app:layout_constraintStart_toStartOf="parent" />
         </android.support.constraint.ConstraintLayout>
 
 
@@ -187,7 +173,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginTop="@dimen/content_padding_13"
-            android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/content_padding_15"
             android:paddingTop="@dimen/dp_10"
@@ -195,25 +180,20 @@
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/content_padding_15">
-
-                <TextView
-                    android:layout_width="4dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/content_padding_3"
-                    android:background="@color/blue_FF53BBF2"
-                    android:text="1"
-                    android:textColor="@color/blue_FF53BBF2"
-                    android:textSize="@dimen/text_size_2" />
+                android:layout_height="wrap_content">
 
                 <TextView
                     style="@style/txt_style_15_323232"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/content_padding_15"
                     android:text="示例截图" />
             </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginBottom="12dp"
+                android:background="#F1F0F0"/>
             <!--<com.sheep.gamegroup.util.MyListview-->
             <!--android:id="@+id/recycler_screenshot_view"-->
             <!--android:layout_width="match_parent"-->
@@ -225,7 +205,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/dp_10"
-                android:layout_marginStart="@dimen/content_padding_15"
                 android:scrollbars="none" />
         </LinearLayout>
     </LinearLayout>

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

@@ -3,7 +3,7 @@
     android:id="@+id/layout_navigationBar"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
-    android:background="@color/white_F9F9F9">
+    android:background="@color/white">
 
     <ImageView
         android:id="@+id/img_baseactivity_title"

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/bg_gray"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <include layout="@layout/title" />

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

@@ -168,7 +168,7 @@
                 android:layout_height="24dp"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentTop="true"
-                android:layout_marginTop="32dp"
+                android:layout_marginTop="28dp"
                 android:background="@drawable/sp_bg_purple_left_radius_12"
                 android:gravity="center"
                 android:paddingEnd="6dp"
@@ -176,6 +176,34 @@
                 android:text="活动规则"
                 android:textColor="#ffffffff"
                 android:textSize="10sp" />
+            <TextView
+                android:id="@+id/ask_act_code"
+                android:layout_width="wrap_content"
+                android:layout_height="24dp"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:layout_marginTop="28dp"
+                android:background="@drawable/sp_bg_purple_right_radius_12"
+                android:gravity="center"
+                android:paddingEnd="10dp"
+                android:paddingStart="6dp"
+                android:text="我的邀请码：976873"
+                android:textColor="#ffffffff"
+                android:textSize="10sp" />
+            <TextView
+                android:id="@+id/ask_act_code_copy"
+                android:layout_width="wrap_content"
+                android:layout_height="20dp"
+                android:layout_alignParentTop="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="30dp"
+                android:background="@drawable/sp_bg_rectangle_orange_10"
+                android:gravity="center"
+                android:paddingEnd="12dp"
+                android:paddingStart="12dp"
+                android:text="复制"
+                android:textColor="#ffffffff"
+                android:textSize="10sp" />
         </RelativeLayout>
     </android.support.v4.widget.NestedScrollView>
 </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>

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

@@ -191,7 +191,6 @@
         <item name="android:textSize">12sp</item>
         <item name="android:textColor">#767676</item>
         <item name="android:gravity">center</item>
-        <item name="android:background">@drawable/sp_bg_rectangle_ash</item>
     </style>
 
     <style name="style_ash_num">