部分bug修改

app/src/main/java/com/kfzs/duanduan/event/EventTypes.java

@@ -23,4 +23,6 @@ public enum EventTypes {
 
     //Todo 遇得到的问题
     INTENT_AMOUNT_VALUE,//提现传值用
+
+    DIALOG_ACTIVITY_DOWNLOAD_FILE,//dialogActivity 下载通知
 }

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

@@ -1,6 +1,7 @@
 package com.kfzs.duanduan.fragment;
 
 import android.app.Activity;
+import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -40,6 +41,7 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
+import org.xutils.ex.DbException;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -212,6 +214,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void onResume() {
         super.onResume();
+        Log.e("onresume-----","");
         if (upview1 != null) {
             //开始滚动
             upview1.startScroll();
@@ -333,4 +336,23 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         super.onDestroyView();
         unbinder.unbind();
     }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        try {
+            userEntity = MyDbManager.getInstance().dbFindUser();
+            if(userEntity != null){
+                refalsh();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        Log.e("onAttach-----","");
+    }
 }

app/src/main/java/com/kfzs/duanduan/services/KFDownloadServices.java

@@ -132,7 +132,9 @@ public class KFDownloadServices extends Service implements OnRetryableFileDownlo
         }
         double fileSize = downloadFileInfo.getFileSizeLong() / 1024f / 1024;
         Double percent = downloadSize / fileSize * 100;
-
+        if(statusInfo == null){
+            return;
+        }
         statusInfo.setStatus(DownloadTaskService.STATUS_ING);
         statusInfo.setDownloadPgrs(percent.intValue());
         statusInfo.setFileTotalSize(fileSize);
@@ -157,6 +159,9 @@ public class KFDownloadServices extends Service implements OnRetryableFileDownlo
         double fileSize = downloadFileInfo.getFileSizeLong() / 1024f / 1024;
         Double percent = downloadSize / fileSize * 100;
 
+        if(statusInfo == null){
+            return;
+        }
         statusInfo.setStatus(DownloadTaskService.STATUS_PAUSE);
         statusInfo.setDownloadUrl(downloadFileInfo.getUrl());
         statusInfo.setDownloadPgrs(percent.intValue());

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

@@ -210,6 +210,11 @@ public interface ApiService {
      */
     @GET(V1 + "/app/user/award_detail")
     Observable<BaseMessage> awardDetail(@Query("page") int page,@Query("per_page") int per_page);
+    /**
+     * 发送绑定手机号短信，只传mobile
+     */
+    @POST(V1 + "/app/user/sms_for_bind_mobile")
+    Observable<BaseMessage> smsBindMobile(@Body JSONObject jsonObject);
 
 
 }

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

@@ -19,6 +19,7 @@ public interface PhoneContract {
 
         void switchPhone(JSONObject object);
         void bindPhone(JSONObject object);
+        void smsBindMobile(JSONObject object);
     }
 
     interface View{
@@ -34,5 +35,7 @@ public interface PhoneContract {
         void changeTelFail(BaseMessage o);
         void bindTelSuccess(BaseMessage o);
         void bindTelFail(BaseMessage o);
+        void bindTelSmsSuccess(BaseMessage o);
+        void bindTelSmsFail(BaseMessage o);
     }
 }

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

@@ -126,12 +126,30 @@ public class PhonePresenter implements PhoneContract.Presenter {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        view.changeTelFail(baseMessage);
+                        view.bindTelFail(baseMessage);
                     }
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        view.changeTelSuccess(baseMessage);
+                        view.bindTelSuccess(baseMessage);
+                    }
+                });
+    }
+
+    @Override
+    public void smsBindMobile(JSONObject object) {
+        apiService.smsBindMobile(object)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        view.bindTelSmsFail(baseMessage);
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        view.bindTelSmsSuccess(baseMessage);
                     }
                 });
     }

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

@@ -53,6 +53,20 @@ public class NetUtil {
     }
 
     /**
+     * 判断是否是流量连接
+     */
+    public static boolean isMobile(Context context)
+    {
+        ConnectivityManager cm = (ConnectivityManager) context
+                .getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        if (cm == null)
+            return false;
+        return cm.getActiveNetworkInfo().getType() == ConnectivityManager.TYPE_MOBILE;
+
+    }
+
+    /**
      * 打开网络设置界面
      */
     public static void openSetting(Activity activity)

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

@@ -22,6 +22,7 @@ import com.sheep.gamegroup.presenter.PhoneContract;
 import com.sheep.gamegroup.presenter.PhonePresenter;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
+import com.sheep.gamegroup.util.SelfCountDownTimer;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -81,6 +82,10 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
     private String noticeStr = "绑定手机号";
     private UserEntity userEntity = null;
 
+    //验证码倒计时
+    private SelfCountDownTimer selfCountDownTimer;
+    private boolean canGetCaptchaPhone = true;
+
     Handler handler = new Handler(){
         @Override
         public void handleMessage(Message msg) {
@@ -132,7 +137,25 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
 
     @Override
     public void initListener() {
+        selfCountDownTimer = new SelfCountDownTimer(60 * 1000, 1000) {
+            @Override
+            public void onTimerRest() {
+                canGetCaptchaPhone = true;
+                phoneBtnCode.setText(getString(R.string.get_captcha));
+            }
 
+            @Override
+            public void onTimerTick(long millisUntilFinished, int counTime) {
+                String textStr = counTime + " s";
+                phoneBtnCode.setText(textStr);
+            }
+
+            @Override
+            public void onTimerFinish() {
+                canGetCaptchaPhone = true;
+                phoneBtnCode.setText(getString(R.string.get_captcha));
+            }
+        };
     }
 
     @Override
@@ -174,7 +197,12 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
                 }
 
                 if(oldOrNew == 0){
-                    presenter.getCaptcha(mobile);
+                    selfCountDownTimer.reset();
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("mobile", mobile+"");
+                    presenter.smsBindMobile(jsonObject);
+                    canGetCaptchaPhone = false;
+                    selfCountDownTimer.start();
                     return;
                 }
                 step = 3;
@@ -221,6 +249,10 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
         jsonObject.put("step", step+"");
         switch (step){
             case 1:
+
+                selfCountDownTimer.reset();
+                canGetCaptchaPhone = false;
+                selfCountDownTimer.start();
                 break;
             case 2:
                 jsonObject.put("sec_code", sec_code+"");
@@ -303,6 +335,17 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
         G.showToast(o.getMsg()+"");
     }
 
+    @Override
+    public void bindTelSmsSuccess(BaseMessage o) {
+
+    }
+
+    @Override
+    public void bindTelSmsFail(BaseMessage o) {
+        G.showToast(o.getMsg() + "");
+
+    }
+
 
     private boolean checkPhoneInput(String etPhone) {
         if (TextUtils.isEmpty(etPhone)) {

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

@@ -37,8 +37,10 @@ import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyListview;;
+import com.sheep.gamegroup.util.NetUtil;
 import com.sheep.gamegroup.view.adapter.TaskStateAdapter;
 import com.sheep.gamegroup.view.customview.SProgress;
+import com.sheep.gamegroup.view.dialog.DialogAccountAbnormal;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.download.DownloadInfo;
@@ -50,6 +52,7 @@ import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
 
 import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
 import org.wlf.filedownloader.DownloadFileInfo;
 import org.wlf.filedownloader.FileDownloader;
 import org.wlf.filedownloader.listener.OnDetectBigUrlFileListener;
@@ -139,6 +142,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         super.onCreate(savedInstanceState);
         setContentView(R.layout.download_item_dialog);
         ButterKnife.bind(this);
+        EventBus.getDefault().register(this);
         activity = this;
         intentService = new Intent(activity, KFDownloadServices.class);
         initViews();
@@ -237,6 +241,10 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                 case 2://开始下载
 //                    downLoadApk();
                     if(!isStartPause){
+                        if(NetUtil.isMobile(activity)){
+                            DialogAccountAbnormal.showDialog(activity,null, "当前网络处于非WIFI状态，确定下载吗？", "取消", "确定" ).show();
+                            return;
+                        }
                         startFiler();
                     }else {
                         FileDownloader.pause(task_entity.getDownload_link());
@@ -284,6 +292,8 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                 downloadInfo.setState(DownloadState.FINISHED);
                 downloadInfo.setPkgName(task_entity.getPackage_names());
                 MyDbManager.getInstance().saveOrUpdateUser(downloadInfo);//保存到数据库
+            }else{
+                downloadInfo.setState(DownloadState.FINISHED);
             }
         }
         return downloadInfo;
@@ -309,6 +319,10 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                 type = 1;
             }if(downloadInfo.getState() ==DownloadState.FINISHED ){
                 buttonStr = "开始安装";
+                type = 3;
+            }else if(downloadInfo.getState() ==DownloadState.STOPPED){
+                buttonStr = "继续下载";
+                type = 2;
             }
             else {
                 buttonStr = "开始下载";
@@ -375,6 +389,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     protected void onDestroy() {
         super.onDestroy();
         unFiler();
+        EventBus.getDefault().unregister(this);
     }
 
     /*----------------------------*/
@@ -408,6 +423,8 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         public void onFileDownloadStatusPaused(DownloadFileInfo downloadFileInfo) {
             start_task_tv.setText("继续下载");
             Log.e("DownloadStatusPaused---",downloadFileInfo.getDownloadedSizeLong()+","+downloadFileInfo.getFileSizeLong());
+            if(downloadInfo != null)
+                downloadInfo.setState(DownloadState.STOPPED);
         }
 
         @Override
@@ -478,4 +495,13 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         });
     }
 
+    @Subscribe
+    public void onEventMainThread(BigEvent event){
+        switch (event.getEventTypes()){
+            case DIALOG_ACTIVITY_DOWNLOAD_FILE:
+                startFiler();
+                break;
+        }
+    }
+
 }

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

@@ -298,6 +298,16 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
 
     }
 
+    @Override
+    public void bindTelSmsSuccess(BaseMessage o) {
+
+    }
+
+    @Override
+    public void bindTelSmsFail(BaseMessage o) {
+
+    }
+
     private void goMain() {
         // TODO: 2018/3/22  测试界面，过后删除s
         SpUtils.login(getApplicationContext(), "13626@395a75211751465f54789a7f459089bd");

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

@@ -1,74 +0,0 @@
-package com.sheep.gamegroup.view.activity;
-
-import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.gamegroup.di.components.PhoneComponent;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.presenter.PhoneContract;
-import com.sheep.jiuyan.samllsheep.R;
-
-/**
- * 解绑久的手机号
- * Created by ljy on 2018/3/27.
- */
-
-public class PhoneOldeAct extends BaseActivity implements PhoneContract.View {
-    @Override
-    public void returnGaptcha(Object o) {
-
-    }
-
-    @Override
-    public void gaptchaFail(BaseMessage o) {
-
-    }
-
-    @Override
-    public void returnLogindata(Object o) {
-
-    }
-
-    @Override
-    public void loginFail(BaseMessage o) {
-
-    }
-
-    @Override
-    public void changeTelSuccess(BaseMessage o) {
-
-    }
-
-    @Override
-    public void changeTelFail(BaseMessage o) {
-
-    }
-
-    @Override
-    public void bindTelSuccess(BaseMessage o) {
-
-    }
-
-    @Override
-    public void bindTelFail(BaseMessage o) {
-
-    }
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.bind_phone_number_act_layout;
-    }
-
-    @Override
-    public void initView() {
-
-    }
-
-    @Override
-    public void initListener() {
-
-    }
-
-    @Override
-    public void initData() {
-
-    }
-}

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

@@ -59,7 +59,7 @@ public class WithdrawalResultAct extends BaseActivity implements WithdrawalResul
         amount = getIntent().getStringExtra("amount");
         withdrawalSuccessMoneyTv.setText("+"+ SpUtils.getWithdral(activity) +"元");
         TitleBarUtils.getInstance()
-                .setTitle(activity, "提现成功")
+                .setTitle(activity, "提现审核中")
                 .setTitleFinish(activity);
         DaggerWithdrawalResultComponent.builder()
                 .netComponent(SheepApp.get(this).getNetComponent())

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogAccountAbnormal.java

@@ -2,13 +2,20 @@ package com.sheep.gamegroup.view.dialog;
 
 import android.app.Activity;
 import android.support.v7.app.AlertDialog;
+import android.text.TextUtils;
 import android.view.View;
+import android.widget.TextView;
 
+import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.utils.dlg.HelperUtils;
 import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.uuzuche.lib_zxing.view.ViewfinderView;
+
+import org.greenrobot.eventbus.EventBus;
 
 public class DialogAccountAbnormal {
 
@@ -47,4 +54,52 @@ public class DialogAccountAbnormal {
         }
         return mAlertDialog;
     }
+    public static AlertDialog showDialog(final Activity activity,String title, String content, String cancel, String sure) {
+            View view = View.inflate(activity, R.layout.diag_account_abnormal, null);
+        final AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
+                    .setView(view)
+                    .create();
+        if(TextUtils.isEmpty(title)){
+            ViewFindUtils.find(view, R.id.title_tv).setVisibility(View.GONE);
+        }else{
+            ((TextView)ViewFindUtils.find(view, R.id.title_tv)).setText(title);
+        }
+        if(TextUtils.isEmpty(content)){
+            ViewFindUtils.find(view, R.id.content_tv).setVisibility(View.GONE);
+        }else{
+            ((TextView)ViewFindUtils.find(view, R.id.content_tv)).setText(content);
+        }
+        TextView dialog_sure = ViewFindUtils.find(view, R.id.dialog_sure);
+        dialog_sure.setText(cancel+"");
+        dialog_sure.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mAlertDialog.dismiss();
+                    }
+                });
+        TextView dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
+        dialog_close.setText(sure+"");
+        dialog_close.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mAlertDialog.dismiss();
+                    }
+                });
+        TextView dialog_action = ViewFindUtils.find(view, R.id.dialog_action);
+        dialog_action.setText(sure+"");
+        dialog_action.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mAlertDialog.dismiss();
+
+                        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.DIALOG_ACTIVITY_DOWNLOAD_FILE));
+                    }
+                });
+        try {
+            mAlertDialog.show();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mAlertDialog;
+    }
 }

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

@@ -18,6 +18,7 @@
                 android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
 
                 <TextView
+                    android:id="@+id/title_tv"
                     style="@style/txt_big_noheight_style"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -26,6 +27,7 @@
                     android:text="挂机账号异常" />
 
                 <TextView
+                    android:id="@+id/content_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="@dimen/content_padding_15"

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

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_margin="@dimen/content_padding_10"
+            android:padding="@dimen/content_padding_20"
+            android:gravity="center"
+            android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
+
+            <TextView
+                android:id="@+id/title_tv"
+                style="@style/txt_big_noheight_style"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#000000"
+                android:textSize="@dimen/text_size_15"
+                android:text="挂机账号异常" />
+
+            <TextView
+                android:id="@+id/content_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/content_padding_15"
+                android:lineSpacingExtra="@dimen/content_padding_8"
+                android:text="你的微信号由于没有实名认证，频繁进入游戏，已被微信封禁。请登录该微信号，完成自助解封后点击“已解封，继续赚钱”，小绵羊会继续帮你干活赚钱（已实名认证的不会再被微信封禁）。"
+                android:textColor="#404040"
+                android:textSize="@dimen/text_size_12" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <CheckBox
+                    android:id="@+id/chec_cb"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:lines="1"
+                    android:text="以后不再提示"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginTop="@dimen/content_padding_10"
+                android:orientation="horizontal">
+                <TextView
+                    android:id="@+id/dialog_action"
+                    android:layout_width="0dp"
+                    android:layout_weight="5"
+                    android:layout_height="40dp"
+                    android:background="@drawable/sp_bg_gradient_rectangle_green"
+                    android:gravity="center"
+                    android:text="取消"
+                    android:textColor="#010101"
+                    android:textSize="@dimen/text_size_12" />
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"/>
+                <TextView
+                    android:id="@+id/dialog_sure"
+                    android:layout_width="0dp"
+                    android:layout_weight="5"
+                    android:layout_height="40dp"
+                    android:background="@drawable/sp_bg_gradient_rectangle_yellow2"
+                    android:gravity="center"
+                    android:text="确定"
+                    android:textColor="#010101"
+                    android:textSize="@dimen/text_size_15" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/dialog_close"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
+            android:padding="2dp"
+            android:layout_alignParentEnd="true"
+            android:src="@mipmap/try_dialog_x"
+            android:background="@drawable/shape_black_ring"/>
+    </RelativeLayout>
+</FrameLayout>

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

@@ -200,11 +200,12 @@
                 <com.layoutscroll.layoutscrollcontrols.view.EasyLayoutScroll
                     android:id="@+id/upview1"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:padding="10dp"
                     app:duration="2000"
                     app:gradient="true"
-                    app:interval="1000"></com.layoutscroll.layoutscrollcontrols.view.EasyLayoutScroll>
+                    app:interval="1000"
+                    ></com.layoutscroll.layoutscrollcontrols.view.EasyLayoutScroll>
 
             </LinearLayout>
         </LinearLayout>

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

@@ -18,6 +18,7 @@
             android:layout_height="wrap_content"
             android:text="手机号登录"
             android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
             style="@style/login_btn"
             android:gravity="center"
             android:textColor="@color/txt_white"

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

@@ -37,7 +37,7 @@
         android:gravity="center"
         android:padding="@dimen/content_padding_10"
         android:text="确定"
-        android:textColor="@color/txt_black_010101"
+        android:textColor="@color/white_DEDEDE"
         android:textSize="@dimen/text_size_18" />
 
 

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

@@ -78,7 +78,7 @@
         <item name="android:layout_margin">@dimen/content_padding</item>
         <item name="android:background">@drawable/sp_bg_gradient_rectangle_blue</item>
     </style>
-    <style name="MyDialogActivityTheme" parent="@android:style/Theme.Dialog">
+    <style name="MyDialogActivityTheme">
         <item name="android:windowFrame">@android:color/transparent</item><!--边框-->
         <item name="android:windowIsFloating">true</item><!--是否浮现在activity之上-->
         <item name="android:windowIsTranslucent">false</item><!--半透明-->