增加正式地址，一些bug修改

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

@@ -27,4 +27,5 @@ public enum EventTypes {
     DIALOG_ACTIVITY_DOWNLOAD_FILE,//dialogActivity 下载通知
 
     TASK_AGAIN_UPLOAD_FILE,//任务审核上传图片 通知
+    REFRESH_DATA_PHONE,//刷新手机
 }

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

@@ -403,12 +403,13 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         } catch (Exception e) {
             e.printStackTrace();
         }
+        Log.e("onAttach-----","");
     }
 
     @Override
     public void onStart() {
         super.onStart();
-        Log.e("onAttach-----","");
+        Log.e("onStart-----","");
     }
     /**
      * banner

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

@@ -50,7 +50,7 @@ public class CommonUtil {
     public String returnPayState(WithdrawalEty ety){
 
         String result = "未付款";
-        switch (ety.getStatus()){
+        switch (ety.getPay_status()){
             case 0:
             case 1:
             case 3:

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

@@ -8,7 +8,8 @@ public class ConnectAddress {
 
 //  public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
 //    public static final String BASE_HTTP = "http://10.8.220.5:8080/";//张伟
-   public static final String BASE_HTTP = "http://test.sheep.kfzs.com/";//测试服地址
+//   public static final String BASE_HTTP = "http://test.sheep.kfzs.com/";//测试服地址
+   public static final String BASE_HTTP = "http://ss.kfzs.com/";//正式地址
 
     public static final String V1 = "/v1/";
 

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

@@ -41,8 +41,11 @@ public class MyDbManager {
      *保存或更新表表
      */
     public void saveOrUpdateUser(UserEntity user) throws DbException {
-        deleteTable(UserEntity.class);//先清空表
-        db.saveOrUpdate(user);
+        if(user != null){
+            deleteTable(UserEntity.class);//先清空表
+            db.saveOrUpdate(user);
+        }
+
     }
 
     /**

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

@@ -11,6 +11,7 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
+import com.kfzs.duanduan.event.BigEvent;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerAccountAndSercuritComponent;
 import com.sheep.gamegroup.di.modules.AccountAndSercuritModule;
@@ -124,7 +125,11 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
 
+    }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(ImageHeadChange done) {
@@ -294,6 +299,16 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
     }
 
+
+    @Subscribe
+    public void onEventMainThread(BigEvent event){
+        switch (event.getEventTypes()){
+            case REFRESH_DATA_PHONE:
+                initData();
+                break;
+        }
+    }
+
     private  void  refalshAuther(UserInfoEntity entity ){
         boolean isBanck = TextUtils.isEmpty(entity.getBank_card());
         boolean isId_number = TextUtils.isEmpty(entity.getId_number());

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

@@ -12,6 +12,8 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
+import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.event.EventTypes;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerChangePhoneComponent;
 import com.sheep.gamegroup.di.components.DaggerPhoneComponent;
@@ -30,6 +32,7 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.greenrobot.eventbus.EventBus;
 import org.xutils.ex.DbException;
 
 import javax.inject.Inject;
@@ -145,18 +148,21 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
             public void onTimerRest() {
                 canGetCaptchaPhone = true;
                 phoneBtnCode.setText(getString(R.string.get_captcha));
+                phone_btn_code_old.setText(getString(R.string.get_captcha));
             }
 
             @Override
             public void onTimerTick(long millisUntilFinished, int counTime) {
                 String textStr = counTime + " s";
                 phoneBtnCode.setText(textStr);
+                phone_btn_code_old.setText(textStr);
             }
 
             @Override
             public void onTimerFinish() {
                 canGetCaptchaPhone = true;
                 phoneBtnCode.setText(getString(R.string.get_captcha));
+                phone_btn_code_old.setText(getString(R.string.get_captcha));
             }
         };
     }
@@ -177,7 +183,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
             hitStr = "请输入原手机号码";
             noticeStr = "验证原手机";
             phoneEtAccount.setHint(hitStr+"");
-            phoneEtAccount.setText(mobiles+"");
+//            phoneEtAccount.setText(mobiles+"");
         }else{
             step = 0;
             hitStr = "请输入手机号码";
@@ -209,10 +215,11 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
                     return;
                 }
                 step = 3;
+                submit();
                 break;
             case R.id.phone_sure_tv://更换手机号
                 sec_code = phoneEtCode.getText().toString()+"";
-
+                mobile = phoneEtAccount.getText().toString() +"";
                 if(!checkPhoneInput(mobile)){
                     return;
                 }
@@ -242,6 +249,9 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
 //                Jump2View.getInstance().goPhoneLoginView(ChangeTelAct.this, 1);
                 break;
             case R.id.phone_btn_code_old://旧手机获取验证码
+                if (!canGetCaptchaPhone) {
+                    return;
+                }
                 sec_code = null;
                 step = 1;
                 submit();
@@ -268,10 +278,14 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
             case 3:
                 jsonObject.put("auth_code", auth_code+"");
                 jsonObject.put("mobile", mobile+"");
+                selfCountDownTimer.reset();
+                canGetCaptchaPhone = false;
+                selfCountDownTimer.start();
                 break;
             case 4:
                 jsonObject.put("sec_code", sec_code+"");
                 jsonObject.put("auth_code", auth_code+"");
+                jsonObject.put("mobile", mobile+"");
                 break;
         }
         presenter.switchPhone(jsonObject);
@@ -301,10 +315,19 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
     @Override
     public void changeTelSuccess(BaseMessage o) {
         try{
+//            if(step == 1 || step == 3){
+//                changeTelSuccess
+//            }
             if(step == 2){
                 refreshData();
+                phoneBtnCode.setText(getString(R.string.get_captcha));
+                if(selfCountDownTimer != null)
+                    selfCountDownTimer.reset();
             }else if(step == 4){
+                SpUtils.savePhone(activity,mobile);
                 G.showToast(o.getMsg()+"");
+
+                EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.REFRESH_DATA_PHONE));
                 finish();
             }
             if(o == null){
@@ -312,10 +335,10 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
                 return;
             }
             if(o.getData() == null || o.getData().equals("")){
-                G.showToast(o.getMsg()+"");
+//                G.showToast(o.getMsg()+"");
                 return;
             }
-            G.showToast(o.getMsg()+"");
+            G.showToast((o.getMsg()).equals("")?"提交成功":o.getMsg()+"");
             JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(o.getData()));
             auth_code = jsonObject.getString("auth_code");
         }catch (Exception e){

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

@@ -21,6 +21,8 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.appstore.utils.string.HexUtils;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
@@ -170,6 +172,13 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
         priceTv.setText("+"+ taskEty.getBonus() +"元");
         dateTv.setText(TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(taskEty.getUpdate_time()))+"");
 
+
+        Glide.with(SheepApp.mContext)
+                .load(taskEty.getIcon())
+                .apply(new RequestOptions().placeholder(R.drawable.icon)
+                        .dontAnimate())
+                .into(iconIv);
+
         taskSchedule();
 
         if (taskEty.getRunTask() == 0 || taskEty.getInspect_type() == 1){

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

@@ -124,6 +124,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
         } catch (DbException e) {
             e.printStackTrace();
         }
+        weixin_name_tv.setText(SpUtils.getWeixin(activity));
         String sr = "可提现金额<font color='#ff2d4b'><small>" + balanceAmount + "</small></font>元";
         withdrawal_click_bindname_tv.setText(Html.fromHtml(sr));
     }