更新apiservice代码

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

@@ -56,12 +56,31 @@ public interface ApiService {
      * 绑定手机号
      */
     @PUT(ConnectAddress.V1+"app/user/bind_mobile/")
-    Observable<BaseMessage> bindMobile();
+    Observable<BaseMessage> bindMobile(@Query("mobile") String mobile, @Query("sec_code") String sec_code);
+    /**
+     * 绑定真实姓名
+     */
+    @PUT(ConnectAddress.V1+"app/user/bind_real_name/")
+    Observable<BaseMessage> bindRealname(@Query("real_name") String real_name);
+    /**
+     * 绑定身份证号
+     */
+    @PUT(ConnectAddress.V1+"app/user/bind_id_number/")
+    Observable<BaseMessage> bindIdNumber(@Query("id_number") String id_number);
 
     /**
      * 用户提现
+     * amount   type
+     * type "体现渠道 1：微信 2：支付宝 3：手机充值"
+     * now only 1：微信
      */
     @POST(ConnectAddress.V1 + "app/withdraw/")
     Observable<BaseMessage> goWithdrawal(@Body JSONObject parame);
 
+    /**
+     * 提现绑定微信号
+     */
+    @GET(ConnectAddress.V1 + "app/user/bind_wx/")
+    Observable<BaseMessage> bindWeixin(@Query("code") String code);
+
 }

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

@@ -1,5 +1,7 @@
 package com.sheep.gamegroup.presenter;
 
+import com.alibaba.fastjson.JSONObject;
+
 /**
  * Created by ljy on 2018/3/18.
  */
@@ -7,10 +9,12 @@ package com.sheep.gamegroup.presenter;
 public interface BindOrChangeWeixinContract {
 
     interface Presenter {
+        void bindWeixin(Object o);
 
     }
 
     interface View{
-
+        void updateView(Object o);
+        void failData(Object o);
     }
 }

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

@@ -1,9 +1,16 @@
 package com.sheep.gamegroup.presenter;
 
+import android.util.Log;
+
+import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.api.ApiService;
+import com.sheep.gamegroup.model.entity.BaseMessage;
 
 import javax.inject.Inject;
 
+import rx.Observer;
+import rx.schedulers.Schedulers;
+
 /**
  * Created by ljy on 2018/3/18.
  */
@@ -18,4 +25,29 @@ public class BindOrChangeWeixinPresenter implements BindOrChangeWeixinContract.P
         this.view = view;
         this.apiService = apiService;
     }
+
+    @Override
+    public void bindWeixin(Object o) {
+        apiService.bindWeixin(((JSONObject) o).getString("code"))
+                .subscribeOn(Schedulers.io())
+                .subscribe(new Observer<BaseMessage>() {
+                    @Override
+                    public void onCompleted() {
+                        Log.e("onCompleted--------","onCompleted");
+
+                    }
+
+                    @Override
+                    public void onError(Throwable throwable) {
+                        Log.e("onError--------","onError:"+throwable);
+                        view.failData(throwable);
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        Log.e("onNext--------","onNext:"+baseMessage.toString());
+                        view.updateView(baseMessage);
+                    }
+                });
+    }
 }

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

@@ -3,8 +3,10 @@ package com.sheep.gamegroup.view.activity;
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v7.widget.AppCompatEditText;
+import android.view.View;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.di.components.DaggerBindOrChangeWeixinComponent;
 import com.sheep.gamegroup.di.modules.BindOrChangeWeixinModule;
 import com.sheep.gamegroup.presenter.BindOrChangeWeixinContract;
@@ -34,6 +36,8 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
     @Inject
     BindOrChangeWeixinPresenter presenter;
 
+    private String code;
+
 
     @Override
     protected int getLayoutId() {
@@ -68,6 +72,29 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
     }
 
     @OnClick(R.id.bindweixin_sure_text)
-    public void onViewClicked() {
+    public void onViewClicked(View view) {
+        switch (view.getId()){
+            case R.id.bindweixin_sure_text:
+                code = weinxinEtAccount.getText().toString();
+                submit();
+                break;
+        }
+    }
+
+    private void submit() {
+        JSONObject j = new JSONObject();
+        j.put("code",code );
+        showProgress();
+        presenter.bindWeixin(j);
+    }
+
+    @Override
+    public void updateView(Object o) {
+        hideProgress();
+    }
+
+    @Override
+    public void failData(Object o) {
+        hideProgress();
     }
 }

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

@@ -0,0 +1,29 @@
+package com.sheep.gamegroup.view.activity;
+
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+
+/**
+ * Created by ljy on 2018/3/19.
+ */
+
+public class HomePageAct extends BaseActivity {
+    @Override
+    protected int getLayoutId() {
+        return 0;
+    }
+
+    @Override
+    public void initView() {
+
+    }
+
+    @Override
+    public void initListener() {
+
+    }
+
+    @Override
+    public void initData() {
+
+    }
+}

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

@@ -2,6 +2,9 @@ package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.preference.PreferenceActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.RelativeLayout;
@@ -53,6 +56,17 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
     Activity activity;
     @Inject
     PersonalCenterPresenter presenter;
+    UserEntity userEntity;
+
+    Handler mHanderl = new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+
+            myPrice.setText(userEntity.getBalance()+" 元");
+            myAllPrice.setText("累计资产 "+userEntity.getTotal_asset()+" 元");
+        }
+    };
 
     @Override
     protected int getLayoutId() {
@@ -61,6 +75,8 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
 
     @Override
     public void initView() {
+
+        ButterKnife.bind(this);
         activity = this;
         DaggerPersonalCenterComponent.builder()
                 .netComponent(SheepApp.get(this).getNetComponent())
@@ -80,13 +96,6 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
         presenter.getUserInfo();
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
-    }
-
     @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()) {
@@ -113,18 +122,16 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
             return;
         }
         BaseMessage baseMessage = (BaseMessage) o;
-        UserEntity userEntity = JSON.parseObject(JSONObject.toJSONString(baseMessage.getData()), UserEntity.class);
+        userEntity = JSON.parseObject(JSONObject.toJSONString(baseMessage.getData()), UserEntity.class);
 
         try {
             MyDbManager.getInstance().saveOrUpdateUser(userEntity);
-            userEntity = MyDbManager.getInstance().dbFindUser();
+//            userEntity = MyDbManager.getInstance().dbFindUser();
             Log.e("------userEntity",userEntity.getNickname()+"|"+userEntity.getMobile()+"");
-        } catch (DbException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        myPrice.setText(userEntity.getBalance());
-        myAllPrice.setText(userEntity.getTotal_asset());
-
+        mHanderl.sendEmptyMessage(0);
     }
 
     @Override

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

@@ -20,6 +20,7 @@ import com.sheep.gamegroup.presenter.PersonalCenterPresenter;
 import com.sheep.gamegroup.presenter.PhoneContract;
 import com.sheep.gamegroup.presenter.PhonePresenter;
 import com.sheep.gamegroup.util.ActivityManager;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
 import com.sheep.gamegroup.util.XXTEA;
@@ -212,10 +213,12 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
             UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
             Log.e("------userEntity",userEntity.getNickname()+"|"+userEntity.getMobile()+"");
             G.showToast(userEntity.getNickname()+"|"+userEntity.getMobile());
-            goMain();
         } catch (DbException e) {
             e.printStackTrace();
         }
+
+        Jump2View.getInstance().goPersonnalCenterView(activity, null);
+        finish();
         Log.e("---login_-", o.toString());
     }
 

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

@@ -109,14 +109,15 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
 
     private void doWithdrawal() {
 //        String price1 = ((GridViewEntity)withdrawalGreidview.getSelectedItem()).getValue();
-        String price = ((GridViewEntity)listData.get(select)).getValue();
-        if(TextUtils.isEmpty(withdrawalGreidview.getSelectedItem()+"")){
+        String amount = ((GridViewEntity)listData.get(select)).getValue();
+        if(TextUtils.isEmpty(amount)){
             G.showToast("请选择金额");
             return;
         }
 
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("price", withdrawalGreidview.getSelectedItem());
+        jsonObject.put("amount", Float.valueOf(amount));
+        jsonObject.put("type", 1);
         showProgress();
         presenter.goWithdrawal(jsonObject);
     }

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

@@ -0,0 +1,19 @@
+<?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">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/icon_img_iv"
+            android:layout_width="@dimen/view_size_60"
+            android:layout_height="@dimen/view_size_60" />
+
+    </RelativeLayout>
+
+</LinearLayout>

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

@@ -96,6 +96,7 @@
     <dimen name="view_size_35">35dp</dimen>
     <dimen name="view_size_40">40dp</dimen>
     <dimen name="view_size_45">45dp</dimen>
+    <dimen name="view_size_60">60dp</dimen>
 
 
 </resources>