Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer

张道锋
2 parents 78184bb7 ab99c955
Showing 6 changed files with 21 additions and 13 deletions Show diff stats
app/src/main/java/com/shunzhi/parent/api/Consult.java
app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
app/src/main/res/layout/fragment_mine.xml
@@ -18,6 +18,9 @@ public interface Consult {
     @GET("api/ParentService/GetAds")
     Observable<JsonObject> getBanners(@Query("position") String position, @Query("areaName") String areaName);
+    @GET("api/ParentService/GetAds")
+    Observable<JsonObject> getBannerskaiping(@Query("position") String position);
+
     @FormUrlEncoded
     @POST("api/ParentService/GetChannelInfo")
 package com.shunzhi.parent.model.consult;
+import android.text.TextUtils;
+
 import com.google.gson.JsonObject;
 import com.share.mvpsdk.base.BaseModel;
 import com.share.mvpsdk.helper.RetrofitCreateHelper;
@@ -24,8 +26,13 @@ public class ConsultModel extends BaseModel implements ConsultContract.IConsultM
     @Override
     public Observable<JsonObject> getBanners(String position,String areaName) {
-        return RetrofitCreateHelper.getInstance().createApi(Consult.class, AppConfig.BASE_URL)
-                .getBanners(position,areaName).compose(RxHelper.<JsonObject>rxSchedulerHelper());
+        if (TextUtils.isEmpty(areaName)) {
+            return RetrofitCreateHelper.getInstance().createApi(Consult.class, AppConfig.BASE_URL)
+                    .getBannerskaiping(position).compose(RxHelper.<JsonObject>rxSchedulerHelper());
+        } else {
+            return RetrofitCreateHelper.getInstance().createApi(Consult.class, AppConfig.BASE_URL)
+                    .getBanners(position, areaName).compose(RxHelper.<JsonObject>rxSchedulerHelper());
+        }
     }
     @Override
@@ -8,7 +8,6 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.widget.NestedScrollView;
-import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
@@ -19,7 +18,6 @@ import android.widget.TextView;
 import com.jcodecraeer.xrecyclerview.XRecyclerView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
-import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
@@ -107,7 +105,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
         nesteScrollView.setOnScrollChangeListener(new NestedScrollView.OnScrollChangeListener() {
             @Override
             public void onScrollChange(NestedScrollView v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
-                ToastUtils.showToast("scrollX="+nesteScrollView.getMeasuredHeight()+"scrollY="+scrollY+"oldScrollX="+oldScrollX+"oldScrollY="+oldScrollY+"layout_consult="+layout_consult.getMeasuredHeight());
+//                ToastUtils.showToast("scrollX="+nesteScrollView.getMeasuredHeight()+"scrollY="+scrollY+"oldScrollX="+oldScrollX+"oldScrollY="+oldScrollY+"layout_consult="+layout_consult.getMeasuredHeight());
             }
         });
     }
@@ -144,7 +142,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
     private void initBanners() {
         xBanner.setData(imgesUrl, describeList);
-        xBanner.setPointsIsVisible(false);
+//        xBanner.setPointsIsVisible(false);
         xBanner.setmAdapter(new XBanner.XBannerAdapter() {
             @Override
             public void loadBanner(XBanner banner, Object model, View view, int position) {
@@ -2,12 +2,9 @@ package com.shunzhi.parent.ui.fragment;
 import android.os.Bundle;
 import android.os.CountDownTimer;
-import android.os.Handler;
-import android.os.Message;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -29,7 +26,6 @@ import java.util.ArrayList;
 import java.util.List;
 import cn.jzvd.JZVideoPlayerStandard;
-import timber.log.Timber;
 public class StartFragment extends BaseMVPCompatFragment<ConsultContract.ConsultPresenter, ConsultContract.IConsultModel>
         implements ConsultContract.IConsultView {
@@ -80,11 +76,11 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
             xBanner.setVisibility(View.GONE);
             AppConfig.getAppConfig(getContext()).set(AppConfig.APP_IS_START, "1");
 //            mPresenter.getBanners("0", AppContext.getInstance().district==""?"余杭区":AppContext.getInstance().district);
-            mPresenter.getBanners("0", "余杭区");
+            mPresenter.getBanners("0", "");
         } else {
             jiecaoVideo.setVisibility(View.GONE);
             xBanner.setVisibility(View.VISIBLE);
-            mPresenter.getBanners("1", "余杭区");
+            mPresenter.getBanners("1", "");
 //            mPresenter.getBanners("1",  AppContext.getInstance().district==""?"余杭区":AppContext.getInstance().district);
         }
@@ -109,18 +109,22 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment&lt;LoginAndRegist
             idCodeLayout.setVisibility(View.GONE);
             passwordLayout_new.setVisibility(View.GONE);
             loginAndRegister.setText("登录");
+            password.setHint("请输入密码：6～16个字符");
             denglu.setVisibility(View.VISIBLE);
             zhuce.setVisibility(View.GONE);
         } else if ("注册".equals(typepage)) {
             idCodeLayout.setVisibility(View.VISIBLE);
             passwordLayout_new.setVisibility(View.GONE);
             loginAndRegister.setText("注册");
+            password.setHint("请设置密码：6～16个字符");
             denglu.setVisibility(View.GONE);
             zhuce.setVisibility(View.VISIBLE);
         } else if ("找回密码".equals(typepage)) {
             idCodeLayout.setVisibility(View.VISIBLE);
             passwordLayout_new.setVisibility(View.VISIBLE);
             loginAndRegister.setText("确定");
+            password.setHint("请设置新密码：6～16个字符");
+            et_password_new.setHint("请再次输入密码：6～16个字符");
             denglu.setVisibility(View.GONE);
             zhuce.setVisibility(View.GONE);
         }
@@ -121,7 +121,7 @@
                         android:layout_width="40dp"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:text="3"
+                        android:text=""
                         android:textSize="@dimen/sp_18"
                         android:textColor="@color/textRed"
                         />
	@@ -121,7 +121,7 @@		@@ -121,7 +121,7 @@
121	android:layout_width="40dp"	121	android:layout_width="40dp"
122	android:layout_height="wrap_content"	122	android:layout_height="wrap_content"
123	android:layout_gravity="center_vertical"	123	android:layout_gravity="center_vertical"
124	- android:text="3"	124	+ android:text=""
125	android:textSize="@dimen/sp_18"	125	android:textSize="@dimen/sp_18"
126	android:textColor="@color/textRed"	126	android:textColor="@color/textRed"
127	/>	127	/>