合并代码

app/src/main/AndroidManifest.xml

@@ -40,7 +40,7 @@
     <application
         android:name=".SheepApp"
         android:allowBackup="true"
-        android:icon="@drawable/icon"
+        android:icon="@mipmap/icon"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
@@ -190,11 +190,15 @@
 
         <!--2.0-->
         <activity android:name="com.sheep.gamegroup.view.activity.LoginAct">
+
+            </activity>
+
+        <activity android:name="com.sheep.gamegroup.view.activity.SplashAct">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-            </activity>
+        </activity>
 
         <activity android:name="com.sheep.gamegroup.view.activity.PhoneAct"/>
         <activity android:name="com.sheep.gamegroup.view.activity.PersonalCenterAct"/>
@@ -304,7 +308,6 @@
         <activity
             android:name="com.tencent.tauth.AuthActivity"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait"
             android:noHistory="true" >
 
             <intent-filter>
@@ -330,6 +333,12 @@
         <activity android:name="com.sheep.gamegroup.view.activity.ActGuideDeblocked"
             android:screenOrientation="portrait" />
 
+        <activity android:name="com.sheep.gamegroup.view.activity.RealNameAuthenAct"
+            android:screenOrientation="portrait" />
+        <activity android:name="com.sheep.gamegroup.view.activity.ChangeWxOrTelAct"
+            android:screenOrientation="portrait"/>
+        <!--友盟start-->
+
 
         <!--友盟start-->
         <meta-data

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

@@ -53,6 +53,8 @@ import com.kfzs.duanduan.utils.net.APIRequestInstance;
 import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
 import com.kfzs.duanduan.view.AppHomepageAdvertisementDialog;
 import com.kfzs.duanduan.view.DialogStorageLow;
+import com.sheep.gamegroup.event.UserNameChange;
+import com.sheep.gamegroup.model.entity.UserInfoEntity;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -61,6 +63,7 @@ import com.zhy.http.okhttp.callback.StringCallback;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.wlf.filedownloader.FileDownloader;
@@ -108,8 +111,16 @@ public class ActMain extends BaseCompatActivity{
         mDownloadTaskService.restoreDownloadTaskStatus();
 
         initLinsener();
+
     }
 
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(UserNameChange done) {
+
+    }
+
+
     private void initLinsener() {
         findViewById(R.id.edt_main_search_enter).setOnClickListener(new View.OnClickListener() {
             @Override
@@ -302,7 +313,6 @@ public class ActMain extends BaseCompatActivity{
                                     OkHttpUtils.get().url(url).build().execute(new StringCallback() {
                                         @Override
                                         public void onError(Call call, Exception e, int id) {
-
                                         }
 
                                         @Override

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

@@ -18,6 +18,8 @@ import com.kf.utils.ToastBuilder;
 import com.kfzs.duanduan.bean.KFIntentKeys;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.lang.reflect.Field;
 
 /**
@@ -221,6 +223,10 @@ public abstract class BaseCompatFragment extends Fragment {
         }
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
 
     /**
      * 设置刷新组件

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

@@ -20,4 +20,7 @@ public enum EventTypes {
     GO_FiRST , //任务功能  登录后 点击返回键 只能返回第一个界面
     ONFRESH_FGT_FAMLLSHEEP , //刷新fgtSmallSheep数据
     ONFRESH_TRYMAKEMANY_PAGE , //刷新TryMakeMoneyact数据
+
+    //Todo 遇得到的问题
+    INTENT_AMOUNT_VALUE,//提现传值用
 }

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

@@ -195,24 +195,28 @@ public class FgtMainGame extends BaseCompatFragment {
      * 加载游戏列表
      */
     private void loadGameLists() {
-        APIRequest bannerRequest = APIRequestInstance.getReq(TAG, UrlBll.AppStoreApi.RECOMMEND_GAME_GROUPS, null, new Response.Listener<ApiResponseOuterClass.ApiResponse>() {
+        try {
+            APIRequest bannerRequest = APIRequestInstance.getReq(TAG, UrlBll.AppStoreApi.RECOMMEND_GAME_GROUPS, null, new Response.Listener<ApiResponseOuterClass.ApiResponse>() {
+
+                @Override
+                public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
+                    int code = apiResponse.getCodeValue();
+                    switch (code) {
+                        case ApiResponseOuterClass.Codes.Success_VALUE:
+                            IndexGameOuterClass.IndexGame indexGame = apiResponse.getIndexGame();
+                            loadViews(indexGame);
+                            break;
+                        default:
+                            break;
+                    }
+                    refreshOver();
 
-            @Override
-            public void onResponse(ApiResponseOuterClass.ApiResponse apiResponse) {
-                int code = apiResponse.getCodeValue();
-                switch (code) {
-                    case ApiResponseOuterClass.Codes.Success_VALUE:
-                        IndexGameOuterClass.IndexGame indexGame = apiResponse.getIndexGame();
-                        loadViews(indexGame);
-                        break;
-                    default:
-                        break;
                 }
-                refreshOver();
-
-            }
-        }, HelperUtils.makeErr(getString(R.string.toast_init_data_fail)));
-        KFZSNetwork.addRequest(bannerRequest);
+            }, HelperUtils.makeErr(getString(R.string.toast_init_data_fail)));
+            KFZSNetwork.addRequest(bannerRequest);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
     }
 
 

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

@@ -28,6 +28,7 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
+import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import javax.inject.Inject;
@@ -91,6 +92,7 @@ public class FgtSmallSheep extends BaseCompatFragment  implements SmallSheepCont
     };
 
     public void initView() {
+        EventBus.getDefault().register(this);
         activity = getActivity();
         ButterKnife.bind(this,mContentView);
         DaggerSmallSheepComponent.builder()
@@ -166,4 +168,11 @@ public class FgtSmallSheep extends BaseCompatFragment  implements SmallSheepCont
                 break;
         }
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        EventBus.getDefault().unregister(this);
+    }
 }

app/src/main/java/com/sheep/gamegroup/IBase/IBasePresenter.java

@@ -8,6 +8,6 @@ import java.util.HashMap;
 
 public interface IBasePresenter {
 
-    void getTask(HashMap<String, Object> map);
+    void getTask(HashMap<String, String> map);
 
 }

app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -6,6 +6,8 @@ import android.support.annotation.Nullable;
 import android.view.KeyEvent;
 import android.widget.Toast;
 
+import com.sheep.gamegroup.util.ActivityManager;
+
 import butterknife.ButterKnife;
 
 /**
@@ -25,6 +27,7 @@ public abstract class BaseActivity extends AppActivity  {
         initView();
         initListener();
         initData();
+        ActivityManager.getInstance().pushActivity(this);
 
     }
 

app/src/main/java/com/sheep/gamegroup/di/components/ReNameComponent.java

@@ -4,6 +4,7 @@ import com.sheep.gamegroup.di.modules.ReNameModule;
 import com.sheep.gamegroup.di.scopes.UserScope;
 import com.sheep.gamegroup.view.activity.ReNameActivity;
 
+
 import dagger.Component;
 
 /**

app/src/main/java/com/sheep/gamegroup/di/components/RealNameAutherComponent.java

@@ -0,0 +1,18 @@
+package com.sheep.gamegroup.di.components;
+
+import com.sheep.gamegroup.di.modules.AccountAndSercuritModule;
+import com.sheep.gamegroup.di.modules.RealNameAutherModule;
+import com.sheep.gamegroup.di.scopes.UserScope;
+import com.sheep.gamegroup.view.activity.AccountAndSecurityAct;
+import com.sheep.gamegroup.view.activity.RealNameAuthenAct;
+
+import dagger.Component;
+
+/**
+ * Created by ljy on 2018/3/15.
+ */
+@UserScope
+@Component(modules = RealNameAutherModule.class, dependencies = NetComponent.class)
+public interface RealNameAutherComponent {
+    void inject(RealNameAuthenAct phoneAct);
+}

app/src/main/java/com/sheep/gamegroup/di/modules/RealNameAutherModule.java

@@ -0,0 +1,23 @@
+package com.sheep.gamegroup.di.modules;
+
+import com.sheep.gamegroup.presenter.AccountAndSecuritContract;
+import com.sheep.gamegroup.presenter.RealNameAutherContract;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Created by Administrator on 2018/3/10.
+ */
+@Module
+public class RealNameAutherModule {
+    private RealNameAutherContract.View view;
+
+    public RealNameAutherModule(RealNameAutherContract.View view) {
+        this.view = view;
+    }
+    @Provides
+    public RealNameAutherContract.View provideView(){
+        return view;
+    }
+}

app/src/main/java/com/sheep/gamegroup/event/MoneyChange.java

@@ -0,0 +1,11 @@
+package com.sheep.gamegroup.event;
+
+/**
+ * Created by Administrator on 2018/3/27.
+ */
+
+public class MoneyChange {
+
+
+
+}

app/src/main/java/com/sheep/gamegroup/event/RealNameAutehrChange.java

@@ -0,0 +1,35 @@
+package com.sheep.gamegroup.event;
+
+/**
+ * Created by Administrator on 2018/3/26.
+ */
+
+public class RealNameAutehrChange {
+    private  String  realName;
+    private  String  idCard;
+    private  String  banck;
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+
+    public String getBanck() {
+        return banck;
+    }
+
+    public void setBanck(String banck) {
+        this.banck = banck;
+    }
+}

app/src/main/java/com/sheep/gamegroup/event/UserNameChange.java

@@ -0,0 +1,17 @@
+package com.sheep.gamegroup.event;
+
+/**
+ * Created by Administrator on 2018/3/26.
+ */
+
+public class UserNameChange {
+    String  nikeName;
+
+    public String getNikeName() {
+        return nikeName;
+    }
+
+    public void setNikeName(String nikeName) {
+        this.nikeName = nikeName;
+    }
+}

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

@@ -86,12 +86,13 @@ public interface ApiService {
      * 绑定身份证号
      */
     @PUT(V1+"app/user/bind_id_number/")
-    Observable<BaseMessage> bindIdNumber(@Query("id_number") String id_number);
+//    Observable<BaseMessage> bindIdNumber(@Query("id_number") String id_number);
+    Observable<BaseMessage> bindIdNumber(@Body JSONObject objec);
     /**
      * 绑定银行卡
      */
     @PUT(V1+"app/user/bind_bank_card/")
-    Observable<BaseMessage> bindBankCard(@Query("bank_card") String bank_card);
+    Observable<BaseMessage> bindBankCard(@Body JSONObject objec);
 
     /**
      * 用户提现
@@ -192,4 +193,10 @@ public interface ApiService {
     Observable<BaseMessage> switchPhone(@Body JSONObject jsonObject);
 
 
+
+    /**
+     * 更换手机号
+     */
+    @PUT(V1 + "/app/user/bind_all_real_info")
+    Observable<BaseMessage> bindALl(@Body JSONObject jsonObject);
 }

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

@@ -7,7 +7,7 @@ package com.sheep.gamegroup.model.entity;
 public class FriendAndAwardEntity {
 
     private   String   award;
-    private   int  frind_count;
+    private   int  friend_count;
     private  String  share_desc;
     private  String  share_link;
     private  String  share_title;
@@ -20,13 +20,7 @@ public class FriendAndAwardEntity {
         this.award = award;
     }
 
-    public int getFrind_count() {
-        return frind_count;
-    }
 
-    public void setFrind_count(int frind_count) {
-        this.frind_count = frind_count;
-    }
 
     public String getShare_desc() {
         return share_desc;
@@ -51,4 +45,12 @@ public class FriendAndAwardEntity {
     public void setShare_title(String share_title) {
         this.share_title = share_title;
     }
+
+    public int getFriend_count() {
+        return friend_count;
+    }
+
+    public void setFriend_count(int friend_count) {
+        this.friend_count = friend_count;
+    }
 }

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

@@ -85,7 +85,7 @@ public class UserEntity {
     }
 
     public String getBalance() {
-        return balance;
+        return balance == null?"0":balance;
     }
 
     public void setBalance(String balance) {
@@ -109,7 +109,7 @@ public class UserEntity {
     }
 
     public String getTotal_asset() {
-        return total_asset;
+        return total_asset == null?"0":total_asset;
     }
 
     public void setTotal_asset(String total_asset) {

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

@@ -1,232 +1,144 @@
-package com.sheep.gamegroup.model.entity;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
 /**
- * Created by Administrator on 2018/3/24.
+ * Copyright 2018 bejson.com
  */
+package com.sheep.gamegroup.model.entity;
 
-public class UserInfoEntity implements Parcelable{
-
-    private  String   access_token;
-
-    /**
-     * 头像
-     */
-    private  String avatar;
-    private  double   balance;
-    /**
-     *     银行卡号
-     */
-    private   String  bank_card;
-
-    private  int  create_time;
-
-    private  String  id;
-
-    /**
-     * 身份证号码
-     */
-    private  String  id_number;
-
-    /**
-     * 邀请码
-     */
-    private  String   invitation_code;
-
-    private  int  last_login_time;
-
-
-    private String    mobile;
-
-    /**
-     *     昵称
-     */
-    private  String nickname;
-
-    /**
-     * 用户唯一标识
-     */
-  private  String  open_id;
-    /**
-     *     父邀请码
-     */
-    private  String  parent_code;
-
-    /**
-     * 真实姓名
-     */
-    private  String  real_name;
-
-
-    private  String  refresh_token;
-
-
-    private  String  share_link;
-
-
-    private  double   total_asset;
-
-    private  double   total_withdraw;
-
-
-    private  int update_time;
-
-
-    private  String wx_openid;
 
+import java.io.Serializable;
 
-    protected UserInfoEntity(Parcel in) {
-        access_token = in.readString();
-        avatar = in.readString();
-        balance = in.readDouble();
-        bank_card = in.readString();
-        create_time = in.readInt();
-        id = in.readString();
-        id_number = in.readString();
-        invitation_code = in.readString();
-        last_login_time = in.readInt();
-        mobile = in.readString();
-        nickname = in.readString();
-        open_id = in.readString();
-        parent_code = in.readString();
-        real_name = in.readString();
-        refresh_token = in.readString();
-        share_link = in.readString();
-        total_asset = in.readDouble();
-        total_withdraw = in.readDouble();
-        update_time = in.readInt();
-        wx_openid = in.readString();
+/**
+ * Auto-generated: 2018-03-26 11:24:11
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class UserInfoEntity  implements Serializable {
+
+    private int id;
+    private String mobile;
+    private String nickname;
+    private int balance;
+    private String invitation_code;
+    private String parent_code;
+    private int total_asset;
+    private long last_login_time;
+    private long create_time;
+    private long update_time;
+    private String avatar;
+    private String access_token;
+    private String refresh_token;
+    private String open_id;
+    private String real_name;
+    private String id_number;
+    private String bank_card;
+    private int total_withdraw;
+    private String wx_openid;
+    private String wx_nickname;
+    private String share_link;
+
+
+    public int getId() {
+        return id;
     }
 
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(access_token);
-        dest.writeString(avatar);
-        dest.writeDouble(balance);
-        dest.writeString(bank_card);
-        dest.writeInt(create_time);
-        dest.writeString(id);
-        dest.writeString(id_number);
-        dest.writeString(invitation_code);
-        dest.writeInt(last_login_time);
-        dest.writeString(mobile);
-        dest.writeString(nickname);
-        dest.writeString(open_id);
-        dest.writeString(parent_code);
-        dest.writeString(real_name);
-        dest.writeString(refresh_token);
-        dest.writeString(share_link);
-        dest.writeDouble(total_asset);
-        dest.writeDouble(total_withdraw);
-        dest.writeInt(update_time);
-        dest.writeString(wx_openid);
+    public void setId(int id) {
+        this.id = id;
     }
 
-    @Override
-    public int describeContents() {
-        return 0;
+    public String getMobile() {
+        return mobile;
     }
 
-    public static final Creator<UserInfoEntity> CREATOR = new Creator<UserInfoEntity>() {
-        @Override
-        public UserInfoEntity createFromParcel(Parcel in) {
-            return new UserInfoEntity(in);
-        }
-
-        @Override
-        public UserInfoEntity[] newArray(int size) {
-            return new UserInfoEntity[size];
-        }
-    };
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
 
-    public String getAccess_token() {
-        return access_token;
+    public String getNickname() {
+        return nickname;
     }
 
-    public void setAccess_token(String access_token) {
-        this.access_token = access_token;
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
     }
 
-    public String getAvatar() {
-        return avatar;
+    public int getBalance() {
+        return balance;
     }
 
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
+    public void setBalance(int balance) {
+        this.balance = balance;
     }
 
-    public double getBalance() {
-        return balance;
+    public String getInvitation_code() {
+        return invitation_code;
     }
 
-    public void setBalance(double balance) {
-        this.balance = balance;
+    public void setInvitation_code(String invitation_code) {
+        this.invitation_code = invitation_code;
     }
 
-    public String getBank_card() {
-        return bank_card;
+    public String getParent_code() {
+        return parent_code;
     }
 
-    public void setBank_card(String bank_card) {
-        this.bank_card = bank_card;
+    public void setParent_code(String parent_code) {
+        this.parent_code = parent_code;
     }
 
-    public int getCreate_time() {
-        return create_time;
+    public int getTotal_asset() {
+        return total_asset;
     }
 
-    public void setCreate_time(int create_time) {
-        this.create_time = create_time;
+    public void setTotal_asset(int total_asset) {
+        this.total_asset = total_asset;
     }
 
-    public String getId() {
-        return id;
+    public long getLast_login_time() {
+        return last_login_time;
     }
 
-    public void setId(String id) {
-        this.id = id;
+    public void setLast_login_time(long last_login_time) {
+        this.last_login_time = last_login_time;
     }
 
-    public String getId_number() {
-        return id_number;
+    public long getCreate_time() {
+        return create_time;
     }
 
-    public void setId_number(String id_number) {
-        this.id_number = id_number;
+    public void setCreate_time(long create_time) {
+        this.create_time = create_time;
     }
 
-    public String getInvitation_code() {
-        return invitation_code;
+    public long getUpdate_time() {
+        return update_time;
     }
 
-    public void setInvitation_code(String invitation_code) {
-        this.invitation_code = invitation_code;
+    public void setUpdate_time(long update_time) {
+        this.update_time = update_time;
     }
 
-    public int getLast_login_time() {
-        return last_login_time;
+    public String getAvatar() {
+        return avatar;
     }
 
-    public void setLast_login_time(int last_login_time) {
-        this.last_login_time = last_login_time;
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
     }
 
-    public String getMobile() {
-        return mobile;
+    public String getAccess_token() {
+        return access_token;
     }
 
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
+    public void setAccess_token(String access_token) {
+        this.access_token = access_token;
     }
 
-    public String getNickname() {
-        return nickname;
+    public String getRefresh_token() {
+        return refresh_token;
     }
 
-    public void setNickname(String nickname) {
-        this.nickname = nickname;
+    public void setRefresh_token(String refresh_token) {
+        this.refresh_token = refresh_token;
     }
 
     public String getOpen_id() {
@@ -237,14 +149,6 @@ public class UserInfoEntity implements Parcelable{
         this.open_id = open_id;
     }
 
-    public String getParent_code() {
-        return parent_code;
-    }
-
-    public void setParent_code(String parent_code) {
-        this.parent_code = parent_code;
-    }
-
     public String getReal_name() {
         return real_name;
     }
@@ -253,51 +157,51 @@ public class UserInfoEntity implements Parcelable{
         this.real_name = real_name;
     }
 
-    public String getRefresh_token() {
-        return refresh_token;
+    public String getId_number() {
+        return id_number;
     }
 
-    public void setRefresh_token(String refresh_token) {
-        this.refresh_token = refresh_token;
+    public void setId_number(String id_number) {
+        this.id_number = id_number;
     }
 
-    public String getShare_link() {
-        return share_link;
+    public String getBank_card() {
+        return bank_card;
     }
 
-    public void setShare_link(String share_link) {
-        this.share_link = share_link;
+    public void setBank_card(String bank_card) {
+        this.bank_card = bank_card;
     }
 
-    public double getTotal_asset() {
-        return total_asset;
+    public int getTotal_withdraw() {
+        return total_withdraw;
     }
 
-    public void setTotal_asset(double total_asset) {
-        this.total_asset = total_asset;
+    public void setTotal_withdraw(int total_withdraw) {
+        this.total_withdraw = total_withdraw;
     }
 
-    public double getTotal_withdraw() {
-        return total_withdraw;
+    public String getWx_openid() {
+        return wx_openid;
     }
 
-    public void setTotal_withdraw(double total_withdraw) {
-        this.total_withdraw = total_withdraw;
+    public void setWx_openid(String wx_openid) {
+        this.wx_openid = wx_openid;
     }
 
-    public int getUpdate_time() {
-        return update_time;
+    public String getWx_nickname() {
+        return wx_nickname;
     }
 
-    public void setUpdate_time(int update_time) {
-        this.update_time = update_time;
+    public void setWx_nickname(String wx_nickname) {
+        this.wx_nickname = wx_nickname;
     }
 
-    public String getWx_openid() {
-        return wx_openid;
+    public String getShare_link() {
+        return share_link;
     }
 
-    public void setWx_openid(String wx_openid) {
-        this.wx_openid = wx_openid;
+    public void setShare_link(String share_link) {
+        this.share_link = share_link;
     }
-}
+}

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

@@ -8,11 +8,11 @@ public class WithdrawalEty {
     private String amount;// 0,
     private String create_time;// 0,
     private String desc;// "string",
-    private String id;// 0,
+    private int id;// 0,
     private String order_no;// "string",
-    private String pay_status;// 0,
-    private String risk_status;// 0,
-    private String status;// 0,
+    private int pay_status;// 0,
+    private int risk_status;// 0,
+    private int status;// 0,
     private String surplus_amount;// 0,
     private String total_amount;// 0,
     private String type;// 0,
@@ -45,11 +45,11 @@ public class WithdrawalEty {
         this.desc = desc;
     }
 
-    public String getId() {
+    public int getId() {
         return id;
     }
 
-    public void setId(String id) {
+    public void setId(int id) {
         this.id = id;
     }
 
@@ -61,27 +61,27 @@ public class WithdrawalEty {
         this.order_no = order_no;
     }
 
-    public String getPay_status() {
+    public int getPay_status() {
         return pay_status;
     }
 
-    public void setPay_status(String pay_status) {
+    public void setPay_status(int pay_status) {
         this.pay_status = pay_status;
     }
 
-    public String getRisk_status() {
+    public int getRisk_status() {
         return risk_status;
     }
 
-    public void setRisk_status(String risk_status) {
+    public void setRisk_status(int risk_status) {
         this.risk_status = risk_status;
     }
 
-    public String getStatus() {
+    public int getStatus() {
         return status;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(int status) {
         this.status = status;
     }
 

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

@@ -31,7 +31,7 @@ public class AccountAndSecuritPresenter implements  AccountAndSecuritContract.Pr
 
 
     @Override
-    public void getTask(HashMap<String, Object> map) {
+    public void getTask(HashMap<String, String> map) {
 
 
         apiService.getInfo().subscribeOn(Schedulers.io())

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

@@ -18,6 +18,7 @@ import java.util.HashMap;
 import javax.inject.Inject;
 
 import rx.Observer;
+import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
 /**
@@ -36,10 +37,11 @@ public class AskGetMoneyPresenter implements AskGetMoneyContract.Presenter {
 
 
     @Override
-    public void getTask(HashMap<String, Object> map) {
+    public void getTask(HashMap<String, String> map) {
 
         apiService.FriendCountAndAward()
                 .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<BaseMessage>() {
                     @Override
                     public void onCompleted() {

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

@@ -9,6 +9,7 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import javax.inject.Inject;
 
+import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
 /**
@@ -35,6 +36,7 @@ public class BindDataPresenter implements BindDataContract.Presenter {
 
         apiService.bindRealname((JSONObject) o)
                 .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
@@ -52,8 +54,9 @@ public class BindDataPresenter implements BindDataContract.Presenter {
     @Override
     public void submitDataBankcard(Object o) {
 
-        apiService.bindBankCard(o.toString())
+        apiService.bindBankCard((JSONObject) o)
                 .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
@@ -71,8 +74,9 @@ public class BindDataPresenter implements BindDataContract.Presenter {
     @Override
     public void submitDataIdnumber(Object o) {
 
-        apiService.bindIdNumber(o.toString())
+        apiService.bindIdNumber((JSONObject) o)
                 .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {

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

@@ -11,6 +11,7 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import javax.inject.Inject;
 
 import rx.Observer;
+import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
 /**
@@ -32,6 +33,7 @@ public class BindOrChangeWeixinPresenter implements BindOrChangeWeixinContract.P
     public void bindWeixin(Object o) {
         apiService.bindWeixin(((JSONObject) o).getString("code"))
                 .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.context){
 
                     @Override

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

@@ -27,6 +27,7 @@ import java.util.Map;
 import javax.inject.Inject;
 
 import rx.Observer;
+import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
 /**
@@ -52,6 +53,7 @@ public class LoginPresenter implements LoginContract.Presenter {
         j.put("scope",ChannelContent.getInstance().getChannel_name() );
         if(type==1){
             apiService.LoginByWX(j).subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(new Observer<BaseMessage>() {
                         @Override
                         public void onCompleted() {
@@ -60,7 +62,7 @@ public class LoginPresenter implements LoginContract.Presenter {
 
                         @Override
                         public void onError(Throwable throwable) {
-                            view.NetError(-1, "网络异常");
+                            view.NetError(-1, "微信登录失败  请检查网络是否正常");
                         }
 
                         @Override
@@ -86,6 +88,7 @@ public class LoginPresenter implements LoginContract.Presenter {
 
         }else{
             apiService.LoginByQQ(j).subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(new Observer<BaseMessage>() {
                         @Override
                         public void onCompleted() {
@@ -94,7 +97,7 @@ public class LoginPresenter implements LoginContract.Presenter {
 
                         @Override
                         public void onError(Throwable throwable) {
-                            view.NetError(-1, "网络异常");
+                            view.NetError(-1, "QQ登录失败  请检查网络是否正常");
                         }
 
                         @Override

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

@@ -50,7 +50,7 @@ public class PhonePresenter implements PhoneContract.Presenter {
 
             apiService.getCaptcha(j)
                     .subscribeOn(Schedulers.io())
-                    .observeOn(rx.android.schedulers.AndroidSchedulers.mainThread())
+                    .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                         @Override
                         public void onError(BaseMessage baseMessage) {

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

@@ -15,6 +15,8 @@ public interface ReNameContract {
 
     interface View extends IBaseView {
        void   showTask();
+      void showDialog();
+      void hideDialog();
 
     }
 }

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

@@ -12,6 +12,7 @@ import java.util.HashMap;
 import javax.inject.Inject;
 
 import rx.Observer;
+import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
 /**
@@ -30,18 +31,19 @@ public class ReNamePresenter implements  ReNameContract.Presenter  {
     }
 
     @Override
-    public void getTask(HashMap<String, Object> map) {
+    public void getTask(HashMap<String, String> map) {
+        view.showDialog();
         JSONObject j = new JSONObject();
         j.put("nickname",map.get("nickname"));
 
-
-
         apiService.changeBaseInfo(j)
                 .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<BaseMessage>() {
                     @Override
                     public void onCompleted() {
                         Log.e("onCompleted--------","onCompleted");
+
                     }
 
                     @Override

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

@@ -0,0 +1,19 @@
+package com.sheep.gamegroup.presenter;
+
+import com.sheep.gamegroup.IBase.IBasePresenter;
+import com.sheep.gamegroup.IBase.IBaseView;
+
+/**
+ * Created by Administrator on 2018/3/10.
+ */
+
+public interface RealNameAutherContract {
+
+    interface Presenter extends IBasePresenter{
+
+    }
+
+    interface View extends IBaseView{
+           void  showGoProgress();
+    }
+}

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

@@ -0,0 +1,70 @@
+package com.sheep.gamegroup.presenter;
+
+import android.util.Log;
+
+import com.alibaba.fastjson.JSONObject;
+import com.sheep.gamegroup.exception.ExceptionEngine;
+import com.sheep.gamegroup.model.api.ApiService;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.UserInfoEntity;
+import com.sheep.gamegroup.util.FastJsonUtils;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import rx.Observer;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by Administrator on 2018/3/10.
+ */
+
+public class RealNameAutherPresenter implements  RealNameAutherContract.Presenter  {
+
+    private RealNameAutherContract.View view;
+    private ApiService apiService;
+
+    @Inject
+    public RealNameAutherPresenter(RealNameAutherContract.View view, ApiService apiService) {
+        this.view = view;
+        this.apiService = apiService;
+    }
+
+    @Override
+    public void getTask(HashMap<String, String> map) {
+       JSONObject  jsonObject=new JSONObject();
+        Iterator map1it=map.entrySet().iterator();
+        for(String key:map.keySet())
+        {
+            jsonObject.put(key,map.get(key));
+        }
+        view.showGoProgress();
+        apiService.bindALl(jsonObject).subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<BaseMessage>() {
+                    @Override
+                    public void onCompleted() {
+
+                    }
+
+                    @Override
+                    public void onError(Throwable throwable) {
+
+                        view.NetError(-1,"绑定信息失败");
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                         view.NetSuccess(0,"修改成功");
+                    }
+                });
+
+
+
+
+    }
+}

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

@@ -9,6 +9,7 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import javax.inject.Inject;
 
+import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
 /**
@@ -29,6 +30,7 @@ public class TaskListPresenter implements TaskListContract.Presenter {
     public void acceptedTask(int page, int pre_page) {
         apiService.acceptedTask(page, pre_page)
                 .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {

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

@@ -9,6 +9,7 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import javax.inject.Inject;
 
+import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
 /**
@@ -31,6 +32,7 @@ public class WithdrawalListPresenter implements WithdrawalListContract.Presenter
 
         apiService.goWithdrawal(page, per_page, start_time, end_time)
                 .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {

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

@@ -9,6 +9,7 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import javax.inject.Inject;
 
+import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
 /**
@@ -30,6 +31,7 @@ public class WithdrawalPresenter implements WithdrawalContract.Presenter {
     public void goWithdrawal(JSONObject jsonObject) {
         apiService.goWithdrawal(jsonObject)
                 .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {

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

@@ -42,10 +42,14 @@ public class ActivityManager {
      * 结束制定activity
      */
     public void endActivity(Class<? extends Activity> cls){
-        for(Activity activity: activityStack){
-            if(activity.getClass().equals(cls)){
-                endActivity(activity);
+        try{
+            for(Activity activity: activityStack){
+                if(activity.getClass().equals(cls)){
+                    endActivity(activity);
+                }
             }
+        }catch (Exception e){
+            e.printStackTrace();
         }
     }
     /**

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

@@ -23,10 +23,10 @@ public class CommonUtil {
         String result = "未审核";
         switch (type){
             case 0:
-                result = "系统审核通过";
+                result = "未审核";
                 break;
             case 1:
-                result = "未审核";
+                result = "系统审核通过";
                 break;
             case 2:
                 result = "等待人工审核";

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

@@ -6,8 +6,8 @@ package com.sheep.gamegroup.util;
 
 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://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 V1 = "/v1/";

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

@@ -8,6 +8,7 @@ import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.bean.KFIntentKeys;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.entity.UserInfoEntity;
 import com.sheep.gamegroup.model.entity.WXOnHookAccount;
 import com.sheep.gamegroup.view.activity.AccountAndSecurityAct;
 import com.sheep.gamegroup.view.activity.ActGuideDeblocked;
@@ -16,13 +17,16 @@ 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.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.LieMakeMoneyAct;
 import com.sheep.gamegroup.view.activity.LoginAct;
+import com.sheep.gamegroup.view.activity.PersionInfoAct;
 import com.sheep.gamegroup.view.activity.PersonalCenterAct;
 import com.sheep.gamegroup.view.activity.PhoneAct;
+import com.sheep.gamegroup.view.activity.RealNameAuthenAct;
 import com.sheep.gamegroup.view.activity.TaskListAct;
 import com.sheep.gamegroup.view.activity.TryMakeMoneyact;
 import com.sheep.gamegroup.view.activity.WithdrawalAct;
@@ -60,7 +64,7 @@ public class Jump2View {
 
 
     /**
-     * 跳到安全中兴
+     * 跳到安全中心
      * @param context
      * @param o
      */
@@ -76,7 +80,8 @@ public class Jump2View {
      */
     public void goLoginView(Context context, Object o){
         Intent intent = new Intent(context, LoginAct.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        if(o != null)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(intent);
     }
 
@@ -139,9 +144,9 @@ public class Jump2View {
      * @param context
      * @param o
      */
-    public void goWithdrawalResultview(Context context, Object o){
+    public void goWithdrawalResultview(Context context, String o){
         Intent intent = new Intent(context, WithdrawalResultAct.class);
-        intent.putExtra(" amount", String.valueOf(o));
+        intent.putExtra(" amount", o);
         context.startActivity(intent);
     }
 
@@ -151,6 +156,10 @@ public class Jump2View {
      * @param o false:绑定   true：切换
      */
     public void goBindOrChangeWeixinView(Context context, Object o){
+        if(!isBindWeixin(context)){
+            goNoBindWx(context, o);
+            return;
+        }
         Intent intent = new Intent(context, BindOrChangeWeixinAct.class);
         intent.putExtra("type",o==null?false:(boolean)o);
         context.startActivity(intent);
@@ -293,4 +302,39 @@ public class Jump2View {
         return false;
     }
 
+
+    /**
+     * 跳转到个人中心界面
+     * @param context
+     * @param o
+     */
+    public void goPersionInfo(Context context, UserInfoEntity o){
+        Intent i = new Intent(context, PersionInfoAct.class);
+        i.putExtra("info", o);
+        context.startActivity(i);
+    }
+
+
+    /**
+     * 跳转到验证界面
+     * @param context
+     * @param o
+     */
+    public void goRealNameAuther(Context context, UserInfoEntity o){
+        Intent i = new Intent(context, RealNameAuthenAct.class);
+        i.putExtra("info", o);
+        context.startActivity(i);
+    }
+    /**
+     * 跳转到未绑定微信界面
+     * @param context
+     * @param o
+     */
+    public void goNoBindWx(Context context, Object o){
+        Intent i = new Intent(context, ChangeWxOrTelAct.class);
+        context.startActivity(i);
+    }
+
+
+
 }

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

@@ -40,6 +40,7 @@ public class MyDbManager {
      *保存或更新表表
      */
     public void saveOrUpdateUser(UserEntity user) throws DbException {
+        deleteTable(UserEntity.class);//先清空表
         db.saveOrUpdate(user);
     }
 
@@ -93,4 +94,16 @@ public class MyDbManager {
         }
 
     }
+
+    /**
+     *删除表
+     * @param o
+     */
+    private void deleteTable(Class<?> o){
+        try {
+            db.dropTable(o);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -3,6 +3,14 @@ package com.sheep.gamegroup.util;
 import android.content.Context;
 import android.text.ClipboardManager;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.Hashtable;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * Created by Administrator on 2018/3/19.
  */
@@ -18,6 +26,218 @@ public class StringUtils {
         cm.setText(text);
     }
 
+    /**
+     * 校验银行卡卡号
+     * @param cardId
+     * @return
+     */
+    public static boolean checkBankCard(String cardId) {
+        char bit = getBankCardCheckCode(cardId.substring(0, cardId.length() - 1));
+        if(bit == 'N'){
+            return false;
+        }
+        return cardId.charAt(cardId.length() - 1) == bit;
+    }
+
+    /**
+     * 从不含校验位的银行卡卡号采用 Luhm 校验算法获得校验位
+     * @param nonCheckCodeCardId
+     * @return
+     */
+    public static char getBankCardCheckCode(String nonCheckCodeCardId){
+        if(nonCheckCodeCardId == null || nonCheckCodeCardId.trim().length() == 0
+                || !nonCheckCodeCardId.matches("\\d+")) {
+            //如果传的不是数据返回N
+            return 'N';
+        }
+        char[] chs = nonCheckCodeCardId.trim().toCharArray();
+        int luhmSum = 0;
+        for(int i = chs.length - 1, j = 0; i >= 0; i--, j++) {
+            int k = chs[i] - '0';
+            if(j % 2 == 0) {
+                k *= 2;
+                k = k / 10 + k % 10;
+            }
+            luhmSum += k;
+        }
+        return (luhmSum % 10 == 0) ? '0' : (char)((10 - luhmSum % 10) + '0');
+    }
+
+
+
+    /**
+     * 验证身份证
+     * @param IDStr
+     * @return "YES" 代表合法的身份证 ,其他值代表错误信息
+     * @throws ParseException
+     */
+    public static String IDCardValidate(String IDStr) {
+        String tipInfo = "YES";// 记录错误信息
+        String Ai = "";
+
+        if(null == IDStr || IDStr.trim().isEmpty())
+            return "身份证号码长度应该为15位或18位。";
+
+        // 判断号码的长度 15位或18位
+        if (IDStr.length() != 15 && IDStr.length() != 18) {
+            tipInfo = "身份证号码长度应该为15位或18位。";
+            return tipInfo;
+        }
+        // 18位身份证前17位位数字，如果是15位的身份证则所有号码都为数字
+        if (IDStr.length() == 18) {
+            Ai = IDStr.substring(0, 17);
+        } else if (IDStr.length() == 15) {
+            Ai = IDStr.substring(0, 6) + "19" + IDStr.substring(6, 15);
+        }
+        if (isNumeric(Ai) == false) {
+            tipInfo = "身份证15位号码都应为数字 ; 18位号码除最后一位外，都应为数字。";
+            return tipInfo;
+        }
+        // 判断出生年月是否有效
+        String strYear = Ai.substring(6, 10);// 年份
+        String strMonth = Ai.substring(10, 12);// 月份
+        String strDay = Ai.substring(12, 14);// 日期
+        if (isDate(strYear + "-" + strMonth + "-" + strDay) == false) {
+            tipInfo = "身份证出生日期无效。";
+            return tipInfo;
+        }
+        GregorianCalendar gc = new GregorianCalendar();
+        SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd");
+        try {
+            if ((gc.get(Calendar.YEAR) - Integer.parseInt(strYear)) > 150
+                    || (gc.getTime().getTime() - s.parse(strYear + "-" + strMonth + "-" + strDay).getTime()) < 0) {
+                tipInfo = "身份证生日不在有效范围。";
+                return tipInfo;
+            }
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+        } catch (java.text.ParseException e) {
+            e.printStackTrace();
+        }
+        if (Integer.parseInt(strMonth) > 12 || Integer.parseInt(strMonth) == 0) {
+            tipInfo = "身份证月份无效";
+            return tipInfo;
+        }
+        if (Integer.parseInt(strDay) > 31 || Integer.parseInt(strDay) == 0) {
+            tipInfo = "身份证日期无效";
+            return tipInfo;
+        }
+        // 判断地区码是否有效
+        Hashtable areacode = GetAreaCode();
+        // 如果身份证前两位的地区码不在Hashtable，则地区码有误
+        if (areacode.get(Ai.substring(0, 2)) == null) {
+            tipInfo = "身份证地区编码错误。";
+            return tipInfo;
+        }
+        if (isVarifyCode(Ai, IDStr) == false) {
+            tipInfo = "身份证校验码无效，不是合法的身份证号码";
+            return tipInfo;
+        }
+        return tipInfo;
+    }
+
+    /*
+     * 判断第18位校验码是否正确 第18位校验码的计算方式： 1. 对前17位数字本体码加权求和 公式为：S = Sum(Ai * Wi), i =
+     * 0, ... , 16 其中Ai表示第i个位置上的身份证号码数字值，Wi表示第i位置上的加权因子，其各位对应的值依次为： 7 9 10 5 8 4
+     * 2 1 6 3 7 9 10 5 8 4 2 2. 用11对计算结果取模 Y = mod(S, 11) 3. 根据模的值得到对应的校验码
+     * 对应关系为： Y值： 0 1 2 3 4 5 6 7 8 9 10 校验码： 1 0 X 9 8 7 6 5 4 3 2
+     */
+    private static boolean isVarifyCode(String Ai, String IDStr) {
+        String[] VarifyCode = { "1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2" };
+        String[] Wi = { "7", "9", "10", "5", "8", "4", "2", "1", "6", "3", "7", "9", "10", "5", "8", "4", "2" };
+        int sum = 0;
+        for (int i = 0; i < 17; i++) {
+            sum = sum + Integer.parseInt(String.valueOf(Ai.charAt(i))) * Integer.parseInt(Wi[i]);
+        }
+        int modValue = sum % 11;
+        String strVerifyCode = VarifyCode[modValue];
+        Ai = Ai + strVerifyCode;
+        if (IDStr.length() == 18) {
+            if (Ai.equals(IDStr) == false) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 将所有地址编码保存在一个Hashtable中
+     *
+     * @return Hashtable 对象
+     */
+    private static Hashtable GetAreaCode() {
+        Hashtable hashtable = new Hashtable();
+        hashtable.put("11", "北京");
+        hashtable.put("12", "天津");
+        hashtable.put("13", "河北");
+        hashtable.put("14", "山西");
+        hashtable.put("15", "内蒙古");
+        hashtable.put("21", "辽宁");
+        hashtable.put("22", "吉林");
+        hashtable.put("23", "黑龙江");
+        hashtable.put("31", "上海");
+        hashtable.put("32", "江苏");
+        hashtable.put("33", "浙江");
+        hashtable.put("34", "安徽");
+        hashtable.put("35", "福建");
+        hashtable.put("36", "江西");
+        hashtable.put("37", "山东");
+        hashtable.put("41", "河南");
+        hashtable.put("42", "湖北");
+        hashtable.put("43", "湖南");
+        hashtable.put("44", "广东");
+        hashtable.put("45", "广西");
+        hashtable.put("46", "海南");
+        hashtable.put("50", "重庆");
+        hashtable.put("51", "四川");
+        hashtable.put("52", "贵州");
+        hashtable.put("53", "云南");
+        hashtable.put("54", "西藏");
+        hashtable.put("61", "陕西");
+        hashtable.put("62", "甘肃");
+        hashtable.put("63", "青海");
+        hashtable.put("64", "宁夏");
+        hashtable.put("65", "新疆");
+        hashtable.put("71", "台湾");
+        hashtable.put("81", "香港");
+        hashtable.put("82", "澳门");
+        hashtable.put("91", "国外");
+        return hashtable;
+    }
+
+    /**
+     * 判断字符串是否为数字,0-9重复0次或者多次
+     *
+     * @param strnum
+     * @return
+     */
+    private static boolean isNumeric(String strnum) {
+        Pattern pattern = Pattern.compile("[0-9]*");
+        Matcher isNum = pattern.matcher(strnum);
+        if (isNum.matches()) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * 功能：判断字符串出生日期是否符合正则表达式：包括年月日，闰年、平年和每月31天、30天和闰月的28天或者29天
+     *
+     * @param string
+     * @return
+     */
+    public static boolean isDate(String strDate) {
+        Pattern pattern = Pattern.compile(
+                "^((\\d{2}(([02468][048])|([13579][26]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([02468][1235679])|([13579][01345789]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))?$");
+        Matcher m = pattern.matcher(strDate);
+        if (m.matches()) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
 
 
 

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

@@ -1,28 +1,46 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-
+import com.bumptech.glide.Glide;
 import com.sheep.gamegroup.absBase.BaseActivity;
-
 import com.sheep.gamegroup.di.components.DaggerAccountAndSercuritComponent;
 import com.sheep.gamegroup.di.modules.AccountAndSercuritModule;
+import com.sheep.gamegroup.event.RealNameAutehrChange;
+import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
 import com.sheep.gamegroup.presenter.AccountAndSecuritContract;
 import com.sheep.gamegroup.presenter.AccountAndSecuritPresenter;
+import com.sheep.gamegroup.util.ActivityManager;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.GlideImageLoader;
+import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+import com.umeng.socialize.UMAuthListener;
+import com.umeng.socialize.UMShareAPI;
+import com.umeng.socialize.bean.SHARE_MEDIA;
+import com.umeng.socialize.handler.UMWXHandler;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.xutils.ex.DbException;
+
+import java.util.Map;
 
 import javax.inject.Inject;
 
 import butterknife.BindView;
+import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 /**
@@ -56,6 +74,8 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
     @Inject
     AccountAndSecuritPresenter presenter;
     UserInfoEntity mEntity;
+    @BindView(R.id.tv_submit)
+    TextView tvSubmit;
 
 
     @Override
@@ -65,15 +85,15 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
     @Override
     public void initView() {
+        TitleBarUtils
+                .getInstance()
+                .setTitle(this, "账号与安全")
+                .setTitleFinish(this);
 
         DaggerAccountAndSercuritComponent.builder()
                 .netComponent(SheepApp.get(this).getNetComponent())
                 .accountAndSercuritModule(new AccountAndSercuritModule(this))
                 .build().inject(this);
-        TitleBarUtils
-                .getInstance()
-                .setTitle(this, "账号与安全")
-                .setTitleFinish(this);
 
     }
 
@@ -84,7 +104,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
     @Override
     public void initData() {
-
+        EventBus.getDefault().register(this);
     }
 
     @Override
@@ -93,55 +113,167 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
         presenter.getTask(null);
     }
 
-    @OnClick({R.id.rl_phone, R.id.rl_wx, R.id.rl_auther, R.id.rl_top})
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(UserNameChange done) {
+        UserInfoEntity user=mEntity;
+        user.setNickname(done.getNikeName());
+        mEntity=user;
+        tvName.setText(mEntity.getNickname());
+
+    }
+
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(RealNameAutehrChange done) {
+
+        UserInfoEntity entiy=mEntity;
+        entiy.setReal_name(done.getRealName());
+        entiy.setId_number(done.getIdCard());
+        entiy.setBank_card(done.getBanck());
+        mEntity=entiy;
+        refalshAuther(mEntity);
+
+    }
+
+
+
+
+    @OnClick({R.id.rl_phone, R.id.rl_wx, R.id.rl_auther, R.id.rl_top,R.id.tv_submit})
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.rl_phone:   //跳转到绑定手机号
+
                 break;
             case R.id.rl_wx:  ////跳转到微信
+                Jump2View.getInstance().goBindOrChangeWeixinView(AccountAndSecurityAct.this,"");
                 break;
             case R.id.rl_auther: ////跳转授权
+                Jump2View.getInstance().goRealNameAuther(AccountAndSecurityAct.this,mEntity);
                 break;
 
             case R.id.rl_top:
-                Intent i = new Intent(AccountAndSecurityAct.this, PersionInfoAct.class);
-                i.putExtra("info", mEntity);
-                startActivity(i);
+                Jump2View.getInstance().goPersionInfo(AccountAndSecurityAct.this,mEntity);
+                break;
+            case R.id.tv_submit:
+                loginOut();
                 break;
         }
     }
 
+    private  void  loginOut(){
+        UMShareAPI api=  UMShareAPI.get(this);
+        api.deleteOauth(this, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
+            @Override
+            public void onStart(SHARE_MEDIA platform) {
+            }
+
+            @Override
+            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
+            }
+
+            @Override
+            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
+                hideProgress();
+            }
+
+            @Override
+            public void onCancel(SHARE_MEDIA platform, int action) {
+                hideProgress();
+            }
+        });
+
+        api.deleteOauth(this, SHARE_MEDIA.QQ, new UMAuthListener() {
+            @Override
+            public void onStart(SHARE_MEDIA platform) {
+            }
+
+            @Override
+            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
+            }
+
+            @Override
+            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
+                hideProgress();
+            }
+
+            @Override
+            public void onCancel(SHARE_MEDIA platform, int action) {
+                hideProgress();
+            }
+        });
+        SpUtils.login(this, "");
+        ActivityManager.getInstance().finishAllActivity();
+        Jump2View.getInstance().goLoginView(AccountAndSecurityAct.this,"");
+        finish();
+    }
+
+
     @Override
     public void NetSuccess(int code, String msg) {
-
+        showToast(msg);
     }
 
     @Override
     public void NetError(int code, String errorMsg) {
-
+        showToast(errorMsg);
 
     }
 
 
     @Override
     public void showTask(final UserInfoEntity entity) {
-        mEntity = entity;
-        tvName.setText(entity.getNickname());
-        tvLinkContent.setText("绵羊号:" + entity.getInvitation_code());
-        tvPhone.setText(entity.getMobile());
-        tvWx.setText(entity.getWx_openid());
-        GlideImageLoader.displayImage(this, ivHead, entity.getAvatar(), R.drawable.logoin_head);
+                mEntity = entity;
+                tvName.setText(entity.getNickname());
+                tvLinkContent.setText("绵羊号:" + entity.getInvitation_code());
+                if (TextUtils.isEmpty(entity.getMobile())) {
+                    tvPhone.setText("未绑定");
+                } else {
+                    tvPhone.setText(entity.getMobile());
+                }
+
+                Glide.with(AccountAndSecurityAct.this)
+                        .load(mEntity.getAvatar())
+                        .placeholder(R.mipmap.x_ic_def_head)
+                        .into(ivHead);
+                if (TextUtils.isEmpty(entity.getWx_nickname())) {
+                    tvWx.setText("未绑定");
+                } else {
+                    tvWx.setText(entity.getWx_nickname());
+                }
+
+                refalshAuther(entity);
+
+    }
+
+    private  void  refalshAuther(UserInfoEntity entity ){
         boolean isBanck = TextUtils.isEmpty(entity.getBank_card());
         boolean isId_number = TextUtils.isEmpty(entity.getId_number());
         boolean isRoalName = TextUtils.isEmpty(entity.getReal_name());
-
         if (isBanck && isId_number && isRoalName) {
-
             tvAuther.setText("未认证");
         } else if (!isBanck && !isId_number && !isRoalName) {
             tvAuther.setText("已认证");
         } else {
             tvAuther.setText("认证中");
         }
+
+    }
+
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
+
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
     }
+
 }

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

@@ -1,11 +1,7 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.AlertDialog;
-import android.app.Dialog;
 import android.graphics.Bitmap;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
@@ -13,7 +9,6 @@ import android.widget.TextView;
 
 
 import com.sheep.gamegroup.absBase.BaseUMActivity;
-
 import com.sheep.gamegroup.di.components.DaggerAskGetMoneyComponent;
 import com.sheep.gamegroup.di.modules.AskGetMoneyModule;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
@@ -35,7 +30,6 @@ import com.uuzuche.lib_zxing.activity.CodeUtils;
 import javax.inject.Inject;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 /**
@@ -60,7 +54,7 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
     @BindView(R.id.rl_link)
     RelativeLayout rlLink;
 
-    private  FriendAndAwardEntity  mEntity;
+    private FriendAndAwardEntity mEntity;
 
     @Override
     protected int getLayoutId() {
@@ -69,14 +63,13 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
 
     @Override
     public void initView() {
+        TitleBarUtils.getInstance()
+                .setTitle(this,"邀请赚钱")
+                .setTitleFinish(this);
         DaggerAskGetMoneyComponent.builder().askGetMoneyModule(new AskGetMoneyModule(this))
                 .netComponent(SheepApp.get(this).getNetComponent())
                 .build()
                 .inject(this);
-
-        TitleBarUtils.getInstance()
-                .setTitle(this, "邀请赚钱")
-                .setTitleFinish(this);
     }
 
     @Override
@@ -206,7 +199,7 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
         this.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                tvSize.setText(mEntity.getFrind_count()+"");
+                tvSize.setText(mEntity.getFriend_count()+"");
                 tvMoney.setText(mEntity.getAward());
             }
         });

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

@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.googlecode.protobuf.format.util.TextUtils;
 import com.sheep.gamegroup.di.components.DaggerBindDataComponent;
 import com.sheep.gamegroup.di.modules.BindDataModule;
+import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.presenter.BindDataContract;
 import com.sheep.gamegroup.presenter.BindDataPresenter;
 import com.sheep.gamegroup.util.ActivityManager;
@@ -63,15 +64,14 @@ public class BindDataAct extends BaseActivity implements BindDataContract.View {
     @Override
     public void upView(Object o) {
         hideProgress();
-        G.showToast("ok");
-        Toast.makeText(activity, "绑定成功",Toast.LENGTH_SHORT);
+        G.showToast("绑定成功");
         finish();
 
     }
 
     @Override
     public void failView(Object o) {
-        G.showToast("error");
+        G.showToast(((BaseMessage)o).getMsg()+"");
         hideProgress();
     }
 
@@ -147,16 +147,16 @@ public class BindDataAct extends BaseActivity implements BindDataContract.View {
                 value = textEt.getText().toString();
                 break;
             case 40002:
-                key = "bank_card";
+                key = "id_number";
                 title = "绑定身份证";
-                textLayout.setVisibility(View.GONE);
-                numberNoticeTv.setVisibility(View.GONE);
-                value = numberEt.getText().toString();
+                numberLayout.setVisibility(View.GONE);
+                textNoticeTv.setVisibility(View.GONE);
+                value = textEt.getText().toString();
                 break;
             case 40003:
-                key = "id_number";
+                key = "bank_card";
                 title = "绑定银行卡";
-                textNoticeTv.setText("真实姓名");
+                textLayout.setVisibility(View.GONE);
                 numberNoticeTv.setText("卡号");
                 value = numberEt.getText().toString();
                 break;

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

@@ -16,6 +16,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.presenter.BindOrChangeWeixinContract;
 import com.sheep.gamegroup.presenter.BindOrChangeWeixinPresenter;
+import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.jiuyan.samllsheep.R;
@@ -127,6 +128,8 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
         } catch (DbException e) {
             e.printStackTrace();
         }
+        ActivityManager.getInstance()
+                .endActivity(ChangeWxOrTelAct.class);
         finish();
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_FGT_FAMLLSHEEP));
     }

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

@@ -0,0 +1,50 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.os.Bundle;
+import android.widget.TextView;
+
+import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * Created by ljy on 2018/3/26.
+ */
+
+public class ChangeWxOrTelAct extends BaseActivity {
+    @BindView(R.id.sure_tv)
+    TextView sureTv;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.change_wx_tel_layout;
+    }
+
+    @Override
+    public void initView() {
+        ButterKnife.bind(this);
+        TitleBarUtils.getInstance()
+                .setTitle(this,"绑定微信号")
+                .setTitleFinish(this);
+
+    }
+
+    @Override
+    public void initListener() {
+
+    }
+
+    @Override
+    public void initData() {
+
+    }
+    @OnClick(R.id.sure_tv)
+    public void onViewClicked() {
+        Jump2View.getInstance().goBindOrChangeWeixinView(ChangeWxOrTelAct.this, true);
+    }
+}

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

@@ -9,18 +9,12 @@ import android.preference.DialogPreference;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
-import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-import android.widget.ArrayAdapter;
-import android.widget.BaseAdapter;
 import android.widget.ImageView;
-import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -46,24 +40,16 @@ import com.sheep.gamegroup.view.adapter.TaskStateAdapter;
 import com.sheep.gamegroup.view.customview.SProgress;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.adapter.DownListAdapter;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.download.DownloadInfo;
 import com.sheep.jiuyan.samllsheep.download.DownloadManager;
 import com.sheep.jiuyan.samllsheep.download.DownloadState;
-import com.sheep.jiuyan.samllsheep.download.DownloadViewHolder;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
 
 import org.greenrobot.eventbus.EventBus;
-import org.xutils.HttpManager;
-import org.xutils.common.Callback;
-import org.xutils.common.task.PriorityExecutor;
 import org.xutils.ex.DbException;
-import org.xutils.http.HttpMethod;
-import org.xutils.http.RequestParams;
 import org.xutils.x;
 
 import java.io.File;
@@ -115,7 +101,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
      * 下载
      */
     private DownLoadTvAdp loadTvAdp;
-    private Callback.Cancelable cancelable;
+    private List<DownloadInfo> infoList = new ArrayList<>();
 
     @Inject
     TaskDialogPresenter preference;
@@ -128,6 +114,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                 case 0:
                     task_entity.setRunTask(1);
                     setBtnState();
+                    loadTvAdp.notifyDataSetChanged();
                     break;
                 case 1:
                     Bundle bundle = msg.getData();
@@ -147,7 +134,6 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         setContentView(R.layout.download_item_dialog);
         ButterKnife.bind(this);
         activity = this;
-        x.view().inject(this);
         initViews();
         initDatas();
     }
@@ -162,15 +148,18 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                 .into(dialogItemIconIv);
         dialogItemNameTv.setText(task_entity.getName());
         dialogItemSizeTv.setText( task_entity.getPackage_size() + "M");
-        isDownLoad = PackageUtil.isAppInstalled(SheepApp.mContext, task_entity.getPackage_names());
+        isDownLoad = PackageUtil.isAppInstalled(activity, task_entity.getPackage_names());
 
-        downLoadApk();
+        isHaveLoad();
+//        downLoadApk();
         /**
          * 下载
          */
-        loadTvAdp = new DownLoadTvAdp(activity);
+        loadTvAdp = new DownLoadTvAdp(activity, infoList);
         listview_down.setAdapter(loadTvAdp);
 
+         setBtnState();
+
         //Todo ok
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("id",task_entity.getRelease_task_id());
@@ -178,7 +167,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
 
     }
 
-        private void initViews() {
+    private void initViews() {
 
 //        startStaskSprogress.setVisibility(View.GONE);
         task_entity = (TaskEty) getIntent().getSerializableExtra("task_entity");
@@ -191,7 +180,6 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                 .taskDialogModule(new TaskDialogModule(this))
                 .build()
                 .inject(DialogActivity.this);
-        setBtnState();
         webview.setWebChromeClient(new WebChromeClient() {
 
         });
@@ -277,7 +265,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         startStaskSprogress.setVisibility(View.VISIBLE);
         if (task_entity != null) {
             ClassFileHelper.getInstance().createSDDirection();
-            final File mApkPath = new File(ClassFileHelper.DIR, task_entity.getTask_name() + ClassFileHelper.FILE_SUFFIX);
+            File mApkPath = new File(ClassFileHelper.DIR, task_entity.getTask_name() + ClassFileHelper.FILE_SUFFIX);
             if (!mApkPath.exists()) {
 //                new File(mApkPath.getAbsolutePath());
                 try{
@@ -302,65 +290,6 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                     downloadInfo.setPkgName(task_entity.getPackage_names());
                     MyDbManager.getInstance().saveOrUpdateUser(downloadInfo);//保存到数据库
                 }
-
-
-                //设置请求参数
-                RequestParams params = new RequestParams(task_entity.getDownload_link());
-                params.setAutoResume(true);//设置是否在下载是自动断点续传
-                params.setAutoRename(false);//设置是否根据头信息自动命名文件
-                params.setSaveFilePath(mApkPath.getAbsolutePath());
-                params.setExecutor(new PriorityExecutor(2, true));//自定义线程池,有效的值范围[1, 3], 设置为3时, 可能阻塞图片加载.
-                params.setCancelFast(true);//是否可以被立即停止.
-                cancelable = x.http().get(params, new Callback.ProgressCallback<File>(){
-
-                    @Override
-                    public void onSuccess(File file) {
-                        Log.e("-----下载","onSuccess");
-                        PackageUtil.installApk(getApplicationContext(), mApkPath.getAbsolutePath());
-                    }
-
-                    @Override
-                    public void onError(Throwable throwable, boolean b) {
-                        Log.e("-----下载","onError--"+"throwable:"+throwable.getMessage()+",b:"+b);
-
-                    }
-
-                    @Override
-                    public void onCancelled(CancelledException e) {
-                        Log.e("-----下载","onCancelled");
-
-                    }
-
-                    @Override
-                    public void onFinished() {
-                        Log.e("-----下载","onFinished");
-
-                    }
-
-                    @Override
-                    public void onWaiting() {
-                        Log.e("-----下载","onWaiting");
-
-                    }
-
-                    @Override
-                    public void onStarted() {
-                        Log.e("-----下载","onStarted");
-
-                    }
-
-                    @Override
-                    public void onLoading(long total, long current, boolean b) {
-                        Log.e("-----下载","onLoading--total:"+total+",current:"+current+",b:"+b);
-                        Message message = new Message();
-                        message.what = 1;
-                        Bundle bundle = new Bundle();
-                        bundle.putLong("total", total);
-                        bundle.putLong("current", current);
-                        message.setData(bundle);
-                        handler.sendMessage(message);
-                    }
-                });
             } else {
                 PackageUtil.installApk(getApplicationContext(), mApkPath.getAbsolutePath());
             }
@@ -375,28 +304,29 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     /**
      * 判断apk是否下载过
      */
-    private void isHave(){
+    private DownloadInfo isHaveLoad(){
+        DownloadInfo downloadInfo = null;
         if (task_entity != null) {
             ClassFileHelper.getInstance().createSDDirection();
             File mApkPath = new File(ClassFileHelper.DIR, task_entity.getTask_name() + ClassFileHelper.FILE_SUFFIX);
-            if (!mApkPath.exists()) {
-                DownloadInfo downloadInfo = MyDbManager.getInstance().dbFindDownLoad(task_entity.getTask_name(), mApkPath.getAbsolutePath());
-                if (downloadInfo == null) {
-                    downloadInfo = new DownloadInfo();
-                    downloadInfo.setUrl(task_entity.getDownload_link());
-                    downloadInfo.setAutoRename(false);
-                    downloadInfo.setAutoResume(true);
-                    downloadInfo.setLabel(task_entity.getTask_name());
-                    downloadInfo.setFileSavePath(mApkPath.getAbsolutePath());
-                    downloadInfo.setIcon(task_entity.getIcon());
-                    downloadInfo.setState(DownloadState.STARTED);
-                    downloadInfo.setPkgName(task_entity.getPackage_names());
-                    MyDbManager.getInstance().saveOrUpdateUser(downloadInfo);//保存到数据库
-                }else{
-                    start_task_tv.setText("继续下载");
-                }
+            downloadInfo = MyDbManager.getInstance().dbFindDownLoad(task_entity.getTask_name(), mApkPath.getAbsolutePath());
+            if (downloadInfo == null) {
+                downloadInfo = new DownloadInfo();
+                downloadInfo.setUrl(task_entity.getDownload_link());
+                downloadInfo.setAutoRename(false);
+                downloadInfo.setAutoResume(true);
+                downloadInfo.setLabel(task_entity.getTask_name());
+                downloadInfo.setFileSavePath(mApkPath.getAbsolutePath());
+                downloadInfo.setIcon(task_entity.getIcon());
+                downloadInfo.setState(DownloadState.STARTED);
+                downloadInfo.setPkgName(task_entity.getPackage_names());
+                MyDbManager.getInstance().saveOrUpdateUser(downloadInfo);//保存到数据库
             }
+
+                infoList.clear();
+                infoList.add(downloadInfo);
         }
+        return downloadInfo;
     }
     /**
      * 去试玩
@@ -409,6 +339,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
      * 按钮状态
      */
     private void setBtnState(){
+
         type = 0;
         if(task_entity.getRunTask() == 0){//开始任务
             buttonStr = "开始任务";
@@ -423,6 +354,10 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
             }
         }
         start_task_tv.setText(buttonStr);
+
+        loadTvAdp.setTaskState(type);
+        loadTvAdp.addTaskPreference(preference);
+        loadTvAdp.addTaskEty(task_entity);
     }
 
     /**
@@ -437,7 +372,6 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                 handler.sendEmptyMessage(0);
                 G.showToast("接收任务成功");
             }
-
             EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
         }catch (Exception e){
             e.printStackTrace();
@@ -448,7 +382,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     @Override
     public void startTaskFailView(Object o) {
 
-        G.showToast("开启任务失败");
+        G.showToast(((BaseMessage)o).getMsg()+ "");
 
     }
 
@@ -481,9 +415,6 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if(cancelable != null){
-            cancelable.cancel();
-        }
     }
 
 }

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

@@ -103,6 +103,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
             finish();
         } else {
             Jump2View.getInstance().goPhoneLoginView(LoginAct.this, false);
+//            finish();
         }
     }
 
@@ -110,6 +111,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
         UMShareAPI.get(this).doOauthVerify(this, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
             @Override
             public void onStart(SHARE_MEDIA platform) {
+                showProgress();
             }
 
             @Override

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

@@ -4,31 +4,34 @@ import android.app.AlertDialog;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.kfzs.duanduan.ActPicturesEnlarge;
-import com.kfzs.duanduan.bean.KFIntentKeys;
 import com.lzy.imagepicker.bean.ImageItem;
 import com.sheep.gamegroup.absBase.BaseActivity;
+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.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity;
+import com.sheep.jiuyan.samllsheep.page.entry.User;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 import butterknife.BindView;
 import butterknife.OnClick;
 
+import static com.sheep.jiuyan.samllsheep.utils.G.mUser;
+
 
 /**
  * Created by Administrator on 2018/3/16.
@@ -47,10 +50,10 @@ public class PersionInfoAct extends AbsChooseImageActivity {
     ImageView tvQr;
     @BindView(R.id.rl_qr)
     RelativeLayout rlQr;
-    @BindView(R.id.rl_head)
-    RelativeLayout rl_head;
     @BindView(R.id.iv_head_right)
     ImageView ivHeadRight;
+    @BindView(R.id.rl_head)
+    RelativeLayout rl_head;
 
     @Override
     protected int getLayoutId() {
@@ -59,7 +62,10 @@ public class PersionInfoAct extends AbsChooseImageActivity {
 
     @Override
     public void initView() {
-
+        TitleBarUtils
+                .getInstance()
+                .setTitle(this, "个人资料")
+                .setTitleFinish(this);
     }
 
     @Override
@@ -71,20 +77,37 @@ public class PersionInfoAct extends AbsChooseImageActivity {
     public void initData() {
         Intent i = getIntent();
         if (i != null && i.hasExtra("info")) {
-            mEntity = i.getParcelableExtra("info");
+            mEntity = (UserInfoEntity) i.getSerializableExtra("info");
             if(mEntity!=null) {
                 tvNike.setText(mEntity.getNickname());
                 tvSheepId.setText(mEntity.getInvitation_code());
                 Bitmap mBitmap = CodeUtils.createImage(mEntity.getShare_link(), 30, 30, null);
                 tvQr.setImageBitmap(mBitmap);
-                GlideImageLoader.displayImage(this, ivHeadRight, mEntity.getAvatar(), R.drawable.logoin_head);
+
+                Glide.with(PersionInfoAct.this)
+                        .load(mEntity.getAvatar())
+                        .placeholder(R.mipmap.ic_launcher)
+                        .into(ivHeadRight);
             }
         }
 
+        EventBus.getDefault().register(this);
+
     }
 
-    private void showQR() {
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(UserNameChange done) {
+        UserInfoEntity user=mEntity;
+        user.setNickname(done.getNikeName());
+        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);
         builder.setView(view);
@@ -106,12 +129,30 @@ public class PersionInfoAct extends AbsChooseImageActivity {
 
 
     private void showHead() {
-        final HashMap<Integer, String> mUrlsCollection = new HashMap<>();
-        mUrlsCollection.put(0,mEntity.getAvatar());
-        Intent picEnlargeIntent = new Intent(this, ActPicturesEnlarge.class);
-        picEnlargeIntent.putExtra(KFIntentKeys.EXTRA_CURRENT_PICTURE_INDEX, 0);
-        picEnlargeIntent.putExtra(KFIntentKeys.EXTRA_CURRENT_PICTURE_COLLECTIONS, mUrlsCollection);
-        startActivity(picEnlargeIntent);
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        View view = View.inflate(this, R.layout.x_ask_qr_dialog, null);
+        builder.setView(view);
+        final AlertDialog dialog = builder.create();
+        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;
+        iv_qr.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+        iv_qr.setLayoutParams(params);
+        Glide.with(PersionInfoAct.this)
+                .load(mEntity.getAvatar())
+                .placeholder(R.mipmap.ic_launcher)
+                .into(iv_qr);
+        dialog.show();
+        iv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+
+
     }
 
 
@@ -129,6 +170,7 @@ public class PersionInfoAct extends AbsChooseImageActivity {
                 break;
             case R.id.rl_qr:
                 showQR();
+                break;
             case R.id.rl_head:
                 showChooseDialog();
                 break;
@@ -144,4 +186,9 @@ public class PersionInfoAct extends AbsChooseImageActivity {
     protected void onGetImage(ImageItem image) {
         GlideImageLoader.displayImage(this, ivHeadRight, image.path, R.drawable.logoin_head);
     }
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
 }

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

@@ -11,11 +11,14 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerPersonalCenterComponent;
 import com.sheep.gamegroup.di.modules.PersonalCenterModule;
+import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.entity.UserInfoEntity;
 import com.sheep.gamegroup.presenter.PersonalCenterContract;
 import com.sheep.gamegroup.presenter.PersonalCenterPresenter;
 import com.sheep.gamegroup.util.Jump2View;
@@ -24,6 +27,10 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;
@@ -79,10 +86,13 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
                 .personalCenterModule(new PersonalCenterModule(this))
                 .build()
                 .inject(this);
-        TitleBarUtils.getInstance()
+
+        TitleBarUtils
+                .getInstance()
                 .setTitle(this, "个人中心")
                 .setTitleFinish(this);
 
+
     }
 
     @Override
@@ -93,8 +103,12 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
     @Override
     public void initData() {
         presenter.getUserInfo();
+
     }
 
+
+
+
     @OnClick({R.id.my_price, R.id.my_all_price, R.id.withdrawal, R.id.account_safe_layout, R.id.account_task_layout, R.id.account_detail_layout})
     public void onViewClicked(View view) {
         switch (view.getId()) {

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

@@ -7,6 +7,7 @@ import android.support.v7.widget.AppCompatEditText;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -14,8 +15,10 @@ import com.alibaba.fastjson.JSONObject;
 
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerPhoneComponent;
+import com.sheep.gamegroup.di.components.NetComponent;
 import com.sheep.gamegroup.di.modules.PhoneModule;
 import com.sheep.gamegroup.exception.ApiException;
+import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.LoginEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
@@ -58,6 +61,8 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
     TextView phoneBtnCode;
     @BindView(R.id.phone_sure_tv)
     TextView phoneSureTv;
+    @BindView(R.id.phone_iv)
+    ImageView phone_iv;
 
     @Inject
     PhonePresenter phonePresenter;
@@ -71,6 +76,9 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
     private String etCode;
     private boolean showNotice = false;//false：手机登录，true：绑定手机
 
+    private int  bindPhone;
+
+
     @Override
     protected int getLayoutId() {
         return R.layout.bind_phone_number_act_layout;
@@ -148,12 +156,12 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
                 getCaptcha();
                 break;
             case R.id.phone_sure_tv:
-                if(BuildConfig.DEBUG){
+                etPhone = phoneEtAccount.getText().toString().trim();
+                etCode = phoneEtCode.getText().toString().trim();
+                if(BuildConfig.DEBUG && TextUtils.isEmpty(etCode) && TextUtils.isEmpty(etPhone)){
                     goMain();
                     return;
                 }
-                etPhone = phoneEtAccount.getText().toString().trim();
-                etCode = phoneEtCode.getText().toString().trim();
                 loginByPhoneGaptcha();
                 break;
         }
@@ -233,7 +241,6 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
     @Override
     public void returnLogindata(Object o) {
         hideProgress();
-        hideProgress();
         if (o == null) {
             return;
         }

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

@@ -1,37 +1,46 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.content.Intent;
-import android.widget.Button;
+import android.os.Bundle;
 import android.widget.EditText;
+import android.widget.TextView;
 
+import com.googlecode.protobuf.format.util.TextUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
-
 import com.sheep.gamegroup.di.components.DaggerReNameComponent;
 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.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.HashMap;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;
+import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 /**
  * Created by Administrator on 2018/3/24.
  */
 
-public class ReNameActivity extends BaseActivity implements ReNameContract.View{
+public class ReNameActivity extends BaseActivity implements ReNameContract.View {
 
 
     @BindView(R.id.et)
     EditText et;
-    @BindView(R.id.btn)
-    Button btn;
+
     @Inject
     ReNamePresenter presenter;
+    @BindView(R.id.tv_submit)
+    TextView tvSubmit;
+
     @Override
     protected int getLayoutId() {
         return R.layout.x_rename_act_layout;
@@ -39,7 +48,10 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View{
 
     @Override
     public void initView() {
-
+        TitleBarUtils
+                .getInstance()
+                .setTitle(this, "修改昵称")
+                .setTitleFinish(this);
         DaggerReNameComponent.builder()
                 .netComponent(SheepApp.get(this).getNetComponent())
                 .reNameModule(new ReNameModule(this))
@@ -68,24 +80,42 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View{
     }
 
 
-    @OnClick(R.id.btn)
-    public void onClick() {
-
-
-    }
-
     @Override
     public void NetSuccess(int code, String msg) {
         showToast(msg);
+        UserNameChange  name=new UserNameChange();
+        name.setNikeName(et.getText().toString());
+        EventBus.getDefault().post(name);
+        finish();
     }
 
     @Override
     public void NetError(int code, String errorMsg) {
-         showToast(errorMsg);
+        showToast(errorMsg);
+        hideProgress();
     }
 
     @Override
     public void showTask() {
 
     }
+
+    @Override
+    public void showDialog() {
+        showProgress();
+    }
+
+    @Override
+    public void hideDialog() {
+        hideProgress();
+    }
+
+
+    @OnClick(R.id.tv_submit)
+    public void onClick() {
+        HashMap<String,String>  map=new HashMap<>();
+        map.put("nickname",et.getText().toString());
+        presenter.getTask(map);
+
+    }
 }

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

@@ -0,0 +1,194 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.bumptech.glide.Glide;
+import com.googlecode.protobuf.format.util.TextUtils;
+import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.di.components.DaggerAccountAndSercuritComponent;
+import com.sheep.gamegroup.di.components.DaggerRealNameAutherComponent;
+import com.sheep.gamegroup.di.modules.AccountAndSercuritModule;
+import com.sheep.gamegroup.di.modules.RealNameAutherModule;
+import com.sheep.gamegroup.event.RealNameAutehrChange;
+import com.sheep.gamegroup.model.entity.UserInfoEntity;
+import com.sheep.gamegroup.presenter.RealNameAutherContract;
+import com.sheep.gamegroup.presenter.RealNameAutherPresenter;
+import com.sheep.gamegroup.util.StringUtils;
+import com.sheep.gamegroup.view.dialog.DialogAccountAbnormal;
+import com.sheep.gamegroup.view.dialog.DialogRealNameAuther;
+import com.sheep.jiuyan.samllsheep.R;
+
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+import com.uuzuche.lib_zxing.activity.CodeUtils;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.HashMap;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * Created by Administrator on 2018/3/26.
+ */
+
+public class RealNameAuthenAct extends BaseActivity implements RealNameAutherContract.View {
+
+    @BindView(R.id.et_id_card)
+    EditText etIdCard;
+    @BindView(R.id.et_bank)
+    EditText etBank;
+    @BindView(R.id.tv_submit)
+    TextView tvSubmit;
+    @BindView(R.id.et_name)
+    EditText etName;
+
+    UserInfoEntity mEntity;
+    @Inject
+    RealNameAutherPresenter  presenter;
+
+    HashMap<String ,String>  map=new HashMap<>();
+
+    private  int  count=0;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.x_real_name_auther_layout;
+    }
+
+    @Override
+    public void initView() {
+
+    }
+
+    @Override
+    public void initListener() {
+    }
+    @Override
+    public void initData() {
+       DaggerRealNameAutherComponent.builder().netComponent(SheepApp.get(this).getNetComponent()).realNameAutherModule( new RealNameAutherModule(this)).build().inject(this);
+        TitleBarUtils
+                .getInstance()
+                .setTitle(this, "实名认证")
+                .setTitleFinish(this);
+
+
+        Intent i = getIntent();
+        if (i != null && i.hasExtra("info")) {
+            mEntity = (UserInfoEntity) i.getSerializableExtra("info");
+            if(mEntity!=null) {
+
+                if(!android.text.TextUtils.isEmpty(mEntity.getReal_name())){
+                    etName.setText(mEntity.getReal_name());
+                    count=count+1;
+                    etName.setEnabled(false);
+                }
+                if(!android.text.TextUtils.isEmpty(mEntity.getId_number())){
+                    etIdCard.setText(mEntity.getId_number());
+                    count=count+1;
+                    etIdCard.setEnabled(false);
+                }
+
+                if(!android.text.TextUtils.isEmpty(mEntity.getBank_card())){
+                    etBank.setText(mEntity.getBank_card());
+                    count=count+1;
+                    etBank.setEnabled(false);
+                }
+                if(count>=3){
+                    tvSubmit.setEnabled(false);
+                    tvSubmit.setBackgroundColor(getResources().getColor(R.color.txt_black_9e9c9c));
+                }else{
+                    DialogRealNameAuther.showDialog(this);
+                }
+
+            }
+        }
+
+
+    }
+
+    @Override
+    public void NetSuccess(int code, String msg) {
+          hideProgress();
+          showToast(msg);
+           RealNameAutehrChange  change=new RealNameAutehrChange();
+           for(String key:map.keySet())
+           {
+              if(key.equals("real_name")&& !android.text.TextUtils.isEmpty(map.get(key))){
+                  change.setRealName(map.get(key));
+              }
+               if(key.equals("id_number")&& !android.text.TextUtils.isEmpty(map.get(key))){
+                   change.setIdCard(map.get(key));
+               }
+               if(key.equals("bank_card")&& !android.text.TextUtils.isEmpty(map.get(key))){
+                   change.setBanck(map.get(key));
+               }
+
+         }
+        EventBus.getDefault().post(change);
+          finish();
+    }
+
+    @Override
+    public void NetError(int code, String errorMsg) {
+        hideProgress();
+        showToast(errorMsg);
+    }
+
+
+
+    @OnClick(R.id.tv_submit)
+    public void onClick() {
+        if(android.text.TextUtils.isEmpty(etName.getText().toString())){
+           showToast("姓名不能为空");
+           return;
+        }
+        map.put("real_name",etName.getText().toString());
+        if(!android.text.TextUtils.isEmpty(etIdCard.getText().toString())){
+            String str=StringUtils.IDCardValidate(etIdCard.getText().toString());
+             if(!str.equals("YES")){
+                 showToast(str+":请填写正确的身份证信息哈！");
+                 return ;
+
+             }else{
+                     map.put("id_number",etIdCard.getText().toString());
+                 if(!android.text.TextUtils.isEmpty(etBank.getText().toString())){
+                     if(StringUtils.checkBankCard(etBank.getText().toString())){
+                         map.put("bank_card",etBank.getText().toString());
+                     }else{
+                         showToast("银行卡不合法哈!");
+                         return ;
+
+                     }
+                 }
+             }
+
+        }
+
+        if(map.size()>0){
+            presenter.getTask(map);
+
+        }else{
+            showToast("亲！ 请填写修改信息哈");
+        }
+
+
+
+
+
+    }
+
+
+    @Override
+    public void showGoProgress() {
+        showProgress();
+    }
+}

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

@@ -15,13 +15,13 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerSplashComponent;
 import com.sheep.gamegroup.di.modules.SplashModule;
 import com.sheep.gamegroup.presenter.SplashContract;
 import com.sheep.gamegroup.presenter.SplashPresenter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.page.LoginActivity;
 import com.sheep.jiuyan.samllsheep.page.MainActivity;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
@@ -146,10 +146,10 @@ public class SplashAct extends BaseActivity implements SplashContract.View, Easy
         startActivity(intent);
     }
 
-    private void goMain() {
+    private synchronized void goMain() {
         String openId = SpUtils.getOpenId(getApplicationContext());
         if (!TextUtils.isEmpty(openId)) {
-            Intent intent = new Intent(activity, MainActivity.class);
+            Intent intent = new Intent(activity, com.kfzs.duanduan.ActMain.class);
             startActivity(intent);
             finish();
         } else {

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

@@ -2,6 +2,8 @@ package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.widget.ListView;
 
 import com.alibaba.fastjson.JSONArray;
@@ -18,6 +20,7 @@ import com.sheep.gamegroup.view.adapter.TaskListItemAdp;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.util.ArrayList;
@@ -62,6 +65,8 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View{
                 .setTitle(this, "任务记录")
                 .setTitleFinish(this);
         adp = new TaskListItemAdp(activity , etyList);
+        withdrawalListview.setAdapter(adp);
+        adp.notifyDataSetChanged();
 
     }
 
@@ -91,6 +96,6 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View{
 
     @Override
     public void failView(Object o) {
-
+        G.showToast(((BaseMessage) o).getMsg()+"");
     }
 }

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

@@ -29,6 +29,7 @@ import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.util.List;
@@ -72,6 +73,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
 
     @Override
     public void initView() {
+        EventBus.getDefault().register(this);
         ButterKnife.bind(this);
         activity = this;
         TitleBarUtils
@@ -100,7 +102,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
                 refresh.setRefreshing(false);
             }
         });
-        recyclerview.setOnScrollListener(new RecyclerView.OnScrollListener() {
+        recyclerview.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
                 super.onScrollStateChanged(recyclerView, newState);
@@ -241,4 +243,11 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
                 break;
         }
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        EventBus.getDefault().unregister(this);
+    }
 }

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

@@ -194,6 +194,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
         hideProgress();
         EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_FGT_FAMLLSHEEP));
 //        BaseMessage baseMessage = (BaseMessage) o;
+        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.INTENT_AMOUNT_VALUE));
         Jump2View.getInstance().goWithdrawalResultview(activity, amount);
     }
 }

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

@@ -16,6 +16,7 @@ import com.sheep.gamegroup.view.adapter.WithdrawalListAdp;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.util.ArrayList;
@@ -92,6 +93,6 @@ public class WithdrawalListAct extends BaseActivity implements WithdrawalListCon
 
     @Override
     public void failView(Object o) {
-
+        G.showToast(((BaseMessage) o).getMsg()+"");
     }
 }

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

@@ -6,6 +6,8 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.view.DialogStorageLow;
 import com.sheep.gamegroup.di.components.DaggerWithdrawalResultComponent;
 import com.sheep.gamegroup.di.modules.WithdrawalResultModule;
 import com.sheep.gamegroup.presenter.WithdrawalResultContract;
@@ -16,6 +18,8 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.greenrobot.eventbus.Subscribe;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;
@@ -50,6 +54,7 @@ public class WithdrawalResultAct extends BaseActivity implements WithdrawalResul
     public void initView() {
         activity = this;
         amount = getIntent().getStringExtra("amount");
+        withdrawalSuccessMoneyTv.setText("+"+amount+"元");
         TitleBarUtils.getInstance()
                 .setTitle(activity, "提现成功")
                 .setTitleFinish(activity);
@@ -92,4 +97,14 @@ public class WithdrawalResultAct extends BaseActivity implements WithdrawalResul
         super.onDestroy();
         ActivityManager.getInstance().endActivity(WithdrawalAct.class);
     }
+
+    @Subscribe
+    public void onEventMainThread(BigEvent event) {
+        switch (event.getEventTypes()) {
+            case INTENT_AMOUNT_VALUE:
+                amount = event.getOthers() +"";
+                withdrawalSuccessMoneyTv.setText("+"+amount+"元");
+                break;
+        }
+    }
 }

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

@@ -9,7 +9,11 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
+import com.kfzs.duanduan.utils.dlg.DeviceUtils;
+import com.sheep.gamegroup.model.entity.TaskEty;
+import com.sheep.gamegroup.presenter.TaskDialogPresenter;
 import com.sheep.gamegroup.view.customview.SProgress;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -24,6 +28,7 @@ import org.xutils.ex.DbException;
 import org.xutils.x;
 
 import java.io.File;
+import java.util.List;
 
 
 /**
@@ -34,24 +39,41 @@ public class DownLoadTvAdp extends BaseAdapter {
     private Context mContext;
     private final LayoutInflater mInflater;
     private DownloadManager downloadManager;
+    private List<DownloadInfo> infoList;
+    private int taskType;
+    TaskDialogPresenter preference;
+    private TaskEty task_entity;
 
-    public DownLoadTvAdp(Context mContext) {
+    public DownLoadTvAdp(Context mContext,List<DownloadInfo> infoList) {
+        this.infoList = infoList;
         this.mContext = mContext;
         this.mInflater = LayoutInflater.from(mContext);
         downloadManager = DownloadManager.getInstance();
     }
 
+    /**
+     *
+     * @param taskType
+     */
+    public void setTaskState(int taskType){
+        this.taskType = taskType;
+    }
+    public void addTaskPreference(TaskDialogPresenter preference){
+        this.preference = preference;
+    }
+    public void addTaskEty(TaskEty task_entity){
+        this.task_entity = task_entity;
+    }
+
 
     @Override
     public int getCount() {
-        if (downloadManager == null)
-            return 0;
-        return downloadManager.getDownloadListCount();
+        return infoList.size();
     }
 
     @Override
     public Object getItem(int i) {
-        return downloadManager.getDownloadInfo(i);
+        return infoList.get(i);
     }
 
     @Override
@@ -63,71 +85,54 @@ public class DownLoadTvAdp extends BaseAdapter {
     @Override
     public View getView(int i, View view, ViewGroup viewGroup) {
         DownloadItemViewHolder holder = null;
-        DownloadInfo downloadInfo = downloadManager.getDownloadInfo(i);
+        DownloadInfo downloadInfo = (DownloadInfo) getItem(i);
         if (view == null) {
-            view = mInflater.inflate(R.layout.down_item, null);
+            view = mInflater.inflate(R.layout.dowanload_tv_item, null);
             holder = new DownloadItemViewHolder(view, downloadInfo);
             view.setTag(holder);
         } else {
             holder = (DownloadItemViewHolder) view.getTag();
             holder.update(downloadInfo);
         }
-        holder.refreshkem();
-        if (downloadInfo.getState().value() < DownloadState.FINISHED.value()) {
-            try {
-                downloadManager.startDownload(
-                        downloadInfo.getPkgName(),
-                        downloadInfo.getUrl(),
-                        downloadInfo.getLabel(),
-                        downloadInfo.getFileSavePath(), "",
-                        downloadInfo.isAutoResume(),
-                        downloadInfo.isAutoRename(),
-                        holder);
-            } catch (DbException ex) {
-                Toast.makeText(x.app(), "添加下载失败", Toast.LENGTH_LONG).show();
-            }
+        if(taskType == 0){//开始任务
+            holder.start_task_tv.setText("开始任务");
+        }else if(taskType == 1){
+            holder.start_task_tv.setText("开始试玩");
         }
+        else {
+            holder.refresh();
+//            if (downloadInfo.getState().value() < DownloadState.FINISHED.value()) {
+//                try {
+//                    downloadManager.startDownload(
+//                            downloadInfo.getPkgName(),
+//                            downloadInfo.getUrl(),
+//                            downloadInfo.getLabel(),
+//                            downloadInfo.getFileSavePath(), "",
+//                            downloadInfo.isAutoResume(),
+//                            downloadInfo.isAutoRename(),
+//                            holder);
+//                } catch (DbException ex) {
+//                    Toast.makeText(x.app(), "添加下载失败", Toast.LENGTH_LONG).show();
+//                }
+//            }
+        }
+
         return view;
     }
 
     class DownloadItemViewHolder extends DownloadViewHolder implements View.OnClickListener {
 
-        private android.widget.ImageView ImageView;
-        private TextView tv_game_name;
-        private ImageView iv_state;
-        private ImageView iv_remove;
-        private SProgress pb_download;
-        private TextView tv_prorgess;
-        private View ll_install;
+        private TextView start_task_tv;
 
         public DownloadItemViewHolder(View view, DownloadInfo downloadInfo) {
             super(view, downloadInfo);
-            ImageView = (ImageView) view.findViewById(R.id.img_icon);
-            tv_game_name = (TextView) view.findViewById(R.id.tv_game_name);
-            iv_state = (ImageView) view.findViewById(R.id.iv_state);
-            pb_download = (SProgress) view.findViewById(R.id.pb_download);
-            iv_remove = (ImageView) view.findViewById(R.id.iv_remove);
-            tv_prorgess = (TextView) view.findViewById(R.id.tv_prorgess);
-            ll_install = view.findViewById(R.id.ll_install);
-            Glide.with(mContext)
-                    .load(downloadInfo.getIcon())
-                    .placeholder(R.drawable.icon)
-                    .dontAnimate()
-                    .into(ImageView);
-            iv_state.setOnClickListener(this);
-            iv_remove.setOnClickListener(this);
-            tv_prorgess.setOnClickListener(this);
-            ll_install.setOnClickListener(this);
+            start_task_tv = (TextView) view.findViewById(R.id.start_task_tv);
+            start_task_tv.setOnClickListener(this);
         }
 
         @Override
         public void update(DownloadInfo downloadInfo) {
             super.update(downloadInfo);
-            Glide.with(mContext)
-                    .load(downloadInfo.getIcon())
-                    .placeholder(R.drawable.icon)
-                    .dontAnimate()
-                    .into(ImageView);
         }
 
         @Override
@@ -160,59 +165,36 @@ public class DownLoadTvAdp extends BaseAdapter {
             refresh();
         }
 
-        public void refresh() {
-            tv_game_name.setText(downloadInfo.getLabel());
-            pb_download.setProgress(downloadInfo.getProgress());
-            tv_prorgess.setText(downloadInfo.getProgress() + "%");
-            DownloadState state = downloadInfo.getState();
-            switch (state) {
-                case WAITING:
-                case STARTED:
-                    iv_state.setImageResource(R.drawable.icon_stop);
-                    break;
-                case ERROR:
-                case STOPPED:
-                    iv_state.setImageResource(R.drawable.icon_begin);
-                    break;
-                case FINISHED:
-                    iv_state.setVisibility(View.GONE);
-                    if (PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())) {
-                        tv_prorgess.setText("已安装");
-                    } else {
-                        tv_prorgess.setText("安 装");
-                        PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
-                    }
-                    break;
-                default:
-                    iv_state.setImageResource(R.drawable.icon_begin);
-                    break;
-            }
-        }
 
-        public void refreshkem() {
-            tv_game_name.setText(downloadInfo.getLabel());
-            pb_download.setProgress(downloadInfo.getProgress());
-            tv_prorgess.setText(downloadInfo.getProgress() + "%");
+        public void refresh() {
+            start_task_tv.setText(downloadInfo.getProgress() + "%");
             DownloadState state = downloadInfo.getState();
             switch (state) {
                 case WAITING:
                 case STARTED:
-                    iv_state.setImageResource(R.drawable.icon_stop);
+//                    if(downloadInfo.getProgress() == 0){
+//                        start_task_tv.setText("开始下载");
+//
+//                    }else if(downloadInfo.getProgress() == 100){
+//                        start_task_tv.setText("开始试玩");
+//                    }
+//                    else {
+//
+//                        start_task_tv.setText("继续");
+//                    }
                     break;
                 case ERROR:
                 case STOPPED:
-                    iv_state.setImageResource(R.drawable.icon_begin);
+                    start_task_tv.setText("继续");
                     break;
                 case FINISHED:
-                    iv_state.setVisibility(View.GONE);
                     if (PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())) {
-                        tv_prorgess.setText("已安装");
+                        start_task_tv.setText("开始试玩");
                     } else {
-                        tv_prorgess.setText("安 装");
+                        start_task_tv.setText("安 装");
                     }
                     break;
                 default:
-                    iv_state.setImageResource(R.drawable.icon_begin);
                     break;
             }
         }
@@ -220,7 +202,14 @@ public class DownLoadTvAdp extends BaseAdapter {
         @Override
         public void onClick(View view) {
             switch (view.getId()) {
-                case R.id.iv_state:
+                case R.id.start_task_tv:
+                    if(taskType == 0){
+                        startTask();
+                        return;
+                    }else if(taskType == 2){
+                        PackageUtil.startApp(SheepApp.mContext, getDownloadInfo().getPkgName());
+                        return;
+                    }
                     DownloadState state = downloadInfo.getState();
                     switch (state) {
                         case WAITING:
@@ -255,35 +244,14 @@ public class DownLoadTvAdp extends BaseAdapter {
                             break;
                     }
                     break;
-                case R.id.iv_remove:
-                    try {
-                        downloadManager.removeDownload(downloadInfo);
-                        File file = new File(downloadInfo.getFileSavePath());
-                        if (file.exists()) {
-                            file.delete();
-                        }
-                        notifyDataSetChanged();
-                        refresh();
-                    } catch (DbException e) {
-                        Toast.makeText(x.app(), "移除任务失败", Toast.LENGTH_LONG).show();
-                    }
-                    break;
-
-                case R.id.tv_prorgess:
-                case R.id.ll_install:
-                    DownloadState states = downloadInfo.getState();
-                    switch (states) {
-                        case FINISHED:
-                            if (!PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())) {
-                                PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
-                            }else{
-                                PackageUtil.startApp(SheepApp.mContext, getDownloadInfo().getPkgName());
-                            }
-                            break;
-                    }
-                    break;
 
             }
         }
     }
+    private void startTask(){
+        JSONObject object = new JSONObject();
+        object.put("device_id", new DeviceUtils(mContext).getIMEI()+"");
+        object.put("release_task_id", Integer.valueOf(task_entity.getRelease_task_id()+""));
+        preference.acceptedTask(object);
+    }
 }

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

@@ -10,7 +10,10 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSONObject;
+import com.kfzs.duanduan.utils.dlg.DeviceUtils;
 import com.sheep.gamegroup.model.entity.TaskState;
+import com.sheep.gamegroup.presenter.TaskDialogPresenter;
 import com.sheep.jiuyan.samllsheep.R;
 
 import java.util.List;
@@ -40,7 +43,7 @@ public class TaskStateAdapter extends BaseAdapter {
 
     @Override
     public long getItemId(int position) {
-        return 0;
+        return position;
     }
 
     @SuppressLint("ResourceAsColor")
@@ -58,16 +61,16 @@ public class TaskStateAdapter extends BaseAdapter {
             holder = (ViewHolder) convertView.getTag();
         }
         holder.name_tv.setText(getItem(position).getName()+"");
-        if(getItem(position).getStatus() == 2){
+        if(getItem(position).getStatus() == 1){
 
             holder.point_iv.setImageResource(R.mipmap.tast_state_piont_ok_img);
-            holder.line_view.setBackgroundColor(R.color.yellow2_end);
-            holder.name_tv.setTextColor(R.color.yellow2_end);
+            holder.line_view.setBackgroundColor(context.getResources().getColor(R.color.yellow2_end));
+            holder.name_tv.setTextColor(context.getResources().getColor(R.color.yellow2_end));
         }else {
 
             holder.point_iv.setImageResource(R.mipmap.tast_state_piont_no_img);
-            holder.line_view.setBackgroundColor(R.color.txt_black_9e9c9c);
-            holder.name_tv.setTextColor(R.color.black);
+            holder.line_view.setBackgroundColor(context.getResources().getColor(R.color.txt_black_9e9c9c));
+            holder.name_tv.setTextColor(context.getResources().getColor(R.color.black));
         }
         if(position == getCount()-1){
             holder.line_view.setVisibility(View.GONE);
@@ -83,4 +86,5 @@ public class TaskStateAdapter extends BaseAdapter {
         View line_view;
         TextView name_tv;
     }
+
 }

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

@@ -50,10 +50,8 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
     @Override
     public int getViewIdByType(int type) {
-        Log.e("1-----getViewIdByType",type+"");
         int resId = R.layout.empty;
         RecyleType recyleType = RecyleType.values()[type];
-        Log.e("1-----getViewIdByType",recyleType+"");
         switch (recyleType){
             case RELEASE_TASK:
                 resId = R.layout.try_mkmy_release_task_list;
@@ -67,7 +65,6 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
     @Override
     public void convert(ViewHolder holder, RecyleObj recyleObj) {
-        Log.e("-----convert",recyleObj.getRecyleType()+"");
 
         switch (recyleObj.getRecyleType()){
             case RELEASE_TASK:
@@ -125,7 +122,6 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
             @Override
             public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, final int i) {
                     viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
-                Log.e("-----viewholder",i+"");
                 if(i == 0){
                     viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.VISIBLE);
                     ((TextView)viewHolder.itemView.findViewById(R.id.item_title_tv)).setText("推荐");

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

@@ -59,7 +59,7 @@ public class WithdrawalListAdp extends BaseAdapter {
         }
 
         WithdrawalEty ety = (WithdrawalEty) getItem(position);
-        holder.name_tv.setText(ety.getDesc()+"");
+        holder.name_tv.setText(ety.getDesc()+"提现");
         try {
             holder.date_tv.setText(TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(ety.getUpdate_time()))+"");
         }catch (Exception e){

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

@@ -0,0 +1,48 @@
+package com.sheep.gamegroup.view.dialog;
+
+import android.app.Activity;
+import android.support.v7.app.AlertDialog;
+import android.view.View;
+
+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;
+
+public class DialogRealNameAuther {
+
+    private static AlertDialog mAlertDialog;
+
+    public static AlertDialog showDialog(final Activity activity) {
+        if (mAlertDialog == null) {
+            View view = View.inflate(activity, R.layout.dialog_real_name_auther, null);
+            ViewFindUtils.find(view, R.id.dialog_sure)
+                    .setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            mAlertDialog.dismiss();
+                        }
+                    });
+            ViewFindUtils.find(view, R.id.dialog_close)
+                    .setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            mAlertDialog.dismiss();
+                        }
+                    });
+            mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
+                    .setView(view)
+                    .create();
+        }
+        if (!HelperUtils.isActivityOnTop(activity)) {
+            return mAlertDialog;//如果不是顶层窗口，那就不显示了。
+        }
+
+        try {
+            mAlertDialog.show();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mAlertDialog;
+    }
+}

app/src/main/java/com/sheep/jiuyan/samllsheep/BaseApplication.java

@@ -24,7 +24,6 @@ public class BaseApplication extends KFZSApp {
         ZXingLibrary.initDisplayOpinion(this);
         UMConfigure.setLogEnabled(true);
         UMConfigure.init(this, UMConfigure.DEVICE_TYPE_PHONE, "5ab0a1da8f4a9d742900035f");
-
         UMShareAPI.get(this);
         PlatformConfig.setWeixin("wx2be7f59bb7bb963f", "6cf7ca0f6c6ac97c6961d901fee8adb9");
         PlatformConfig.setQQZone("101461115", "b874bc950bcf066f17fd52cf2bb959e9");

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -20,6 +20,7 @@ import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.umeng.commonsdk.UMConfigure;
 
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 /**
@@ -50,10 +51,6 @@ public class SheepApp extends BaseApplication {
         registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
         initGoble();
         Bugly.init(getApplicationContext(), Config.BUGLY_APPID, true);
-
-        //友盟
-        UMConfigure.init(this, UMConfigure.DEVICE_TYPE_PHONE, "xxxxx");
-
         initNet();
         initImagePicker();
     }
@@ -72,6 +69,19 @@ public class SheepApp extends BaseApplication {
         imagePicker.setOutPutY(1000);//保存文件的高度。单位像素
     }
 
+    public  static void  removeAllActivity(){
+
+        Iterator<Map.Entry<String, Activity>> it = mActivitys.entrySet().iterator();
+        while(it.hasNext()){
+            Map.Entry<String, Activity> entry = it.next();
+            Activity a=entry.getValue();
+            a.finish();
+            it.remove();
+        }
+    }
+
+
+
     private void initNet() {
         netComponent = DaggerNetComponent.builder()
                 .netModule(new NetModule())
@@ -79,8 +89,6 @@ public class SheepApp extends BaseApplication {
     }
 
     private void regWx() {
-        mWxapi = WXAPIFactory.createWXAPI(this, Config.WX_APPID);
-        mWxapi.registerApp(Config.WX_APPID);
         mActivitys = new HashMap<>();
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseActivity.java

@@ -12,6 +12,8 @@ import android.widget.Toast;
 
 import com.sheep.gamegroup.util.ActivityManager;
 
+import org.greenrobot.eventbus.EventBus;
+
 import butterknife.ButterKnife;
 
 /**
@@ -63,12 +65,10 @@ public abstract class BaseActivity extends AppActivity  {
     }
 
 
-
-
-
-
-
-
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {

app/src/main/java/com/sheep/jiuyan/samllsheep/floatwindow/FloatService.java

@@ -69,7 +69,6 @@ public class FloatService extends Service implements View.OnClickListener {
     @Override
     public void onCreate() {
         super.onCreate();
-        EventBus.getDefault().register(this);
         Log.i(TAG, "MainService Created");
         mSize = DeviceInfo.getDeviceSize(this);
         createToucher();
@@ -173,7 +172,6 @@ public class FloatService extends Service implements View.OnClickListener {
         if (floaticon != null) {
             mWm.removeView(mFloatwindow);
         }
-        EventBus.getDefault().unregister(this);
         super.onDestroy();
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java

@@ -115,7 +115,6 @@ public class MainActivity extends BaseActivity {
             showNewDialog();
         }
         super.onCreate(savedInstanceState);
-        EventBus.getDefault().register(this);
         startOpenXFK();
         goToQX();
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/UserCenterActivity.java

@@ -16,8 +16,10 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
+import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.event.NewUserDialog;
 import com.sheep.jiuyan.samllsheep.net.NetManager;
 import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
@@ -27,6 +29,10 @@ import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.StringUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import java.io.IOException;
 import java.util.HashMap;
 
@@ -84,6 +90,8 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
     }
 
 
+
+
     @Override
     protected void onResume() {
         super.onResume();

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

@@ -4,5 +4,5 @@
   <item android:state_checked="true" android:drawable="@drawable/button_full_normal_main_click"/>
   <item android:state_selected="true" android:drawable="@drawable/button_full_normal_main_click"/>
   <item android:state_pressed="true" android:drawable="@drawable/button_full_normal_main_click"/>
-  <item android:drawable="@drawable/button_full_normal_main"/>
+  <item android:drawable="@drawable/sp_bg_gradient_rectangle_blue"/>
 </selector>

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

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

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

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/bg_gray">
+
+    <include
+        layout="@layout/title"/>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scrollbars="none">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/phone_iv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginLeft="@dimen/content_padding_100"
+                android:layout_marginRight="@dimen/content_padding_100"
+                android:src="@mipmap/no_bind_img"
+                android:layout_marginTop="@dimen/content_padding_35"
+                android:layout_marginBottom="5dp"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/no_bind_wx_notice_text"
+                style="@style/txt_style_12"
+                android:layout_marginTop="@dimen/content_padding_30"
+                android:layout_marginBottom="@dimen/content_padding_10"
+                android:layout_gravity="center"/>
+            <TextView
+                android:id="@+id/sure_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/txt_big_btn_style"
+                android:text="立即绑定"
+                android:background="@drawable/selector_button_full_main"/>
+
+        </LinearLayout>
+    </ScrollView>
+
+
+</LinearLayout>

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

@@ -0,0 +1,58 @@
+<?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: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="wrap_content"
+                android:layout_height="40dp"
+                android:layout_marginTop="@dimen/content_padding_10"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/dialog_sure"
+                    android:layout_width="200dp"
+                    android:layout_height="40dp"
+                    android:background="@drawable/sp_bg_gradient_rectangle_yellow2"
+                    android:gravity="center"
+                    android:layout_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/dowanload_tv_item.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+    <TextView
+        android:id="@+id/start_task_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/content_padding_small"
+        android:background="@drawable/sp_bg_gradient_rectangle_yellow"
+        android:gravity="center"
+        android:minHeight="36dp"
+        android:minWidth="151dp"
+        android:text="开始任务"
+        android:textSize="18sp"
+        android:textColor="@color/txt_black"
+        android:visibility="visible"/>
+
+</RelativeLayout>

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

@@ -18,15 +18,14 @@
             android:layout_height="wrap_content"
             android:minWidth="300dp"
             android:minHeight="196dp"
-            android:orientation="horizontal"
-            android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
+            android:orientation="horizontal">
 
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_alignParentRight="@dimen/view_size_60"
-                android:layout_marginTop="@dimen/content_padding"
-                android:padding="@dimen/content_padding">
+                android:layout_margin="@dimen/content_padding_10"
+                android:padding="@dimen/content_padding_20"
+                android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
 
                 <ImageView
                     android:id="@+id/dialog_item_icon_iv"
@@ -74,6 +73,7 @@
                     android:layout_height="wrap_content"
                     android:scrollbars="none"
                     android:divider="@null"
+                    android:listSelector="@color/transparent"
                     android:layout_below="@+id/dialog_item_icon_iv"
                     android:layout_centerHorizontal="true"
                     android:layout_marginLeft="@dimen/content_padding_40"
@@ -82,11 +82,12 @@
 
                 <LinearLayout
                     android:id="@+id/start_layout"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/listview"
                     android:layout_centerHorizontal="true"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:visibility="gone">
 
                     <com.sheep.gamegroup.view.customview.SProgress
                         android:id="@+id/start_stask_sprogress"
@@ -124,21 +125,20 @@
                         android:textSize="18sp"
                         android:textColor="@color/txt_black"
                         android:visibility="gone"/>
-                    <com.sheep.gamegroup.util.MyListview
-                        android:id="@+id/listview_down"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:scrollbars="none"
-                        android:divider="@null"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginLeft="@dimen/content_padding_40"
-                        android:layout_marginRight="@dimen/content_padding_40"
-                        android:layout_marginTop="@dimen/content_padding_small"
-                        android:gravity="center"
-                        android:minHeight="36dp"
-                        android:minWidth="151dp"></com.sheep.gamegroup.util.MyListview>
                 </LinearLayout>
 
+                <com.sheep.gamegroup.util.MyListview
+                    android:id="@+id/listview_down"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scrollbars="none"
+                    android:divider="@null"
+                    android:layout_below="@+id/listview"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginLeft="@dimen/content_padding_40"
+                    android:layout_marginRight="@dimen/content_padding_40"
+                    android:layout_marginTop="@dimen/content_padding_15"/>
+
                 <TextView
                     android:id="@+id/doalog_item_get_rewards_tv"
                     android:layout_width="wrap_content"
@@ -161,13 +161,12 @@
 
             <ImageView
                 android:id="@+id/dialog_item_x"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:minHeight="@dimen/view_size_20"
-                android:minWidth="@dimen/view_size_20"
-                android:layout_alignParentRight="true"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:padding="2dp"
+                android:layout_alignParentEnd="true"
                 android:src="@mipmap/try_dialog_x"
-                android:layout_margin="@dimen/content_padding"/>
+                android:background="@drawable/shape_black_ring"/>
         </RelativeLayout>
     </ScrollView>
 </RelativeLayout>

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

@@ -20,9 +20,9 @@
             android:layout_alignParentBottom="true"
             style="@style/login_btn"
             android:textColor="@color/txt_white"
-            android:background="@drawable/sp_bg_transparency_line_white"
-            android:layout_marginBottom="80dp"
-            android:layout_marginTop="@dimen/content_padding_10"/>
+            android:background="@mipmap/x_ic_login_bg_sure"
+            android:layout_marginBottom="@dimen/content_padding_65"
+            android:layout_marginTop="@dimen/content_padding_20"/>
 
 
         <LinearLayout

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

@@ -19,12 +19,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:minWidth="100dp"
+
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:text="提 现"
-            android:textColor="@color/black"
+            android:textColor="@color/white"
             android:textSize="20dp"
-            android:background="@drawable/sp_bg_yellow"
+            android:background="@drawable/sp_bg_gradient_rectangle_blue"
             android:gravity="center"
             android:padding="5dp"/>
         <TextView
@@ -55,33 +56,33 @@
             android:textSize="12dp"/>
     </RelativeLayout>
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-        android:layout_margin="12dp"
-        android:paddingTop="15dp"
-        android:paddingRight="15dp"
-        android:paddingLeft="15dp"
-        android:paddingBottom="1dp">
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        >
         <TextView
             android:id="@+id/account_info_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="账户信息"
             android:textColor="@color/black"
+            android:layout_margin="15dp"
             android:textSize="15dp"/>
         <RelativeLayout
             android:id="@+id/account_safe_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/account_info_tv"
+            android:padding="15dp"
             android:gravity="center">
             <ImageView
                 android:id="@+id/personalcenter_item_icon_iv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@mipmap/personalcenter_img"
+                android:src="@mipmap/x_ic_account_secuity"
                 android:layout_marginRight="12dp"
                 android:layout_centerVertical="true"/>
             <TextView
@@ -93,7 +94,6 @@
                 android:textColor="@color/black"
                 android:textSize="14dp"
                 android:layout_centerVertical="true"
-                android:layout_alignBottom="@+id/personalcenter_item_icon_iv"
                 android:layout_toEndOf="@+id/personalcenter_item_icon_iv" />
             <ImageView
                 android:id="@+id/personalcenter_item_right_iv"
@@ -103,25 +103,29 @@
                 android:layout_alignParentRight="true"
                 android:layout_marginLeft="12dp"
                 android:layout_centerVertical="true"/>
-            <TextView
-                android:layout_marginTop="25dp"
-                android:id="@+id/personalcenter_item_line"
-                android:layout_width="match_parent"
-                android:layout_height="1sp"
-                android:background="@color/white_bg_line"
-                android:layout_below="@+id/personalcenter_item_name_tv"/>
+
         </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/white_bg_line"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            />
+
         <RelativeLayout
             android:id="@+id/account_task_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/account_safe_layout"
+            android:padding="15dp"
+
             android:layout_alignParentStart="true">
             <ImageView
                 android:id="@+id/tast_item_icon_iv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@mipmap/personalcenter_img"
+                android:src="@mipmap/x_ic_task_history"
                 android:layout_marginRight="12dp"
                 android:layout_centerVertical="true"/>
             <TextView
@@ -143,24 +147,28 @@
                 android:layout_alignParentRight="true"
                 android:layout_marginLeft="12dp"
                 android:layout_centerVertical="true"/>
-            <TextView
-                android:layout_marginTop="25dp"
-                android:id="@+id/tast_item_line"
-                android:layout_width="match_parent"
-                android:layout_height="1sp"
-                android:background="@color/white_bg_line"
-                android:layout_below="@+id/tast_item_name_tv"/>
+
         </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/white_bg_line"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            />
+
         <RelativeLayout
             android:id="@+id/account_detail_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/account_task_layout">
+            android:padding="15dp"
+         >
             <ImageView
                 android:id="@+id/detail_item_icon_iv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@mipmap/personalcenter_img"
+                android:src="@mipmap/x_ic_withdrawal"
                 android:layout_marginRight="12dp"
                 android:layout_centerVertical="true"/>
             <TextView
@@ -182,15 +190,8 @@
                 android:layout_alignParentRight="true"
                 android:layout_marginLeft="12dp"
                 android:layout_centerVertical="true"/>
-            <TextView
-                android:layout_marginTop="25dp"
-                android:id="@+id/detail_item_line"
-                android:layout_width="match_parent"
-                android:layout_height="1sp"
-                android:background="@color/transparent"
-                android:layout_below="@+id/detail_item_name_tv"
-                android:visibility="visible"/>
+
         </RelativeLayout>
-    </RelativeLayout>
+    </LinearLayout>
 
 </LinearLayout>

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

@@ -9,16 +9,19 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
-        android:src="@drawable/splash_bg"/>
+        android:src="@drawable/splash_bg_img"/>
 
     <TextView
         android:id="@+id/btn_join"
-        style="@style/style_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="140dp"
+        android:layout_height="40dp"
         android:layout_gravity="center|bottom"
-        android:layout_marginBottom="25dp"
-        android:text="进入赚钱"
-        android:textSize="@dimen/text_size_5"/>
+        android:layout_marginBottom="15dp"
+        android:background="@drawable/splash_bnt_img"
+        android:gravity="center"
+        android:paddingBottom="@dimen/content_padding_small"
+        android:text="进 入 赚 钱"
+        android:textColor="@color/white"
+        android:textSize="@dimen/text_size_3" />
 
 </FrameLayout>

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

@@ -6,13 +6,14 @@
 
     <RelativeLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/content_padding_2">
 
         <ImageView
             android:id="@+id/point_iv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@mipmap/tast_state_piont_ok_img"/>
+            android:src="@mipmap/tast_state_piont_no_img"/>
         <View
             android:id="@+id/line_view"
             android:layout_width="1dp"

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

@@ -123,7 +123,8 @@
                     android:numColumns="3"
                     android:layout_marginTop="@dimen/content_padding_20"
                     android:visibility="visible"
-                    android:background="@color/white"/>
+                    android:background="@color/white"
+                    android:listSelector="@color/transparent"/>
             </android.support.constraint.ConstraintLayout>
             <TextView
                 android:id="@+id/withdrawal_sure"
@@ -131,7 +132,7 @@
                 android:layout_height="wrap_content"
                 style="@style/txt_big_btn_style"
                 android:text="确 定"
-                android:background="@drawable/sp_bg_gradient_rectangle_yellow"/>
+                android:background="@drawable/selector_button_full_main"/>
         </LinearLayout>
     </ScrollView>
 

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

@@ -10,6 +10,6 @@
     <ListView
         android:id="@+id/withdrawal_listview"
         android:layout_width="match_parent"
-        android:layout_height="240dp"
+        android:layout_height="wrap_content"
         android:scrollbars="none"></ListView>
 </LinearLayout>

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

@@ -12,16 +12,17 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="15dp"
-        android:background="@drawable/x_ll_bg"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:layout_margin="10dp"
         android:id="@+id/rl_top"
         >
         <ImageView
             android:id="@+id/iv_head"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
             android:background="@null"
-            android:src="@mipmap/ic_launcher"
+            android:scaleType="centerInside"
+            android:src="@mipmap/x_ic_def_head"
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
             />
@@ -30,7 +31,6 @@
             android:id="@+id/tv_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="野蛮老司机"
             android:layout_toRightOf="@id/iv_head"
             style="@style/txt_style_15_black"
             android:layout_marginTop="5dp"
@@ -40,7 +40,7 @@
             android:id="@+id/tv_link_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/share_link_content"
+            android:text=""
             android:layout_toRightOf="@id/iv_head"
             android:layout_below="@id/tv_name"
             android:layout_marginTop="3dp"
@@ -61,155 +61,174 @@
 
     </RelativeLayout>
 
-<LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@drawable/x_ll_bg"
-    android:layout_marginLeft="10dp"
-    android:layout_marginRight="10dp"
-    >
-
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="15dp"
-        android:id="@+id/rl_phone"
+        android:orientation="vertical"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
         >
-        <ImageView
-            android:id="@+id/iv_phone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:src="@mipmap/x_ic_phone"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/phone"
-            android:layout_toRightOf="@id/iv_phone"
-            style="@style/txt_style_15"
-            android:layout_marginLeft="5dp"
-            android:layout_centerVertical="true"
-            />
 
-
-        <TextView
-            android:id="@+id/tv_phone"
-            android:layout_width="wrap_content"
+        <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="13658025248"
-            style="@style/hint_txt_style"
-            android:layout_marginLeft="5dp"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"
-            android:drawableRight="@mipmap/x_ic_next"
-            android:drawablePadding="10dp"
-            />
-    </RelativeLayout>
-
-
-
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="@color/white_bg_line"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/rl_wx"
-        android:padding="15dp"
-        >
-        <ImageView
-            android:id="@+id/iv_wx"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:src="@mipmap/x_ic_weixin"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
+            android:padding="15dp"
+            android:id="@+id/rl_phone"
+            >
+            <ImageView
+                android:id="@+id/iv_phone"
+                android:layout_width="40dp"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:src="@mipmap/x_ic_phone"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/phone"
+                android:layout_toRightOf="@id/iv_phone"
+                style="@style/txt_style_15"
+                android:layout_marginLeft="5dp"
+                android:layout_centerVertical="true"
+                />
+
+
+            <TextView
+                android:id="@+id/tv_phone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/hint_txt_style"
+                android:layout_marginLeft="5dp"
+                android:layout_centerVertical="true"
+                android:layout_alignParentRight="true"
+                android:drawableRight="@mipmap/x_ic_next"
+                android:drawablePadding="10dp"
+                />
+        </RelativeLayout>
+
+
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/white_bg_line"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
             />
 
-        <TextView
-            android:layout_width="wrap_content"
+        <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/bind_wx"
-            android:layout_toRightOf="@id/iv_wx"
-            style="@style/txt_style_15"
-            android:layout_marginLeft="5dp"
-            android:layout_centerVertical="true"
+            android:id="@+id/rl_wx"
+            android:padding="15dp"
+            >
+            <ImageView
+                android:id="@+id/iv_wx"
+                android:layout_width="40dp"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:src="@mipmap/x_ic_weixin"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bind_wx"
+                android:layout_toRightOf="@id/iv_wx"
+                style="@style/txt_style_15"
+                android:layout_marginLeft="5dp"
+                android:layout_centerVertical="true"
+                />
+
+
+            <TextView
+                android:id="@+id/tv_wx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/hint_txt_style"
+                android:layout_centerVertical="true"
+                android:layout_alignParentRight="true"
+                android:drawableRight="@mipmap/x_ic_next"
+                android:drawablePadding="10dp"
+                />
+        </RelativeLayout>
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/white_bg_line"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
             />
 
-
-        <TextView
-            android:id="@+id/tv_wx"
-            android:layout_width="wrap_content"
+        <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="小河里翻大浪"
-            style="@style/hint_txt_style"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"
-            android:drawableRight="@mipmap/x_ic_next"
-            android:drawablePadding="10dp"
-            />
-    </RelativeLayout>
-
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="@color/white_bg_line"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        />
-
-    <RelativeLayout
+            android:id="@+id/rl_auther"
+            android:padding="15dp"
+            >
+            <ImageView
+                android:id="@+id/iv_auther"
+                android:layout_width="40dp"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:src="@mipmap/x_ic_id_card"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/auther"
+                android:layout_toRightOf="@id/iv_auther"
+                style="@style/txt_style_15"
+                android:layout_marginLeft="5dp"
+                android:layout_centerVertical="true"
+                />
+
+
+            <TextView
+                android:id="@+id/tv_auther"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="未认证"
+                style="@style/hint_txt_style"
+                android:layout_marginLeft="5dp"
+                android:layout_centerVertical="true"
+                android:layout_alignParentRight="true"
+                android:drawableRight="@mipmap/x_ic_next"
+                android:drawablePadding="10dp"
+                />
+        </RelativeLayout>
+
+
+
+
+
+    </LinearLayout>
+
+
+    <TextView
+        android:id="@+id/tv_submit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/rl_auther"
-        android:padding="15dp"
-        >
-        <ImageView
-            android:id="@+id/iv_auther"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@null"
-            android:src="@mipmap/x_ic_id_card"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/auther"
-            android:layout_toRightOf="@id/iv_auther"
-            style="@style/txt_style_15"
-            android:layout_marginLeft="5dp"
-            android:layout_centerVertical="true"
-            />
-
-
-        <TextView
-            android:id="@+id/tv_auther"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="未认证"
-            style="@style/hint_txt_style"
-            android:layout_marginLeft="5dp"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"
-            android:drawableRight="@mipmap/x_ic_next"
-            android:drawablePadding="10dp"
-            />
-    </RelativeLayout>
-</LinearLayout>
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="40dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:background="@drawable/selector_button_full_main"
+        android:gravity="center"
+        android:padding="@dimen/content_padding_10"
+        android:text="退出登录"
+        android:textColor="@color/txt_black_010101"
+        android:textSize="@dimen/text_size_18" />
 </LinearLayout>

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/bg_gray"
+    android:background="@color/white_light"
     android:scrollbars="none"
     >
 
@@ -20,7 +20,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/x_ll_bg"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:layout_margin="12dp"
         android:orientation="vertical"
         >
@@ -209,7 +209,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="100dp"
-        android:background="@drawable/x_ll_bg"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:layout_margin="12dp"
         android:orientation="horizontal"
         >
@@ -286,7 +286,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/x_ll_bg"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:layout_margin="12dp"
         android:orientation="vertical"
         android:padding="15dp"

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

@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-
     android:layout_marginLeft="20dp"
     android:layout_marginRight="20dp"
     android:layout_marginBottom="20dp"

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

@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/white_light"
+    >
+    <include
+        layout="@layout/title"/>
+
+
+
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+    android:layout_marginLeft="10dp"
+    android:layout_marginRight="10dp"
+    >
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="15dp"
+        android:id="@+id/rl_phone"
+        >
+
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="姓    名"
+            style="@style/txt_style_15"
+            android:layout_marginLeft="5dp"
+            android:layout_centerVertical="true"
+            />
+
+
+        <EditText
+            android:id="@+id/et_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_centerVertical="true"
+            android:layout_alignParentRight="true"
+            android:drawablePadding="10dp"
+            android:background="@null"
+            android:textSize="@dimen/text_size_2"
+            android:hint="请填写姓名"
+            android:textColor="@color/txt_black_9e9c9c"
+            />
+    </RelativeLayout>
+
+
+
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/white_bg_line"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="15dp"
+        >
+
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="身份证"
+            android:layout_toRightOf="@id/iv_phone"
+            style="@style/txt_style_15"
+            android:layout_marginLeft="5dp"
+            android:layout_centerVertical="true"
+            />
+
+
+        <EditText
+            android:id="@+id/et_id_card"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_centerVertical="true"
+            android:layout_alignParentRight="true"
+            android:drawablePadding="10dp"
+            android:background="@null"
+            android:hint="请填写身份证号"
+            android:maxLength="18"
+            android:textSize="@dimen/text_size_2"
+            android:textColor="@color/txt_black_9e9c9c"
+            />
+    </RelativeLayout>
+
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/white_bg_line"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="15dp"
+        >
+
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="银行卡"
+            android:layout_toRightOf="@id/iv_phone"
+            style="@style/txt_style_15"
+            android:layout_marginLeft="5dp"
+            android:layout_centerVertical="true"
+            />
+
+
+        <EditText
+            android:id="@+id/et_bank"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_centerVertical="true"
+            android:layout_alignParentRight="true"
+            android:drawablePadding="10dp"
+            android:background="@null"
+            android:inputType="number"
+            android:maxLength="19"
+            android:hint="请填写银行卡"
+            android:textSize="@dimen/text_size_2"
+            android:textColor="@color/txt_black_9e9c9c"
+            />
+    </RelativeLayout>
+
+
+
+
+
+</LinearLayout>
+
+
+    <TextView
+        android:id="@+id/tv_submit"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="40dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:background="@drawable/selector_button_full_main"
+        android:gravity="center"
+        android:padding="@dimen/content_padding_10"
+        android:text="提交"
+        android:textColor="@color/txt_black_010101"
+        android:textSize="@dimen/text_size_18" />
+</LinearLayout>

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

@@ -3,33 +3,42 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="vertical"
-              android:background="@color/bg_gray"
+    android:background="@color/white_light"
     android:baselineAligned="false">
     <include layout="@layout/title"></include>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:background="@drawable/x_ll_bg"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:layout_margin="12dp"
-        android:padding="20dp"
+        android:padding="10dp"
         android:orientation="vertical"
         >
         <EditText
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:background="@null"
             android:id="@+id/et"
             />
 
     </LinearLayout>
 
-    <Button
+    <TextView
+        android:id="@+id/tv_submit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="修改"
-        android:id="@+id/btn"
-        />
+        android:layout_gravity="center_horizontal"
+
+        android:layout_marginTop="30dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:background="@drawable/selector_button_full_main"
+        android:gravity="center"
+        android:padding="@dimen/content_padding_10"
+        android:text="确定"
+        android:textColor="@color/txt_black_010101"
+        android:textSize="@dimen/text_size_18" />
 
 
 </LinearLayout>

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

@@ -5,194 +5,195 @@
     android:orientation="vertical"
     android:background="@color/white_light"
     >
-        <include
-            layout="@layout/title"/>
+    <include
+        layout="@layout/title"/>
+
+    <RelativeLayout
+        android:id="@+id/rl_head"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="15dp"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+        android:layout_margin="10dp"
+        >
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/header"
+            android:layout_alignParentLeft="true"
+            style="@style/txt_style_15_black"
+            android:layout_centerVertical="true"
+            />
+
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="@style/hint_txt_style"
+            android:layout_centerVertical="true"
+            android:layout_alignParentRight="true"
+            android:drawableRight="@mipmap/x_ic_next"
+            android:drawablePadding="10dp"
+            android:id="@+id/tv_more"
+            />
+
+        <ImageView
+            android:id="@+id/iv_head_right"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:background="@null"
+            android:src="@mipmap/ic_launcher"
+            android:scaleType="centerInside"
+            android:layout_toLeftOf="@id/tv_more"
+            android:layout_centerVertical="true"
+
+
+            />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="15dp"
+
+            android:layout_margin="10dp"
+            >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/niker"
+                android:layout_alignParentLeft="true"
+                style="@style/txt_style_15_black"
+                android:layout_centerVertical="true"
+                />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/hint_txt_style"
+                android:layout_centerVertical="true"
+                android:layout_alignParentRight="true"
+                android:drawableRight="@mipmap/x_ic_next"
+                android:drawablePadding="10dp"
+                android:id="@+id/tv_more1"
+                />
+
+            <TextView
+                android:id="@+id/tv_nike"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:src="@mipmap/ic_launcher"
+                android:layout_toLeftOf="@id/tv_more1"
+                android:layout_centerVertical="true"
+
+                />
+
+        </RelativeLayout>
+
+
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/white_bg_line"
+
+            />
 
         <RelativeLayout
-            android:id="@+id/rl_head"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="15dp"
-            android:background="@drawable/x_ll_bg"
             android:layout_margin="10dp"
             >
 
-                <TextView
-                    android:id="@+id/tv_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/header"
-                    android:layout_alignParentLeft="true"
-                    style="@style/txt_style_15_black"
-                    android:layout_centerVertical="true"
-                    />
-
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/hint_txt_style"
-                    android:layout_centerVertical="true"
-                    android:layout_alignParentRight="true"
-                    android:drawableRight="@mipmap/x_ic_next"
-                    android:drawablePadding="10dp"
-                    android:id="@+id/tv_more"
-                    />
-
-                <ImageView
-                    android:id="@+id/iv_head_right"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:src="@drawable/logoin_head"
-                    android:layout_toLeftOf="@id/tv_more"
-                    android:layout_centerVertical="true"
-
-
-                    />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/sheep_id"
+                android:layout_alignParentLeft="true"
+                style="@style/txt_style_15_black"
+                android:layout_centerVertical="true"
+                />
+
+
+
+            <TextView
+                android:id="@+id/tv_sheep_id"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:src="@mipmap/ic_launcher"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+
+                />
 
         </RelativeLayout>
 
-        <LinearLayout
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/white_bg_line"
+
+            />
+
+        <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:background="@drawable/x_ll_bg"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:padding="15dp"
+
+            android:layout_margin="10dp"
+            android:id="@+id/rl_qr"
             >
 
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="15dp"
-                    android:background="@drawable/x_ll_bg"
-                    android:layout_margin="10dp"
-                    >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/niker"
-                            android:layout_alignParentLeft="true"
-                            style="@style/txt_style_15_black"
-                            android:layout_centerVertical="true"
-                            />
-
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/hint_txt_style"
-                            android:layout_centerVertical="true"
-                            android:layout_alignParentRight="true"
-                            android:drawableRight="@mipmap/x_ic_next"
-                            android:drawablePadding="10dp"
-                            android:id="@+id/tv_more1"
-                            />
-
-                        <TextView
-                            android:id="@+id/tv_nike"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@null"
-                            android:src="@mipmap/ic_launcher"
-                            android:layout_toLeftOf="@id/tv_more1"
-                            android:layout_centerVertical="true"
-
-                            />
-
-                </RelativeLayout>
-
-
-
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1px"
-                    android:background="@color/white_bg_line"
-
-                    />
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="15dp"
-                    android:background="@drawable/x_ll_bg"
-                    android:layout_margin="10dp"
-                    >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/sheep_id"
-                            android:layout_alignParentLeft="true"
-                            style="@style/txt_style_15_black"
-                            android:layout_centerVertical="true"
-                            />
-
-
-
-                        <TextView
-                            android:id="@+id/tv_sheep_id"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@null"
-                            android:src="@mipmap/ic_launcher"
-                            android:layout_alignParentEnd="true"
-                            android:layout_centerVertical="true"
-
-                            />
-
-                </RelativeLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1px"
-                    android:background="@color/white_bg_line"
-
-                    />
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="15dp"
-                    android:background="@drawable/x_ll_bg"
-                    android:layout_margin="10dp"
-                    android:id="@+id/rl_qr"
-                    >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/my_qr"
-                            android:layout_alignParentLeft="true"
-                            style="@style/txt_style_15_black"
-                            android:layout_centerVertical="true"
-                            />
-
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/hint_txt_style"
-                            android:layout_centerVertical="true"
-                            android:layout_alignParentRight="true"
-                            android:drawableRight="@mipmap/x_ic_next"
-                            android:drawablePadding="10dp"
-                            android:id="@+id/tv_more3"
-                            />
-
-                        <ImageView
-                            android:id="@+id/tv_qr"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:background="@null"
-                            android:src="@mipmap/ic_launcher"
-                            android:layout_toLeftOf="@id/tv_more3"
-                            android:layout_centerVertical="true"
-
-                            />
-
-                </RelativeLayout>
-        </LinearLayout>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/my_qr"
+                android:layout_alignParentLeft="true"
+                style="@style/txt_style_15_black"
+                android:layout_centerVertical="true"
+                />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/hint_txt_style"
+                android:layout_centerVertical="true"
+                android:layout_alignParentRight="true"
+                android:drawableRight="@mipmap/x_ic_next"
+                android:drawablePadding="10dp"
+                android:id="@+id/tv_more3"
+                />
+
+            <ImageView
+                android:id="@+id/tv_qr"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:background="@null"
+                android:src="@mipmap/ic_launcher"
+                android:layout_toLeftOf="@id/tv_more3"
+                android:layout_centerVertical="true"
+
+                />
+
+        </RelativeLayout>
+    </LinearLayout>
 </LinearLayout>