合并小绵羊主页与半袋米主页

app/build.gradle

@@ -217,4 +217,5 @@ dependencies {
     compile project(':datashare')
     compile files('libs/jackson-core-2.2.1.jar')
     compile files('libs/jackson-dataformat-xml-2.1.2.jar')
+    compile 'io.reactivex:rxandroid:1.2.1'
 }

app/src/main/AndroidManifest.xml

@@ -174,10 +174,10 @@
             android:name=".page.SplashActivity"
             android:screenOrientation="portrait">
 
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
+            <!--<intent-filter>-->
+                <!--<action android:name="android.intent.action.MAIN"/>-->
+                <!--<category android:name="android.intent.category.LAUNCHER"/>-->
+            <!--</intent-filter>-->
         </activity>
         <activity
             android:name="com.sheep.gamegroup.view.activity.AskRewardAct"

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

@@ -14,6 +14,7 @@ import com.kfzs.android.view.CompatActivity;
 import com.kfzs.duanduan.bean.VipStyle;
 import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.kfzs.duanduan.utils.ThemeUtils;
+import com.sheep.gamegroup.util.ActivityManager;
 import com.umeng.analytics.MobclickAgent;
 
 import java.util.List;
@@ -63,6 +64,7 @@ public abstract class BaseCompatActivity extends CompatActivity {
         TAG = this.getClass().getCanonicalName();
         app = KFZSApp.getInstance();
         app.appCompatActivityList.add(this);
+        ActivityManager.getInstance().pushActivity(this);
     }
 
     /**

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

@@ -1,13 +1,155 @@
 package com.kfzs.duanduan.fragment;
 
+import android.app.Activity;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.BaseCompatFragment;
+import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
+import com.sheep.gamegroup.di.modules.SmallSheepModule;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.presenter.SmallSheepContract;
+import com.sheep.gamegroup.presenter.SmallSheepPresenter;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.MyDbManager;
+import com.sheep.gamegroup.util.MyListview;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
+
+import javax.inject.Inject;
 
-public class FgtSmallSheep extends BaseCompatFragment {
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import de.hdodenhof.circleimageview.CircleImageView;
+
+public class FgtSmallSheep extends BaseCompatFragment  implements SmallSheepContract.View {
 
     @Override
     protected void initView(Bundle savedInstanceState) {
         setContentView(R.layout.homepage_act_layout);
+        initView();
+        initListener();
+        initData();
+    }
+
+    @BindView(R.id.icon_img_iv)
+    CircleImageView iconImgIv;
+    @BindView(R.id.name_tv)
+    TextView nameTv;
+    @BindView(R.id.sheep_num_tv)
+    TextView sheepNumTv;
+    @BindView(R.id.user_layout)
+    RelativeLayout userLayout;
+    @BindView(R.id.withdrawal)
+    TextView withdrawal;
+    @BindView(R.id.my_price)
+    TextView myPrice;
+    @BindView(R.id.my_all_price)
+    TextView myAllPrice;
+    @BindView(R.id.couple_red_packets_iv)
+    ImageView coupleRedPacketsIv;
+    @BindView(R.id.try_play_layout)
+    LinearLayout tryPlayLayout;
+    @BindView(R.id.invitation_layout)
+    LinearLayout invitationLayout;
+    @BindView(R.id.lying_layout)
+    LinearLayout lyingLayout;
+    @BindView(R.id.listview)
+    MyListview listview;
+
+    @Inject
+    SmallSheepPresenter pagePresenter;
+    private Activity activity;
+    private UserEntity userEntity;
+
+
+    Handler mHanderl = new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+
+            myPrice.setText(userEntity.getBalance()+" 元");
+            myAllPrice.setText("累计资产 "+userEntity.getTotal_asset()+" 元");
+            nameTv.setText(userEntity.getNickname()+"");//绵羊号：123456789
+            sheepNumTv.setText("绵羊号："+userEntity.getInvitation_code());
+        }
+    };
+
+    public void initView() {
+        activity = getActivity();
+        ButterKnife.bind(this,mContentView);
+        DaggerSmallSheepComponent.builder()
+                .netComponent(SheepApp.get(getContext()).getNetComponent())
+                .smallSheepModule(new SmallSheepModule(this))
+                .build()
+                .inject(this);
+    }
+
+    public void initListener() {
+
+    }
+
+    public void initData() {
+        pagePresenter.getUserInfo();
+
+    }
+
+    @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})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.icon_img_iv:
+                break;
+            case R.id.user_layout:
+                Jump2View.getInstance().goPersonnalCenterView(activity, null);
+                break;
+            case R.id.withdrawal:
+                Jump2View.getInstance().goWithdrawal(activity, null);
+                break;
+            case R.id.couple_red_packets_iv:
+                break;
+            case R.id.try_play_layout:
+                Jump2View.getInstance().goTryplayView(activity, null);
+                break;
+            case R.id.invitation_layout:
+                break;
+            case R.id.lying_layout:
+                break;
+        }
+    }
+
+    @Override
+    public void updateData2View(Object o) {
+        if(o == null){
+            return;
+        }
+        BaseMessage baseMessage = (BaseMessage) o;
+        userEntity = JSON.parseObject(JSONObject.toJSONString(baseMessage.getData()), UserEntity.class);
+        try {
+            MyDbManager.getInstance().saveOrUpdateUser(userEntity);
+//            userEntity = MyDbManager.getInstance().dbFindUser();
+            Log.e("------userEntity",userEntity.getNickname()+"|"+userEntity.getMobile()+"");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        mHanderl.sendEmptyMessage(0);
+
+    }
+
+    @Override
+    public void failData2View(Object o) {
+        G.showToast("网络错误");
+
     }
 }

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

@@ -1,42 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.RelativeLayout;
-
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.sheep.jiuyan.samllsheep.R;
-
-/**
- * Created by Administrator on 2018/1/17.
- */
-
-public class FgtTask extends BaseCompatFragment {
-
-    private static int  count=0;
-    private RelativeLayout rl;
-
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_task);
-        rl=(RelativeLayout)mContentView.findViewById(R.id.rl);
-        rl.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-
-
-            }
-        });
-
-
-
-    }
-
-
-
-
-
-
-
-}

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

@@ -0,0 +1,16 @@
+package com.sheep.gamegroup.di.components;
+
+import com.kfzs.duanduan.fragment.FgtSmallSheep;
+import com.sheep.gamegroup.di.modules.SmallSheepModule;
+import com.sheep.gamegroup.di.scopes.UserScope;
+
+import dagger.Component;
+
+/**
+ * Created by ljy on 2018/3/19.
+ */
+@UserScope
+@Component(modules = SmallSheepModule.class, dependencies = NetComponent.class)
+public interface SmallSheepComponent {
+    void inject(FgtSmallSheep fgtSmallSheep);
+}

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

@@ -0,0 +1,23 @@
+package com.sheep.gamegroup.di.modules;
+
+import com.sheep.gamegroup.presenter.SmallSheepContract;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Created by ljy on 2018/3/19.
+ */
+
+@Module
+public class SmallSheepModule {
+    private SmallSheepContract.View view;
+
+    public SmallSheepModule(SmallSheepContract.View view) {
+        this.view = view;
+    }
+    @Provides
+    public SmallSheepContract.View providView(){
+        return view;
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.sheep.gamegroup.presenter;
+
+/**
+ * Created by ljy on 2018/3/19.
+ */
+
+public interface SmallSheepContract {
+
+    interface Persenter{
+
+        void getUserInfo();
+    }
+
+    interface View {
+
+        void updateData2View(Object o);
+        void failData2View(Object o);
+    }
+}

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

@@ -0,0 +1,57 @@
+package com.sheep.gamegroup.presenter;
+
+import android.util.Log;
+
+import com.sheep.gamegroup.model.api.ApiService;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+
+import javax.inject.Inject;
+
+import rx.Observer;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by ljy on 2018/3/19.
+ */
+
+public class SmallSheepPresenter implements SmallSheepContract.Persenter {
+    private SmallSheepContract.View view;
+    private ApiService apiService;
+
+    @Inject
+    public SmallSheepPresenter(SmallSheepContract.View view, ApiService apiService) {
+        this.view = view;
+        this.apiService = apiService;
+    }
+
+    @Override
+    public void getUserInfo() {
+        String token = SpUtils.getOpenId(SheepApp.mContext);
+
+        Log.e("token---user",token+"");
+        apiService.getInfo()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<BaseMessage>() {
+                    @Override
+                    public void onCompleted() {
+
+                    }
+
+                    @Override
+                    public void onError(Throwable throwable) {
+                        view.failData2View(throwable);
+                        Log.e("throwable",throwable+"");
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage o) {
+                        Log.e("token---user",o.toString()+"");
+                        view.updateData2View(o);
+                    }
+                });
+    }
+}

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

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
+import com.kfzs.duanduan.ActMain;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.view.activity.AuthenticationAct;
 import com.sheep.gamegroup.view.activity.BindDataAct;
@@ -62,7 +63,7 @@ public class Jump2View {
      * @param o
      */
     public void goHomePageView(Context context, Object o){
-        Intent intent = new Intent(context, HomePageAct.class);
+        Intent intent = new Intent(context, ActMain.class);
         context.startActivity(intent);
     }