xiongxiaohe лет назад: 8
Родитель
Сommit
e3f7167d38

+ 1 - 0
app/build.gradle

@@ -219,4 +219,5 @@ dependencies {
     compile 'io.reactivex:rxandroid:1.2.1'
     compile 'io.reactivex:rxandroid:1.2.1'
     compile 'com.github.ithedan:TextViewDrawable:v1.0'
     compile 'com.github.ithedan:TextViewDrawable:v1.0'
     compile 'com.lzy.widget:imagepicker:0.6.1'
     compile 'com.lzy.widget:imagepicker:0.6.1'
+    compile 'com.github.zhangkexpz:LayoutScroll:v1.0'
 }
 }

+ 2 - 0
app/src/main/AndroidManifest.xml

@@ -337,6 +337,8 @@
             android:screenOrientation="portrait" />
             android:screenOrientation="portrait" />
         <activity android:name="com.sheep.gamegroup.view.activity.ChangeWxOrTelAct"
         <activity android:name="com.sheep.gamegroup.view.activity.ChangeWxOrTelAct"
             android:screenOrientation="portrait"/>
             android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.ReNameActivity"
+            android:screenOrientation="portrait"/>
         <!--友盟start-->
         <!--友盟start-->
 
 
 
 

+ 1 - 4
app/src/main/java/com/kfzs/duanduan/ActMain.java

@@ -53,6 +53,7 @@ import com.kfzs.duanduan.utils.net.APIRequestInstance;
 import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
 import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
 import com.kfzs.duanduan.view.AppHomepageAdvertisementDialog;
 import com.kfzs.duanduan.view.AppHomepageAdvertisementDialog;
 import com.kfzs.duanduan.view.DialogStorageLow;
 import com.kfzs.duanduan.view.DialogStorageLow;
+import com.sheep.gamegroup.event.MoneyChange;
 import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
@@ -115,10 +116,6 @@ public class ActMain extends BaseCompatActivity{
     }
     }
 
 
 
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onMessageEvent(UserNameChange done) {
-
-    }
 
 
 
 
     private void initLinsener() {
     private void initLinsener() {

+ 6 - 0
app/src/main/java/com/kfzs/duanduan/fragment/FgtMainGame.java

@@ -10,6 +10,8 @@ import com.kf.utils.KFLog;
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
 import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.BaseCompatFragment;
+import com.sheep.gamegroup.event.MoneyChange;
+import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.adp.AdpMainPageRecy;
 import com.kfzs.duanduan.adp.AdpMainPageRecy;
 import com.kfzs.duanduan.bean.BaseMsg;
 import com.kfzs.duanduan.bean.BaseMsg;
@@ -33,6 +35,7 @@ import com.kfzs.duanduan.utils.net.APIRequestInstance;
 
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 
 
 
 /**
 /**
@@ -257,6 +260,9 @@ public class FgtMainGame extends BaseCompatFragment {
                 .handlDownloadResult(info);
                 .handlDownloadResult(info);
     }
     }
 
 
+
+
+
     @Override
     @Override
     public void setUserVisibleHint(boolean isVisibleToUser) {
     public void setUserVisibleHint(boolean isVisibleToUser) {
         super.setUserVisibleHint(isVisibleToUser);
         super.setUserVisibleHint(isVisibleToUser);

+ 144 - 15
app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -4,8 +4,11 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Message;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout;
@@ -13,32 +16,49 @@ import android.widget.TextView;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
+import com.bumptech.glide.Glide;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.BigEvent;
+import com.layoutscroll.layoutscrollcontrols.view.EasyLayoutScroll;
 import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
 import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
 import com.sheep.gamegroup.di.modules.SmallSheepModule;
 import com.sheep.gamegroup.di.modules.SmallSheepModule;
+import com.sheep.gamegroup.event.ImageHeadChange;
+import com.sheep.gamegroup.event.MoneyChange;
+import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.MoreDataEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.presenter.SmallSheepContract;
 import com.sheep.gamegroup.presenter.SmallSheepContract;
 import com.sheep.gamegroup.presenter.SmallSheepPresenter;
 import com.sheep.gamegroup.presenter.SmallSheepPresenter;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyDbManager;
-import com.sheep.gamegroup.util.MyListview;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
 
 
 import javax.inject.Inject;
 import javax.inject.Inject;
 
 
 import butterknife.BindView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.OnClick;
+import butterknife.Unbinder;
 import de.hdodenhof.circleimageview.CircleImageView;
 import de.hdodenhof.circleimageview.CircleImageView;
 
 
-public class FgtSmallSheep extends BaseCompatFragment  implements SmallSheepContract.View {
+public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContract.View {
+
+    @BindView(R.id.upview1)
+    EasyLayoutScroll upview1;
+    Unbinder unbinder;
 
 
     @Override
     @Override
     protected void initView(Bundle savedInstanceState) {
     protected void initView(Bundle savedInstanceState) {
@@ -70,31 +90,26 @@ public class FgtSmallSheep extends BaseCompatFragment  implements SmallSheepCont
     LinearLayout invitationLayout;
     LinearLayout invitationLayout;
     @BindView(R.id.lying_layout)
     @BindView(R.id.lying_layout)
     LinearLayout lyingLayout;
     LinearLayout lyingLayout;
-    @BindView(R.id.listview)
-    MyListview listview;
 
 
     @Inject
     @Inject
     SmallSheepPresenter pagePresenter;
     SmallSheepPresenter pagePresenter;
     private Activity activity;
     private Activity activity;
     private UserEntity userEntity;
     private UserEntity userEntity;
+    List<View> views = new ArrayList<>();
 
 
-
-    Handler mHanderl = new Handler(){
+    Handler mHanderl = new Handler() {
         @Override
         @Override
         public void handleMessage(Message msg) {
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
             super.handleMessage(msg);
+            refalsh();
 
 
-            myPrice.setText(userEntity.getBalance()+" 元");
-            myAllPrice.setText("累计资产 "+userEntity.getTotal_asset()+" 元");
-            nameTv.setText(userEntity.getNickname()+"");//绵羊号:123456789
-            sheepNumTv.setText("绵羊号:"+userEntity.getInvitation_code());
         }
         }
     };
     };
 
 
     public void initView() {
     public void initView() {
         EventBus.getDefault().register(this);
         EventBus.getDefault().register(this);
         activity = getActivity();
         activity = getActivity();
-        ButterKnife.bind(this,mContentView);
+        ButterKnife.bind(this, mContentView);
         DaggerSmallSheepComponent.builder()
         DaggerSmallSheepComponent.builder()
                 .netComponent(SheepApp.get(getContext()).getNetComponent())
                 .netComponent(SheepApp.get(getContext()).getNetComponent())
                 .smallSheepModule(new SmallSheepModule(this))
                 .smallSheepModule(new SmallSheepModule(this))
@@ -102,6 +117,21 @@ public class FgtSmallSheep extends BaseCompatFragment  implements SmallSheepCont
                 .inject(this);
                 .inject(this);
     }
     }
 
 
+
+    private void refalsh() {
+
+        myPrice.setText(userEntity.getBalance() + " 元");
+        myAllPrice.setText("累计资产 " + userEntity.getTotal_asset() + " 元");
+        nameTv.setText(userEntity.getNickname() + "");//绵羊号:123456789
+        sheepNumTv.setText("绵羊号:" + userEntity.getInvitation_code());
+        Glide.with(getActivity())
+                .load(userEntity.getAvatar())
+                .placeholder(R.drawable.icon)
+                .into(iconImgIv);
+
+    }
+
+
     public void initListener() {
     public void initListener() {
 
 
     }
     }
@@ -109,6 +139,8 @@ public class FgtSmallSheep extends BaseCompatFragment  implements SmallSheepCont
     public void initData() {
     public void initData() {
         pagePresenter.getUserInfo();
         pagePresenter.getUserInfo();
 
 
+        pagePresenter.getAwardDetail();
+
     }
     }
 
 
     @OnClick({R.id.icon_img_iv, R.id.user_layout, R.id.withdrawal, R.id.couple_red_packets_iv, R.id.try_play_layout, R.id.invitation_layout, R.id.lying_layout})
     @OnClick({R.id.icon_img_iv, R.id.user_layout, R.id.withdrawal, R.id.couple_red_packets_iv, R.id.try_play_layout, R.id.invitation_layout, R.id.lying_layout})
@@ -138,7 +170,7 @@ public class FgtSmallSheep extends BaseCompatFragment  implements SmallSheepCont
 
 
     @Override
     @Override
     public void updateData2View(Object o) {
     public void updateData2View(Object o) {
-        if(o == null){
+        if (o == null) {
             return;
             return;
         }
         }
         BaseMessage baseMessage = (BaseMessage) o;
         BaseMessage baseMessage = (BaseMessage) o;
@@ -146,7 +178,7 @@ public class FgtSmallSheep extends BaseCompatFragment  implements SmallSheepCont
         try {
         try {
             MyDbManager.getInstance().saveOrUpdateUser(userEntity);
             MyDbManager.getInstance().saveOrUpdateUser(userEntity);
 //            userEntity = MyDbManager.getInstance().dbFindUser();
 //            userEntity = MyDbManager.getInstance().dbFindUser();
-            Log.e("------userEntity",userEntity.getNickname()+"|"+userEntity.getMobile()+"");
+            Log.e("------userEntity", userEntity.getNickname() + "|" + userEntity.getMobile() + "");
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
@@ -160,19 +192,116 @@ public class FgtSmallSheep extends BaseCompatFragment  implements SmallSheepCont
 
 
     }
     }
 
 
+    @Override
+    public void showMore(final List<MoreDataEntity> loginEty) {
+        getActivity().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                setViews(loginEty);
+            }
+        });
+
+
+
+    }
+
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (upview1 != null) {
+            //停止滚动
+            upview1.stopScroll();
+        }
+    }
+
+    private void setViews(final List<MoreDataEntity> loginEty) {
+
+        for (MoreDataEntity entity:loginEty) {
+            LinearLayout moreView = (LinearLayout) LayoutInflater.from(getActivity()).inflate(R.layout.x_item_view, null);
+            StringBuilder  sb=new StringBuilder();
+            TextView tv_desc = moreView.findViewById(R.id.tv_desc);
+            sb.append(TimeStamp2Date(entity.getTime())+"   ");
+            sb.append(entity.getName()+"   ");
+            sb.append(entity.getDesc());
+            tv_desc.setText(sb.toString());
+            views.add(moreView);
+        }
+        upview1.setEasyViews(views);
+        //开始滚动
+        upview1.setAutoStart(true);
+        upview1.startScroll();
+
+
+    }
+
+
+
+
+    public  String TimeStamp2Date(long  timestampString) {
+        String     formats = "yyyy-MM-dd HH:mm:ss";
+        Long timestamp = timestampString * 1000;
+        String date = new SimpleDateFormat(formats, Locale.CHINA).format(new Date(timestamp));
+        return date;
+    }
+
+
     @Subscribe
     @Subscribe
-    public void onEventMainThread(BigEvent event){
-        switch (event.getEventTypes()){
+    public void onEventMainThread(BigEvent event) {
+        switch (event.getEventTypes()) {
             case ONFRESH_FGT_FAMLLSHEEP:
             case ONFRESH_FGT_FAMLLSHEEP:
                 initData();
                 initData();
                 break;
                 break;
         }
         }
     }
     }
 
 
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(UserNameChange done) {
+        UserEntity enity = userEntity;
+        enity.setNickname(done.getNikeName());
+        userEntity = enity;
+        refalsh();
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(MoneyChange done) {
+        UserEntity enity = userEntity;
+        enity.setBalance(done.getBalance());
+        enity.setTotal_asset(done.getTotal_asset());
+        userEntity = enity;
+        refalsh();
+    }
+
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(ImageHeadChange done) {
+        UserEntity enity = userEntity;
+        enity.setAvatar(done.getAvatar());
+        userEntity = enity;
+        refalsh();
+    }
+
+
+
     @Override
     @Override
     public void onDestroy() {
     public void onDestroy() {
         super.onDestroy();
         super.onDestroy();
 
 
         EventBus.getDefault().unregister(this);
         EventBus.getDefault().unregister(this);
     }
     }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        // TODO: inflate a fragment view
+        View rootView = super.onCreateView(inflater, container, savedInstanceState);
+        unbinder = ButterKnife.bind(this, rootView);
+        return rootView;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
 }
 }

+ 17 - 0
app/src/main/java/com/sheep/gamegroup/event/ImageHeadChange.java

@@ -0,0 +1,17 @@
+package com.sheep.gamegroup.event;
+
+/**
+ * Created by Administrator on 2018/3/27.
+ */
+
+public class ImageHeadChange {
+    private  String avatar;
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+}

+ 16 - 0
app/src/main/java/com/sheep/gamegroup/event/MoneyChange.java

@@ -6,6 +6,22 @@ package com.sheep.gamegroup.event;
 
 
 public class MoneyChange {
 public class MoneyChange {
 
 
+    private  String balance;
+    private  String  total_asset;
 
 
+    public String getBalance() {
+        return balance;
+    }
 
 
+    public void setBalance(String balance) {
+        this.balance = balance;
+    }
+
+    public String getTotal_asset() {
+        return total_asset;
+    }
+
+    public void setTotal_asset(String total_asset) {
+        this.total_asset = total_asset;
+    }
 }
 }

+ 8 - 0
app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -199,4 +199,12 @@ public interface ApiService {
      */
      */
     @PUT(V1 + "/app/user/bind_all_real_info")
     @PUT(V1 + "/app/user/bind_all_real_info")
     Observable<BaseMessage> bindALl(@Body JSONObject jsonObject);
     Observable<BaseMessage> bindALl(@Body JSONObject jsonObject);
+
+    /**
+     * 更换手机号
+     */
+    @GET(V1 + "/app/user/award_detail")
+    Observable<BaseMessage> awardDetail(@Query("page") int page,@Query("per_page") int per_page);
+
+
 }
 }

+ 43 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/MoreDataEntity.java

@@ -0,0 +1,43 @@
+/**
+ * Copyright 2018 bejson.com
+ */
+package com.sheep.gamegroup.model.entity;
+
+/**
+ * Auto-generated: 2018-03-27 2:40:9
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+public class MoreDataEntity {
+
+
+    private long  time;
+    private  String  desc;
+    private  String name;
+
+
+    public long getTime() {
+        return time;
+    }
+
+    public void setTime(long time) {
+        this.time = time;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

+ 6 - 7
app/src/main/java/com/sheep/gamegroup/model/entity/UserInfoEntity.java

@@ -17,10 +17,10 @@ public class UserInfoEntity  implements Serializable {
     private int id;
     private int id;
     private String mobile;
     private String mobile;
     private String nickname;
     private String nickname;
-    private int balance;
+    private double balance;
     private String invitation_code;
     private String invitation_code;
     private String parent_code;
     private String parent_code;
-    private int total_asset;
+    private double total_asset;
     private long last_login_time;
     private long last_login_time;
     private long create_time;
     private long create_time;
     private long update_time;
     private long update_time;
@@ -36,7 +36,6 @@ public class UserInfoEntity  implements Serializable {
     private String wx_nickname;
     private String wx_nickname;
     private String share_link;
     private String share_link;
 
 
-
     public int getId() {
     public int getId() {
         return id;
         return id;
     }
     }
@@ -61,11 +60,11 @@ public class UserInfoEntity  implements Serializable {
         this.nickname = nickname;
         this.nickname = nickname;
     }
     }
 
 
-    public int getBalance() {
+    public double getBalance() {
         return balance;
         return balance;
     }
     }
 
 
-    public void setBalance(int balance) {
+    public void setBalance(double balance) {
         this.balance = balance;
         this.balance = balance;
     }
     }
 
 
@@ -85,11 +84,11 @@ public class UserInfoEntity  implements Serializable {
         this.parent_code = parent_code;
         this.parent_code = parent_code;
     }
     }
 
 
-    public int getTotal_asset() {
+    public double getTotal_asset() {
         return total_asset;
         return total_asset;
     }
     }
 
 
-    public void setTotal_asset(int total_asset) {
+    public void setTotal_asset(double total_asset) {
         this.total_asset = total_asset;
         this.total_asset = total_asset;
     }
     }
 
 

+ 10 - 0
app/src/main/java/com/sheep/gamegroup/presenter/SmallSheepContract.java

@@ -1,5 +1,9 @@
 package com.sheep.gamegroup.presenter;
 package com.sheep.gamegroup.presenter;
 
 
+import com.sheep.gamegroup.model.entity.MoreDataEntity;
+
+import java.util.List;
+
 /**
 /**
  * Created by ljy on 2018/3/19.
  * Created by ljy on 2018/3/19.
  */
  */
@@ -9,11 +13,17 @@ public interface SmallSheepContract {
     interface Persenter{
     interface Persenter{
 
 
         void getUserInfo();
         void getUserInfo();
+
+
+        void  getAwardDetail();
     }
     }
 
 
     interface View {
     interface View {
 
 
         void updateData2View(Object o);
         void updateData2View(Object o);
         void failData2View(Object o);
         void failData2View(Object o);
+        void  showMore( List<MoreDataEntity> loginEty);
+
+
     }
     }
 }
 }

+ 32 - 0
app/src/main/java/com/sheep/gamegroup/presenter/SmallSheepPresenter.java

@@ -2,12 +2,18 @@ package com.sheep.gamegroup.presenter;
 
 
 import android.util.Log;
 import android.util.Log;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.MoreDataEntity;
+import com.sheep.gamegroup.model.entity.UserInfoEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.FastJsonUtils;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 
+import java.util.List;
+
 import javax.inject.Inject;
 import javax.inject.Inject;
 
 
 import rx.Observer;
 import rx.Observer;
@@ -50,4 +56,30 @@ public class SmallSheepPresenter implements SmallSheepContract.Persenter {
                     }
                     }
                 });
                 });
     }
     }
+
+    @Override
+    public void getAwardDetail() {
+        apiService.awardDetail(0,100)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+
+
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+
+                        if(baseMessage!=null){
+                            List<MoreDataEntity> loginEty = FastJsonUtils.toList( JSONObject.toJSONString(baseMessage.getData()),MoreDataEntity.class);
+                            view.showMore(loginEty);
+
+                        }
+
+
+                    }
+                });
+    }
 }
 }

+ 15 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/AccountAndSecurityAct.java

@@ -12,6 +12,8 @@ import com.bumptech.glide.Glide;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerAccountAndSercuritComponent;
 import com.sheep.gamegroup.di.components.DaggerAccountAndSercuritComponent;
 import com.sheep.gamegroup.di.modules.AccountAndSercuritModule;
 import com.sheep.gamegroup.di.modules.AccountAndSercuritModule;
+import com.sheep.gamegroup.event.ImageHeadChange;
+import com.sheep.gamegroup.event.MoneyChange;
 import com.sheep.gamegroup.event.RealNameAutehrChange;
 import com.sheep.gamegroup.event.RealNameAutehrChange;
 import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
@@ -104,6 +106,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
 
     @Override
     @Override
     public void initData() {
     public void initData() {
+        presenter.getTask(null);
         EventBus.getDefault().register(this);
         EventBus.getDefault().register(this);
     }
     }
 
 
@@ -234,7 +237,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
 
                 Glide.with(AccountAndSecurityAct.this)
                 Glide.with(AccountAndSecurityAct.this)
                         .load(mEntity.getAvatar())
                         .load(mEntity.getAvatar())
-                        .placeholder(R.mipmap.x_ic_def_head)
+                        .placeholder(R.drawable.icon)
                         .into(ivHead);
                         .into(ivHead);
                 if (TextUtils.isEmpty(entity.getWx_nickname())) {
                 if (TextUtils.isEmpty(entity.getWx_nickname())) {
                     tvWx.setText("未绑定");
                     tvWx.setText("未绑定");
@@ -243,6 +246,17 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
                 }
                 }
 
 
                 refalshAuther(entity);
                 refalshAuther(entity);
+                MoneyChange change=new MoneyChange();
+                change.setBalance(entity.getBalance()+"");
+                change.setTotal_asset(mEntity.getTotal_asset()+"");
+                EventBus.getDefault().post(change);
+
+        ImageHeadChange  change1=new ImageHeadChange();
+        change1.setAvatar(mEntity.getAvatar());
+        EventBus.getDefault().post(change1);
+
+
+        EventBus.getDefault().post(change);
 
 
     }
     }
 
 

+ 2 - 5
app/src/main/java/com/sheep/gamegroup/view/activity/PersionInfoAct.java

@@ -86,7 +86,7 @@ public class PersionInfoAct extends AbsChooseImageActivity {
 
 
                 Glide.with(PersionInfoAct.this)
                 Glide.with(PersionInfoAct.this)
                         .load(mEntity.getAvatar())
                         .load(mEntity.getAvatar())
-                        .placeholder(R.mipmap.x_ic_def_head)
+                        .placeholder(R.drawable.icon)
                         .into(ivHeadRight);
                         .into(ivHeadRight);
             }
             }
         }
         }
@@ -142,7 +142,7 @@ public class PersionInfoAct extends AbsChooseImageActivity {
         iv_qr.setLayoutParams(params);
         iv_qr.setLayoutParams(params);
         Glide.with(PersionInfoAct.this)
         Glide.with(PersionInfoAct.this)
                 .load(mEntity.getAvatar())
                 .load(mEntity.getAvatar())
-                .placeholder(R.mipmap.ic_launcher)
+                .placeholder(R.mipmap.x_ic_def_head)
                 .into(iv_qr);
                 .into(iv_qr);
         dialog.show();
         dialog.show();
         iv.setOnClickListener(new View.OnClickListener() {
         iv.setOnClickListener(new View.OnClickListener() {
@@ -160,9 +160,6 @@ public class PersionInfoAct extends AbsChooseImageActivity {
     @OnClick({R.id.iv_head_right, R.id.tv_nike, R.id.rl_qr, R.id.rl_head})
     @OnClick({R.id.iv_head_right, R.id.tv_nike, R.id.rl_qr, R.id.rl_head})
     public void onClick(View view) {
     public void onClick(View view) {
         switch (view.getId()) {
         switch (view.getId()) {
-            case R.id.iv_head_right:
-                showHead();
-                break;
             case R.id.tv_nike:
             case R.id.tv_nike:
                 Intent i=new Intent(PersionInfoAct.this,ReNameActivity.class);
                 Intent i=new Intent(PersionInfoAct.this,ReNameActivity.class);
                 i.putExtra("name",mEntity.getNickname());
                 i.putExtra("name",mEntity.getNickname());

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/adapter/TaskListItemAdp.java

@@ -68,7 +68,7 @@ public class TaskListItemAdp extends BaseAdapter {
         holder.price_tv.setText(returnValue(ety));
         holder.price_tv.setText(returnValue(ety));
         Glide.with(context)
         Glide.with(context)
                 .load(ety.getRelease_task().getTask().getIcon())
                 .load(ety.getRelease_task().getTask().getIcon())
-                .placeholder(R.mipmap.ic_launcher)
+                .placeholder(R.mipmap.x_ic_def_head)
                 .into(holder.icon_iv);
                 .into(holder.icon_iv);
         return convertView;
         return convertView;
     }
     }

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

@@ -133,7 +133,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getBonus() +"元");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getBonus() +"元");
                 Glide.with(context)
                 Glide.with(context)
                         .load(etyList.get(i).getTask().getIcon()+"")
                         .load(etyList.get(i).getTask().getIcon()+"")
-                        .placeholder(R.mipmap.ic_launcher)
+                        .placeholder(R.mipmap.x_ic_def_head)
                         .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
                         .into((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv));
                 viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
                 viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     @Override
@@ -170,7 +170,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
         TextView cancel_task_tv = holder.getView(R.id.cancel_task_tv);
         TextView cancel_task_tv = holder.getView(R.id.cancel_task_tv);
         Glide.with(context)
         Glide.with(context)
                 .load(acceptedEty.getRelease_task().getTask().getIcon()+"")
                 .load(acceptedEty.getRelease_task().getTask().getIcon()+"")
-                .placeholder(R.mipmap.ic_launcher)
+                .placeholder(R.mipmap.x_ic_def_head)
                 .dontAnimate()
                 .dontAnimate()
                 .into(icon);
                 .into(icon);
         item_anem_tv.setText(acceptedEty.getRelease_task().getName()+"");
         item_anem_tv.setText(acceptedEty.getRelease_task().getName()+"");

+ 8 - 3
app/src/main/res/layout/homepage_act_layout.xml

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:orientation="vertical"
     android:background="@color/bg_gray">
     android:background="@color/bg_gray">
 
 
@@ -200,11 +201,15 @@
                     android:textSize="@dimen/text_size_15"
                     android:textSize="@dimen/text_size_15"
                     android:textColor="@color/black_191919"/>
                     android:textColor="@color/black_191919"/>
 
 
-                <com.sheep.gamegroup.util.MyListview
-                    android:id="@+id/listview"
+                <com.layoutscroll.layoutscrollcontrols.view.EasyLayoutScroll
+                    android:id="@+id/upview1"
                     android:layout_width="match_parent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_height="wrap_content"
-                    android:scrollbars="none"></com.sheep.gamegroup.util.MyListview>
+                    android:padding="10dp"
+                    app:duration="2000"
+                    app:gradient="true"
+                    app:interval="1000"></com.layoutscroll.layoutscrollcontrols.view.EasyLayoutScroll>
+
             </LinearLayout>
             </LinearLayout>
         </LinearLayout>
         </LinearLayout>
     </ScrollView>
     </ScrollView>

+ 5 - 8
app/src/main/res/layout/x_account_security_layout.xml

@@ -16,17 +16,14 @@
         android:layout_margin="10dp"
         android:layout_margin="10dp"
         android:id="@+id/rl_top"
         android:id="@+id/rl_top"
         >
         >
-        <ImageView
+
+        <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/iv_head"
             android:id="@+id/iv_head"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:background="@null"
-            android:scaleType="centerInside"
-            android:src="@mipmap/x_ic_def_head"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
             android:layout_alignParentLeft="true"
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
             android:layout_centerVertical="true"
-            />
-
+            android:src="@drawable/icon"/>
         <TextView
         <TextView
             android:id="@+id/tv_name"
             android:id="@+id/tv_name"
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"

+ 19 - 0
app/src/main/res/layout/x_item_view.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="wrap_content"
+    android:orientation="vertical"
+    >
+    <TextView
+        android:id="@+id/tv_desc"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="内容"
+        style="@style/txt_style_12"
+        android:layout_margin="5dp"
+        android:layout_centerVertical="true"
+        />
+</LinearLayout>