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

app/src/main/AndroidManifest.xml

@@ -45,7 +45,7 @@
         android:icon="@mipmap/icon"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppThemes">
 
         <activity
             android:name=".wxapi.WXEntryActivity"
@@ -193,12 +193,15 @@
 
         <!--2.0-->
         <activity android:name="com.sheep.gamegroup.view.activity.LoginAct"
+            android:theme="@style/FullScreenTheme"
             android:screenOrientation="portrait">
 
             </activity>
 
         <activity android:name="com.sheep.gamegroup.view.activity.SplashAct"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:theme="@style/FullScreenTheme"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -230,6 +233,11 @@
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.WithdrawalListAct"
             android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.ChangeTelAct"
+            android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.DialogToastAct"
+            android:theme="@style/MyDialogActivityTheme"
+            />
 
         <service android:name=".service.TopService"
                  android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
@@ -252,7 +260,7 @@
             android:hardwareAccelerated="true"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme"
+            android:theme="@style/ACTMAIN"
             android:windowSoftInputMode="adjustPan|stateHidden">
             <category android:name="android.intent.category.DEFAULT" />
             <intent-filter>

app/src/main/java/com/kfzs/duanduan/ActMain.java

@@ -1,6 +1,7 @@
 package com.kfzs.duanduan;
 
 import android.Manifest;
+import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.BitmapFactory;
@@ -56,9 +57,11 @@ import com.kfzs.duanduan.view.DialogStorageLow;
 import com.sheep.gamegroup.event.MoneyChange;
 import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
+import com.sheep.gamegroup.view.dialog.DialogAccountAbnormal;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
 
@@ -336,7 +339,12 @@ public class ActMain extends BaseCompatActivity{
                                         }
                                     });
                                 } else {
-
+//                                    if(SpUtils.getClick(ActMain.this)){
+//                                        SpUtils.saveClick(ActMain.this, false);
+//                                    }else{
+//                                        DialogAccountAbnormal.showDialog((Activity) ActMain.this,null, "当前网络处于非WIFI状态，确定下载吗？", "取消", "确定" );
+//                                        return;
+//                                    }
                                     FileDownloader.start(downloadUrl);
                                     addNewDownloadTask(game.getGameName(),
                                             downloadUrl,

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/kfzs/duanduan/utils/GameStatusScanner.java

@@ -1,5 +1,6 @@
 package com.kfzs.duanduan.utils;
 
+import android.app.Activity;
 import android.content.Context;
 import android.text.TextUtils;
 import android.view.View;
@@ -7,6 +8,7 @@ import android.widget.Toast;
 
 import com.kfzs.duanduan.view.KFProgressButton;
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
+import com.sheep.gamegroup.view.dialog.DialogAccountAbnormal;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.kfzs.duanduan.KFZSApp;
 import com.sheep.jiuyan.samllsheep.R;
@@ -24,6 +26,7 @@ import com.kfzs.duanduan.proto.GameOuterClass;
 import com.kfzs.duanduan.proto.UserPlayedGameOuterClass;
 import com.kfzs.duanduan.utils.net.APIRequest;
 import com.kfzs.duanduan.utils.net.APIRequestInstance;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.umeng.analytics.MobclickAgent;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
@@ -141,6 +144,15 @@ public abstract class GameStatusScanner {
         mTarget.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+//                if(SpUtils.getClick(mContext)){
+//                    SpUtils.saveClick(mContext, false);
+//                }else{
+//                    DialogAccountAbnormal.showDialog((Activity) mContext,null, "当前网络处于非WIFI状态，确定下载吗？", "取消", "确定" );
+//                    return;
+//                }
+//                if(!DialogAccountAbnormal.showDialog((Activity) mContext,null, "当前网络处于非WIFI状态，确定下载吗？", "取消", "确定" )){
+//                    return;
+//                }
                 if (null == downloadTaskService) {
                     downloadTaskService = new DownloadTaskService(mContext);
                 }

app/src/main/java/com/kfzs/duanduan/utils/dlg/DownBtnUtils.java

@@ -1,5 +1,6 @@
 package com.kfzs.duanduan.utils.dlg;
 
+import android.app.Activity;
 import android.content.Context;
 import android.util.Log;
 
@@ -8,6 +9,7 @@ import com.kfzs.duanduan.utils.InstallButtonUtils;
 import com.kfzs.duanduan.event.EventDownloadHandler;
 import com.kfzs.duanduan.utils.GameStatusScanner;
 import com.kfzs.duanduan.proto.GameOuterClass;
+import com.sheep.gamegroup.view.dialog.DialogAccountAbnormal;
 
 import java.util.Map;
 

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

@@ -199,12 +199,22 @@ public interface ApiService {
      */
     @PUT(V1 + "/app/user/bind_all_real_info")
     Observable<BaseMessage> bindALl(@Body JSONObject jsonObject);
+    /**
+     * 绑定手机号
+     */
+    @PUT(V1 + "//app/user/bind_mobile")
+    Observable<BaseMessage> bindPhone(@Body JSONObject jsonObject);
 
     /**
      * 更换手机号
      */
     @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

@@ -1,10 +1,10 @@
 package com.sheep.gamegroup.presenter;
 
+import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.exception.ApiException;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 
 import org.json.JSONException;
-import org.json.JSONObject;
 
 /**
  * Created by ljy on 2018/3/15.
@@ -18,6 +18,8 @@ public interface PhoneContract {
         void loginByCaptcha(String telphone, String code);
 
         void switchPhone(JSONObject object);
+        void bindPhone(JSONObject object);
+        void smsBindMobile(JSONObject object);
     }
 
     interface View{
@@ -31,5 +33,9 @@ public interface PhoneContract {
 
         void changeTelSuccess(BaseMessage o);
         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

@@ -3,6 +3,7 @@ package com.sheep.gamegroup.presenter;
 import android.util.Log;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.orhanobut.logger.Logger;
 import com.sheep.gamegroup.exception.ExceptionEngine;
@@ -14,12 +15,14 @@ import com.sheep.gamegroup.util.XXTEA;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
 
+
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.inject.Inject;
 
 import rx.Observer;
+import rx.Scheduler;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
@@ -96,4 +99,58 @@ public class PhonePresenter implements PhoneContract.Presenter {
                 });
 
     }
+
+    @Override
+    public void switchPhone(JSONObject object) {
+        apiService.switchPhone(object)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        view.changeTelFail(baseMessage);
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        view.changeTelSuccess(baseMessage);
+                    }
+                });
+    }
+
+    @Override
+    public void bindPhone(JSONObject object) {
+        apiService.bindPhone(object)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        view.bindTelFail(baseMessage);
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage 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/CommonUtil.java

@@ -1,6 +1,10 @@
 package com.sheep.gamegroup.util;
 
+import android.text.TextUtils;
+import android.widget.Toast;
+
 import com.sheep.gamegroup.model.entity.WithdrawalEty;
+import com.sheep.jiuyan.samllsheep.utils.G;
 
 /**
  * 一些公用的class
@@ -58,4 +62,41 @@ public class CommonUtil {
         }
         return result;
     }
+
+    /**
+     * 昵称限制
+     * @param str
+     * @param maxLen
+     * @return
+     */
+    public boolean handleText(String str, int maxLen) {
+        if (TextUtils.isEmpty(str)) {
+            return false;
+        }
+        int count = 0;
+        int endIndex=0;
+        for (int i = 0; i < str.length(); i++) {
+            char item = str.charAt(i);
+            if (item < 128) {
+                count = count + 1;
+            } else {
+                count = count + 2;
+            }
+            if(maxLen==count || (item>=128 && maxLen+1==count)){
+                endIndex=i;
+            }
+        }
+//        if (count <= maxLen) {
+//            return str;
+//        } else {
+//            G.showToast("昵称超过限制长度");
+//            return str.substring(0, endIndex) + "...";
+//        }
+        if(count <= maxLen){
+            return true;
+        }else {
+            return false;
+        }
+
+    }
 }

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

@@ -17,10 +17,12 @@ import com.sheep.gamegroup.view.activity.AskGetMoneyAct;
 import com.sheep.gamegroup.view.activity.AuthenticationAct;
 import com.sheep.gamegroup.view.activity.BindDataAct;
 import com.sheep.gamegroup.view.activity.BindOrChangeWeixinAct;
+import com.sheep.gamegroup.view.activity.ChangeTelAct;
 import com.sheep.gamegroup.view.activity.ChangeWxOrTelAct;
 import com.sheep.gamegroup.view.activity.CommitWxAct;
 import com.sheep.gamegroup.view.activity.CommitWxCodeAct;
 import com.sheep.gamegroup.view.activity.DialogActivity;
+import com.sheep.gamegroup.view.activity.DialogToastAct;
 import com.sheep.gamegroup.view.activity.LieMakeMoneyAct;
 import com.sheep.gamegroup.view.activity.LoginAct;
 import com.sheep.gamegroup.view.activity.PersionInfoAct;
@@ -334,6 +336,24 @@ public class Jump2View {
         Intent i = new Intent(context, ChangeWxOrTelAct.class);
         context.startActivity(i);
     }
+    /**
+     * 跳转到绑定手机页面
+     * @param context
+     * @param o
+     */
+    public void goBindPhone(Context context, Object o){
+        Intent i = new Intent(context, ChangeTelAct.class);
+        context.startActivity(i);
+    }
+    /**
+     * 跳转到绑定手机页面
+     * @param context
+     * @param o
+     */
+    public void goNoticeAct(Context context, Object o){
+        Intent i = new Intent(context, DialogToastAct.class);
+        context.startActivity(i);
+    }
 
 
 

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/util/TimeUtil.java

@@ -19,7 +19,7 @@ public class TimeUtil {
     public static String[] getCalendarShowTime(long paramLong)
     {
         String[] localObject;
-        String str = new SimpleDateFormat("yyyy:MMM:d", Locale.ENGLISH).format(new Date(paramLong));
+        String str = new SimpleDateFormat("yyyy:MM:dd", Locale.ENGLISH).format(new Date(paramLong));
         try
         {
             String[] arrayOfString = str.split(":");

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

@@ -1,5 +1,6 @@
 package com.sheep.gamegroup.view.activity;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -80,6 +81,8 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
     @BindView(R.id.tv_submit)
     TextView tvSubmit;
 
+    private Activity activity;
+
 
     @Override
     protected int getLayoutId() {
@@ -88,6 +91,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
     @Override
     public void initView() {
+        activity = this;
         TitleBarUtils
                 .getInstance()
                 .setTitle(this, "账号与安全")
@@ -154,7 +158,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.rl_phone:   //跳转到绑定手机号
-
+                Jump2View.getInstance().goBindPhone(activity, null);
                 break;
             case R.id.rl_wx:  ////跳转到微信
                 Jump2View.getInstance().goBindOrChangeWeixinView(AccountAndSecurityAct.this,false);

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

@@ -1,15 +1,19 @@
 package com.sheep.gamegroup.view.activity;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v7.widget.AppCompatEditText;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.di.components.DaggerChangePhoneComponent;
 import com.sheep.gamegroup.di.components.DaggerPhoneComponent;
 import com.sheep.gamegroup.di.modules.PhoneModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -18,8 +22,10 @@ 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;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.xutils.ex.DbException;
@@ -37,8 +43,6 @@ import butterknife.OnClick;
 public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
     @BindView(R.id.tel_tv)
     TextView telTv;
-    @BindView(R.id.change_sure_tv)
-    TextView change_sure_tv;
     @BindView(R.id.sure_change_tv)
     TextView sureTv;
     @BindView(R.id.show_change_layout)
@@ -63,14 +67,24 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
     @Inject
     PhonePresenter presenter;
 
+    private Activity activity;
     private final int CHANGGE_CLICK = 0;//切换手机按钮点击后
     private final int OLD_PHONE_CLICK = 1;//旧手机获取验证码后
 
     private int oldOrNew;   //1,绑定过   0，未绑定过
 
+    private int step = 1;   //1、获取旧手机验证码 2、提交旧手机验证码 3、提交新手机号码 4、提交新手机获取的验证码
+    private String sec_code;
+    private String auth_code;
+    private String mobile;
+
     private String hitStr = "请输入手机号";
     private String noticeStr = "绑定手机号";
-    UserEntity userEntity = null;
+    private UserEntity userEntity = null;
+
+    //验证码倒计时
+    private SelfCountDownTimer selfCountDownTimer;
+    private boolean canGetCaptchaPhone = true;
 
     Handler handler = new Handler(){
         @Override
@@ -95,13 +109,16 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
     @Override
     public void initView() {
         ButterKnife.bind(this);
+        activity = this;
+        DaggerChangePhoneComponent.builder()
+                .netComponent(SheepApp.get(activity).getNetComponent())
+                .phoneModule(new PhoneModule(this))
+                .build()
+                .inject(this);
 
-//        DaggerPhoneComponent.builder()
-//                .netComponent(SheepApp.get(this).getNetComponent())
-//                .phoneModule(new PhoneModule(this))
-//                .build()
-//                .inject(this);
-        oldOrNew = 0;
+        TitleBarUtils.getInstance()
+                .setTitle(this, noticeStr)
+                .setTitleFinish(this);
         try {
             userEntity = MyDbManager.getInstance()
                     .dbFindUser();
@@ -109,10 +126,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
             e.printStackTrace();
         }
         if(userEntity != null && !TextUtils.isEmpty(userEntity.getMobile())){//提示
-
-            TitleBarUtils.getInstance()
-                    .setTitle(this, noticeStr)
-                    .setTitleFinish(this);
+            oldOrNew = 1;
             showChangeLayout.setVisibility(View.VISIBLE);
             changePhoneLayout.setVisibility(View.GONE);
             telTv.setText(userEntity.getMobile()+"");
@@ -123,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
@@ -144,45 +176,112 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
             phoneEtAccount.setHint(hitStr+"");
             phoneEtAccount.setText(userEntity.getMobile()+"");
         }else{
-            hitStr = "请输入原手机号码";
-            noticeStr = "更换手机号";
+            step = 0;
+            hitStr = "请输入手机号码";
+            noticeStr = "绑定手机号";
             phoneEtAccount.setHint(hitStr+"");
+            TitleBarUtils.getInstance()
+                    .setTitle(this, noticeStr)
+                    .setTitleFinish(this);
         }
-        TitleBarUtils.getInstance()
-                .setTitle(this, noticeStr)
-                .setTitleFinish(this);
     }
 
-    @OnClick({R.id.change_sure_tv, R.id.phone_btn_code, R.id.phone_sure_tv, R.id.sure_change_tv, R.id.phone_btn_code_old})
+    @OnClick({ R.id.phone_btn_code, R.id.phone_sure_tv, R.id.sure_change_tv, R.id.phone_btn_code_old})
     public void onViewClicked(View view) {
         switch (view.getId()) {
-            case R.id.change_sure_tv:
-                break;
             case R.id.phone_btn_code:
+                sec_code = null;
+                mobile = phoneEtAccount.getText().toString() +"";
+                if(!checkPhoneInput(mobile)){
+                    return;
+                }
+
+                if(oldOrNew == 0){
+                    selfCountDownTimer.reset();
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("mobile", mobile+"");
+                    presenter.smsBindMobile(jsonObject);
+                    canGetCaptchaPhone = false;
+                    selfCountDownTimer.start();
+                    return;
+                }
+                step = 3;
                 break;
-            case R.id.phone_sure_tv:
+            case R.id.phone_sure_tv://更换手机号
+                sec_code = phoneEtCode.getText().toString()+"";
+
+                if(!checkPhoneInput(mobile)){
+                    return;
+                }
+                if(!checkCodeInput(sec_code)){
+                    return;
+                }
+                if(oldOrNew == 0){
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("mobile", mobile+"");
+                    jsonObject.put("sec_code", sec_code+"");
+                    presenter.bindPhone(jsonObject);
+                    return;
+                }
+                step = 4;
+                submit();
                 break;
             case R.id.sure_change_tv:
                 oldOrNew = 1;
                 handler.sendEmptyMessage(CHANGGE_CLICK);
-                if(!checkCodeInput(phone_et_code_old.getText().toString() +"")){
+                sec_code = phone_et_code_old.getText().toString()+"";
+                if(!checkCodeInput(sec_code)){
                     return;
                 }
+                step = 2;
+                submit();
 //                Jump2View.getInstance().goPhoneLoginView(ChangeTelAct.this, 1);
                 break;
             case R.id.phone_btn_code_old://旧手机获取验证码
+                sec_code = null;
+                step = 1;
+                submit();
                 break;
         }
     }
 
+    /**
+     * 提交
+     */
+    private void submit(){
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("step", step+"");
+        switch (step){
+            case 1:
+
+                selfCountDownTimer.reset();
+                canGetCaptchaPhone = false;
+                selfCountDownTimer.start();
+                break;
+            case 2:
+                jsonObject.put("sec_code", sec_code+"");
+                break;
+            case 3:
+                jsonObject.put("auth_code", auth_code+"");
+                jsonObject.put("mobile", mobile+"");
+                break;
+            case 4:
+                jsonObject.put("sec_code", sec_code+"");
+                jsonObject.put("auth_code", auth_code+"");
+                break;
+        }
+        presenter.switchPhone(jsonObject);
+    }
+
     @Override
     public void returnGaptcha(Object o) {
-
+        Log.e("---Gaptcha-", o.toString());
+//        G.showToast(o.getMsg() + "");
     }
 
     @Override
     public void gaptchaFail(BaseMessage o) {
-
+        G.showToast(o.getMsg() + "");
     }
 
     @Override
@@ -197,11 +296,57 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
 
     @Override
     public void changeTelSuccess(BaseMessage o) {
-
+        try{
+            if(step == 2){
+                refreshData();
+            }else if(step == 4){
+                G.showToast(o.getMsg()+"");
+                finish();
+            }
+            if(o == null){
+                G.showToast("网络错误");
+                return;
+            }
+            if(o.getData() == null || o.getData().equals("")){
+                G.showToast(o.getMsg()+"");
+                return;
+            }
+            G.showToast(o.getMsg()+"");
+            JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(o.getData()));
+            auth_code = jsonObject.getString("auth_code");
+        }catch (Exception e){
+            e.printStackTrace();
+        }
     }
 
     @Override
     public void changeTelFail(BaseMessage o) {
+        if(o == null){
+            G.showToast("网络错误");
+            return;
+        }
+        G.showToast(o.getMsg()+"");
+    }
+
+    @Override
+    public void bindTelSuccess(BaseMessage o) {
+        G.showToast(o.getMsg()+"");
+        finish();
+    }
+
+    @Override
+    public void bindTelFail(BaseMessage o) {
+        G.showToast(o.getMsg()+"");
+    }
+
+    @Override
+    public void bindTelSmsSuccess(BaseMessage o) {
+
+    }
+
+    @Override
+    public void bindTelSmsFail(BaseMessage o) {
+        G.showToast(o.getMsg() + "");
 
     }
 

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,11 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                 case 2://开始下载
 //                    downLoadApk();
                     if(!isStartPause){
+                        if(NetUtil.isMobile(activity)){
+//                            DialogAccountAbnormal.showDialog(activity,null, "当前网络处于非WIFI状态，确定下载吗？", "取消", "确定" ).show();
+                            Jump2View.getInstance().goNoticeAct(activity, null);
+                            return;
+                        }
                         startFiler();
                     }else {
                         FileDownloader.pause(task_entity.getDownload_link());
@@ -284,6 +293,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 +320,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 +390,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     protected void onDestroy() {
         super.onDestroy();
         unFiler();
+        EventBus.getDefault().unregister(this);
     }
 
     /*----------------------------*/
@@ -408,6 +424,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 +496,14 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         });
     }
 
+    @Subscribe
+    public void onEventMainThread(BigEvent event){
+        switch (event.getEventTypes()){
+            case DIALOG_ACTIVITY_DOWNLOAD_FILE:
+                isStartPause = !isStartPause;
+                startFiler();
+                break;
+        }
+    }
+
 }

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

@@ -0,0 +1,62 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.event.EventTypes;
+import com.sheep.jiuyan.samllsheep.R;
+
+import org.greenrobot.eventbus.EventBus;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * Created by ljy on 2018/3/29.
+ */
+
+public class DialogToastAct extends Activity {
+
+    @BindView(R.id.title_tv)
+    TextView titleTv;
+    @BindView(R.id.content_tv)
+    TextView contentTv;
+    @BindView(R.id.chec_cb)
+    CheckBox checCb;
+    @BindView(R.id.dialog_action)
+    TextView dialogAction;
+    @BindView(R.id.dialog_sure)
+    TextView dialogSure;
+    @BindView(R.id.dialog_close)
+    ImageView dialogClose;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.dialog_notice_layout);
+        ButterKnife.bind(this);
+    }
+
+    @OnClick({R.id.dialog_action, R.id.dialog_sure, R.id.dialog_close})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.dialog_action:
+                finish();
+                break;
+            case R.id.dialog_sure:
+                EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.DIALOG_ACTIVITY_DOWNLOAD_FILE));
+                finish();
+                break;
+            case R.id.dialog_close:
+                finish();
+                break;
+        }
+    }
+}

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

@@ -121,13 +121,20 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
             @Override
             public void onError(SHARE_MEDIA platform, int action, Throwable t) {
-                showToast("微信授权失败");
                 hideProgress();
+                String  str=t.getMessage();
+                if(str.indexOf("2008")>0) {
+                    showToast("微信授权失败,请先安装微信客户端 在登录吧！");
+
+                }else{
+                    showToast("微信授权失败  请检查网络是否正常");
+
+                }
+
             }
 
             @Override
             public void onCancel(SHARE_MEDIA platform, int action) {
-
                 showToast("微信授权取消");
                 hideProgress();
             }
@@ -152,7 +159,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
             @Override
             public void onError(SHARE_MEDIA platform, int action, Throwable t) {
-                showToast("QQ授权失败");
+                showToast("QQ授权失败  请检查网络是否正常");
                 hideProgress();
             }
 

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

@@ -3,6 +3,7 @@ package com.sheep.gamegroup.view.activity;
 import android.app.AlertDialog;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -14,7 +15,6 @@ import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.event.ImageHeadChange;
 import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
-
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity;
@@ -27,8 +27,9 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import butterknife.BindView;
+import butterknife.ButterKnife;
 import butterknife.OnClick;
-
+import de.hdodenhof.circleimageview.CircleImageView;
 
 
 /**
@@ -48,10 +49,14 @@ public class PersionInfoAct extends AbsChooseImageActivity {
     ImageView tvQr;
     @BindView(R.id.rl_qr)
     RelativeLayout rlQr;
-    @BindView(R.id.iv_head_right)
-    ImageView ivHeadRight;
+
     @BindView(R.id.rl_head)
     RelativeLayout rl_head;
+    @BindView(R.id.iv_head_right)
+    ImageView ivHeadRight;
+    @BindView(R.id.layout_more1)
+    RelativeLayout layout_more1;
+
 
     @Override
     protected int getLayoutId() {
@@ -60,6 +65,7 @@ public class PersionInfoAct extends AbsChooseImageActivity {
 
     @Override
     public void initView() {
+        ButterKnife.bind(this);
         TitleBarUtils
                 .getInstance()
                 .setTitle(this, "个人资料")
@@ -76,7 +82,7 @@ public class PersionInfoAct extends AbsChooseImageActivity {
         Intent i = getIntent();
         if (i != null && i.hasExtra("info")) {
             mEntity = (UserInfoEntity) i.getSerializableExtra("info");
-            if(mEntity!=null) {
+            if (mEntity != null) {
                 tvNike.setText(mEntity.getNickname());
                 tvSheepId.setText(mEntity.getInvitation_code());
                 Bitmap mBitmap = CodeUtils.createImage(mEntity.getShare_link(), 30, 30, null);
@@ -96,15 +102,14 @@ public class PersionInfoAct extends AbsChooseImageActivity {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(UserNameChange done) {
-        UserInfoEntity user=mEntity;
+        UserInfoEntity user = mEntity;
         user.setNickname(done.getNikeName());
-        mEntity=user;
+        mEntity = user;
         tvNike.setText(mEntity.getNickname());
 
     }
 
 
-
     private void showQR() {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         View view = View.inflate(this, R.layout.x_ask_qr_dialog, null);
@@ -134,8 +139,8 @@ public class PersionInfoAct extends AbsChooseImageActivity {
         ImageView iv = view.findViewById(R.id.iv_close);
         ImageView iv_qr = view.findViewById(R.id.iv_qr);
         ViewGroup.LayoutParams params = iv_qr.getLayoutParams();
-        params.height=G.WIDTH - 60;
-        params.width =G.HEIGHT / 2-20;
+        params.height = G.WIDTH - 60;
+        params.width = G.HEIGHT / 2 - 20;
         iv_qr.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
         iv_qr.setLayoutParams(params);
         Glide.with(PersionInfoAct.this)
@@ -154,13 +159,12 @@ public class PersionInfoAct extends AbsChooseImageActivity {
     }
 
 
-
-    @OnClick({R.id.iv_head_right, R.id.tv_nike, R.id.rl_qr, R.id.rl_head})
+    @OnClick({R.id.layout_more1, R.id.rl_qr, R.id.rl_head})
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.tv_nike:
-                Intent i=new Intent(PersionInfoAct.this,ReNameActivity.class);
-                i.putExtra("name",mEntity.getNickname());
+            case R.id.layout_more1:
+                Intent i = new Intent(PersionInfoAct.this, ReNameActivity.class);
+                i.putExtra("name", mEntity.getNickname());
                 startActivity(i);
                 break;
             case R.id.rl_qr:
@@ -184,7 +188,7 @@ public class PersionInfoAct extends AbsChooseImageActivity {
 
     @Override
     protected void onGetNetImageUrl(String url) {
-        ImageHeadChange  imageHeadChange=new ImageHeadChange();
+        ImageHeadChange imageHeadChange = new ImageHeadChange();
         imageHeadChange.setAvatar(url);
         EventBus.getDefault().post(imageHeadChange);
 
@@ -195,4 +199,5 @@ public class PersionInfoAct extends AbsChooseImageActivity {
         super.onDestroy();
         EventBus.getDefault().unregister(this);
     }
+
 }

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

@@ -288,6 +288,26 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
 
     }
 
+    @Override
+    public void bindTelSuccess(BaseMessage o) {
+
+    }
+
+    @Override
+    public void bindTelFail(BaseMessage o) {
+
+    }
+
+    @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,54 +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
-    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/ReNameActivity.java

@@ -2,6 +2,9 @@ package com.sheep.gamegroup.view.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -12,8 +15,10 @@ import com.sheep.gamegroup.di.modules.ReNameModule;
 import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.presenter.ReNameContract;
 import com.sheep.gamegroup.presenter.ReNamePresenter;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -61,7 +66,21 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View
 
     @Override
     public void initListener() {
+        et.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+            }
+        });
     }
 
     @Override
@@ -113,6 +132,15 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View
 
     @OnClick(R.id.tv_submit)
     public void onClick() {
+        if(android.text.TextUtils.isEmpty(et.getText().toString())){
+            G.showToast("请输入昵称");
+            return;
+        }
+
+        if(!CommonUtil.getInstance().handleText(et.getText().toString(), 12)){
+            G.showToast("昵称长度要小于6个字符");
+            return;
+        }
         HashMap<String,String>  map=new HashMap<>();
         map.put("nickname",et.getText().toString());
         presenter.getTask(map);

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

@@ -9,6 +9,8 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AlertDialog;
@@ -49,6 +51,8 @@ public class SplashAct extends BaseActivity implements SplashContract.View, Easy
     @Inject
     SplashPresenter presenter;
 
+    private boolean isClick;
+
     private static final int PERMISSON_REQUESTCODE = 1;
     /**
      * 需要进行检测的权限数组
@@ -71,13 +75,26 @@ public class SplashAct extends BaseActivity implements SplashContract.View, Easy
             EasyPermissions.requestPermissions(this, "应用需要这些权限", PERMISSON_REQUESTCODE, needPermissions);
         } else {
 //            setContentView(R.layout.splash_activity);
-            if(Build.VERSION.SDK_INT >= 21){
-                animWelcomeImage();
+//            if(Build.VERSION.SDK_INT >= 21){
+//                animWelcomeImage();
+//
+//            }else {
+//            }
+            mHandler.sendEmptyMessageDelayed(0, 1000);
+        }
+    }
 
-            }else {
+    Handler mHandler = new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            if(!isClick){
+                isClick = true;
+                goMain();
             }
+
         }
-    }
+    };
 
     @Override
     protected int getLayoutId() {
@@ -207,7 +224,10 @@ public class SplashAct extends BaseActivity implements SplashContract.View, Easy
     public void onViewClicked(View view) {
         switch (view.getId()){
             case R.id.btn_join:
-                goMain();
+                if(!isClick){
+                    isClick = true;
+                    goMain();
+                }
                 break;
         }
     }

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

@@ -1,14 +1,24 @@
 package com.sheep.gamegroup.view.dialog;
 
 import android.app.Activity;
+import android.content.Context;
 import android.support.v7.app.AlertDialog;
+import android.text.TextUtils;
 import android.view.View;
+import android.widget.ImageView;
+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.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.uuzuche.lib_zxing.view.ViewfinderView;
+
+import org.greenrobot.eventbus.EventBus;
 
 public class DialogAccountAbnormal {
 
@@ -47,4 +57,106 @@ public class DialogAccountAbnormal {
         }
         return mAlertDialog;
     }
+    public static boolean showDialog(final Activity activity,String title, String content, String cancel, String sure) {
+        final boolean[] flag = {false};
+            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(sure+"");
+        dialog_sure.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mAlertDialog.dismiss();
+                        flag[0] = true;
+                        SpUtils.saveClick(activity, true);
+                    }
+                });
+        ImageView dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
+        dialog_close.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mAlertDialog.dismiss();
+                        flag[0] = false;
+                        SpUtils.saveClick(activity, false);
+                    }
+                });
+        TextView dialog_action = ViewFindUtils.find(view, R.id.dialog_action);
+        dialog_action.setText(cancel+"");
+        dialog_action.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mAlertDialog.dismiss();
+                        flag[0] = false;
+                        SpUtils.saveClick(activity, false);
+
+//                        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.DIALOG_ACTIVITY_DOWNLOAD_FILE));
+                    }
+                });
+        try {
+            mAlertDialog.show();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return flag[0];
+    }
+
+    public static AlertDialog showDialogs(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();
+                    }
+                });
+        ImageView dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
+        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/java/com/sheep/jiuyan/samllsheep/utils/SpUtils.java

@@ -72,6 +72,24 @@ public class SpUtils {
         return user.getString("withdral_price", "");
     }
 
+    /**
+     * 点击事件 记录
+     * @param context
+     * @param vaule
+     */
+    public static void saveClick(Context context, boolean vaule) {
+        SharedPreferences user = context.getSharedPreferences("btn_download_click", Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = user.edit();
+        editor.putBoolean("click", vaule);
+        editor.apply();
+    }
+
+
+    public static boolean getClick(Context context) {
+        SharedPreferences user = context.getSharedPreferences("btn_download_click", Context.MODE_PRIVATE);
+        return user.getBoolean("click", false);
+    }
+
 
 
 

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

@@ -6,7 +6,9 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:padding="@dimen/content_padding_small"
+            android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -14,10 +16,10 @@
                 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">
+                android:gravity="center">
 
                 <TextView
+                    android:id="@+id/title_tv"
                     style="@style/txt_big_noheight_style"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -26,6 +28,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"
@@ -44,11 +47,11 @@
                         android:layout_width="0dp"
                         android:layout_weight="5"
                         android:layout_height="40dp"
-                        android:background="@drawable/sp_bg_gradient_rectangle_green"
+                        android:textColor="@color/white"
+                        android:background="@drawable/sp_bg_gradient_rectangle_blue"
                         android:gravity="center"
                         android:text="了解如何解封"
-                        android:textColor="#010101"
-                        android:textSize="@dimen/text_size_12" />
+                        android:textSize="@dimen/text_size_15" />
                     <View
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -61,7 +64,7 @@
                         android:background="@drawable/sp_bg_gradient_rectangle_yellow2"
                         android:gravity="center"
                         android:text="确定"
-                        android:textColor="#010101"
+                        android:textColor="@color/white"
                         android:textSize="@dimen/text_size_15" />
                 </LinearLayout>
 

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

@@ -0,0 +1,101 @@
+<?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"
+        android:layout_gravity="center"
+        android:padding="@dimen/content_padding_small"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
+
+        <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">
+
+            <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="挂机账号异常"
+                android:visibility="gone"/>
+
+            <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="当前网络处于非WIFI状态，确定下载吗？"
+                android:textColor="#404040"
+                android:textSize="@dimen/text_size_12" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:visibility="gone">
+                <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:gravity="center"
+                    android:text="取消"
+                    android:textColor="@color/white"
+                    android:background="@drawable/sp_bg_gradient_rectangle_blue"
+                    android:textSize="@dimen/text_size_15" />
+                <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="@color/white"
+                    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/task_list_item.xml

@@ -31,7 +31,7 @@
             android:id="@+id/date_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="2018/2/14 14:41"
+            android:text="2018/02/14 14:41"
             android:layout_below="@+id/name_tv"
             android:textSize="@dimen/text_size_3"
             android:textColor="@color/txt_black_818181"

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

@@ -21,7 +21,7 @@
             android:id="@+id/date_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="2018/2/14 14:41"
+            android:text="2018/02/14 14:41"
             android:layout_below="@+id/name_tv"
             android:textSize="@dimen/text_size_3"
             android:textColor="@color/txt_black_818181"

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

@@ -42,7 +42,8 @@
                 android:drawablePadding="10dp"
                 android:hint="请填写姓名"
                 android:textColor="@color/txt_black_9e9c9c"
-                android:textSize="@dimen/text_size_2" />
+                android:textSize="@dimen/text_size_2"
+                android:gravity="right"/>
         </RelativeLayout>
 
 
@@ -81,7 +82,8 @@
                 android:hint="请填写身份证号"
                 android:maxLength="18"
                 android:textColor="@color/txt_black_9e9c9c"
-                android:textSize="@dimen/text_size_2" />
+                android:textSize="@dimen/text_size_2"
+                android:gravity="right"/>
         </RelativeLayout>
 
 
@@ -119,7 +121,8 @@
                 android:inputType="number"
                 android:maxLength="19"
                 android:textColor="@color/txt_black_9e9c9c"
-                android:textSize="@dimen/text_size_2" />
+                android:textSize="@dimen/text_size_2"
+                android:gravity="right"/>
         </RelativeLayout>
 
     </LinearLayout>

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/layout/xpersion_info_act_layout.xml

@@ -67,7 +67,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="15dp"
-
+            android:id="@+id/layout_more1"
             android:layout_margin="10dp"
             >
 

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

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light">
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</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>
         <item name="main_color_mid">@color/theme_app_mid</item>
@@ -15,6 +14,8 @@
         <item name="main_color_light">@color/theme_app_highlight_more</item>
         <item name="star_unselect">@drawable/xina</item>
         <item name="star_select">@drawable/xinb</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
         <!--下面的属性全是为了兼容安卓4.0！多了好多文件啊-->
         <item name="line_short">@drawable/sp_line_vertical</item>
         <item name="star_style">@style/ratingbar_main</item>

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

@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowContentOverlay">@null</item>
-        <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="main_color">@color/theme_app_main</item>
-        <item name="main_color_dark">@color/theme_app_dark</item>
-        <item name="main_color_mid">@color/theme_app_mid</item>
-        <item name="main_color_accent">@color/theme_app_highlight</item>
-        <item name="main_color_light">@color/theme_app_highlight_more</item>
-        <item name="star_unselect">@drawable/xina</item>
-        <item name="star_select">@drawable/xinb</item>
-        <!--下面的属性全是为了兼容安卓4.0！多了好多文件啊-->
-        <item name="line_short">@drawable/sp_line_vertical</item>
-        <item name="star_style">@style/ratingbar_main</item>
-        <item name="radio_btn">@drawable/sel_circle_dot</item>
-        <item name="button_full_normal">@drawable/selector_button_full_main</item>
-        <item name="full.button">@style/full.button_main</item>
-        <item name="small.button">@style/small.button_main</item>
-        <item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>
-        <item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_main</item>
-        <item name="sp_search_edt">@drawable/sp_search_edt_main</item>
-        <item name="btn_color">@color/btn_color_main</item>
-    </style>
+    <!--<style name="AppTheme" parent="Theme.AppCompat.Light">-->
+        <!--<item name="android:windowContentOverlay">@null</item>-->
+        <!--<item name="colorPrimary">@color/colorPrimary</item>-->
+        <!--<item name="colorPrimaryDark">@color/theme_app_main</item>-->
+        <!--<item name="colorAccent">@color/colorAccent</item>-->
+        <!--<item name="colorControlHighlight">@color/theme_app_highlight_more</item>-->
+        <!--<item name="windowActionBar">false</item>-->
+        <!--<item name="windowNoTitle">true</item>-->
+        <!--<item name="android:windowBackground">@color/theme_app_main</item>-->
+        <!--<item name="android:windowIsTranslucent">true</item>-->
+        <!--<item name="main_color">@color/theme_app_main</item>-->
+        <!--<item name="main_color_dark">@color/theme_app_dark</item>-->
+        <!--<item name="main_color_mid">@color/theme_app_mid</item>-->
+        <!--<item name="main_color_accent">@color/theme_app_highlight</item>-->
+        <!--<item name="main_color_light">@color/theme_app_highlight_more</item>-->
+        <!--<item name="star_unselect">@drawable/xina</item>-->
+        <!--<item name="star_select">@drawable/xinb</item>-->
+        <!--&lt;!&ndash;下面的属性全是为了兼容安卓4.0！多了好多文件啊&ndash;&gt;-->
+        <!--<item name="line_short">@drawable/sp_line_vertical</item>-->
+        <!--<item name="star_style">@style/ratingbar_main</item>-->
+        <!--<item name="radio_btn">@drawable/sel_circle_dot</item>-->
+        <!--<item name="button_full_normal">@drawable/selector_button_full_main</item>-->
+        <!--<item name="full.button">@style/full.button_main</item>-->
+        <!--<item name="small.button">@style/small.button_main</item>-->
+        <!--<item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>-->
+        <!--<item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_main</item>-->
+        <!--<item name="sp_search_edt">@drawable/sp_search_edt_main</item>-->
+        <!--<item name="btn_color">@color/btn_color_main</item>-->
+    <!--</style>-->
 
 
     <attr name="sp_search_edt" format="reference" />

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

@@ -20,11 +20,46 @@
     <!--透明，有任务栏电量时间等-->
     <style name="NoTitleTranslucentTheme" parent="Trans">
         <item name="android:windowNoTitle">true</item>
-        <item name="android:windowBackground">@color/translate</item>
+        <item name="android:windowBackground">@color/theme_app_main</item>
         <item name="android:windowIsTranslucent">true</item>
     </style>
 
 
+    <style name="aaa" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+
+        <item name="colorAccent">@color/white_bg_line</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsTranslucent">false</item>
+        <!--下面的属性全是为了兼容安卓4.0！多了好多文件啊-->
+        <item name="line_short">@drawable/sp_line_vertical</item>
+        <item name="star_style">@style/ratingbar_main</item>
+        <item name="radio_btn">@drawable/sel_circle_dot</item>
+        <item name="button_full_normal">@drawable/selector_button_full_main</item>
+        <item name="full.button">@style/full.button_main</item>
+        <item name="small.button">@style/small.button_main</item>
+        <item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>
+        <item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_main</item>
+        <item name="sp_search_edt">@drawable/sp_search_edt_main</item>
+        <item name="btn_color">@color/btn_color_main</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowDisablePreview">true</item>
+    </style>
+    <style name="AppThemes" parent="@style/aaa">
+        <item name="colorPrimary">@color/white_light</item>
+        <item name="colorPrimaryDark">@color/white_light</item>
+        <item name="android:windowBackground">@color/white_light</item>
+    </style>
+    <style name="ACTMAIN" parent="@style/aaa">
+        <item name="colorPrimary">@color/theme_app_mid</item>
+        <item name="colorPrimaryDark">@color/theme_app_mid</item>
+        <item name="android:windowBackground">@color/theme_app_mid</item>
+
+    </style>
+
+
+
+
     <!-- Base application theme. -->
     <style name="XMYTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->

small_sheep_android.iml

@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>