修改 shap 阴影和任务 弹框

app/build.gradle

@@ -43,6 +43,7 @@ android {
     dexOptions {
         preDexLibraries = false
         javaMaxHeapSize "4g"
+        incremental true
     }
     packagingOptions {
 

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

@@ -20,6 +20,15 @@ public class TaskEty implements Serializable{
     private String task_type;// 0,
     private String update_time;// 0
     private String icon;
+    private String package_size;
+
+    public String getPackage_size() {
+        return package_size;
+    }
+
+    public void setPackage_size(String package_size) {
+        this.package_size = package_size;
+    }
 
     public String getIcon() {
         return icon;

app/src/main/java/com/sheep/gamegroup/presenter/TaskListPresenter.java

@@ -1,9 +1,16 @@
 package com.sheep.gamegroup.presenter;
 
+import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.api.ApiService;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.util.ExceptionHandle;
+import com.sheep.gamegroup.model.util.MySubscriber;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import javax.inject.Inject;
 
+import rx.schedulers.Schedulers;
+
 /**
  * Created by ljy on 2018/3/21.
  */
@@ -20,6 +27,28 @@ public class TaskListPresenter implements TaskListContract.Presenter {
 
     @Override
     public void acceptedTask(int page, int pre_page) {
+        apiService.acceptedTask(page, pre_page)
+                .subscribeOn(Schedulers.io())
+                .subscribe(new MySubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(ExceptionHandle.ResponeThrowable throwable) {
+                        int statusCode = throwable.code;
+                        switch (statusCode){
+                            case ExceptionHandle.ERROR.BAD_REQUEST_ERROR://400
+                            default:
+                                try {
+                                    view.failView(JSONObject.parseObject(throwable.message, BaseMessage.class));
+                                }catch (Exception e){
+                                    e.printStackTrace();
+                                }
+                                break;
+                        }
+                    }
 
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        view.updataView(baseMessage);
+                    }
+                });
     }
 }

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

@@ -153,7 +153,7 @@ public class Jump2View {
      */
     public void goBindDataView(Context context, Object o) {
         Intent intent = new Intent(context, BindDataAct.class);
-        intent.putExtra("stype", o.toString());
+        intent.putExtra("stype", Integer.valueOf(o.toString()));
         context.startActivity(intent);
     }
 

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

@@ -14,6 +14,7 @@ import com.sheep.gamegroup.presenter.BindOrChangeWeixinPresenter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import javax.inject.Inject;
 
@@ -47,6 +48,11 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
     @Override
     public void initView() {
         activity = this;
+
+        TitleBarUtils
+                .getInstance()
+                .setTitle(activity, "更换微信号")
+                .setTitleFinish(activity);
         DaggerBindOrChangeWeixinComponent.builder()
                 .netComponent(SheepApp.get(this).getNetComponent())
                 .bindOrChangeWeixinModule(new BindOrChangeWeixinModule(this))

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

@@ -44,6 +44,8 @@ public class DialogActivity extends Activity {
     TextView doalogItemGetRewardsTv;
     @BindView(R.id.webview)
     WebView webview;
+    @BindView(R.id.start_task_tv)
+    TextView start_task_tv;
     private TaskEty task_entity;
 
     private DownloadManager downloadManager;
@@ -66,7 +68,7 @@ public class DialogActivity extends Activity {
                 .dontAnimate()
                 .into(dialogItemIconIv);
         dialogItemNameTv.setText(task_entity.getTask_name());
-        dialogItemSizeTv.setText( "11M");
+        dialogItemSizeTv.setText( task_entity.getPackage_size() + "M");
         if (PackageUtil.isAppInstalled(SheepApp.mContext, task_entity.getPackage_names())) {
             startStaskSprogress.setProgress(100);
         } else {
@@ -97,7 +99,7 @@ public class DialogActivity extends Activity {
 
     }
 
-    @OnClick({R.id.doalog_item_get_rewards_tv, R.id.dialog_item_x})
+    @OnClick({R.id.doalog_item_get_rewards_tv, R.id.dialog_item_x, R.id.start_task_tv})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.doalog_item_get_rewards_tv:
@@ -105,6 +107,8 @@ public class DialogActivity extends Activity {
             case R.id.dialog_item_x:
                 finish();
                 break;
+            case R.id.start_task_tv:
+                break;
         }
     }
 }

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

@@ -77,8 +77,8 @@ public class HomePageAct extends BaseActivity implements HomePageContract.View{
 
             myPrice.setText(userEntity.getBalance()+" 元");
             myAllPrice.setText("累计资产 "+userEntity.getTotal_asset()+" 元");
-            nameTv.setText(userEntity.getNickname()+"");//绵阳号：123456789
-            sheepNumTv.setText("绵阳号："+userEntity.getInvitation_code());
+            nameTv.setText(userEntity.getNickname()+"");//绵羊号：123456789
+            sheepNumTv.setText("绵羊号："+userEntity.getInvitation_code());
         }
     };
     @Override

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

@@ -1,10 +1,8 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.Manifest;
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
-import android.os.Bundle;
 import android.support.v4.app.ActivityCompat;
 import android.view.View;
 import android.widget.ImageView;
@@ -15,9 +13,10 @@ import com.sheep.gamegroup.di.components.DaggerLoginComponent;
 import com.sheep.gamegroup.di.modules.LoginModule;
 import com.sheep.gamegroup.presenter.LoginContract;
 import com.sheep.gamegroup.presenter.LoginPresenter;
-import com.sheep.gamegroup.util.ActivityManager;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.umeng.socialize.UMAuthListener;
 import com.umeng.socialize.UMShareAPI;
 import com.umeng.socialize.bean.SHARE_MEDIA;
@@ -59,6 +58,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
                 .build()
                 .inject(this);
 
+
     }
 
 
@@ -170,10 +170,10 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
                 goTelLogin();
                 break;
             case R.id.iv_wx:
-                goWeixin();
+//                goWeixin();
                 break;
             case R.id.iv_qq:
-                loginQQ();
+//                loginQQ();
                 break;
         }
     }

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

@@ -25,6 +25,7 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.xutils.ex.DbException;
 
@@ -83,7 +84,9 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
                 .personalCenterModule(new PersonalCenterModule(this))
                 .build()
                 .inject(this);
-
+        TitleBarUtils.getInstance()
+                .setTitle(this, "个人中心")
+                .setTitleFinish(this);
     }
 
     @Override
@@ -109,8 +112,10 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
             case R.id.account_safe_layout:
                 break;
             case R.id.account_task_layout://任务记录
+                Jump2View.getInstance().goTaskList2View(activity, null);
                 break;
             case R.id.account_detail_layout://提现明细
+                Jump2View.getInstance().goWithdrawallistView(activity, null);
                 break;
         }
     }

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

@@ -114,8 +114,8 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
         super.onCreate(savedInstanceState);
         // TODO: add setContentView(...) invocation
         ButterKnife.bind(this);
-        phoneEtAccount.setText("17628083502");
-        phoneEtCode.setText("123456");
+//        phoneEtAccount.setText("17628083502");
+//        phoneEtCode.setText("123456");
     }
 
     @OnClick({R.id.phone_et_account, R.id.phone_et_code, R.id.phone_btn_code, R.id.phone_sure_tv})
@@ -132,7 +132,12 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
             case R.id.phone_sure_tv:
                 etPhone = phoneEtAccount.getText().toString().trim();
                 etCode = phoneEtCode.getText().toString().trim();
-                loginByPhoneGaptcha();
+//                loginByPhoneGaptcha();
+                // TODO: 2018/3/22  测试界面，过后删除
+                SpUtils.login(getApplicationContext(), "12@1c421522bb7e44d3cd6a8d59a54df182");
+//        startActivity(new Intent(this, ActMain.class));
+                Jump2View.getInstance().goHomePageView(this, null);
+                finish();
                 break;
         }
     }

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

@@ -72,7 +72,7 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View{
 
     @Override
     public void initData() {
-
+        presenter.acceptedTask(0,10);
     }
 
     @Override

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

@@ -26,6 +26,7 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.util.List;
 
@@ -67,6 +68,10 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
     public void initView() {
         ButterKnife.bind(this);
         activity = this;
+        TitleBarUtils
+                .getInstance()
+                .setTitle(activity, "试玩赚钱")
+                .setTitleFinish(activity);
         DaggerTryMakeMoneyComponent.builder()
                 .netComponent(SheepApp.get(this).getNetComponent())
                 .tryMakeMoneyModule(new TryMakeMoneyModule(this))

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

@@ -21,6 +21,7 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -61,6 +62,10 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     public void initView() {
         ButterKnife.bind(this);
         activity = this;
+        TitleBarUtils
+                .getInstance()
+                .setTitle(activity, "提现")
+                .setTitleFinish(activity);
         DaggerWithdrawalComponent.builder()
                 .netComponent(SheepApp.get(this).getNetComponent())
                 .withdrawalModule(new WithdrawalModule(this))

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

@@ -4,9 +4,6 @@
 
     <gradient
         android:startColor="@color/blue_start"
-        android:angle="-90"
-        android:centerY="50%"
-        android:centerX="50%"
         android:endColor="@color/blue_end"/>
 
     <corners

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

@@ -4,10 +4,7 @@
 
     <gradient
         android:startColor="@color/yellow_start"
-        android:angle="-90"
-        android:centerY="50%"
-        android:centerX="50%"
         android:endColor="@color/yellow_end"/>
     <corners
-        android:radius="@dimen/radius_15"/>
+        android:radius="@dimen/radius_10"/>
 </shape>

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

@@ -5,6 +5,6 @@
         android:color="@color/white"/>
 
     <corners
-        android:radius="20dp"/>
+        android:radius="10dp"/>
 
 </shape>

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--第一层-->
+    <item>
+        <shape>
+            <solid android:color="@color/white" />
+            <!--描边-->
+            <stroke
+                android:width="1dp"
+                android:color="@color/white" />
+
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+    <!--第二层-->
+    <item
+        android:left="2.66dp"
+        android:top="2.66dp"
+        android:bottom="2.66dp"
+        android:right="2.66dp">
+        <shape>
+            <solid android:color="@color/white" />
+            <!--描边-->
+            <stroke
+                android:width="0.33dp"
+                android:color="@color/white_DEDEDE" />
+
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+
+</layer-list>

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

@@ -11,7 +11,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/sp_rectangle_bg_white_radius"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:orientation="vertical"
         android:layout_margin="@dimen/content_padding"
         android:padding="@dimen/content_padding_15">

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

@@ -11,7 +11,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/sp_rectangle_bg_white_radius"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:layout_margin="@dimen/content_padding_15"
         android:orientation="vertical">
 
@@ -25,7 +25,7 @@
             <TextView
                 android:id="@+id/text_notice_tv"
                 android:layout_width="0dp"
-                android:layout_weight="1"
+                android:layout_weight="2"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center|center_vertical"
                 android:gravity="left"
@@ -38,7 +38,7 @@
                 style="@style/edt_style"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/edt_heigh_default"
-                android:layout_weight="5"
+                android:layout_weight="9"
                 android:hint="请输入"
                 android:paddingLeft="@dimen/content_padding_big"
                 android:textSize="@dimen/text_size_3"/>
@@ -54,7 +54,7 @@
             <TextView
                 android:id="@+id/number_notice_tv"
                 android:layout_width="0dp"
-                android:layout_weight="1"
+                android:layout_weight="2"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center|center_vertical"
                 android:text="卡 号"
@@ -67,7 +67,7 @@
                 style="@style/edt_style"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/edt_heigh_default"
-                android:layout_weight="5"
+                android:layout_weight="9"
                 android:hint="请输入"
                 android:inputType="number"
                 android:paddingLeft="@dimen/content_padding_big"

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

@@ -40,7 +40,7 @@
                 android:layout_marginLeft="12dp"
                 android:layout_marginRight="12dp"
                 android:layout_marginTop="40dp"
-                android:background="@drawable/sp_rectangle_bg_white_radius"
+                android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
                 android:orientation="vertical">
                 <android.support.v7.widget.AppCompatEditText
                     android:id="@+id/phone_et_account"

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

@@ -1,40 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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:id="@+id/dialog_layout">
+    android:id="@+id/dialog_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:layout_margin="@dimen/content_padding_65"
-        android:scrollbars="none" >
+        android:scrollbars="none">
+
         <RelativeLayout
             android:id="@+id/dialog_son_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <ImageView
-                android:id="@+id/dialog_item_x"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@mipmap/try_dialog_x"
-                android:layout_alignParentRight="true"/>
+            android:orientation="horizontal"
+            android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
+
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@mipmap/try_dialog_bg"
+                android:layout_alignParentRight="@dimen/view_size_60"
                 android:layout_marginTop="@dimen/content_padding"
                 android:padding="@dimen/content_padding">
 
                 <ImageView
                     android:id="@+id/dialog_item_icon_iv"
-                    android:layout_width="@dimen/view_size_80"
-                    android:layout_height="@dimen/view_size_80"
-                    android:minHeight="@dimen/view_size_80"
-                    android:minWidth="@dimen/view_size_80"
+                    android:layout_width="@dimen/view_size_60"
+                    android:layout_height="@dimen/view_size_60"
                     android:src="@drawable/icon_lj" />
 
                 <TextView
@@ -43,7 +38,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/content_padding"
-                    android:layout_marginTop="@dimen/content_padding_15"
+                    android:layout_marginTop="@dimen/content_padding_small"
                     android:layout_toRightOf="@id/dialog_item_icon_iv"
                     android:text="无敌大航海" />
 
@@ -53,7 +48,7 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/dialog_item_name_tv"
                     android:layout_marginLeft="@dimen/content_padding"
-                    android:layout_marginTop="@dimen/content_padding_10"
+                    android:layout_marginTop="@dimen/content_padding_small"
                     android:layout_toRightOf="@id/dialog_item_icon_iv"
                     android:text="10M"
                     android:textSize="@dimen/text_size_12" />
@@ -64,51 +59,80 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/dialog_item_icon_iv"
-                    android:layout_marginTop="@dimen/content_padding_15"
+                    android:layout_centerHorizontal="true"
                     android:layout_marginLeft="@dimen/content_padding_40"
                     android:layout_marginRight="@dimen/content_padding_40"
-                    android:layout_centerHorizontal="true">
+                    android:layout_marginTop="@dimen/content_padding_15">
 
                 </WebView>
 
-                <com.sheep.gamegroup.view.customview.SProgress
-                    android:id="@+id/start_stask_sprogress"
-                    android:layout_width="match_parent"
+                <LinearLayout
+                    android:id="@+id/start_layout"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/webview"
-                    android:layout_marginTop="@dimen/content_padding_15"
-                    android:layout_marginLeft="@dimen/content_padding_40"
-                    android:layout_marginRight="@dimen/content_padding_40"
-                    android:layout_toLeftOf="@+id/frentallystart"
-                    android:minHeight="36dp"
-                    android:padding="2dp"
-                    android:layout_centerHorizontal="true"
-                    app:backColor="@color/bg_gray"
-                    app:minProgress="0"
-                    app:progressColor="@color/txt_bg_yellow"
-                    app:progressendcolor="#ffff6969"
-                    app:startprogress="0"
-                    app:textColor="#ffffffff"
-                    app:textsize="18sp"
-                    android:minWidth="151dp"/>
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/start_task_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginLeft="@dimen/content_padding_40"
+                        android:layout_marginRight="@dimen/content_padding_40"
+                        android:layout_marginTop="@dimen/content_padding_15"
+                        android:background="@drawable/sp_bg_gradient_rectqangle_yellow"
+                        android:gravity="center"
+                        android:minHeight="36dp"
+                        android:minWidth="151dp"
+                        android:text="开始任务"
+                        android:textSize="18sp" />
+
+                    <com.sheep.gamegroup.view.customview.SProgress
+                        android:id="@+id/start_stask_sprogress"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginLeft="@dimen/content_padding_40"
+                        android:layout_marginRight="@dimen/content_padding_40"
+                        android:layout_marginTop="@dimen/content_padding_15"
+                        android:minHeight="36dp"
+                        android:minWidth="151dp"
+                        android:padding="2dp"
+                        app:backColor="@color/txt_gray_929292"
+                        app:minProgress="0"
+                        app:progressColor="@color/txt_bg_yellow"
+                        app:progressendcolor="#ffff6969"
+                        app:startprogress="0"
+                        app:textColor="#ffffffff"
+                        app:textsize="18sp"
+                        android:visibility="gone"/>
+                </LinearLayout>
 
                 <TextView
                     android:id="@+id/doalog_item_get_rewards_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_below="@+id/start_stask_sprogress"
+                    android:layout_below="@+id/start_layout"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginLeft="@dimen/content_padding_40"
+                    android:layout_marginRight="@dimen/content_padding_40"
+                    android:layout_marginTop="@dimen/content_padding_15"
                     android:background="@drawable/sp_bg_gradient_rectqangle_yellow"
                     android:gravity="center"
                     android:minHeight="36dp"
                     android:minWidth="151dp"
                     android:text="领取奖励"
-                    android:textSize="18sp"
-                    android:layout_marginTop="@dimen/content_padding_15"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginLeft="@dimen/content_padding_40"
-                    android:layout_marginRight="@dimen/content_padding_40"/>
+                    android:textSize="18sp" />
 
             </RelativeLayout>
+
+            <ImageView
+                android:id="@+id/dialog_item_x"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:src="@mipmap/try_dialog_x" />
         </RelativeLayout>
     </ScrollView>
 </RelativeLayout>

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

@@ -79,7 +79,7 @@
                         android:text="提 现"
                         android:textColor="@color/blue_34a6e7"
                         android:textSize="@dimen/text_size_4"
-                        android:background="@drawable/sp_rectangle_bg_white_radius"
+                        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
                         android:gravity="center"
                         android:padding="5dp"/>
                     <TextView
@@ -184,7 +184,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/sp_rectangle_bg_white_radius"
+                android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
                 android:orientation="vertical"
                 android:minHeight="@dimen/view_size_80"
                 android:padding="@dimen/content_padding_10"

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@drawable/sp_rectangle_bg_white_radius"
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
     android:padding="@dimen/content_padding_15">
 
     <TextView

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

@@ -11,7 +11,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/sp_rectangle_bg_white_radius"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:layout_margin="12dp"
         android:padding="15dp">
         <TextView
@@ -58,7 +58,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/sp_rectangle_bg_white_radius"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:layout_margin="12dp"
         android:paddingTop="15dp"
         android:paddingRight="15dp"

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

@@ -10,7 +10,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/sp_rectangle_bg_white_radius"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:layout_margin="@dimen/content_padding_15"
         android:padding="@dimen/content_padding_20"
         android:orientation="vertical">

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

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/sp_rectangle_bg_white_radius"
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
     android:padding="@dimen/content_padding_20"
     android:layout_margin="@dimen/content_padding_10">
 

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

@@ -3,7 +3,7 @@
                 android:id="@+id/layout_navigationBar"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/layout_heigh_default"
-                android:background="@color/white_light">
+                android:background="@color/white_F9F9F9">
 
     <ImageView
         android:id="@+id/img_baseactivity_title"

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="@drawable/sp_rectangle_bg_white_radius"
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
     android:padding="12dp">
     <TextView
         android:id="@+id/item_title_tv"

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

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/sp_rectangle_bg_white_radius"
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
     android:padding="@dimen/content_padding_20"
     android:layout_margin="@dimen/content_padding_10">
 

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

@@ -19,7 +19,7 @@
             <android.support.constraint.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/sp_rectangle_bg_white_radius"
+                android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
                 android:padding="@dimen/content_padding_20"
                 android:layout_margin="@dimen/content_padding_15">
                 <TextView

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

@@ -92,6 +92,7 @@
         <dimen name="radius_100">100dp</dimen>
         <dimen name="radius_25">25dp</dimen>
         <dimen name="radius_15">15dp</dimen>
+        <dimen name="radius_10">10dp</dimen>
         <dimen name="radius_5">5dp</dimen>
 
     <dimen name="view_size_35">35dp</dimen>

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

@@ -3,6 +3,7 @@
     <color name="txt_black">#010101</color>
     <color name="txt_bg_yellow">#FDBD24</color>
     <color name="white_light">#F8F8F8</color>
+    <color name="white_F9F9F9">#F9F9F9</color>
     <color name="txt_white">#FFFFFF</color>
     <color name="black">#000000</color>
     <color name="black_191919">#191919</color>
@@ -10,7 +11,7 @@
     <color name="white_bg_line">#dfdfdf</color>
     <color name="txt_red">#ff2d4b</color>
     <color name="txt_bule">#4889ff</color>
-    <color name="bg_gray">#e3e1e1</color>
+    <color name="bg_gray">#F9F9F9</color>
     <color name="txt_black_404040">#404040</color>
     <color name="txt_gray_929292">#929292</color>
     <color name="red_fd2d54">#fd2d54</color>
@@ -25,5 +26,6 @@
     <color name="green_start">#76eab8</color>
     <color name="green_end">#02ca73</color>
     <color name="blue_34a6e7">#34a6e7</color>
+    <color name="white_DEDEDE">#DEDEDE</color>
 
 </resources>

datashare/build.gradle

@@ -11,6 +11,9 @@ android {
         versionName VERSION_NAME
     }
 
+    dexOptions {
+        incremental true
+    }
     greendao {
         schemaVersion 2
         targetGenDir 'src/main/java'

view/build.gradle

@@ -17,6 +17,7 @@ android {
 
     dexOptions {
         preDexLibraries = false
+        incremental true
     }
     buildTypes {
         release {