Merge branch 'sheep2.0' of http://10.8.230.114:3000/kemllor/small_sheep_android into sheep2.0

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

@@ -53,6 +53,11 @@ public interface ApiService {
      */
     @GET(V1+"app/user/get_info/")
     Observable<BaseMessage> getInfo();
+    /**
+     * 获取用户的已经挂机微信
+     */
+    @GET(V1+"/app/wechat//")
+    Observable<BaseMessage> getWebchat();
 
     /**
      * 绑定手机号
@@ -63,7 +68,8 @@ public interface ApiService {
      * 绑定真实姓名
      */
     @PUT(V1+"app/user/bind_real_name/")
-    Observable<BaseMessage> bindRealname(@Query("real_name") String real_name);
+    Observable<BaseMessage> bindRealname(@Body JSONObject object);
+//    Observable<BaseMessage> bindRealname(@Query("real_name") String real_name);
     /**
      * 绑定身份证号
      */

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

@@ -11,7 +11,7 @@ public class TaskEty implements Serializable{
     private String boot_address;//private String string",
     private String create_time;// 0,
     private String download_link;//private String string",
-    private String id;// 0,
+    private int id;// 0,
     private String inspect_type;// 0,
     private String package_names;//private String string",
     private String remarks;//private String string",
@@ -21,13 +21,13 @@ public class TaskEty implements Serializable{
     private String update_time;// 0
     private String icon;
     private String package_size;
-    private String release_task_id;
+    private int release_task_id;
 
-    public String getRelease_task_id() {
+    public int getRelease_task_id() {
         return release_task_id;
     }
 
-    public void setRelease_task_id(String release_task_id) {
+    public void setRelease_task_id(int release_task_id) {
         this.release_task_id = release_task_id;
     }
 
@@ -81,11 +81,11 @@ public class TaskEty implements Serializable{
         this.download_link = download_link;
     }
 
-    public String getId() {
+    public int getId() {
         return id;
     }
 
-    public void setId(String id) {
+    public void setId(int id) {
         this.id = id;
     }
 

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

@@ -12,7 +12,7 @@ public class TaskReleaseEty implements Serializable{
     private String create_time;// 0,
     private String deadline;// 0,
     private String duration;// 0,
-    private String id;// 0,
+    private int id;// 0,
     private String last_num;// 0,
     private String name;//private String string",
     private String online_time;// 0,
@@ -59,11 +59,11 @@ public class TaskReleaseEty implements Serializable{
         this.duration = duration;
     }
 
-    public String getId() {
+    public int getId() {
         return id;
     }
 
-    public void setId(String id) {
+    public void setId(int id) {
         this.id = id;
     }
 

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

@@ -1,5 +1,6 @@
 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;
@@ -32,7 +33,7 @@ public class BindDataPresenter implements BindDataContract.Presenter {
     @Override
     public void submitDataRealname(Object o) {
 
-        apiService.bindRealname(o.toString())
+        apiService.bindRealname((JSONObject) o)
                 .subscribeOn(Schedulers.io())
                 .subscribe(new MySubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override

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

@@ -7,12 +7,14 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.di.components.DaggerBindDataComponent;
 import com.sheep.gamegroup.di.modules.BindDataModule;
 import com.sheep.gamegroup.presenter.BindDataContract;
 import com.sheep.gamegroup.presenter.BindDataPresenter;
+import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
@@ -59,7 +61,10 @@ public class BindDataAct extends BaseActivity implements BindDataContract.View {
 
     @Override
     public void upView(Object o) {
+        hideProgress();
         G.showToast("ok");
+        Toast.makeText(activity, "提现成功",Toast.LENGTH_SHORT);
+        ActivityManager.getInstance().endActivity(WithdrawalAct.class);
         finish();
 
     }
@@ -67,6 +72,7 @@ public class BindDataAct extends BaseActivity implements BindDataContract.View {
     @Override
     public void failView(Object o) {
         G.showToast("error");
+        hideProgress();
     }
 
     @Override
@@ -114,16 +120,15 @@ public class BindDataAct extends BaseActivity implements BindDataContract.View {
         JSONObject j = new JSONObject();
         j.put(key, value);
         showProgress();
-        presenter.submitData(j);
         switch (type) {
             case 40001:
-                presenter.submitDataRealname(value);
+                presenter.submitDataRealname(j);
                 break;
             case 40002:
-                presenter.submitDataIdnumber(value);
+                presenter.submitDataIdnumber(j);
                 break;
             case 40003:
-                presenter.submitDataBankcard(value);
+                presenter.submitDataBankcard(j);
                 break;
         }
     }

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

@@ -17,6 +17,9 @@ import android.widget.Toast;
 
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
+import com.kfzs.duanduan.utils.dlg.DeviceUtils;
+import com.sheep.gamegroup.di.components.DaggerTaskDialogComponent;
+import com.sheep.gamegroup.di.modules.TaskDialogModule;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.presenter.TaskDialogContract;
 import com.sheep.gamegroup.presenter.TaskDialogPresenter;
@@ -115,6 +118,11 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
             finish();
             return;
         }
+        DaggerTaskDialogComponent.builder()
+                .netComponent(SheepApp.get(DialogActivity.this).getNetComponent())
+                .taskDialogModule(new TaskDialogModule(this))
+                .build()
+                .inject(DialogActivity.this);
         setBtnState();
         webview.setWebChromeClient(new WebChromeClient() {
 
@@ -187,19 +195,23 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
      * 开始任务或者下载游戏、试玩
      */
     private void startStask() {
-        switch (type){
-            case 0://开始任务
-                JSONObject object = new JSONObject();
-                object.put("device_id", "");
-                object.put("release_task_id", task_entity.getRelease_task_id()+"");
-                preference.acceptedTask(object);
-                break;
-            case 1://开始试玩
-                toTestPlay();
-                break;
-            case 2://开始下载
-                downLoadApk();
-                break;
+        try{
+            switch (type){
+                case 0://开始任务
+                    JSONObject object = new JSONObject();
+                    object.put("device_id", new DeviceUtils(activity).getIMEI()+"");
+                    object.put("release_task_id", Integer.valueOf(task_entity.getRelease_task_id()+""));
+                    preference.acceptedTask(object);
+                    break;
+                case 1://开始试玩
+                    toTestPlay();
+                    break;
+                case 2://开始下载
+                    downLoadApk();
+                    break;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
         }
     }
 

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

@@ -251,10 +251,11 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
     }
 
     private void goMain() {
-        // TODO: 2018/3/22  测试界面，过后删除
+        // TODO: 2018/3/22  测试界面，过后删除s
                 SpUtils.login(getApplicationContext(), "12@1c421522bb7e44d3cd6a8d59a54df182");
 //        startActivity(new Intent(this, ActMain.class));
                 Jump2View.getInstance().goHomePageView(this, null);
+                ActivityManager.getInstance().endActivity(LoginAct.class);
                 finish();
     }
 

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

@@ -72,7 +72,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
                 .build()
                 .inject(this);
         adapter = new WithdrawalAdapter(activity, assemblyData());
-        withdrawalGreidview.setVerticalSpacing(15);
+        withdrawalGreidview.setVerticalSpacing(25);
         withdrawalGreidview.setAdapter(adapter);
         adapter.notifyDataSetChanged();
         withdrawalGreidview.setOnItemClickListener(new AdapterView.OnItemClickListener() {

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

@@ -90,7 +90,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                     public void onClick(View v) {
                         TaskEty taskEty = etyList.get(i).getTask();
                         taskEty.setRunTask(0);
-//                        taskEty.setRelease_task_id(etyList.getRelease_task_id());
+                        taskEty.setRelease_task_id(etyList.get(i).getId());
                         Jump2View.getInstance().goDialogActivityView(context, taskEty);
                     }
                 });
@@ -151,7 +151,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
             public void onClick(View v) {
                 TaskEty taskEty = acceptedEty.getRelease_task().getTask();
                 taskEty.setRunTask(1);
-                taskEty.setRelease_task_id(acceptedEty.getRelease_task_id());
+                taskEty.setRelease_task_id(acceptedEty.getRelease_task().getId());
                 Jump2View.getInstance().goDialogActivityView(context, taskEty);
             }
         });

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

@@ -3,7 +3,7 @@
     android:shape="rectangle">
 
     <solid
-        android:color="@color/txt_black_818181"/>
+        android:color="@color/txt_gray_e6e4e4"/>
 
     <corners
         android:radius="@dimen/radius_25"/>

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

@@ -3,21 +3,22 @@
     <!--第一层-->
     <item>
         <shape>
-            <solid android:color="@color/white_DEDEDE" />
+            <solid android:color="@color/white_ededed" />
             <!--描边-->
             <stroke
-                android:width="1dp"
-                android:color="@color/white_DEDEDE" />
+                android:width="1px"
+                android:color="@color/white_ededed"
+                />
 
             <corners android:radius="10dp" />
         </shape>
     </item>
     <!--第二层-->
     <item
-        android:left="1dp"
-        android:top="1dp"
-        android:bottom="1dp"
-        android:right="1dp">
+        android:left="1px"
+        android:top="1px"
+        android:bottom="1px"
+        android:right="1px">
         <shape>
             <solid android:color="@color/white" />
             <!--描边-->

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

@@ -25,7 +25,7 @@
             <TextView
                 android:id="@+id/text_notice_tv"
                 android:layout_width="0dp"
-                android:layout_weight="2"
+                android:layout_weight="1"
                 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="9"
+                android:layout_weight="4"
                 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="2"
+                android:layout_weight="1"
                 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="9"
+                android:layout_weight="4"
                 android:hint="请输入"
                 android:inputType="number"
                 android:paddingLeft="@dimen/content_padding_big"

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

@@ -21,7 +21,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginLeft="100dp"
                 android:layout_marginRight="100dp"
-                android:src="@drawable/icon"
+                android:src="@mipmap/no_bind_phone"
                 android:layout_marginTop="35dp"
                 android:layout_marginBottom="5dp"/>
 

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

@@ -9,13 +9,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:layout_margin="@dimen/content_padding_65"
+        android:layout_margin="@dimen/content_padding_30"
         android:scrollbars="none">
 
         <RelativeLayout
             android:id="@+id/dialog_son_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:minWidth="300dp"
+            android:minHeight="196dp"
             android:orientation="horizontal"
             android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
 
@@ -71,23 +73,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/webview"
+                    android:layout_centerHorizontal="true"
                     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"
@@ -104,9 +92,24 @@
                         app:progressColor="@color/txt_bg_yellow"
                         app:progressendcolor="#ffff6969"
                         app:startprogress="0"
-                        app:textColor="#ffffffff"
+                        app:textColor="@color/black"
                         app:textsize="18sp"
                         android:visibility="visible"/>
+
+                    <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_small"
+                        android:background="@drawable/sp_bg_gradient_rectqangle_yellow"
+                        android:gravity="center"
+                        android:minHeight="36dp"
+                        android:minWidth="151dp"
+                        android:text="开始任务"
+                        android:textSize="18sp" />
                 </LinearLayout>
 
                 <TextView
@@ -117,7 +120,7 @@
                     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:layout_marginTop="@dimen/content_padding_small"
                     android:background="@drawable/sp_bg_gradient_rectqangle_yellow"
                     android:gravity="center"
                     android:minHeight="36dp"
@@ -131,6 +134,8 @@
                 android:id="@+id/dialog_item_x"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:minHeight="@dimen/view_size_20"
+                android:minWidth="@dimen/view_size_20"
                 android:layout_alignParentRight="true"
                 android:src="@mipmap/try_dialog_x"
                 android:layout_margin="@dimen/content_padding"/>

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

@@ -90,4 +90,18 @@
             android:layout_height="12dp"
             android:src="@mipmap/triangle_popup_nomal"/>
     </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_alignParentBottom="true">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/white_ededed"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/white_FFF7F7F7"/>
+    </LinearLayout>
 </RelativeLayout>

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

@@ -4,15 +4,37 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-    android:padding="12dp">
-    <TextView
-        android:id="@+id/item_title_tv"
-        android:layout_width="wrap_content"
+    android:paddingRight="12dp"
+    android:paddingTop="12dp"
+    android:paddingLeft="20dp"
+    android:paddingBottom="12dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="进行中"
-        android:textColor="@color/black"
-        android:textSize="15dp"
-        android:layout_marginBottom="13dp"/>
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/item_title_tv"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="进行中"
+            android:textColor="@color/black"
+            android:textSize="15dp"
+            android:layout_marginBottom="13dp"/>
+        <TextView
+            android:id="@+id/cancel_task_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="取消任务"
+            android:minWidth="@dimen/view_size_80"
+            android:textColor="@color/black"
+            android:textSize="15dp"
+            android:layout_gravity=""
+            android:layout_marginBottom="13dp"
+            android:background="@drawable/sp_bg_gradient_rectangle_blue"/>
+    </LinearLayout>
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -26,12 +48,13 @@
             android:id="@+id/item_anem_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="无敌大航海"
+            android:text=""
             android:layout_alignTop="@+id/item_icon_iv"
             android:layout_toEndOf="@+id/item_icon_iv"
             android:layout_marginTop="6dp"
             android:layout_marginStart="15dp"
-            android:layout_above="@+id/item_num_tv" />
+            android:layout_above="@+id/item_num_tv"
+            style="@style/txt_style_15"/>
         <TextView
             android:id="@+id/item_num_tv"
             android:layout_width="wrap_content"
@@ -39,7 +62,9 @@
             android:text=""
             android:layout_below="@+id/item_money"
             android:layout_alignStart="@+id/item_anem_tv"
-            android:layout_marginTop="8dp"/>
+            android:layout_marginTop="8dp"
+            android:textColor="@color/txt_black_8e8e8e"
+            android:textSize="@dimen/text_size_12"/>
         <TextView
             android:id="@+id/item_money"
             android:layout_width="wrap_content"
@@ -50,4 +75,10 @@
             android:layout_centerVertical="true"
             android:layout_alignParentRight="true"/>
     </RelativeLayout>
+    <TextView
+        android:id="@+id/line_tv"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="@color/white_bg_line"
+        android:layout_marginTop="17dp"/>
 </LinearLayout>

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

@@ -3,12 +3,12 @@
     android:id="@+id/item_tv"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:minHeight="@dimen/view_size_35"
+    android:minHeight="@dimen/view_size_30"
     android:gravity="center"
     android:text="10元"
     android:textSize="@dimen/text_size_3"
     android:textColor="@color/txt_black"
-    android:padding="@dimen/content_padding_small"
+    android:padding="@dimen/content_padding_3"
     android:background="@drawable/radidius_bg_tv_blue_gray_selector">
 
 </TextView>

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

@@ -58,11 +58,11 @@
                 <TextView
                     android:id="@+id/line_one"
                     android:layout_width="0dp"
-                    android:layout_height="1dp"
+                    android:layout_height="0.5dp"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/weixin_name_tv"
-                    android:background="@color/txt_gray_929292"
+                    android:background="@color/white_bg_line"
                     android:layout_marginTop="17dp"/>
 
                 <TextView
@@ -75,7 +75,8 @@
                     android:textColor="@color/txt_gray_929292"
                     android:textSize="@dimen/text_size_12"
                     app:layout_constraintTop_toBottomOf="@+id/line_one"
-                    android:layout_marginTop="@dimen/content_padding_20"/>
+                    android:layout_marginTop="@dimen/content_padding_20"
+                    android:visibility="gone"/>
                 <TextView
                     android:id="@+id/withdrawal_real_name_tv"
                     android:layout_width="wrap_content"
@@ -87,7 +88,8 @@
                     app:layout_constraintLeft_toLeftOf="parent"
                     android:layout_marginTop="6dp"
                     android:textSize="@dimen/text_size_3"
-                    android:textColor="@color/txt_black_404040"/>
+                    android:textColor="@color/txt_black_404040"
+                    android:visibility="gone"/>
                 <TextView
                     android:id="@+id/line_two"
                     android:layout_width="0dp"
@@ -96,7 +98,8 @@
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/withdrawal_real_name_tv"
                     android:background="@color/txt_gray_929292"
-                    android:layout_marginTop="17dp"/>
+                    android:layout_marginTop="17dp"
+                    android:visibility="gone"/>
 
                 <TextView
                     android:id="@+id/withdrawal_click_bindname_tv"
@@ -108,7 +111,8 @@
                     android:textColor="@color/txt_gray_929292"
                     android:textSize="@dimen/text_size_12"
                     app:layout_constraintTop_toBottomOf="@+id/line_two"
-                    android:layout_marginTop="@dimen/content_padding_20"/>
+                    android:layout_marginTop="@dimen/content_padding_20"
+                    android:visibility="gone"/>
                 <com.sheep.gamegroup.util.MyGridview
                     android:id="@+id/withdrawal_greidview"
                     android:layout_height="wrap_content"

app/src/main/res/values-v23/style_theme.xml

@@ -6,7 +6,7 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="colorControlHighlight">@color/theme_app_highlight_more</item>
+        <item name="colorControlHighlight">@color/black</item>
 
         <item name="main_color">@color/theme_app_main</item>
         <item name="main_color_dark">@color/theme_app_dark</item>

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--APP的相关主要颜色值-->
-    <color name="colorPrimary">#FDE054</color>
-    <color name="colorPrimaryDark">#FEDC56</color>
+    <color name="colorPrimary">@color/white_DEDEDE</color>
+    <color name="colorPrimaryDark">@color/txt_black_818181</color>
     <color name="colorAccent">#FF842C</color>
     <color name="colorGreen">#4ADE15</color>
     <!--APP中的文本颜色主要值-->
@@ -66,6 +66,7 @@
     </style>
 
     <!--APP中的主要内容的各种间距值pading默认值和较大值-->
+    <dimen name="content_padding_3">3dp</dimen>
     <dimen name="content_padding_small">6dp</dimen>
     <dimen name="content_padding_8">8dp</dimen>
     <dimen name="content_padding_big">18dp</dimen>
@@ -95,6 +96,8 @@
         <dimen name="radius_10">10dp</dimen>
         <dimen name="radius_5">5dp</dimen>
 
+    <dimen name="view_size_20">20dp</dimen>
+    <dimen name="view_size_30">30dp</dimen>
     <dimen name="view_size_35">35dp</dimen>
     <dimen name="view_size_40">40dp</dimen>
     <dimen name="view_size_45">45dp</dimen>

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

@@ -14,8 +14,10 @@
     <color name="bg_gray">#F9F9F9</color>
     <color name="txt_black_404040">#404040</color>
     <color name="txt_gray_929292">#929292</color>
+    <color name="txt_gray_e6e4e4">#e6e4e4</color>
     <color name="red_fd2d54">#fd2d54</color>
     <color name="txt_black_818181">#818181</color>
+    <color name="txt_black_8e8e8e">#8e8e8e</color>
     <color name="txt_black_9e9c9c">#9e9c9c</color>
     <color name="txt_black_cc444444">#cc444444</color>
     <color name="txt_black_444444">#444444</color>
@@ -30,5 +32,7 @@
     <color name="green_end">#02ca73</color>
     <color name="blue_34a6e7">#34a6e7</color>
     <color name="white_DEDEDE">#DEDEDE</color>
+    <color name="white_ededed">#ededed</color>
+    <color name="white_FFF7F7F7">#FFF7F7F7</color>
 
 </resources>