Commit ac3c7edce9f2d8b0546cd3af68517dd1b69c0418

Authored by 姚旭斌
1 parent 8c6d07ed

no message

app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java
1 package com.shunzhi.parent.ui.activity.binding; 1 package com.shunzhi.parent.ui.activity.binding;
2 2
3 -import android.content.Intent;  
4 import android.os.Bundle; 3 import android.os.Bundle;
5 import android.support.annotation.NonNull; 4 import android.support.annotation.NonNull;
6 import android.support.v4.util.ArrayMap; 5 import android.support.v4.util.ArrayMap;
@@ -22,7 +21,7 @@ import com.shunzhi.parent.bean.ChildClass; @@ -22,7 +21,7 @@ import com.shunzhi.parent.bean.ChildClass;
22 import com.shunzhi.parent.bean.CurrentBean; 21 import com.shunzhi.parent.bean.CurrentBean;
23 import com.shunzhi.parent.contract.mine.MyChildContract; 22 import com.shunzhi.parent.contract.mine.MyChildContract;
24 import com.shunzhi.parent.presenter.mine.MyChildPresenter; 23 import com.shunzhi.parent.presenter.mine.MyChildPresenter;
25 -import com.shunzhi.parent.ui.activity.MyChildActivity; 24 +import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
26 25
27 import java.util.ArrayList; 26 import java.util.ArrayList;
28 import java.util.List; 27 import java.util.List;
@@ -132,7 +131,7 @@ public class CreateChildInfoActivity extends BaseMVPCompatActivity<MyChildContra @@ -132,7 +131,7 @@ public class CreateChildInfoActivity extends BaseMVPCompatActivity<MyChildContra
132 131
133 @Override 132 @Override
134 public void addChildSuccess() { 133 public void addChildSuccess() {
135 - startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).setClass(CreateChildInfoActivity.this, MyChildActivity.class)); 134 + WebViewActivity.getInstance(CreateChildInfoActivity.this,AppConfig.BASE_URL_ORDER+"/ParentOrderCenter.aspx?userid="+AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.BINDING_SUCCESS_NOT);
136 finish(); 135 finish();
137 } 136 }
138 137
app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
@@ -186,9 +186,14 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity<SchoolListContra @@ -186,9 +186,14 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity<SchoolListContra
186 @Override 186 @Override
187 public void showList(List<SchoolBean> list) { 187 public void showList(List<SchoolBean> list) {
188 final List<SortBean> schoolList = OrderedSortSmodel(list); 188 final List<SortBean> schoolList = OrderedSortSmodel(list);
  189 + if(schoolListAdapter==null){
189 schoolListAdapter = new SchoolListAdapter(this, schoolList); 190 schoolListAdapter = new SchoolListAdapter(this, schoolList);
190 schoolListAdapter.addAll(schoolList); 191 schoolListAdapter.addAll(schoolList);
191 schoollist.setAdapter(schoolListAdapter); 192 schoollist.setAdapter(schoolListAdapter);
  193 + }else{
  194 + schoolListAdapter.addAll(schoolList);
  195 + schoolListAdapter.notifyDataSetChanged();
  196 + }
192 } 197 }
193 198
194 @Override 199 @Override
@@ -208,6 +213,9 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity&lt;SchoolListContra @@ -208,6 +213,9 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity&lt;SchoolListContra
208 213
209 @Override 214 @Override
210 public void getCity(String name) { 215 public void getCity(String name) {
  216 + tvLocalAddress.setText(name.split(" ")[2]);
  217 + mPresenter.schoolListResult(name.split(" ")[2],"");
  218 +
211 219
212 } 220 }
213 } 221 }
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
@@ -31,9 +31,6 @@ import com.shunzhi.parent.util.AttrsUtils; @@ -31,9 +31,6 @@ import com.shunzhi.parent.util.AttrsUtils;
31 import com.shunzhi.parent.views.TextAndImgShowView; 31 import com.shunzhi.parent.views.TextAndImgShowView;
32 import com.stx.xhb.xbanner.XBanner; 32 import com.stx.xhb.xbanner.XBanner;
33 33
34 -import java.io.ByteArrayOutputStream;  
35 -import java.io.IOException;  
36 -import java.io.InputStream;  
37 import java.util.ArrayList; 34 import java.util.ArrayList;
38 import java.util.List; 35 import java.util.List;
39 36
@@ -198,6 +195,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu @@ -198,6 +195,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
198 textAndImgShowView.setTextColor(R.color.textColor); 195 textAndImgShowView.setTextColor(R.color.textColor);
199 textAndImgShowView.setText(list.get(i).getChannelName()); 196 textAndImgShowView.setText(list.get(i).getChannelName());
200 // textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(list.get(i).getChannelImage())); 197 // textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(list.get(i).getChannelImage()));
  198 + textAndImgShowView.addImgs(list.get(i).getChannelImage());
201 textAndImgShowView.setSelect(true); 199 textAndImgShowView.setSelect(true);
202 textAndImgShowView.setWidth(getActivity(), layout_control); 200 textAndImgShowView.setWidth(getActivity(), layout_control);
203 textAndImgShowView.setBackground(AttrsUtils.getAttrs(getActivity()).getDrawable(0)); 201 textAndImgShowView.setBackground(AttrsUtils.getAttrs(getActivity()).getDrawable(0));
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
@@ -97,6 +97,7 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract @@ -97,6 +97,7 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
97 Bundle bundle = new Bundle(); 97 Bundle bundle = new Bundle();
98 bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" + 98 bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" +
99 AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID)); 99 AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID));
  100 + bundle.putInt("type",AppConfig.ORDER_CENTER);
100 startNewActivity(WebViewActivity.class, bundle); 101 startNewActivity(WebViewActivity.class, bundle);
101 break; 102 break;
102 default: 103 default:
app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
@@ -4,7 +4,6 @@ import android.app.Activity; @@ -4,7 +4,6 @@ import android.app.Activity;
4 import android.content.Context; 4 import android.content.Context;
5 import android.support.annotation.DrawableRes; 5 import android.support.annotation.DrawableRes;
6 import android.support.annotation.Nullable; 6 import android.support.annotation.Nullable;
7 -import android.text.Layout;  
8 import android.util.AttributeSet; 7 import android.util.AttributeSet;
9 import android.util.Log; 8 import android.util.Log;
10 import android.view.View; 9 import android.view.View;
app/src/main/res/layout/layout_textandimgshow.xml
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 android:layout_width="match_parent" 3 android:layout_width="match_parent"
4 android:layout_height="wrap_content" 4 android:layout_height="wrap_content"
5 android:orientation="horizontal" 5 android:orientation="horizontal"
  6 + android:background="@drawable/report_white"
6 android:scrollbars="none"> 7 android:scrollbars="none">
7 8
8 <HorizontalScrollView 9 <HorizontalScrollView