Commit ac3c7edce9f2d8b0546cd3af68517dd1b69c0418
1 parent
8c6d07ed
Exists in
yxb_dev
and in
2 other branches
no message
Showing
6 changed files
with
13 additions
and
7 deletions
Show diff stats
app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java
| 1 | 1 | package com.shunzhi.parent.ui.activity.binding; |
| 2 | 2 | |
| 3 | -import android.content.Intent; | |
| 4 | 3 | import android.os.Bundle; |
| 5 | 4 | import android.support.annotation.NonNull; |
| 6 | 5 | import android.support.v4.util.ArrayMap; |
| ... | ... | @@ -22,7 +21,7 @@ import com.shunzhi.parent.bean.ChildClass; |
| 22 | 21 | import com.shunzhi.parent.bean.CurrentBean; |
| 23 | 22 | import com.shunzhi.parent.contract.mine.MyChildContract; |
| 24 | 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 | 26 | import java.util.ArrayList; |
| 28 | 27 | import java.util.List; |
| ... | ... | @@ -132,7 +131,7 @@ public class CreateChildInfoActivity extends BaseMVPCompatActivity<MyChildContra |
| 132 | 131 | |
| 133 | 132 | @Override |
| 134 | 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 | 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 | 186 | @Override |
| 187 | 187 | public void showList(List<SchoolBean> list) { |
| 188 | 188 | final List<SortBean> schoolList = OrderedSortSmodel(list); |
| 189 | + if(schoolListAdapter==null){ | |
| 189 | 190 | schoolListAdapter = new SchoolListAdapter(this, schoolList); |
| 190 | 191 | schoolListAdapter.addAll(schoolList); |
| 191 | 192 | schoollist.setAdapter(schoolListAdapter); |
| 193 | + }else{ | |
| 194 | + schoolListAdapter.addAll(schoolList); | |
| 195 | + schoolListAdapter.notifyDataSetChanged(); | |
| 196 | + } | |
| 192 | 197 | } |
| 193 | 198 | |
| 194 | 199 | @Override |
| ... | ... | @@ -208,6 +213,9 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity<SchoolListContra |
| 208 | 213 | |
| 209 | 214 | @Override |
| 210 | 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 | 31 | import com.shunzhi.parent.views.TextAndImgShowView; |
| 32 | 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 | 34 | import java.util.ArrayList; |
| 38 | 35 | import java.util.List; |
| 39 | 36 | |
| ... | ... | @@ -198,6 +195,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu |
| 198 | 195 | textAndImgShowView.setTextColor(R.color.textColor); |
| 199 | 196 | textAndImgShowView.setText(list.get(i).getChannelName()); |
| 200 | 197 | // textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(list.get(i).getChannelImage())); |
| 198 | + textAndImgShowView.addImgs(list.get(i).getChannelImage()); | |
| 201 | 199 | textAndImgShowView.setSelect(true); |
| 202 | 200 | textAndImgShowView.setWidth(getActivity(), layout_control); |
| 203 | 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<LoginAndRegisterContract |
| 97 | 97 | Bundle bundle = new Bundle(); |
| 98 | 98 | bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" + |
| 99 | 99 | AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID)); |
| 100 | + bundle.putInt("type",AppConfig.ORDER_CENTER); | |
| 100 | 101 | startNewActivity(WebViewActivity.class, bundle); |
| 101 | 102 | break; |
| 102 | 103 | default: | ... | ... |
app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
| ... | ... | @@ -4,7 +4,6 @@ import android.app.Activity; |
| 4 | 4 | import android.content.Context; |
| 5 | 5 | import android.support.annotation.DrawableRes; |
| 6 | 6 | import android.support.annotation.Nullable; |
| 7 | -import android.text.Layout; | |
| 8 | 7 | import android.util.AttributeSet; |
| 9 | 8 | import android.util.Log; |
| 10 | 9 | import android.view.View; | ... | ... |
app/src/main/res/layout/layout_textandimgshow.xml