From ac3c7edce9f2d8b0546cd3af68517dd1b69c0418 Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Mon, 19 Mar 2018 10:38:42 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java | 5 ++---
 app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java    | 8 ++++++++
 app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java                 | 4 +---
 app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java                    | 1 +
 app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java                    | 1 -
 app/src/main/res/layout/layout_textandimgshow.xml                                     | 1 +
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java
index e52fd64..83f9913 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java
@@ -1,6 +1,5 @@
 package com.shunzhi.parent.ui.activity.binding;
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.util.ArrayMap;
@@ -22,7 +21,7 @@ import com.shunzhi.parent.bean.ChildClass;
 import com.shunzhi.parent.bean.CurrentBean;
 import com.shunzhi.parent.contract.mine.MyChildContract;
 import com.shunzhi.parent.presenter.mine.MyChildPresenter;
-import com.shunzhi.parent.ui.activity.MyChildActivity;
+import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -132,7 +131,7 @@ public class CreateChildInfoActivity extends BaseMVPCompatActivity<MyChildContra
 
     @Override
     public void addChildSuccess() {
-        startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).setClass(CreateChildInfoActivity.this, MyChildActivity.class));
+        WebViewActivity.getInstance(CreateChildInfoActivity.this,AppConfig.BASE_URL_ORDER+"/ParentOrderCenter.aspx?userid="+AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.BINDING_SUCCESS_NOT);
         finish();
     }
 
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
index 6b91084..01681e6 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
@@ -186,9 +186,14 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity<SchoolListContra
     @Override
     public void showList(List<SchoolBean> list) {
         final List<SortBean> schoolList = OrderedSortSmodel(list);
+        if(schoolListAdapter==null){
         schoolListAdapter = new SchoolListAdapter(this, schoolList);
         schoolListAdapter.addAll(schoolList);
         schoollist.setAdapter(schoolListAdapter);
+        }else{
+            schoolListAdapter.addAll(schoolList);
+            schoolListAdapter.notifyDataSetChanged();
+        }
     }
 
     @Override
@@ -208,6 +213,9 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity<SchoolListContra
 
     @Override
     public void getCity(String name) {
+        tvLocalAddress.setText(name.split(" ")[2]);
+        mPresenter.schoolListResult(name.split(" ")[2],"");
+
 
     }
 }
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 f1a9b37..d7887bd 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
@@ -31,9 +31,6 @@ import com.shunzhi.parent.util.AttrsUtils;
 import com.shunzhi.parent.views.TextAndImgShowView;
 import com.stx.xhb.xbanner.XBanner;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -198,6 +195,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
             textAndImgShowView.setTextColor(R.color.textColor);
             textAndImgShowView.setText(list.get(i).getChannelName());
 //            textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(list.get(i).getChannelImage()));
+            textAndImgShowView.addImgs(list.get(i).getChannelImage());
             textAndImgShowView.setSelect(true);
             textAndImgShowView.setWidth(getActivity(), layout_control);
             textAndImgShowView.setBackground(AttrsUtils.getAttrs(getActivity()).getDrawable(0));
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
index dca55ac..3a5403b 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
@@ -97,6 +97,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
                 Bundle bundle = new Bundle();
                 bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" +
                         AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID));
+                bundle.putInt("type",AppConfig.ORDER_CENTER);
                 startNewActivity(WebViewActivity.class, bundle);
                 break;
             default:
diff --git a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
index 81717e0..dd9ee36 100644
--- a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
+++ b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.Nullable;
-import android.text.Layout;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
diff --git a/app/src/main/res/layout/layout_textandimgshow.xml b/app/src/main/res/layout/layout_textandimgshow.xml
index 1b9c8b9..4e26724 100644
--- a/app/src/main/res/layout/layout_textandimgshow.xml
+++ b/app/src/main/res/layout/layout_textandimgshow.xml
@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
+    android:background="@drawable/report_white"
     android:scrollbars="none">
 
     <HorizontalScrollView
--
libgit2 0.21.0