多个界面与功能优化

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

@@ -311,7 +311,7 @@ public class ActDownloadMgr extends BaseCompatActivity {
                         changeTaskPersistenceStatus(downloadTask.getMDownloadUrl(), DownloadTaskService.STATUS_ING, 1, false);
                     }
                 } else {
-                    if (new File(downloadTask.getMApkPath()).exists()) {
+                    if (!TextUtils.isEmpty(downloadTask.getMApkPath()) && new File(downloadTask.getMApkPath()).exists()) {
                         ApkUtils.installApk(this, downloadTask.getMApkPath());
                     } else {
                         restartTaskByDownloadUrl(downloadTask);

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

@@ -12,6 +12,7 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -109,6 +110,9 @@ public class FgtFindChild extends BaseCompatFragment {
     RecyclerView view_list;
     private void initView(){
         title.setVisibility(View.GONE);
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) empty_view.getLayoutParams();
+        layoutParams.topMargin = getResources().getDimensionPixelSize(R.dimen.content_padding);
+        empty_view.setLayoutParams(layoutParams);
         refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
@@ -142,19 +146,19 @@ public class FgtFindChild extends BaseCompatFragment {
                 TextView find_item_time = (TextView)rootConvertView.findViewById(R.id.find_item_time);
                 ImageView find_item_iv = (ImageView)rootConvertView.findViewById(R.id.find_item_iv);
                 TextView find_item_des = (TextView)rootConvertView.findViewById(R.id.find_item_des);
-                TextView find_item_pf_label = (TextView)rootConvertView.findViewById(R.id.find_item_pf_label);
+//                TextView find_item_pf_label = (TextView)rootConvertView.findViewById(R.id.find_item_pf_label);
                 TextView find_item_download = (TextView)rootConvertView.findViewById(R.id.find_item_download);
                 TagFlowLayout find_item_tags = (TagFlowLayout)rootConvertView.findViewById(R.id.find_item_tags);
 
                 if(item.isGame()){
                     find_item_download.setVisibility(View.VISIBLE);
-                    find_item_pf_label.setVisibility(View.VISIBLE);
                     FindApp findApp = item.getApplication();
-                    find_item_pf_label.setText(Html.fromHtml(String.format(Locale.CHINA, "评分：<font color='%s'>%.1f</font>分", "#29d6fd", findApp.getScore())));
+//                    find_item_pf_label.setVisibility(View.VISIBLE);
+//                    find_item_pf_label.setText(Html.fromHtml(String.format(Locale.CHINA, "评分：<font color='%s'>%.1f</font>分", "#29d6fd", findApp.getScore())));
                     updateView(activity, findApp, find_item_download);
                 } else {
                     find_item_download.setVisibility(View.GONE);
-                    find_item_pf_label.setVisibility(View.GONE);
+//                    find_item_pf_label.setVisibility(View.GONE);
                 }
                 ViewUtil.setText(find_item_name, item.getTitle());
                 ViewUtil.setTextTime(find_item_time, item.getCreated_at(), "yyyy-MM-dd");

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

@@ -25,12 +25,16 @@ import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.view.activity.PersonalCenterAct;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.afinal.simplecache.ACache;
 
+import java.util.Locale;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -64,6 +68,8 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     View proxy_service_layout;
     @BindView(R.id.proxy_service_layout_line)
     View proxy_service_layout_line;
+    @BindView(R.id.version_item_tv)
+    TextView version_item_tv;
     @BindView(R.id.personal_center_version_new)
     View personal_center_version_new;
     Unbinder unbinder;
@@ -77,6 +83,25 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     protected void initView(Bundle savedInstanceState) {
         setContentView(R.layout.fgt_personalcenter_layout);
         activity = getActivity();
+        TitleBarUtils titleBarUtils = TitleBarUtils.getInstance()
+                .setTitleBackgroud(mContentView, R.drawable.sp_bg_gradient_blue_nocorners)
+                .setShowOrHideLine(mContentView, false)
+                .setRightImgBotton(mContentView, R.mipmap.setting, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        Jump2View.getInstance().goSetting(activity, null);
+                    }
+                });
+        if (activity instanceof PersonalCenterAct) {
+            titleBarUtils.setTitle(mContentView, "个人中心")
+                    .setTitleColor(mContentView, getResources().getColor(R.color.white))
+                    .setTitleListen(mContentView, R.drawable.narrow_back_white, new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            activity.finish();
+                        }
+                    });
+        }
     }
 
     private void initData() {
@@ -115,6 +140,9 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 });
         String newVersionUrl = ACache.get(SheepApp.getInstance()).getAsString("version_url");
         personal_center_version_new.setVisibility(TextUtils.isEmpty(newVersionUrl) ? View.GONE : View.VISIBLE);
+        String appVersionName = ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance());
+        version_item_tv.setText("小绵羊V");
+        version_item_tv.append(appVersionName);
 
     }
 
@@ -130,9 +158,9 @@ public class FgtPersonalCenter extends BaseCompatFragment {
 
     private void initWidget() {
 
-        personalcenter_item_price_tv.setText(userEntitys.getBalance() + " 元");
-        nameTv.setText(userEntitys.getNickname() + "");//绵羊号：123456789
-        sheepNumTv.setText("绵羊号：" + userEntitys.getInvitation_code());
+        personalcenter_item_price_tv.setText(String.format(Locale.CHINA, "%s\u0020元", userEntitys.getBalance()));
+        ViewUtil.setText(nameTv, userEntitys.getNickname());
+        sheepNumTv.setText(String.format(Locale.CHINA, "绵羊号：%s", userEntitys.getInvitation_code()));
         Glide.with(activity)
                 .load(userEntitys.getAvatar() + "")
                 .apply(new RequestOptions().circleCrop().placeholder(R.drawable.icon))
@@ -157,7 +185,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
 
     @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.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
     })
     public void onViewClicked(View view) {
@@ -206,6 +234,10 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 }
                 USER_SHARE.onEvent();
                 break;
+            case R.id.version_layout://版本更新
+                SysAppUtil.showVersionInfo(activity, null);
+                USER_UPGRADE.onEvent();
+                break;
             case R.id.change_layout://新功能介绍
                 Jump2View.getInstance().goVersionChange(activity, ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance()));
                 break;

app/src/main/java/com/sheep/gamegroup/heler/TaskHelper.java

@@ -156,7 +156,7 @@ public class TaskHelper {
             });
             return;
         }
-        GlideImageLoader.centerImage(find_information_game_icon, taskEty.getIcon());
+        GlideImageLoader.setGameImage(find_information_game_icon, taskEty.getIcon());
         ViewUtil.setText(find_information_game_name, taskReleaseEty.getName());
         setTaskTypeText(find_information_game_surplus, taskReleaseEty);
         find_information_game_surplus1.setVisibility(View.VISIBLE);

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

@@ -82,6 +82,12 @@ public class TaskEty implements Serializable, IDownload {
     }
 
     public void setScreenshotsList(List<ScreenshotsEntity> screenshotsList) {
+        List<ScreenshotsEntity> removeList = ListUtil.emptyList();
+        for (ScreenshotsEntity screenshotsEntity : screenshotsList) {
+            if(TextUtils.isEmpty(screenshotsEntity.getImg()))
+                removeList.add(screenshotsEntity);
+        }
+        screenshotsList.removeAll(removeList);
         this.screenshotsList = screenshotsList;
     }
 

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

@@ -70,6 +70,18 @@ public class GlideImageLoader {
                 .apply(new RequestOptions().transform(new RoundedCorners(radius)).placeholder(R.drawable.loading_01))
                 .into(imageView);
     }
+    public static void setGameImage(ImageView imageView, String url) {
+        Glide.with(SheepApp.getInstance())
+                .load(url)
+                .apply(new RequestOptions().centerCrop().transform(new RoundedCorners(imageView.getResources().getDimensionPixelSize(R.dimen.content_padding_10))).placeholder(R.drawable.loading_01))
+                .into(imageView);
+    }
+    public static void setGameImage(ImageView imageView, String url, int radius) {
+        Glide.with(SheepApp.getInstance())
+                .load(url)
+                .apply(new RequestOptions().centerCrop().transform(new RoundedCorners(radius)).placeholder(R.drawable.loading_01))
+                .into(imageView);
+    }
 
     public static void downLoadImage(String name, String link, final Action1<File> action1) {
         String fileName = name + ".png";

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

@@ -295,7 +295,7 @@ public class Jump2View {
                             }
 
                             if(userEntity != null && userEntity.canBindMobile()
-                                    //&& !BuildConfig.DEBUG
+                                    && !BuildConfig.DEBUG
                                     ){//老用户没有绑定手机号
                                 Jump2View.getInstance().goBindPhone(activity, 1);
                                 return;

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

@@ -24,6 +24,7 @@ import com.sheep.gamegroup.model.entity.FindApp;
 import com.sheep.gamegroup.model.entity.FindItem;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LogUtil;
@@ -172,7 +173,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
         TextView find_information_game_yuan = (TextView)itemView.findViewById(R.id.find_information_game_yuan);
         TextView find_information_game_task_bottom = (TextView)itemView.findViewById(R.id.find_information_game_task_bottom);
         TextView find_information_game_task_center = (TextView)itemView.findViewById(R.id.find_information_game_task_center);
-        ViewUtil.setImage(find_information_game_icon, findApp.getIcon());
+        GlideImageLoader.setGameImage(find_information_game_icon, findApp.getIcon());
         ViewUtil.setText(find_information_game_name, findApp.getName());
         final boolean isNeedReservation = !findApp.isCanDonload();//这里认为只有两种状态：可下载与预约下载
         ViewUtil.setText(find_information_game_surplus);

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

@@ -51,27 +51,17 @@ public class ActSetting extends BaseActivity {
     public void initListener() {
 
     }
-
-    @BindView(R.id.version_item_tv)
-    TextView version_item_tv;
     @Override
     public void initData() {
-        String appVersionName = ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance());
-        version_item_tv.setText("小绵羊V");
-        version_item_tv.append(appVersionName);
         initCacheSize();
     }
 
-    @OnClick({R.id.abourt_us_layout, R.id.version_layout, R.id.clear_layout, R.id.tv_submit})
+    @OnClick({R.id.abourt_us_layout, R.id.clear_layout, R.id.tv_submit})
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.abourt_us_layout://关于我们
                 Jump2View.getInstance().goNewAboutUs(activity);
                 break;
-            case R.id.version_layout://版本更新
-                SysAppUtil.showVersionInfo(activity, null);
-                USER_UPGRADE.onEvent();
-                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/PersonalCenterAct.java

@@ -30,21 +30,6 @@ public class PersonalCenterAct extends BaseActivity {
     public void initView() {
         activity = this;
 
-        TitleBarUtils
-                .getInstance()
-                .setTitle(this, "个人中心")
-                .setTitleColor(this, getResources().getColor(R.color.white))
-                .setTitleListen(this, R.drawable.narrow_back_white, null)
-                .setTitleBackgroud(this, R.drawable.sp_bg_gradient_blue_nocorners)
-                .setShowOrHideLine(this, false)
-                .setTitleFinish(this)
-                .setRightImgBotton(this, R.mipmap.setting, new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        Jump2View.getInstance().goSetting(activity, null);
-                    }
-                });
-
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
         Bundle bundle = new Bundle();
         Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");

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

@@ -53,7 +53,9 @@ import com.sheep.gamegroup.presenter.TaskDetailPresenter;
 import com.sheep.gamegroup.usage.AppUsageManager;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DeviceUtil;
+import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LocationUtils;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MyDbManager;
@@ -126,7 +128,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     @BindView(R.id.detail_item_layout_3)
     LinearLayout detail_item_layout_3;
     @BindView(R.id.item_layout)
-    RelativeLayout item_layout;
+    View item_layout;
     /**
      * 2.6详情改版
      */
@@ -252,10 +254,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         num_tv.setText("剩" + taskReleaseEty.getLast_num() + "份");
 
 
-        Glide.with(SheepApp.mContext)
-                .load(taskEty.getIcon())
-                .apply(new RequestOptions().placeholder(R.drawable.icon))
-                .into(iconIv);
+        GlideImageLoader.setGameImage(iconIv, taskEty.getIcon());
 
 
         detailTaskTv.setVisibility(View.GONE);
@@ -609,7 +608,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                             ViewUtil.showGamePayAccount(activity, game_id, taskReleaseEty.getName());
                             return;
                         }
-                    }else if(taskEty.getTask_type() == 1002 ||taskEty.getTask_type() == 1003){
+                    }else if(taskEty.isGameTask()){
                         if(taskEty.isGameReservationCantDownload()){
                             CommonUtil.getInstance().reservationGameTask(activity, taskReleaseEty, null);
                         } else {
@@ -1022,7 +1021,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
                 break;
             case 1002:
-            case 1003://游戏任务
+            case 1003:
+            case 1004://游戏任务
                 ems_game_layout.setVisibility(View.VISIBLE);
                 detail_shrae_friend_layout.setVisibility(View.GONE);
                 item_layout.setBackgroundResource(R.drawable.x_shap_shadow_bg_rectgangle_white);
@@ -1036,26 +1036,29 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 break;
         }
 
-        //非连续任务使用TaskdetailSonListviewAdp显示单个任务详情
-        if(!isSuccession && taskEty.getDescEntityList() != null && taskEty.getDescEntityList().size()>0){
+        //非连续任务且非游戏任务且应用自动审核时长任务  使用TaskdetailSonListviewAdp显示单个任务详情
+        if(!isSuccession && !ListUtil.isEmpty(taskEty.getDescEntityList())){
             List<TaskChild> descEntityArrayList = new ArrayList<>();
             TaskChild taskChild = new TaskChild();
             taskChild.setDescEntityList(taskEty.getDescEntityList());
-            List<ScreenshotsEntity> listS = new ArrayList<>();
-            if(taskEty.getDescEntityList() != null && taskEty.getDescEntityList().size() > 0){
-                listS.clear();
-                for(TaskDescEntity descEntity: taskEty.getDescEntityList()){
-                    if(descEntity.getImg() != null){
-                        ScreenshotsEntity screenshotsEntity = new ScreenshotsEntity();
-                        screenshotsEntity.setImg(descEntity.getImg());
-                        listS.add(screenshotsEntity);
+            if(!taskEty.isGameTask() && !taskEty.isAppAutoCommitTask()) {
+                List<ScreenshotsEntity> listS = new ArrayList<>();
+                if (taskEty.getDescEntityList() != null && taskEty.getDescEntityList().size() > 0) {
+                    listS.clear();
+                    for (TaskDescEntity descEntity : taskEty.getDescEntityList()) {
+                        if (!TextUtils.isEmpty(descEntity.getImg())) {
+                            ScreenshotsEntity screenshotsEntity = new ScreenshotsEntity();
+                            screenshotsEntity.setImg(descEntity.getImg());
+                            screenshotsEntity.setDesc(descEntity.getDesc());
+                            listS.add(screenshotsEntity);
+                        }
                     }
                 }
-            }
-            if(listS.size() > 0){
-                taskChild.setScreenshotsList(listS);
-            }else {
-                taskChild.setScreenshotsList(taskEty.getScreenshotsList());
+                if (listS.size() > 0) {
+                    taskChild.setScreenshotsList(listS);
+                } else {
+                    taskChild.setScreenshotsList(taskEty.getScreenshotsList());
+                }
             }
 
             descEntityArrayList.add(taskChild);

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

@@ -36,6 +36,7 @@ import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
@@ -219,11 +220,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 task_type_tv.setVisibility(View.VISIBLE);
                 viewHolder.itemView.findViewById(R.id.item_money).setVisibility(View.GONE);
 
-                Glide.with(context)
-                        .load(item.getIcon()+"")
-                        .apply(new RequestOptions().placeholder(R.mipmap.icon).centerCrop())
-                        .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
-
+                GlideImageLoader.setGameImage((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv), item.getIcon());
                 if(item.isGameReservationCantDownload()){
                     task_type_tv.setEnabled(false);
                     detail_task_tv.setEnabled(false);
@@ -463,10 +460,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 ((TextView) viewHolder.itemView.findViewById(R.id.item_name_tv)).setText(taskReleaseEty.getName() + "");
                 ((TextView) viewHolder.itemView.findViewById(R.id.item_num_tv)).setText(taskReleaseEty.getTask().getDetailShow()+"");
                 ((TextView) viewHolder.itemView.findViewById(R.id.item_money)).setVisibility(View.GONE);
-                Glide.with(context)
-                        .load(taskEty.getIcon() + "")
-                        .apply(new RequestOptions().placeholder(R.mipmap.icon).centerCrop())
-                        .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
+                GlideImageLoader.setGameImage((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv), taskEty.getIcon());
                 viewHolder.itemView.setEnabled(false);
                 ((TextView) viewHolder.itemView.findViewById(R.id.item_date_tv)).setVisibility(View.GONE);
                 viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.GONE);
@@ -577,11 +571,8 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 TaskHelper.setTaskTypeText((TextView) viewHolder.itemView.findViewById(R.id.item_num_tv), taskReleaseEty);
                 TaskHelper.setNumText((TextView) viewHolder.itemView.findViewById(R.id.item_num_tv1), taskReleaseEty);
                 ((TextView) viewHolder.itemView.findViewById(R.id.item_money)).setText("+" + taskReleaseEty.getBonus() + "元");
-                Glide.with(context)
-                        .load(taskEty.getIcon() + "")
-                        .apply(new RequestOptions().placeholder(R.mipmap.icon).centerCrop())
-                        .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
 
+                GlideImageLoader.setGameImage((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv), taskEty.getIcon());
                 if (isBegin == 1 || type == 2) {//即将开始
                     viewHolder.itemView.setEnabled(false);
                     ((TextView) viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
@@ -819,10 +810,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
                     }
                 });
-                Glide.with(context)
-                        .load(taskEty.getIcon()+"")
-                        .apply(new RequestOptions().placeholder(R.mipmap.icon).centerCrop())
-                        .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
+                GlideImageLoader.setGameImage((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv), taskEty.getIcon());
                 viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {

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

@@ -45,6 +45,19 @@ public class TitleBarUtils {
         titleView.setText(title == null ? "" : title);
         return mTitleBarUtils;
     }
+    /**
+     * 设置标题
+     *
+     * @param view
+     * @param title
+     * @return
+     */
+    public TitleBarUtils setTitle(View view, String title) {
+        TextView titleView = view.findViewById(R.id.txt_baseactivity_title);
+        titleView.setVisibility(View.VISIBLE);
+        titleView.setText(title == null ? "" : title);
+        return mTitleBarUtils;
+    }
 
     /**
      * 设置Title文本的颜色
@@ -58,6 +71,18 @@ public class TitleBarUtils {
         titleView.setTextColor(color);
         return mTitleBarUtils;
     }
+    /**
+     * 设置Title文本的颜色
+     *
+     * @param view
+     * @param color    颜色值
+     * @return
+     */
+    public TitleBarUtils setTitleColor(View view, int color) {
+        TextView titleView = view.findViewById(R.id.txt_baseactivity_title);
+        titleView.setTextColor(color);
+        return mTitleBarUtils;
+    }
 
 
     /**
@@ -81,6 +106,16 @@ public class TitleBarUtils {
                 .setOnClickListener(listener);
         return mTitleBarUtils;
     }
+    public TitleBarUtils setTitleFinish(final Activity activity, View view) {
+        view.findViewById(R.id.img_baseactivity_title)
+                .setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        activity.finish();
+                    }
+                });
+        return mTitleBarUtils;
+    }
 
 
     /**
@@ -91,7 +126,6 @@ public class TitleBarUtils {
      * @param onClickListener 如果为null,不改监听
      */
     public TitleBarUtils setTitleListen(Activity activity, int drawableID, View.OnClickListener onClickListener) {
-        TextView titleView = activity.findViewById(R.id.txt_baseactivity_title);
         ImageView imageView = activity.findViewById(R.id.img_baseactivity_title);
         if (drawableID == 0) {
             imageView.setVisibility(View.INVISIBLE);
@@ -107,6 +141,29 @@ public class TitleBarUtils {
         }
         return mTitleBarUtils;
     }
+    /**
+     * 设置最左边的Title监听
+     *
+     * @param view
+     * @param drawableID      如果为0显示透明，如果写-1表示资源不变。-2为Gone，其它为显示该值资源
+     * @param onClickListener 如果为null,不改监听
+     */
+    public TitleBarUtils setTitleListen(View view, int drawableID, View.OnClickListener onClickListener) {
+        ImageView imageView = view.findViewById(R.id.img_baseactivity_title);
+        if (drawableID == 0) {
+            imageView.setVisibility(View.INVISIBLE);
+        } else if (drawableID == -2) {
+            imageView.setVisibility(View.GONE);
+            return this;
+        } else if (drawableID != -1) {
+            imageView.setImageResource(drawableID);
+        }
+
+        if (onClickListener != null) {
+            imageView.setOnClickListener(onClickListener);
+        }
+        return mTitleBarUtils;
+    }
 
 
     /**
@@ -167,6 +224,32 @@ public class TitleBarUtils {
             imageButton.setOnClickListener(onClickListener);
         }
     }
+    /**
+     * 设置最右边的普通按钮状态
+     *
+     * @param view
+     * @param backgroundImgResId 设置背景的ResID,为零透明，-1不变,-2为Gone，其它是资源
+     * @param onClickListener    点击时的操作。
+     */
+    public TitleBarUtils setRightImgBotton(View view, int backgroundImgResId, View.OnClickListener onClickListener) {
+        Button button = view.findViewById(R.id.btn_baseactivity_right);
+        ImageButton imageButton = view.findViewById(R.id.ibtn_baseactivity_right);
+        if(button != null)
+            button.setVisibility(View.GONE);
+        imageButton.setVisibility(View.VISIBLE);
+        if (backgroundImgResId == 0) {
+            imageButton.setImageDrawable(new ColorDrawable(0x00000000));
+        } else if (backgroundImgResId == -2) {
+            imageButton.setVisibility(View.GONE);
+            return this;
+        } else if (backgroundImgResId != -1) {
+            imageButton.setImageResource(backgroundImgResId);
+        }
+        if (onClickListener != null) {
+            imageButton.setOnClickListener(onClickListener);
+        }
+        return this;
+    }
 
     /**
      * 设置红点是否显示
@@ -235,6 +318,14 @@ public class TitleBarUtils {
                 .setVisibility(isShow ? View.VISIBLE : View.GONE);
         return mTitleBarUtils;
     }
+    /**
+     * 隐藏线，GONE或VISIBLE
+     */
+    public TitleBarUtils setShowOrHideLine(View view, boolean isShow) {
+        view.findViewById(R.id.title_bottom_line)
+                .setVisibility(isShow ? View.VISIBLE : View.GONE);
+        return mTitleBarUtils;
+    }
 
 
     /**
@@ -245,6 +336,14 @@ public class TitleBarUtils {
                 .setBackground(activity.getResources().getDrawable(backgroundImgResId));
         return mTitleBarUtils;
     }
+    /**
+     * 设置标题栏颜色
+     */
+    public TitleBarUtils setTitleBackgroud(View view, int backgroundImgResId) {
+        view.findViewById(R.id.layout_navigationBar)
+                .setBackground(view.getResources().getDrawable(backgroundImgResId));
+        return mTitleBarUtils;
+    }
 
     /**
      * 右边两个按钮的情况

app/src/main/res/drawable/shape_red_solid_rectangle.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="15dp" />
+    <corners android:radius="7dp" />
     <solid android:color="#ED3C60" />
 </shape>

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

@@ -32,22 +32,6 @@
         <View style="@style/style_item_line" />
 
         <LinearLayout
-            android:id="@+id/version_layout"
-            style="@style/style_item_container">
-
-            <TextView
-                style="@style/style_item_label"
-                android:text="更新版本" />
-
-            <TextView
-                android:id="@+id/version_item_tv"
-                style="@style/style_item_end" />
-
-        </LinearLayout>
-
-        <View style="@style/style_item_line" />
-
-        <LinearLayout
             android:id="@+id/clear_layout"
             style="@style/style_item_container">
 

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

@@ -19,15 +19,13 @@
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="36dp"
         app:tabBackground="@android:color/transparent"
-        app:tabIndicatorHeight="4dp"
+        app:tabIndicatorHeight="1dp"
         app:tabGravity="center"
-        app:tabIndicatorColor="#4bc1fe"
-        app:tabPadding="7dp"
+        app:tabIndicatorColor="#2ebef2"
         app:tabMode="scrollable"
-        app:tabSelectedTextColor="#4bc1fe"
-        app:tabTextColor="#444444"
+        app:tabSelectedTextColor="#2ebef2"
         app:tabTextAppearance="@style/SheepTabLayoutTextAppearance"
         />
 

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

@@ -13,7 +13,6 @@
         style="@style/style_item_container">
 
         <ImageView
-            android:id="@+id/account_detail_item_icon_iv"
             style="@style/style_item_img"
             android:src="@mipmap/x_ic_account_secuity" />
 
@@ -32,7 +31,6 @@
         style="@style/style_item_container">
 
         <ImageView
-            android:id="@+id/tast_item_icon_iv"
             style="@style/style_item_img"
             android:src="@mipmap/x_ic_task_history" />
 
@@ -51,7 +49,6 @@
         style="@style/style_item_container">
 
         <ImageView
-            android:id="@+id/order_item_icon_iv"
             style="@style/style_item_img"
             android:src="@mipmap/personalc_ic_order_manager" />
 
@@ -74,7 +71,6 @@
         android:visibility="gone">
 
         <ImageView
-            android:id="@+id/proxy_service_item_icon_iv"
             style="@style/style_item_img"
             android:src="@mipmap/personalc_ic_proxy_service" />
 
@@ -95,7 +91,6 @@
         style="@style/style_item_container">
 
         <ImageView
-            android:id="@+id/proxy_game_account_item_icon_iv"
             style="@style/style_item_img"
             android:src="@mipmap/personalc_ic_game_account" />
 

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

@@ -14,7 +14,6 @@
         style="@style/style_item_container">
 
         <ImageView
-            android:id="@+id/reservation_item_icon_iv"
             style="@style/style_item_img"
             android:src="@mipmap/personalc_ic_reservation" />
 
@@ -33,7 +32,6 @@
         style="@style/style_item_container">
 
         <ImageView
-            android:id="@+id/feedbook_item_icon_iv"
             style="@style/style_item_img"
             android:src="@mipmap/personalc_ic_feedback" />
 
@@ -52,7 +50,6 @@
         style="@style/style_item_container">
 
         <ImageView
-            android:id="@+id/faq_item_icon_iv"
             style="@style/style_item_img"
             android:src="@mipmap/faq" />
 
@@ -71,7 +68,6 @@
         style="@style/style_item_container">
 
         <ImageView
-            android:id="@+id/recommend_friend_item_icon_iv"
             style="@style/style_item_img"
             android:src="@mipmap/personalc_ic_recommend_friend" />
 
@@ -83,30 +79,28 @@
 
     </LinearLayout>
 
-
     <View style="@style/style_item_line" />
 
     <LinearLayout
-        android:id="@+id/change_layout"
+        android:id="@+id/version_layout"
         style="@style/style_item_container">
 
         <ImageView
-            android:id="@+id/change_item_icon_iv"
             style="@style/style_item_img"
-            android:src="@mipmap/personalc_ic_change" />
-
+            android:src="@mipmap/personalc_ic_version" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/style_item_label_parent"
-            android:text="新版本介绍" />
+            android:text="更新版本" />
         <TextView
             android:id="@+id/personal_center_version_new"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="14dp"
             android:textColor="@color/white"
             android:paddingStart="6dp"
             android:paddingEnd="6dp"
+            android:gravity="center"
             android:textSize="9sp"
             android:layout_marginStart="@dimen/content_padding"
             android:background="@drawable/shape_red_solid_rectangle"
@@ -115,6 +109,25 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"/>
+        <TextView
+            android:id="@+id/version_item_tv"
+            style="@style/style_item_end" />
+
+    </LinearLayout>
+
+    <View style="@style/style_item_line" />
+
+    <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" />
 

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

@@ -10,6 +10,8 @@
         android:background="@color/bg_gray"
         android:orientation="vertical">
 
+        <include layout="@layout/title" />
+
         <include layout="@layout/fgt_personacenter_item_top" />
 
         <include layout="@layout/fgt_personalcenter_item_center_one" />

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

@@ -9,64 +9,78 @@
         android:id="@+id/find_information_game_icon"
         android:layout_width="70dp"
         android:layout_height="70dp"
-        android:src="@mipmap/icon"/>
+        android:src="@mipmap/icon" />
 
-    <TextView
-        android:id="@+id/find_information_game_name"
+    <LinearLayout
+        android:id="@+id/find_information_game_name_ll"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="5dp"
-        android:maxLines="2"
-        android:text="小绵羊小绵羊小绵羊小绵羊小小绵羊小绵羊小绵羊小绵羊小小绵羊小绵羊小绵羊小绵羊小小绵羊小绵羊小绵羊小绵羊小"
-        android:textColor="#444444"
-        android:textSize="14sp"
-        app:layout_constraintBottom_toTopOf="@+id/find_information_game_surplus"
+        android:layout_height="70dp"
+        android:layout_marginStart="@dimen/content_padding"
+        android:orientation="vertical"
         app:layout_constraintEnd_toStartOf="@+id/find_information_game_task_bottom"
-        app:layout_constraintStart_toEndOf="@+id/find_information_game_icon"
-        app:layout_constraintTop_toTopOf="@+id/find_information_game_icon" />
+        app:layout_constraintStart_toEndOf="@+id/find_information_game_icon">
 
-    <TextView
-        android:id="@+id/find_information_game_surplus"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/app_name"
-        android:textColor="#cc8e8e8e"
-        android:textSize="10sp"
-        app:layout_constraintBottom_toTopOf="@+id/find_information_game_time"
-        app:layout_constraintStart_toStartOf="@+id/find_information_game_name"
-        app:layout_constraintTop_toBottomOf="@+id/find_information_game_name" />
-    <TextView
-        android:id="@+id/find_information_game_surplus1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/app_name"
-        android:textColor="#cc8e8e8e"
-        android:textSize="10sp"
-        android:visibility="gone"
-        android:layout_marginStart="@dimen/content_padding"
-        app:layout_constraintBottom_toTopOf="@+id/find_information_game_time"
-        app:layout_constraintStart_toEndOf="@+id/find_information_game_surplus"
-        app:layout_constraintTop_toBottomOf="@+id/find_information_game_name" />
+        <TextView
+            android:id="@+id/find_information_game_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLines="2"
+            android:text="小绵羊小绵羊小绵羊小绵羊小小绵羊小绵羊小绵羊小绵羊小小绵羊小绵羊小绵羊小绵羊小小绵羊小绵羊小绵羊小绵羊小"
+            android:textColor="#444444"
+            android:textSize="14sp" />
 
-    <TextView
-        android:id="@+id/find_information_game_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/app_name"
-        android:textColor="#cc8e8e8e"
-        android:textSize="10sp"
-        app:layout_constraintBottom_toBottomOf="@+id/find_information_game_icon"
-        app:layout_constraintStart_toStartOf="@+id/find_information_game_name"
-        app:layout_constraintTop_toBottomOf="@+id/find_information_game_surplus" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="3" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/find_information_game_surplus"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/app_name"
+                android:textColor="#cc8e8e8e"
+                android:textSize="10sp" />
+
+            <TextView
+                android:id="@+id/find_information_game_surplus1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/content_padding"
+                android:text="@string/app_name"
+                android:textColor="#cc8e8e8e"
+                android:textSize="10sp"
+                android:visibility="gone" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/find_information_game_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/app_name"
+            android:textColor="#cc8e8e8e"
+            android:textSize="10sp" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/find_information_game_yuan"
         android:layout_width="@dimen/find_bt_with"
         android:layout_height="wrap_content"
+        android:gravity="center"
         android:text="@string/app_name"
         android:textColor="@color/red"
         android:textSize="17sp"
-        android:gravity="center"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -77,34 +91,39 @@
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
         android:id="@+id/find_information_game_task_center"
         style="@style/style_button_find"
         android:text="接受任务"
         android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
         android:id="@+id/find_information_game_task_bottom"
         style="@style/style_button_find"
         android:text="接受任务"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/find_information_game_name" />
+        app:layout_constraintStart_toEndOf="@+id/find_information_game_name_ll" />
 
     <TextView
         android:id="@+id/find_information_game_task_end_time"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="#66FFFFFF"
+        android:layout_marginEnd="@dimen/content_padding_4"
+        android:layout_marginStart="@dimen/content_padding_4"
+        android:layout_marginTop="55dp"
+        android:background="@drawable/shape_ash_stroke_white_solid_rectangle"
         android:gravity="center"
-        android:textSize="12sp"
-        android:textColor="#ff2d4b"
         android:text="@string/app_name"
         android:lines="1"
-        app:layout_constraintStart_toStartOf="@+id/find_information_game_icon"
+        android:textColor="#989898"
+        android:textSize="12sp"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="@+id/find_information_game_icon"
-        app:layout_constraintBottom_toBottomOf="@+id/find_information_game_icon"
-        android:visibility="gone"/>
+        app:layout_constraintStart_toStartOf="@+id/find_information_game_icon"
+        app:layout_constraintTop_toTopOf="parent" />
 </android.support.constraint.ConstraintLayout>

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

@@ -60,17 +60,28 @@
 
         <TextView
             android:id="@+id/find_item_des"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/content_padding"
+            android:layout_marginTop="17dp"
             app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/find_item_download"
             android:maxLines="2"
             android:ellipsize="end"
             android:text="@string/app_name"
             android:textColor="#646464"
             android:textSize="14sp" />
-
         <TextView
+            android:id="@+id/find_item_download"
+            android:layout_marginTop="@dimen/content_padding_15"
+            style="@style/style_button_find"
+            android:layout_marginStart="5dp"
+            app:layout_constraintStart_toEndOf="@+id/find_item_des"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:text="下载游戏" />
+
+<!--        <TextView
             android:id="@+id/find_item_pf_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -78,14 +89,8 @@
             android:layout_marginTop="8dp"
             android:text="评分：8.9"
             android:textColor="#646464"
-            android:textSize="14sp" />
+            android:textSize="14sp" />-->
 
-        <TextView
-            android:id="@+id/find_item_download"
-            style="@style/style_button_find"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="@+id/find_item_pf_label"
-            android:text="下载游戏" />
     </android.support.constraint.ConstraintLayout>
 
 </LinearLayout>

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

@@ -6,8 +6,6 @@
     android:orientation="vertical">
 
     <include
-        layout="@layout/title" />
-    <include
         android:id="@+id/layout_main_activity_toolbar"
         layout="@layout/toolbar_main_activity"
         android:layout_width="match_parent"

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

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     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:orientation="vertical">
 
@@ -97,43 +98,44 @@
                     android:layout_marginLeft="@dimen/content_padding_10"
                     android:layout_marginRight="@dimen/content_padding_10"
                     android:layout_marginBottom="@dimen/content_padding_10">
-                    <RelativeLayout
+                    <android.support.constraint.ConstraintLayout
                         android:id="@+id/item_layout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
                         android:padding="@dimen/content_padding_10">
-                        <RelativeLayout
-                            android:id="@+id/icon_layout"
-                            android:layout_width="@dimen/view_size_65"
-                            android:layout_height="@dimen/view_size_65"
-                            android:layout_centerVertical="true"
-                            android:background="@drawable/sp_bg_transparent_radius_transparent">
-                            <ImageView
-                                android:id="@+id/icon_iv"
-                                android:layout_width="@dimen/view_size_65"
-                                android:layout_height="@dimen/view_size_65"
-                                android:src="@mipmap/icon"/>
-                            <TextView
-                                android:id="@+id/end_of_time_tv"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_alignParentBottom="true"
-                                android:background="#99FFFFFF"
-                                android:lines="1"
-                                android:text=""
-                                android:gravity="center"
-                                android:visibility="gone"/>
-                        </RelativeLayout>
+                        <ImageView
+                            android:id="@+id/icon_iv"
+                            android:layout_width="70dp"
+                            android:layout_height="70dp"
+                            android:src="@drawable/icon_lj"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"/>
+                        <TextView
+                            android:id="@+id/end_of_time_tv"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/content_padding_4"
+                            android:layout_marginEnd="@dimen/content_padding_4"
+                            android:layout_marginTop="55dp"
+                            android:background="@drawable/shape_ash_stroke_white_solid_rectangle"
+                            android:gravity="center"
+                            android:lines="1"
+                            android:textColor="#989898"
+                            android:textSize="12sp"
+                            android:visibility="gone"
+                            app:layout_constraintEnd_toEndOf="@+id/icon_iv"
+                            app:layout_constraintStart_toStartOf="@+id/icon_iv"
+                            app:layout_constraintTop_toTopOf="parent"/>
 
-                        <RelativeLayout
+                        <LinearLayout
                             android:id="@+id/name_date_layout"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_toRightOf="@+id/icon_layout"
-                            android:layout_toLeftOf="@+id/price_layout"
-                            android:layout_marginLeft="@dimen/content_padding"
-                            android:layout_centerVertical="true"
+                            android:layout_width="0dp"
+                            android:layout_height="70dp"
+                            android:orientation="vertical"
+                            android:layout_marginStart="@dimen/content_padding"
+                            app:layout_constraintEnd_toStartOf="@+id/price_layout"
+                            app:layout_constraintStart_toEndOf="@+id/icon_iv"
                             >
                             <TextView
                                 android:id="@+id/name_tv"
@@ -141,36 +143,45 @@
                                 android:textColor="@color/black_444444"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:lines="2"
+                                android:maxLines="2"
                                 android:ellipsize="middle"
                                 android:text=""/>
+                            <View
+                                android:layout_width="match_parent"
+                                android:layout_height="0dp"
+                                android:layout_weight="3"/>
 
                             <TextView
                                 android:id="@+id/num_tv"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text=""
-                                android:layout_below="@+id/name_tv"
                                 android:textSize="@dimen/text_size_2"
                                 android:textColor="@color/txt_black_818181"/>
 
+                            <View
+                                android:layout_width="match_parent"
+                                android:layout_height="0dp"
+                                android:layout_weight="1"/>
                             <TextView
                                 android:id="@+id/date_tv"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="111"
-                                android:layout_below="@+id/num_tv"
                                 android:textSize="@dimen/text_size_2"
                                 android:textColor="@color/txt_black_818181"/>
-                        </RelativeLayout>
+                        </LinearLayout>
 
                         <LinearLayout
                             android:id="@+id/price_layout"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_centerVertical="true"
-                            android:layout_marginLeft="@dimen/content_padding_10"
-                            android:layout_alignParentRight="true"
+                            android:layout_marginStart="@dimen/content_padding_5"
+                            app:layout_constraintStart_toEndOf="@+id/name_date_layout"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="@+id/icon_iv"
+                            app:layout_constraintBottom_toBottomOf="@+id/icon_iv"
                             android:gravity="right"
                             android:orientation="vertical">
                             <TextView
@@ -205,7 +216,7 @@
                                 android:layout_alignParentBottom="true"/>
                         </LinearLayout>
 
-                    </RelativeLayout>
+                    </android.support.constraint.ConstraintLayout>
                     <LinearLayout
                         android:id="@+id/detail_shrae_friend_layout"
                         android:layout_width="match_parent"

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

@@ -61,10 +61,11 @@
 
         <ImageView
             android:id="@+id/item_icon_iv"
-            android:layout_width="@dimen/view_size_65"
-            android:layout_height="@dimen/view_size_65"
-            app:layout_constraintTop_toTopOf="parent"
-            android:src="@drawable/icon_lj" />
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:src="@drawable/icon_lj"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
 
         <TextView
@@ -73,97 +74,106 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/content_padding_4"
             android:layout_marginStart="@dimen/content_padding_4"
+            android:layout_marginTop="55dp"
             android:background="@drawable/shape_ash_stroke_white_solid_rectangle"
             android:gravity="center"
             android:lines="1"
             android:textColor="#989898"
-            android:layout_marginTop="55dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/item_icon_iv"
-            app:layout_constraintEnd_toEndOf="@+id/item_icon_iv"
             android:textSize="12sp"
-            android:visibility="gone"/>
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="@+id/item_icon_iv"
+            app:layout_constraintStart_toStartOf="@+id/item_icon_iv"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/item_money"
             android:layout_width="@dimen/find_bt_with"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text=""
+            android:text="+10元"
             android:textColor="@color/txt_red"
             android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="@+id/item_name_tv"
             app:layout_constraintEnd_toEndOf="parent" />
 
-        <TextView
-            android:id="@+id/item_name_tv"
-            android:textSize="14sp"
-            android:textColor="#444444"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
-            android:ellipsize="middle"
-            android:gravity="start"
-            android:lines="2"
-            android:text=""
-            app:layout_constraintRight_toLeftOf="@+id/task_type_tv"
-            app:layout_constraintStart_toEndOf="@+id/item_icon_iv"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <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"
-            app:layout_constraintStart_toStartOf="@+id/item_name_tv"
-            app:layout_constraintTop_toBottomOf="@+id/item_name_tv" />
-
-        <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"
-            app:layout_constraintBottom_toBottomOf="@+id/item_num_tv"
-            app:layout_constraintStart_toEndOf="@+id/item_num_tv"
-            app:layout_constraintTop_toTopOf="@+id/item_num_tv" />
-
         <LinearLayout
-            android:id="@+id/item_date_layout"
+            android:id="@+id/item_name_tv_ll"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/content_padding_8"
-            android:layout_marginTop="@dimen/content_padding_2"
-            android:orientation="horizontal"
-            app:layout_constraintBottom_toBottomOf="@+id/item_icon_iv"
-            app:layout_constraintEnd_toStartOf="@+id/detail_task_layout"
-            app:layout_constraintStart_toEndOf="@+id/item_icon_iv"
-            app:layout_constraintStart_toStartOf="@+id/item_name_tv"
-            app:layout_constraintTop_toBottomOf="@+id/item_num_tv">
+            android:layout_height="70dp"
+            android:orientation="vertical"
+            android:layout_marginStart="@dimen/content_padding"
+            app:layout_constraintEnd_toStartOf="@+id/task_type_tv"
+            app:layout_constraintStart_toEndOf="@+id/item_icon_iv">
 
             <TextView
-                android:id="@+id/item_date_tv"
-                android:layout_width="0dp"
+                android:id="@+id/item_name_tv"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:lines="1"
+                android:ellipsize="middle"
+                android:gravity="start"
+                android:maxLines="2"
                 android:text=""
-                android:textColor="#cc8e8e8e"
-                android:textSize="10sp" />
-
-            <ImageView
-                android:id="@+id/item_date_question_img"
-                android:layout_width="15dp"
-                android:layout_height="15dp"
-                android:src="@mipmap/task_game_qustion_icon"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/item_date_tv" />
+                android:textColor="#444444"
+                android:textSize="14sp" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="3"/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <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/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" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"/>
+            <LinearLayout
+                android:id="@+id/item_date_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/content_padding_8"
+                android:layout_marginTop="@dimen/content_padding_2"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/item_date_tv"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:lines="1"
+                    android:text=""
+                    android:textColor="#cc8e8e8e"
+                    android:textSize="10sp" />
+
+                <ImageView
+                    android:id="@+id/item_date_question_img"
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:src="@mipmap/task_game_qustion_icon"
+                    android:visibility="gone"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/item_date_tv" />
+            </LinearLayout>
         </LinearLayout>
 
         <RelativeLayout

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

@@ -319,8 +319,8 @@
     </style>
 
     <style name="SheepTabLayoutTextAppearance" parent="@android:style/TextAppearance.Holo.Large">
-        <item name="android:textSize">15sp</item>
-        <item name="android:textColor">#444444</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">#000000</item>
     </style>
 
     <style name="style_item_container">