修复充值、绑定微信与绑定银行卡信息界面

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

@@ -414,7 +414,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             case R.id.user_layout:
                 break;
             case R.id.withdrawal:
-                Jump2View.getInstance().goWithdrawal(activity, null);
+                Jump2View.getInstance().tryGoWithdrawal(activity, userEntity);
                 break;
             case R.id.try_play_layout://试玩赚钱
                 Jump2View.getInstance().goTryplayView(activity, null);

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

@@ -276,8 +276,24 @@ public class UserEntity implements Serializable {
         this.certification_count = certification_count;
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
     public boolean isNewRegistUser() {//新注册用户
         return TextUtils.equals(create_time, last_login_time);
     }
-
+    //没有实名认证
+    public boolean notCertification() {
+        return TextUtils.isEmpty(getReal_name()) || TextUtils.isEmpty(getId_number()) || TextUtils.isEmpty(getBank_card_mobile()) || TextUtils.isEmpty(getBank_card());
+    }
 }

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

@@ -88,6 +88,9 @@ public class CommonUtil {
     public static String FAIL_DOWNLOAD = "下载失败";
     public static String START_INSTALL = "开始安装";
     public static String OPEN_APPLY = "打开应用";
+    public static String GAME_RECHAGE = "充值游戏";
+    public static String GAME_DOWNLOAD = "下载游戏";
+    public static String GAME_INSTALL = "安装游戏";
     private static CommonUtil commonUtil;
 
     public static CommonUtil getInstance(){

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

@@ -120,30 +120,41 @@ public class Jump2View {
     /**
      * 跳转到提现页面
      * @param context
-     * @param o
      */
-    public void goWithdrawal(Context context, Object o){
-        UserEntity userEntity = null;
-        try {
-            userEntity = MyDbManager.getInstance().dbFindUser();
-        } catch (DbException e) {
-            e.printStackTrace();
+    public void goWithdrawal(Context context){
+        Intent intent = new Intent(context, WithdrawalAct.class);
+        context.startActivity(intent);
+        UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_TIXIAN);
+    }
+
+    /**
+     * 跳转到提现页面
+     * @param context
+     * @param userEntity
+     */
+    public void tryGoWithdrawal(Context context, UserEntity userEntity){
+        if(userEntity == null) {
+            try {
+                userEntity = MyDbManager.getInstance().dbFindUser();
+            } catch (DbException e) {
+                e.printStackTrace();
+            }
         }
         if(userEntity == null){
             G.showToast(R.string.loading_data);
             return;
         }
-        if(!isBindWeixin(context)){
-            goBindOrChangeWeixinView(context, false);
+        if(
+                TestUtil.isTestRecharge() ||
+                !isBindWeixin(context)){
+            goNoBindWx(context, ChangeWxOrTelAct.TYPE_RECHARGE);
             return;
         }
-        if(TextUtils.isEmpty(userEntity.getReal_name()) || TextUtils.isEmpty(userEntity.getId_number())){//没有实名认证
+        if(userEntity.notCertification()){//没有实名认证
             goRealNameAuther(context, userEntity, 1);
             return;
         }
-        Intent intent = new Intent(context, WithdrawalAct.class);
-        context.startActivity(intent);
-        UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_TIXIAN);
+        goWithdrawal(context);
     }
 
 
@@ -269,14 +280,12 @@ public class Jump2View {
      * 跳到绑定微信页面
      * @param context
      * @param o false:绑定   true：切换
+     * @param from
      */
-    public void goBindOrChangeWeixinView(Context context, boolean o){
-        if(!isBindWeixin(context) && !o){
-            goNoBindWx(context, o);
-            return;
-        }
+    public void goBindOrChangeWeixinView(Context context, boolean o, int from){
         Intent intent = new Intent(context, BindOrChangeWeixinAct.class);
         intent.putExtra("type",o);
+        intent.putExtra("from",from);
         context.startActivity(intent);
     }
 
@@ -603,10 +612,11 @@ public class Jump2View {
     /**
      * 跳转到未绑定微信界面
      * @param context
-     * @param o
+     * @param from
      */
-    public void goNoBindWx(Context context, Object o){
+    public void goNoBindWx(Context context, int from){
         Intent i = new Intent(context, ChangeWxOrTelAct.class);
+        i.putExtra("from", from);
         context.startActivity(i);
     }
     /**

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

@@ -446,13 +446,8 @@ public class TestUtil {
                 .open();
     }
 
-    public static String getShareUrl(int taskId) {
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append(SpUtils.getTaskDetailsUrl(SheepApp.getInstance()));
-        stringBuilder.append("?authorization=").append(SpUtils.getOpenId(SheepApp.getInstance()));
-        stringBuilder.append("&task_id=").append(taskId);
-        stringBuilder.append("&invitation_code=").append(MyDbManager.getInstance().dbFindValue());
-        LogUtil.println("getShareUrl", stringBuilder.toString());
-        return stringBuilder.toString();
+    public static boolean isTestRecharge() {
+//        return BuildConfig.DEBUG;//测试充值与绑定微信和身份信息逻辑
+        return false;
     }
 }

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

@@ -156,8 +156,8 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
             case R.id.rl_wx:  ////跳转到微信
                 if(mEntity == null){
                     G.showToast(R.string.loading_data);
-                } else if(TextUtils.isEmpty(mEntity.getWx_nickname())) {
-                    Jump2View.getInstance().goBindOrChangeWeixinView(AccountAndSecurityAct.this, false);
+                } else if(TextUtils.isEmpty(mEntity.getWx_openid())) {
+                    Jump2View.getInstance().goNoBindWx(AccountAndSecurityAct.this, ChangeWxOrTelAct.TYPE_NORMAL);
                 } else {
                     G.showToast("您已经绑定微信");
                 }
@@ -204,7 +204,11 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
                         .apply(new RequestOptions().circleCrop().placeholder(R.drawable.icon))
                         .into(ivHead);
                 if (TextUtils.isEmpty(entity.getWx_nickname())) {
-                    tvWx.setText("未绑定");
+                    if(TextUtils.isEmpty(entity.getWx_openid())) {
+                        tvWx.setText("未绑定");
+                    } else {
+                        tvWx.setText("");
+                    }
                 } else {
                     tvWx.setText(entity.getWx_nickname());
                     SpUtils.saveWeixin(activity, entity.getWx_nickname());

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

@@ -116,7 +116,7 @@ public class ActMyMoney extends BaseActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.my_money_withdraw_tv://提现
-                Jump2View.getInstance().goWithdrawal(ActMyMoney.this, null);
+                Jump2View.getInstance().tryGoWithdrawal(ActMyMoney.this, null);
                 break;
             case R.id.my_money_recharge_tv://充值
                 Jump2View.getInstance().goRechargeAct(ActMyMoney.this, null);

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

@@ -17,7 +17,10 @@ import com.sheep.gamegroup.presenter.BindOrChangeWeixinContract;
 import com.sheep.gamegroup.presenter.BindOrChangeWeixinPresenter;
 import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
+import com.sheep.gamegroup.util.TestUtil;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.gamegroup.absBase.BaseActivity;
@@ -26,6 +29,7 @@ import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
+import org.xutils.ex.DbException;
 
 import javax.inject.Inject;
 
@@ -49,6 +53,7 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
 
     private String code;
     private boolean isBindOrChange;
+    private int from;
     private String isBindOrChangeStr;
 
 
@@ -61,6 +66,7 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
     public void initView() {
         activity = this;
         isBindOrChange = getIntent().getBooleanExtra("type", false);
+        from = getIntent().getIntExtra("from", ChangeWxOrTelAct.TYPE_NORMAL);
         if(isBindOrChange){
             isBindOrChangeStr = "更换微信号";
         }else {
@@ -68,14 +74,20 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
         }
         TitleBarUtils
                 .getInstance()
-                .setTitle(activity, "绑定微信号")
+                .setTitle(activity, isBindOrChangeStr)
                 .setTitleFinish(activity);
         DaggerBindOrChangeWeixinComponent.builder()
                 .netComponent(SheepApp.get(this).getNetComponent())
                 .bindOrChangeWeixinModule(new BindOrChangeWeixinModule(this))
                 .build()
                 .inject(this);
+        try {
+            mEntity = MyDbManager.getInstance().dbFindUser();
+        } catch (DbException e) {
+            e.printStackTrace();
+        }
     }
+    private UserEntity mEntity;
 
     @Override
     public void initListener() {
@@ -93,6 +105,10 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
             case R.id.bindweixin_sure_text:
                 code = weinxinEtAccount.getText().toString();
                 if(TextUtils.isEmpty(code)){
+                    if(TestUtil.isTestRecharge()){
+                        updateView(null);
+                        return;
+                    }
                     G.showToast("请输入验证码");
                     return;
                 }
@@ -109,24 +125,18 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
     }
 
     @Override
-    public void updateView(Object o) {
+    public void updateView(Object object) {
         hideProgress();
         G.showToast("提交成功");
-        try {
-            UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
-            if(userEntity == null){
-                userEntity.setWx_openid("succes");
-                MyDbManager.getInstance().saveOrUpdateUser(userEntity);
-                SpUtils.saveWeixin(activity, "succes");
-
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
         CommonUtil.getInstance()
                 .getUserInfo(SheepApp.mContext);
-        ActivityManager.getInstance()
-                .endActivity(ChangeWxOrTelAct.class);
+        if(from == ChangeWxOrTelAct.TYPE_RECHARGE){//来自充值功能,需要检查并跳转到绑定身份与银行卡信息界面
+            if(
+                    TestUtil.isTestRecharge() ||
+                    mEntity != null && mEntity.notCertification()){//没有实名认证
+                Jump2View.getInstance().goRealNameAuther(this, mEntity, 1);
+            }
+        }
         finish();
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_FGT_FAMLLSHEEP));
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.REFRESH_DATA_PHONE));

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

@@ -16,6 +16,8 @@ import butterknife.OnClick;
  */
 
 public class ChangeWxOrTelAct extends BaseActivity {
+    public static final int TYPE_RECHARGE = 1;//提现
+    public static final int TYPE_NORMAL = 0;//正常情况下
     @BindView(R.id.change_sure_tv)
     TextView sureTv;
 
@@ -23,13 +25,13 @@ public class ChangeWxOrTelAct extends BaseActivity {
     protected int getLayoutId() {
         return R.layout.change_wx_tel_layout;
     }
-
+    private int from;
     @Override
     public void initView() {
         TitleBarUtils.getInstance()
                 .setTitle(this,"绑定微信号")
                 .setTitleFinish(this);
-
+        from = getIntent().getIntExtra("from", TYPE_NORMAL);
     }
 
     @Override
@@ -43,7 +45,8 @@ public class ChangeWxOrTelAct extends BaseActivity {
     }
     @OnClick(R.id.change_sure_tv)
     public void onViewClicked() {
-        Jump2View.getInstance().goBindOrChangeWeixinView(ChangeWxOrTelAct.this, true);
+        Jump2View.getInstance().goBindOrChangeWeixinView(ChangeWxOrTelAct.this, true, from);
         UMConfigUtils.onEvent(UMConfigUtils.Event.USER_BIND_WEIXIN);
+        finish();
     }
 }

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

@@ -171,8 +171,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.doalog_item_get_rewards_tv:
-                Jump2View.getInstance()
-                        .goWithdrawal(activity, null);
+                Jump2View.getInstance().tryGoWithdrawal(activity, null);
                 finish();
                 break;
             case R.id.dialog_item_x:

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

@@ -110,7 +110,7 @@ public class HomePageAct extends BaseActivity implements HomePageContract.View{
                 Jump2View.getInstance().goPersonnalCenterView(activity, null);
                 break;
             case R.id.withdrawal:
-                Jump2View.getInstance().goWithdrawal(activity, null);
+                Jump2View.getInstance().tryGoWithdrawal(activity, userEntity);
                 break;
             case R.id.try_play_layout:
                 Jump2View.getInstance().goTryplayView(activity, null);

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

@@ -112,7 +112,7 @@ public class MiddleAct extends Activity {
                             Jump2View.getInstance().goPersonnalCenterView(activity, null);
                             break;
                         case 62://提现
-                            Jump2View.getInstance().goWithdrawal(activity, null);
+                            Jump2View.getInstance().tryGoWithdrawal(activity, null);
                             break;
                         case 621://提现结果页面
                             Jump2View.getInstance().goWithdrawalResultview(activity, msg.getMsg());

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

@@ -21,6 +21,7 @@ import com.sheep.gamegroup.presenter.RealNameAutherPresenter;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.StringUtils;
+import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.dialog.DialogRealNameAuther;
@@ -100,9 +101,9 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
         }
         showProgress();
         tvSubmit.setVisibility(View.GONE);
-        updateUserInfo(new Action1<BaseMessage>() {
+        updateUserInfo(new Action1<UserEntity>() {
             @Override
-            public void call(BaseMessage baseMessage) {
+            public void call(UserEntity userEntity) {
                 hideProgress();
                 if (mEntity != null) {
                     if (!TextUtils.isEmpty(mEntity.getReal_name())) {
@@ -141,7 +142,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     }
 
     @Override
-    public void NetSuccess(int code, String msg, String s) {
+    public void NetSuccess(int code, String msg, String string) {
         hideProgress();
         G.showToast(msg);
         RealNameAutehrChange change = new RealNameAutehrChange();
@@ -158,20 +159,20 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
 
         }
         EventBus.getDefault().post(change);
-        updateUserInfo(new Action1<BaseMessage>(){
+        updateUserInfo(new Action1<UserEntity>(){
 
             @Override
-            public void call(BaseMessage s) {
-                if(s != null)
+            public void call(UserEntity userEntity) {
+                if(userEntity != null)
                     if (whereFrom == 1) {
-                        Jump2View.getInstance().goWithdrawal(RealNameAuthenAct.this, 1);
+                        Jump2View.getInstance().goWithdrawal(RealNameAuthenAct.this);
                     }
                 finish();
             }
         });
     }
 
-    private void updateUserInfo(final Action1<BaseMessage> action1) {
+    private void updateUserInfo(final Action1<UserEntity> action1) {
         SheepApp.get(RealNameAuthenAct.this)
                 .getNetComponent()
                 .getApiService()
@@ -189,7 +190,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        UserEntity userEntity = JSON.parseObject(JSONObject.toJSONString(baseMessage.getData()), UserEntity.class);
+                        UserEntity userEntity = baseMessage.getData(UserEntity.class);
                         if(userEntity != null) {
                             mEntity = userEntity;
                             try {
@@ -199,7 +200,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
                             }
                         }
                         if(action1 != null)
-                            action1.call(baseMessage);
+                            action1.call(mEntity);
                     }
                 });
     }
@@ -249,6 +250,10 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
         String bankCard;
         String bankCardMobile;
         if (TextUtils.isEmpty((realName = etName.getText().toString()))) {
+            if(TestUtil.isTestRecharge()){
+                NetSuccess(0, "测试成功", "");
+                return;
+            }
             G.showToast("姓名不能为空");
             return;
         } else if (TextUtils.isEmpty((idNumber = etIdCard.getText().toString()))) {

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

@@ -289,7 +289,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             detail_task_listview.setVisibility(View.GONE);
         }
 
-        detailTaskTv.setVisibility(View.INVISIBLE);
+        detailTaskTv.setVisibility(View.GONE);
 
         if (!taskReleaseEty.isIs_running() || taskEty.getInspect_type() == 1) {
             btnUpImag.setVisibility(View.GONE);
@@ -342,22 +342,24 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             btnUpImag.setText("领取奖励");
 //            type =100;
         }
-        if (type == DownloadTaskService.STATUS_INSTALLED) {
-            btnUpImag.setVisibility(View.VISIBLE);
-            if(taskEty.getTask_type() == 1002 ||taskEty.getTask_type() == 1003){
-                btnTaskItem.setVisibility(View.GONE);
-                //奖励领取是否
-                if((gettaskAcceptedEty != null && gettaskAcceptedEty.getStatus() == 3) || game_type == 1){
-                    btnUpImag.setText("充值游戏");
+        if(taskEty.getTask_type() == 1002 ||taskEty.getTask_type() == 1003){
+            btnTaskItem.setVisibility(View.GONE);
+            //奖励领取是否
+            if((gettaskAcceptedEty != null && gettaskAcceptedEty.getStatus() == 3) || game_type == 1){
+                btnUpImag.setText(CommonUtil.GAME_RECHAGE);
+                if (type == DownloadTaskService.STATUS_INSTALLED) {
+                    btnUpImag.setVisibility(View.VISIBLE);
                     type = 101;
+                } else {
+                    boolean isExistApk = !TextUtils.isEmpty(PackageUtil.isExistsFile(taskEty.getPackage_names()));
+                    btnUpImag.setVisibility(View.GONE);
+                    btnTaskItem.setVisibility(View.VISIBLE);
+                    btnTaskItem.setText(isExistApk ? CommonUtil.GAME_INSTALL : CommonUtil.GAME_DOWNLOAD);
                 }
             }
-        } else {
-            btnUpImag.setVisibility(View.GONE);
         }
-//        btnUpImag.setVisibility(View.VISIBLE);
 
-        taskSchedule();
+//        taskSchedule();
         //2.6修改
         if(btn_show)
             bottom_btn_layout.setVisibility(View.GONE);
@@ -384,9 +386,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             taskdetail_explain_layout.setVisibility(View.GONE);
         }
 
-        if(gettaskAcceptedEty != null){// && taskEty.getTask_type() == 1000) {//连续任务
+        if(!CommonUtil.GAME_RECHAGE.equals(btnUpImag.getText().toString()) && gettaskAcceptedEty != null){// && taskEty.getTask_type() == 1000) {//连续任务
             if(!TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots())) {
-                detailTaskTv.setVisibility(View.VISIBLE);
+//                detailTaskTv.setVisibility(View.VISIBLE);//不显示截图
             }
             switch (gettaskAcceptedEty.getStatus()) {
                 case 1://"已接受任务";

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

@@ -110,7 +110,7 @@ public class NewbieTaskAdp extends BaseAdapter {
                     Jump2View.getInstance().goUnderstandSheep(context, null);
                     break;
                 case 2://完成首次提现
-                    Jump2View.getInstance().goWithdrawal(context, null);
+                    Jump2View.getInstance().tryGoWithdrawal(context, null);
                     break;
                 case 3://成功邀请好友
                     Jump2View.getInstance().goAskGetMoney(context, null);

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

@@ -2,16 +2,16 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/content_padding_10"
-    android:paddingStart="@dimen/content_padding_10"
-    android:paddingTop="@dimen/content_padding_10">
+    android:paddingEnd="@dimen/dp_10"
+    android:paddingStart="@dimen/dp_10"
+    android:paddingTop="@dimen/dp_10">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-        android:paddingStart="@dimen/content_padding_10"
-        android:paddingEnd="@dimen/content_padding_10"
+        android:paddingStart="@dimen/dp_10"
+        android:paddingEnd="@dimen/dp_10"
         android:paddingTop="@dimen/content_padding_20"
         android:paddingBottom="@dimen/content_padding_20"
         >
@@ -29,8 +29,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_toEndOf="@+id/credit_card_task_iv"
-            android:layout_marginStart="@dimen/content_padding_10"
-            android:layout_marginEnd="@dimen/content_padding_10"
+            android:layout_marginStart="@dimen/dp_10"
+            android:layout_marginEnd="@dimen/dp_10"
             android:layout_centerVertical="true"
             android:gravity="center_vertical"
             android:orientation="vertical">

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

@@ -14,7 +14,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:layout_margin="@dimen/content_padding_10"
+                android:layout_margin="@dimen/dp_10"
                 android:padding="@dimen/content_padding_20"
                 android:gravity="center">
 
@@ -40,7 +40,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
-                    android:layout_marginTop="@dimen/content_padding_10"
+                    android:layout_marginTop="@dimen/dp_10"
                     android:orientation="horizontal">
                     <TextView
                         android:id="@+id/dialog_action"

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

@@ -7,7 +7,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_margin="@dimen/content_padding_10">
+        android:layout_margin="@dimen/dp_10">
 
         <LinearLayout
             android:id="@+id/dialog_center_ll"
@@ -16,9 +16,9 @@
             android:paddingTop="64dp"
             android:background="@drawable/shape_white_solid_rectangle"
             android:gravity="center"
-            android:paddingBottom="@dimen/content_padding_10"
-            android:paddingStart="@dimen/content_padding_10"
-            android:paddingEnd="@dimen/content_padding_10"
+            android:paddingBottom="@dimen/dp_10"
+            android:paddingStart="@dimen/dp_10"
+            android:paddingEnd="@dimen/dp_10"
             android:orientation="vertical">
         </LinearLayout>
         <TextView
@@ -29,7 +29,7 @@
             android:textSize="20sp"
             android:gravity="center"
             android:textColor="@android:color/white"
-            android:padding="@dimen/content_padding_10"
+            android:padding="@dimen/dp_10"
             android:background="@drawable/shape_main_solid_rectangle_top" />
 
         <ImageView

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

@@ -6,7 +6,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="@dimen/content_padding_10"
+        android:layout_marginBottom="@dimen/dp_10"
         android:background="@color/white"/>
     <ImageView
         android:id="@+id/img_list_empty"
@@ -31,7 +31,7 @@
         android:text="暂无数据，稍后再试。" />
     <View
         android:layout_width="match_parent"
-        android:layout_height="@dimen/content_padding_10"
+        android:layout_height="@dimen/dp_10"
         android:layout_alignParentBottom="true"
         android:background="@drawable/shape_white_solid_rectangle_small_bottom"/>
 </RelativeLayout>

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

@@ -8,17 +8,17 @@
         layout="@layout/empty_view_bottom"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginStart="@dimen/content_padding_10"
-        android:layout_marginEnd="@dimen/content_padding_10"
-        android:layout_marginBottom="@dimen/content_padding_10"/>
+        android:layout_marginStart="@dimen/dp_10"
+        android:layout_marginEnd="@dimen/dp_10"
+        android:layout_marginBottom="@dimen/dp_10"/>
 
     <com.sheep.gamegroup.view.customview.RefreshLayout
         android:id="@+id/swipe_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/content_padding_10"
-        android:layout_marginEnd="@dimen/content_padding_10"
-        android:layout_marginBottom="@dimen/content_padding_10">
+        android:layout_marginStart="@dimen/dp_10"
+        android:layout_marginEnd="@dimen/dp_10"
+        android:layout_marginBottom="@dimen/dp_10">
 
         <ListView
             android:id="@+id/list_view"

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

@@ -108,9 +108,9 @@
         style="@style/style_button_small_yellow"
         android:layout_width="wrap_content"
         android:layout_height="30dp"
-        android:paddingStart="@dimen/content_padding_10"
-        android:paddingEnd="@dimen/content_padding_10"
-        android:layout_margin="@dimen/content_padding_10"
+        android:paddingStart="@dimen/dp_10"
+        android:paddingEnd="@dimen/dp_10"
+        android:layout_margin="@dimen/dp_10"
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
         android:text="切换服务器"
@@ -120,9 +120,9 @@
         style="@style/style_button_small_yellow"
         android:layout_width="wrap_content"
         android:layout_height="30dp"
-        android:paddingStart="@dimen/content_padding_10"
-        android:paddingEnd="@dimen/content_padding_10"
-        android:layout_margin="@dimen/content_padding_10"
+        android:paddingStart="@dimen/dp_10"
+        android:paddingEnd="@dimen/dp_10"
+        android:layout_margin="@dimen/dp_10"
         android:layout_below="@+id/test_change"
         android:layout_alignParentEnd="true"
         android:text="切换账号"

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

@@ -45,6 +45,7 @@
     <dimen name="content_padding_8">8dp</dimen>
     <dimen name="content_padding_big">18dp</dimen>
     <dimen name="content_padding_10">13dp</dimen>
+    <dimen name="dp_10">10dp</dimen>
     <dimen name="content_padding_12">12dp</dimen>
     <dimen name="content_padding_13">13dp</dimen>
     <dimen name="content_padding_15">15dp</dimen>

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

@@ -10,7 +10,7 @@
         <item name="android:gravity">center</item>
         <item name="android:background">@drawable/selector_button_newbie_task</item>
         <item name="android:textColor">@color/btn_color_main</item>
-        <item name="android:layout_margin">@dimen/content_padding_10</item>
+        <item name="android:layout_margin">@dimen/dp_10</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>
 
@@ -20,7 +20,7 @@
         <item name="android:gravity">center</item>
         <item name="android:background">@drawable/selector_button_full_main</item>
         <item name="android:textColor">@color/btn_color_main</item>
-        <item name="android:layout_margin">@dimen/content_padding_10</item>
+        <item name="android:layout_margin">@dimen/dp_10</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>
     <style name="style_button_show" parent="button">
@@ -47,7 +47,7 @@
         <item name="android:gravity">center</item>
         <item name="android:background">@drawable/selector_button_stroke_main</item>
         <item name="android:textColor">@color/btn_color_main_stroke</item>
-        <item name="android:layout_margin">@dimen/content_padding_10</item>
+        <item name="android:layout_margin">@dimen/dp_10</item>
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>
 
@@ -62,7 +62,7 @@
         <item name="android:textAlignment">center</item>
         <item name="android:textColor">@color/selector_color_main_tab</item>
         <item name="android:background">@drawable/selector_check_stroke_main</item>
-        <item name="android:layout_margin">@dimen/content_padding_10</item>
+        <item name="android:layout_margin">@dimen/dp_10</item>
         <item name="android:textSize">@dimen/text_size_13</item>
     </style>
 
@@ -235,11 +235,11 @@
         <item name="android:textSize">16sp</item>
         <item name="android:paddingStart">@dimen/content_padding_20</item>
         <item name="android:paddingEnd">@dimen/content_padding_20</item>
-        <item name="android:paddingTop">@dimen/content_padding_10</item>
-        <item name="android:paddingBottom">@dimen/content_padding_10</item>
-        <item name="android:layout_marginTop">@dimen/content_padding_10</item>
-        <item name="android:layout_marginStart">@dimen/content_padding_10</item>
-        <item name="android:layout_marginEnd">@dimen/content_padding_10</item>
+        <item name="android:paddingTop">@dimen/dp_10</item>
+        <item name="android:paddingBottom">@dimen/dp_10</item>
+        <item name="android:layout_marginTop">@dimen/dp_10</item>
+        <item name="android:layout_marginStart">@dimen/dp_10</item>
+        <item name="android:layout_marginEnd">@dimen/dp_10</item>
         <item name="android:textColor">#454545</item>
         <item name="android:background">@drawable/shape_ash_solid_rectangle_top</item>
     </style>
@@ -248,8 +248,8 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:orientation">vertical</item>
-        <item name="android:layout_marginStart">@dimen/content_padding_10</item>
-        <item name="android:layout_marginEnd">@dimen/content_padding_10</item>
+        <item name="android:layout_marginStart">@dimen/dp_10</item>
+        <item name="android:layout_marginEnd">@dimen/dp_10</item>
         <item name="android:background">@drawable/shape_white_solid_rectangle_bottom</item>
     </style>