From 6c90ae8c87865e412cebf44468d3ca40e2b31843 Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Tue, 24 Apr 2018 11:36:31 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/api/Consult.java                        | 2 +-
 app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java   | 2 +-
 app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java         | 4 ++--
 app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java | 7 ++++---
 app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java        | 2 ++
 app/src/main/res/layout/fragment_mine.xml                                    | 4 +++-
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/shunzhi/parent/api/Consult.java b/app/src/main/java/com/shunzhi/parent/api/Consult.java
index f346523..81101e2 100644
--- a/app/src/main/java/com/shunzhi/parent/api/Consult.java
+++ b/app/src/main/java/com/shunzhi/parent/api/Consult.java
@@ -35,6 +35,6 @@ public interface Consult {
 
     @FormUrlEncoded
     @POST("RoleLogin/GetToken")
-    Observable<JsonObject> loginVote(@Field("username") String username, @Field("password") String password);
+    Observable<String> loginVote(@Field("username") String username, @Field("password") String password);
 
 }
diff --git a/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java b/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java
index 1f63ad8..07af53a 100644
--- a/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java
+++ b/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java
@@ -42,7 +42,7 @@ public interface ConsultContract {
 
         Observable<JsonObject> getInformationTopic(String keyword,String areaName,String channel,String toFirstPage,int pageIndex);
 
-        Observable<JsonObject> loginVote(String phoneNum,String password);
+        Observable<String> loginVote(String phoneNum,String password);
     }
 
     interface IConsultView extends IBaseFragment {
diff --git a/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java b/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java
index 516939a..cc98d31 100644
--- a/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java
+++ b/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java
@@ -48,9 +48,9 @@ public class ConsultModel extends BaseModel implements ConsultContract.IConsultM
     }
 
     @Override
-    public Observable<JsonObject> loginVote(String phoneNum, String password) {
+    public Observable<String> loginVote(String phoneNum, String password) {
         return RetrofitCreateHelper.getInstance().createApi(Consult.class, AppConfig.BASE_URL_VOTE)
-                .loginVote(phoneNum,password).compose(RxHelper.<JsonObject>rxSchedulerHelper());
+                .loginVote(phoneNum,password).compose(RxHelper.<String>rxSchedulerHelper());
 //        return  null;
     }
 
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
index 5c5c4e6..6a5890a 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
@@ -1,5 +1,6 @@
 package com.shunzhi.parent.presenter.consult;
 
+import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 
@@ -133,15 +134,15 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter {
 
     @Override
     public void loginVote(String phoneNum, String password, final int position) {
-        mRxManager.register(mIModel.loginVote(phoneNum, password).subscribe(new Consumer<JsonObject>() {
+        mRxManager.register(mIModel.loginVote(phoneNum, password).subscribe(new Consumer<String>() {
             @Override
-            public void accept(JsonObject jsonObject) throws Exception {
-                ToastUtils.showToast(jsonObject.toString());
+            public void accept(String str) throws Exception {
                 mIView.showVote(position);
             }
         }, new Consumer<Throwable>() {
             @Override
             public void accept(Throwable throwable) throws Exception {
+                Log.e("111111",throwable.getMessage());
                 mIView.showVote(position);
             }
         }));
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
index d836716..2ea80aa 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
@@ -11,6 +11,7 @@ import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.support.v4.widget.NestedScrollView;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -241,6 +242,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
         for (int i = 0; i < guangGaoBeanList.size(); i++) {
             imgesUrl.add(AppConfig.BASE_URL_FILE + guangGaoBeanList.get(i).fileSrc);
             describeList.add(guangGaoBeanList.get(i).describe);
+            Log.e("aaaa",guangGaoBeanList.get(i).url);
             imgWebUrl.add(guangGaoBeanList.get(i).url);
         }
         initBanners();
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index ae22a91..4f5efbf 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -385,7 +385,9 @@
                 android:background="@drawable/shape_xueqing_radius8"
                 android:text="测试入口"
                 android:textColor="@color/white"
-                android:textSize="@dimen/size_dp_16" />
+                android:textSize="@dimen/size_dp_16"
+                android:visibility="gone"
+                />
 
         </LinearLayout>
 </ScrollView>
--
libgit2 0.21.0