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

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

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,6 +15,7 @@ import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.FutureTarget;
@@ -85,12 +87,43 @@ public class FgtPersonalCenter extends BaseCompatFragment {
             e.printStackTrace();
         }
         if(userEntitys != null){
-            personalcenter_item_price_tv.setText(userEntitys.getBalance()+" 元");
-            nameTv.setText(userEntitys.getNickname() + "");//绵羊号：123456789
-            sheepNumTv.setText("绵羊号：" + userEntitys.getInvitation_code());
+            initWidget();
+        }else {
+            SheepApp.get(getActivity())
+                    .getNetComponent()
+                    .getApiService()
+                    .getInfo()
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                        @Override
+                        public void onError(BaseMessage baseMessage) {
+                            G.showToast(baseMessage.getMsg() +"");
+
+                        }
+
+                        @Override
+                        public void onNext(BaseMessage baseMessage) {
+                            userEntitys = JSON.parseObject(JSONObject.toJSONString(baseMessage.getData()), UserEntity.class);
+                            try {
+                                MyDbManager.getInstance().saveOrUpdateUser(userEntitys);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                            initWidget();
+                        }
+                    });
+
         }
     }
 
+    private void initWidget(){
+
+        personalcenter_item_price_tv.setText(userEntitys.getBalance()+" 元");
+        nameTv.setText(userEntitys.getNickname() + "");//绵羊号：123456789
+        sheepNumTv.setText("绵羊号：" + userEntitys.getInvitation_code());
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -373,7 +373,7 @@ public interface ApiService {
     Observable<BaseMessage> homeList();
 
     /**
-     * 关于我们
+     * 已经反馈
      */
     @POST("app/feedback")
     Observable<BaseMessage> feedback(@Body JSONObject jsonObject);

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

@@ -1,14 +1,57 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
+import android.content.Intent;
+import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.Toast;
 
+import com.kfzs.appstore.utils.restful.KFZSNetwork;
+import com.kfzs.duanduan.ActDownloadMgr;
+import com.kfzs.duanduan.ActGameDetails;
+import com.kfzs.duanduan.ActMain;
+import com.kfzs.duanduan.ActSearch;
+import com.kfzs.duanduan.KFZSApp;
+import com.kfzs.duanduan.bean.KFIntentKeys;
+import com.kfzs.duanduan.bll.UrlBll;
+import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
+import com.kfzs.duanduan.db.DataSave;
+import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.fragment.FgtMainGame;
+import com.kfzs.duanduan.proto.ApiResponseOuterClass;
+import com.kfzs.duanduan.proto.GameOuterClass;
+import com.kfzs.duanduan.proto.RecommendedGameOuterClass;
+import com.kfzs.duanduan.services.DownloadTaskService;
+import com.kfzs.duanduan.utils.dlg.SkipUtils;
+import com.kfzs.duanduan.utils.net.APIRequest;
+import com.kfzs.duanduan.utils.net.APIRequestInstance;
+import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
+import com.kfzs.duanduan.view.AppHomepageAdvertisementDialog;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+import com.zhy.http.okhttp.OkHttpUtils;
+import com.zhy.http.okhttp.callback.StringCallback;
+
+import org.greenrobot.eventbus.EventBus;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import okhttp3.Call;
+
+import static com.kfzs.duanduan.services.DownloadTaskService.STATUS_ING;
 
 /**
  * Created by ljy on 2018/5/10.
@@ -16,7 +59,22 @@ import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 public class ActMainGame extends BaseActivity {
 
+    @BindView(R.id.layout_main_activity_toolbar)
+    View layout_main_activity_toolbar;
+    @BindView(R.id.download_layout)
+    View download_layout;
+    @BindView(R.id.edt_main_search_enter)
+    EditText edt_main_search_enter;
     Activity activity;
+
+
+    private static final String TAG = "ActMainGame";
+    private DownloadTaskService mDownloadTaskService;
+
+    private ImageView mImgDot;//下载按钮的小红点
+    private AppHomepageAdvertisementDialog gameDialog;//预约窗口
+    private boolean isGetAdvertisementDialogData = false;
+
     @Override
     protected int getLayoutId() {
         return R.layout.personalcenter_act_layout;
@@ -30,16 +88,23 @@ public class ActMainGame extends BaseActivity {
         TitleBarUtils
                 .getInstance()
                 .setTitle(this, "玩转游戏")
-                .setTitleFinish(this);
+                .setTitleFinish(this)
+                .setRightImgBotton(activity, R.drawable.index_download, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        startActivity(new Intent(activity, ActDownloadMgr.class));
+                        UMConfigUtils.onEvent(UMConfigUtils.Event.GAME_DOWNLOAD_MANAGER);
+                    }
+                });
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
         Bundle bundle = new Bundle();
         Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");
-        if(fragment == null){
+        if (fragment == null) {
             fragment = new FgtMainGame();
             fragment.setArguments(bundle);
             transaction.add(R.id.frame_container, fragment, "tag");
             transaction.commit();
-        }else {
+        } else {
             fragment.setArguments(bundle);
             transaction.replace(R.id.frame_container, fragment);
             transaction.commit();
@@ -49,10 +114,189 @@ public class ActMainGame extends BaseActivity {
     @Override
     public void initListener() {
 
+        edt_main_search_enter.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(activity, ActSearch.class));
+            }
+        });
     }
 
     @Override
     public void initData() {
+        layout_main_activity_toolbar.setVisibility(View.VISIBLE);
+        download_layout.setVisibility(View.GONE);
+        if (!isGetAdvertisementDialogData) {
+            isGetAdvertisementDialogData = true;
+            getAdvertisementDialogData();//获取广告弹窗信息
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
+    /**
+     *移植过来
+     */
+    /**
+     * 获取首页弹窗Dialog广告
+     */
+    public void getAdvertisementDialogData() {
+        Log.d(TAG, "getAdvertisementDialogData: " + UrlBll.AdvertisementApi.RECOMMENDED_ADVERTISEMENT);
+        APIRequest bannerRequest = APIRequestInstance.getReqUrl(TAG, UrlBll.AdvertisementApi.RECOMMENDED_ADVERTISEMENT, null, new ResponseNetworkTask() {
+
+            public void onSuccess(ApiResponseOuterClass.ApiResponse apiResponse) {
+                showAdvertisementDialog(apiResponse);
+            }
+
+            @Override
+            public void onFail(int code, String msg) {
+                Log.d("FLY", "code: " + code + "\nmsg: " + msg);
+            }
+        }, null);
+        KFZSNetwork.addRequest(bannerRequest);
+    }
+
+    private void showAdvertisementDialog(ApiResponseOuterClass.ApiResponse apiResponse) {
+        if (apiResponse == null || apiResponse.getRecommendedGamesList().isEmpty()) {
+            Log.d(TAG, "The showAdvertisementDialog response is null ");
+            return;
+        }
 
+        final RecommendedGameOuterClass.RecommendedGame recommendeGame = apiResponse.getRecommendedGamesList().get(0);
+        final String splashImageUrL = recommendeGame.getImageUrl();
+        Log.d(TAG, "splashImageUrL: " + splashImageUrL);
+        final String splashImageUr1 = recommendeGame.getTitle();
+        Log.d(TAG, "splashImageUrL: " + splashImageUr1);
+        final GameOuterClass.Game game = recommendeGame.getGame();
+        Log.d(TAG, "game: " + game.toString());
+        if (null != game || splashImageUrL != null || (!"".equals(splashImageUrL))) {
+            if (gameDialog != null) {
+                gameDialog.dismiss();
+            }
+            gameDialog = new AppHomepageAdvertisementDialog(activity);
+            gameDialog.setShutImg(BitmapFactory.decodeResource(getResources(), R.drawable.btn_dialog_close));
+            gameDialog.setBackground(splashImageUrL);
+            if (getBtntext(recommendeGame).equals(getString(R.string.book_now))) {
+                gameDialog.setCanceledOnTouchOutside(true);
+                gameDialog.setCanceledOnTouchOutside(true);
+                gameDialog.setCancelable(true);
+                gameDialog.setDownloadOnOnclickListener(getBtntext(recommendeGame), new AppHomepageAdvertisementDialog.onDownloadOnclickListener() {
+                    @Override
+                    public void onDownloadClick() {
+                        SkipUtils.getInstance().goGameDetails(activity,
+                                recommendeGame.getGame().getId());
+                    }
+                });
+                gameDialog.setBackgroundOnclickListener(new AppHomepageAdvertisementDialog.onBackOnclickListener() {
+                    @Override
+                    public void onClick() {
+                        SkipUtils.getInstance().goGameDetails(activity, recommendeGame.getGame().getId());
+                    }
+                });
+
+
+            } else {
+                gameDialog.setDownloadOnOnclickListener(getBtntext(recommendeGame),
+                        new AppHomepageAdvertisementDialog.onDownloadOnclickListener() {
+                            @Override
+                            public void onDownloadClick() {
+                                final String downloadUrl = game.getDownloadUrl();
+                                if (!TextUtils.isEmpty(downloadUrl) && !downloadUrl.endsWith(".apk")) {
+                                    String url = UrlBll.GameApi.DOWNLOAD_REDIRECT + "game_id=" + game.getId() + "&channel=" + DataSave.getInstance().getChannelName();
+                                    OkHttpUtils.get().url(url).build().execute(new StringCallback() {
+                                        @Override
+                                        public void onError(Call call, Exception e, int id) {
+                                        }
+
+                                        @Override
+                                        public void onResponse(String response, int id) {
+                                            if (!TextUtils.isEmpty(response)) {
+                                                try {
+                                                    JSONObject object = new JSONObject(response);
+                                                    String realUrl = object.optString("DownloadUrl");
+                                                    if (TextUtils.isEmpty(realUrl))
+                                                        Toast.makeText(activity, "获取" + DataSave.getInstance().getChannelName() + "渠道下载地址失败", Toast.LENGTH_SHORT).show();
+                                                    else {
+                                                        KFZSApp.getInstance().mRealDownloadUrl.put(realUrl, downloadUrl);
+                                                        DownLoadInfo downloadInfo = addNewDownloadTask(game.getGameName(), realUrl, game.getPackageName(),
+                                                                Integer.parseInt(game.getVersionCode()), game.getIconImage(), game.getSize(), game.getId(), STATUS_ING);
+                                                        mDownloadTaskService.start(downloadInfo);
+                                                        EventBus.getDefault().post(BigEvent.get()
+                                                                .setEventTypes(EventTypes.TIPS_DOWN_ICON));
+                                                    }
+                                                } catch (JSONException e) {
+                                                    e.printStackTrace();
+                                                }
+                                            }
+
+                                        }
+                                    });
+                                } else {
+                                    DownLoadInfo downloadInfo = addNewDownloadTask(game.getGameName(),
+                                            downloadUrl,
+                                            game.getPackageName(),
+                                            Integer.parseInt(game.getVersionCode()),
+                                            game.getIconImage(),
+                                            game.getSize(),
+                                            game.getId(),
+                                            STATUS_ING);
+
+                                    mDownloadTaskService.start(downloadInfo);
+                                    EventBus.getDefault().post(BigEvent.get()
+                                            .setEventTypes(EventTypes.TIPS_DOWN_ICON));
+                                }
+                            }
+                        });
+
+                gameDialog.setBackgroundOnclickListener(new AppHomepageAdvertisementDialog.onBackOnclickListener() {
+                    @Override
+                    public void onClick() {
+                        Intent intent = new Intent(activity, ActGameDetails.class);
+                        intent.putExtra(KFIntentKeys.EXTRA_GAME_ID, recommendeGame.getGameId() + "");
+                        activity.startActivity(intent);
+                    }
+                });
+            }
+
+
+            gameDialog.show();
+        } else {
+            Log.d(TAG, "showAdvertisementDialog: game or splashImageUrL is null");
+        }
+    }
+
+    private DownLoadInfo addNewDownloadTask(String gameName, String downloadUrl, String packageName,
+                                            int versionCode, String iconUrl, String size, Integer gameId, int state) {
+
+        DownLoadInfo task = new DownLoadInfo();
+        task.setMIconUrl(iconUrl);
+        task.setMGameName(gameName);
+        task.setMDownloadUrl(downloadUrl);
+        task.setMPackageName(packageName);
+        task.setMVersionCode(versionCode);
+        task.setMTotalSize(Double.valueOf(size));
+        task.setMGameID(gameId);
+        task.setMStatus(state);
+        mDownloadTaskService.addDownloadTask(task);
+        return task;
+    }
+
+
+    /**
+     * 返回首页启动广告弹窗的按钮文本
+     *
+     * @param game
+     * @return
+     */
+    private String getBtntext(RecommendedGameOuterClass.RecommendedGame game) {
+        String backStr = "立即下载";
+        if (TextUtils.isEmpty(game.getApkUrl())) {
+            backStr = getString(R.string.book_now);
+        }
+        return backStr;
     }
 }

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

@@ -231,7 +231,11 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
     private void initWigget(){
         taskEty = taskReleaseEty.getTask();
-        taskChildList.addAll(taskEty.getChild());
+        if(taskEty.getChild() != null && taskEty.getChild().size() > 0){
+            taskChildList.clear();
+            taskChildList.addAll(taskEty.getChild());
+        }
+
         downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(taskEty);
         webText.setWebChromeClient(new WebChromeClient(){
 

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

@@ -135,7 +135,7 @@ public class WebviewAct extends BaseActivity {
                                 AboutUsEntity aboutUsEntity = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), AboutUsEntity.class);
                                 if(aboutUsEntity != null){
                                     title_name_tv.setVisibility(View.VISIBLE);
-                                    title_name_tv.setText(webviewEntity.getTitle()+"");
+                                    title_name_tv.setText(aboutUsEntity.getTitle()+"");
                                     activityWebview.loadDataWithBaseURL(
                                             null,
                                             sHead + aboutUsEntity.getContent() + "</body></html>",

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

@@ -49,7 +49,7 @@ public class AdpTaskDetailChildListview extends BaseAdapter {
             convertView = LayoutInflater.from(context).inflate(R.layout.adp_taskdetail_child_listview, null);
             holder.item_name_tv = convertView.findViewById(R.id.item_name_tv);
             holder.item_detail_tv = convertView.findViewById(R.id.item_detail_tv);
-            holder.detail_task_tv = convertView.findViewById(R.id.detail_task_tv);
+            holder.state_task_tv = convertView.findViewById(R.id.state_task_tv);
             convertView.setTag(holder);
         }else {
             holder = (ViewHolder) convertView.getTag();
@@ -58,26 +58,26 @@ public class AdpTaskDetailChildListview extends BaseAdapter {
         if(taskChild == null){
             return convertView;
         }
-        holder.item_name_tv.setText(taskChild.getName()+"");
+        holder.item_name_tv.setText("·" + taskChild.getName()+"");
         holder.item_detail_tv.setText(taskChild.getAmount()+"元");
         switch (taskChild.getTaskType()){
             case 0://0 即将开始  1 进行中  2 已完成
             default:
-                holder.detail_task_tv.setText("即将开始 ");
+                holder.state_task_tv.setText("即将开始 ");
                 CommonUtil.getInstance()
-                        .setViewBackground(holder.detail_task_tv, "#929292");
+                        .setViewBackground(holder.state_task_tv, "#929292");
                 break;
             case 1:
 
-                holder.detail_task_tv.setText("进行中");
+                holder.state_task_tv.setText("进行中");
                 CommonUtil.getInstance()
-                        .setViewBackground(holder.detail_task_tv, "##fd2d54");
+                        .setViewBackground(holder.state_task_tv, "#fd2d54");
                 break;
             case 2:
 
-                holder.detail_task_tv.setText("已完成");
+                holder.state_task_tv.setText("已完成");
                 CommonUtil.getInstance()
-                        .setViewBackground(holder.detail_task_tv, "#FF2EF77B");
+                        .setViewBackground(holder.state_task_tv, "#FF2EF77B");
                 break;
         }
 
@@ -85,6 +85,6 @@ public class AdpTaskDetailChildListview extends BaseAdapter {
     }
 
     class ViewHolder{
-        TextView item_name_tv, item_detail_tv, detail_task_tv;
+        TextView item_name_tv, item_detail_tv, state_task_tv;
     }
 }

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

@@ -217,7 +217,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                                     task_type_tv,
                                     etyList.get(i).getLabel_color()+"");
                 }else {
-                    task_type_tv.setVisibility(View.GONE);
+                    task_type_tv.setVisibility(View.INVISIBLE);
                 }
 
 
@@ -322,7 +322,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                                     task_type_tv,
                                     etyList.get(i).getRelease_task().getLabel_color()+"");
                 }else {
-                    task_type_tv.setVisibility(View.GONE);
+                    task_type_tv.setVisibility(View.INVISIBLE);
                 }
                 viewHolder.itemView.findViewById(R.id.detail_task_tv).setOnClickListener(new View.OnClickListener() {
                     @Override

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient
+        android:startColor="@color/blue_start"
+        android:endColor="@color/blue_end"/>
+
+    <corners
+        android:radius="@dimen/radius_25"/>
+
+</shape>

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

@@ -2,10 +2,7 @@
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     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"
-    android:layout_margin="@dimen/content_padding">
+    android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/q_iv"

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

@@ -2,40 +2,62 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
     android:gravity="center"
     android:layout_gravity="center_vertical"
     android:padding="@dimen/content_padding_10"
     android:layout_marginRight="@dimen/content_padding_small">
 
-    <TextView
-        android:id="@+id/item_name_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="·第一天签到任务"
-        android:layout_centerVertical="true"
-        style="@style/nomal_txt_style"/>
-    <TextView
-        android:id="@+id/item_detail_tv"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:text="1.5元"
-        android:textColor="@color/txt_red"
-        android:textSize="@dimen/text_size_15"
-        android:layout_marginLeft="@dimen/content_padding_small"/>
-    <TextView
-        android:id="@+id/detail_task_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="任务截图"
-        android:minWidth="@dimen/view_size_73"
-        android:textColor="@color/white"
-        android:textSize="@dimen/text_size_12"
-        android:gravity="center"
-        android:padding="@dimen/content_padding_3"
-        android:layout_alignParentRight="true"
-        android:layout_below="@+id/item_layout"
-        android:background="@drawable/sp_rectangle_bg_gray_radius"
-        android:layout_alignParentBottom="true"/>
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/item_name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="·第一天签到任务"
+            android:layout_centerVertical="true"
+            android:adjustViewBounds="true"
+            style="@style/nomal_txt_style"
+            android:lines="1"
+            android:ellipsize="end"
+            android:maxWidth="@dimen/view_size_200"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/item_detail_tv"/>
+        <TextView
+            android:id="@+id/item_detail_tv"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:maxWidth="@dimen/view_size_90"
+            android:text="1.5元"
+            android:lines="1"
+            android:adjustViewBounds="true"
+            android:textColor="@color/txt_red"
+            android:textSize="@dimen/text_size_15"
+            app:layout_constraintHorizontal_bias="0.0"
+            android:layout_marginLeft="@dimen/content_padding_small"
+            app:layout_constraintLeft_toRightOf="@+id/item_name_tv"
+            app:layout_constraintRight_toLeftOf="@+id/state_task_tv"/>
+        <TextView
+            android:id="@+id/state_task_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="任务截图"
+            app:layout_constraintHorizontal_bias="0.0"
+            android:minWidth="@dimen/view_size_73"
+            android:adjustViewBounds="true"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_size_12"
+            android:gravity="center"
+            android:padding="@dimen/content_padding_3"
+            android:layout_alignParentRight="true"
+            android:layout_below="@+id/item_layout"
+            android:background="@drawable/sp_bg_gradient_rectangle_blue_change"
+            android:layout_alignParentBottom="true"
+            app:layout_constraintLeft_toRightOf="@+id/item_detail_tv"
+            app:layout_constraintRight_toRightOf="parent"/>
+    </android.support.constraint.ConstraintLayout>
+
+
 </LinearLayout>

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

@@ -16,7 +16,9 @@
         android:gravity="center_horizontal"
         android:scrollbars="none"
         android:numColumns="2"
-        android:listSelector="@color/transparent"/>
+        android:listSelector="@color/transparent"
+        android:verticalSpacing="@dimen/content_padding_8"
+        android:layout_marginBottom="@dimen/content_padding_8"/>
 
     <com.sheep.gamegroup.util.MyListview
         android:id="@+id/home_list_gridview_listview"
@@ -24,6 +26,8 @@
         android:layout_height="wrap_content"
         android:scrollbars="none"
         android:divider="@null"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+        android:padding="@dimen/content_padding_10"
         android:listSelector="@color/transparent"/>
 
 </LinearLayout>

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

@@ -7,7 +7,13 @@
 
     <include
         layout="@layout/title" />
-
+    <include
+        android:id="@+id/layout_main_activity_toolbar"
+        layout="@layout/toolbar_main_activity"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/app_nav_toolbar_height"
+        android:layout_alignParentTop="true"
+        android:visibility="gone"/>
     <FrameLayout
         android:id="@+id/frame_container"
         android:layout_width="match_parent"

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

@@ -99,7 +99,9 @@
                     android:scrollbars="none"
                     android:divider="@null"
                     android:listSelector="@color/transparent"
-                    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"/>
+                    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+                    android:padding="@dimen/content_padding_10"
+                    android:layout_margin="@dimen/content_padding_10"/>
 
                 <LinearLayout
                     android:id="@+id/detail_item_layout_2"

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

@@ -24,6 +24,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/content_padding_default"
+        android:layout_marginRight="@dimen/content_padding_2"
         android:layout_weight="1"
         android:background="@drawable/sp_search_edt_white"
         android:gravity="center_vertical">
@@ -55,10 +56,12 @@
     </RelativeLayout>
 
     <RelativeLayout
+        android:id="@+id/download_layout"
         android:layout_width="@dimen/app_nav_toolbar_height"
         android:layout_height="@dimen/app_nav_toolbar_height"
         android:layout_alignParentRight="true"
-        android:layout_centerInParent="true">
+        android:layout_centerInParent="true"
+        android:visibility="visible">
 
         <ImageView
             android:id="@+id/img_download_manager"

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

@@ -53,7 +53,7 @@
             android:id="@+id/task_type_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="取消任务取消任务取消任务"
+            android:text="取消任务"
             android:minWidth="@dimen/view_size_60"
             android:textColor="@color/white"
             android:textSize="@dimen/text_size_12"
@@ -61,8 +61,8 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:padding="@dimen/content_padding_3"
-            android:background="@drawable/sp_bg_gradient_rectangle_blue"
-            android:visibility="visible"/>
+            android:background="@drawable/sp_bg_gradient_rectangle_blue_change"
+            android:visibility="invisible"/>
         <ImageView
             android:id="@+id/item_icon_iv"
             android:layout_width="@dimen/view_size_60"

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

@@ -14,12 +14,15 @@
         android:gravity="center"
         style="@style/txt_style_17_black"
         android:layout_marginBottom="@dimen/content_padding_15"
+        android:layout_marginTop="@dimen/content_padding_15"
         android:visibility="gone"/>
 
     <com.kfzs.android.view.widget.SafeWebView
         android:id="@+id/activity_webview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="visible"/>
+        android:visibility="visible"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+        android:padding="@dimen/common_margin_10"/>
 
 </LinearLayout>

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

@@ -73,6 +73,8 @@
     <dimen name="view_size_100">100dp</dimen>
     <dimen name="view_size_130">130dp</dimen>
     <dimen name="view_size_150">150dp</dimen>
+    <dimen name="view_size_200">200dp</dimen>
+    <dimen name="view_size_250">250dp</dimen>
 
 
 </resources>