diff --git a/app/src/main/assets/banners.png b/app/src/main/assets/banners.png new file mode 100644 index 0000000..11ea09a Binary files /dev/null and b/app/src/main/assets/banners.png differ diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java index bbe5c78..b64b874 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java @@ -4,6 +4,7 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.view.View; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; @@ -12,13 +13,17 @@ import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; import com.shunzhi.parent.R; import com.shunzhi.parent.views.TextAndImgShowView; +import butterknife.OnClick; + public class CePingFragment extends BaseMVPCompatFragment { TextView tvLocalAddress; ImageView ivCamera; - TextAndImgShowView textAndImg1,textAndImg2,textAndImg3,textAndImg4; + TextAndImgShowView textAndImg1,textAndImg2,textAndImg3,textAndImg4,textAndImg_xqjc,textAndImg_zxlx; + + FrameLayout frame_hot1; @Override public int getLayoutId() { @@ -33,23 +38,40 @@ public class CePingFragment extends BaseMVPCompatFragment { textAndImg2=view.findViewById(R.id.textAndImg2); textAndImg3=view.findViewById(R.id.textAndImg3); textAndImg4=view.findViewById(R.id.textAndImg4); + textAndImg_xqjc=view.findViewById(R.id.textAndImg_xqjc); + textAndImg_zxlx=view.findViewById(R.id.textAndImg_zxlx); + frame_hot1=view.findViewById(R.id.frame_hot1); + textAndImg1.setTextColor(R.color.textColor); - textAndImg1.setText("工具一"); - textAndImg1.setImgs(R.drawable.play,R.drawable.play); + textAndImg1.setText("高校直通"); + textAndImg1.setImgs(R.drawable.play,R.drawable.gxzt); + textAndImg1.setSelect(true); textAndImg2.setTextColor(R.color.textColor); - textAndImg2.setText("工具二"); - textAndImg2.setImgs(R.drawable.play,R.drawable.play); + textAndImg2.setText("专业查询"); + textAndImg2.setImgs(R.drawable.play,R.drawable.zycx); + textAndImg2.setSelect(true); textAndImg3.setTextColor(R.color.textColor); - textAndImg3.setText("工具三"); - textAndImg3.setImgs(R.drawable.play,R.drawable.play); + textAndImg3.setText("传媒艺考"); + textAndImg3.setImgs(R.drawable.play,R.drawable.cmyk); + textAndImg3.setSelect(true); textAndImg4.setTextColor(R.color.textColor); - textAndImg4.setText("工具四"); - textAndImg4.setImgs(R.drawable.play,R.drawable.play); + textAndImg4.setText("排行榜"); + textAndImg4.setImgs(R.drawable.play,R.drawable.phb); + textAndImg4.setSelect(true); + textAndImg_xqjc.setTextColor(R.color.white); + textAndImg_xqjc.setText("学情检测"); + textAndImg_xqjc.setImgs(R.drawable.xqjc,R.drawable.xqjc); + textAndImg_xqjc.setSelect(true); + + textAndImg_zxlx.setText("专项训练"); + textAndImg_zxlx.setTextColor(R.color.white); + textAndImg_zxlx.setImgs(R.drawable.zxlx,R.drawable.zxlx); + textAndImg_zxlx.setSelect(true); } @NonNull @@ -57,4 +79,20 @@ public class CePingFragment extends BaseMVPCompatFragment { public BasePresenter initPresenter() { return null; } + + @OnClick({R.id.frame_hot1,R.id.frame_hot2,R.id.frame_hot3}) + void click(View view){ + switch (view.getId()){ + case R.id.frame_hot1://热门课程 + + break; + case R.id.frame_hot2: + + break; + case R.id.frame_hot3: + + break; + } + } + } 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 c930742..5a2b305 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 @@ -1,20 +1,124 @@ package com.shunzhi.parent.ui.fragment; import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; +import com.bumptech.glide.Glide; +import com.share.mvpsdk.base.BasePresenter; +import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; import com.shunzhi.parent.R; +import com.shunzhi.parent.views.TextAndImgShowView; +import com.stx.xhb.xbanner.XBanner; -public class ConsultFragment extends Fragment { +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +public class ConsultFragment extends BaseMVPCompatFragment { + + ImageView ivSearch; + + TextAndImgShowView textAndImg1,textAndImg2,textAndImg3,textAndImg4; + + XBanner xBanner; + + List imgesUrl = new ArrayList<>(); + + @Override + public int getLayoutId() { + return R.layout.fragment_zi_xun; + } + + @Override + public void initUI(View view, @Nullable Bundle savedInstanceState) { + + ivSearch=view.findViewById(R.id.ivSearch); + textAndImg1=view.findViewById(R.id.textAndImg1); + textAndImg2=view.findViewById(R.id.textAndImg2); + textAndImg3=view.findViewById(R.id.textAndImg3); + textAndImg4=view.findViewById(R.id.textAndImg4); + xBanner=view.findViewById(R.id.xBanner); + + textAndImg1.setTextColor(R.color.textColor); + textAndImg1.setText("小学"); + textAndImg1.setImgs(R.drawable.play,R.drawable.xiaoxue); + textAndImg1.setSelect(true); + + textAndImg2.setTextColor(R.color.textColor); + textAndImg2.setText("中学"); + textAndImg2.setImgs(R.drawable.play,R.drawable.zhongxue); + textAndImg2.setSelect(true); + + textAndImg3.setTextColor(R.color.textColor); + textAndImg3.setText("高中"); + textAndImg3.setImgs(R.drawable.play,R.drawable.gaozhong); + textAndImg3.setSelect(true); + + textAndImg4.setTextColor(R.color.textColor); + textAndImg4.setText("家长"); + textAndImg4.setImgs(R.drawable.play,R.drawable.parent); + textAndImg4.setSelect(true); + + initBanners(); + } + + private void initBanners() { + + InputStream inputStream=getClass().getResourceAsStream("/assets/banners.png"); + try { + imgesUrl.add(new String(InputStreamToByte(inputStream))); + imgesUrl.add(new String(InputStreamToByte(inputStream))); + imgesUrl.add(new String(InputStreamToByte(inputStream))); + imgesUrl.add(new String(InputStreamToByte(inputStream))); + } catch (IOException e) { + e.printStackTrace(); + } + xBanner.setData(imgesUrl,null); + xBanner.setmAdapter(new XBanner.XBannerAdapter() { + @Override + public void loadBanner(XBanner banner, Object model, View view, int position) { + Glide.with(getActivity()).load(imgesUrl.get(position)).placeholder(R.drawable.ic_launcher_background) + .into((ImageView) view); + } + }); + + } + + @NonNull @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_zi_xun, container, false); + public BasePresenter initPresenter() { + return null; } + private byte[] InputStreamToByte(InputStream is) throws IOException { + ByteArrayOutputStream bytestream = new ByteArrayOutputStream(); + int ch; + while ((ch = is.read()) != -1) { + bytestream.write(ch); + } + byte imgdata[] = bytestream.toByteArray(); + bytestream.close(); + return imgdata; + + } + + @Override + public void onResume() { + super.onResume(); + xBanner.startAutoPlay(); + } + + @Override + public void onStop() { + super.onStop(); + xBanner.stopAutoPlay(); + } } diff --git a/app/src/main/res/drawable-xhdpi/cmyk.png b/app/src/main/res/drawable-xhdpi/cmyk.png new file mode 100644 index 0000000..02ca6d4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/cmyk.png differ diff --git a/app/src/main/res/drawable-xhdpi/gaozhong.png b/app/src/main/res/drawable-xhdpi/gaozhong.png new file mode 100644 index 0000000..808a09a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/gaozhong.png differ diff --git a/app/src/main/res/drawable-xhdpi/gxzt.png b/app/src/main/res/drawable-xhdpi/gxzt.png new file mode 100644 index 0000000..480408e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/gxzt.png differ diff --git a/app/src/main/res/drawable-xhdpi/parent.png b/app/src/main/res/drawable-xhdpi/parent.png new file mode 100644 index 0000000..7d3eca7 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/parent.png differ diff --git a/app/src/main/res/drawable-xhdpi/phb.png b/app/src/main/res/drawable-xhdpi/phb.png new file mode 100644 index 0000000..d8919d7 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/phb.png differ diff --git a/app/src/main/res/drawable-xhdpi/search_black.png b/app/src/main/res/drawable-xhdpi/search_black.png new file mode 100644 index 0000000..99175fa Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/search_black.png differ diff --git a/app/src/main/res/drawable-xhdpi/success.png b/app/src/main/res/drawable-xhdpi/success.png new file mode 100644 index 0000000..6e75eaa Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/success.png differ diff --git a/app/src/main/res/drawable-xhdpi/xiaoxue.png b/app/src/main/res/drawable-xhdpi/xiaoxue.png new file mode 100644 index 0000000..8ef607c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/xiaoxue.png differ diff --git a/app/src/main/res/drawable-xhdpi/xqjc.png b/app/src/main/res/drawable-xhdpi/xqjc.png new file mode 100644 index 0000000..161d0ad Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/xqjc.png differ diff --git a/app/src/main/res/drawable-xhdpi/zhongxue.png b/app/src/main/res/drawable-xhdpi/zhongxue.png new file mode 100644 index 0000000..a1a3c3d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/zhongxue.png differ diff --git a/app/src/main/res/drawable-xhdpi/zxlx.png b/app/src/main/res/drawable-xhdpi/zxlx.png new file mode 100644 index 0000000..b4f2537 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/zxlx.png differ diff --git a/app/src/main/res/drawable-xhdpi/zycx.png b/app/src/main/res/drawable-xhdpi/zycx.png new file mode 100644 index 0000000..b0f6ef5 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/zycx.png differ diff --git a/app/src/main/res/drawable/shape_edit_radius4_white.xml b/app/src/main/res/drawable/shape_edit_radius4_white.xml new file mode 100644 index 0000000..6de2f56 --- /dev/null +++ b/app/src/main/res/drawable/shape_edit_radius4_white.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_stroke_radius4_white.xml b/app/src/main/res/drawable/shape_stroke_radius4_white.xml new file mode 100644 index 0000000..559c40b --- /dev/null +++ b/app/src/main/res/drawable/shape_stroke_radius4_white.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_xueqing_radius8.xml b/app/src/main/res/drawable/shape_xueqing_radius8.xml new file mode 100644 index 0000000..033b446 --- /dev/null +++ b/app/src/main/res/drawable/shape_xueqing_radius8.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_zxlx_radius8.xml b/app/src/main/res/drawable/shape_zxlx_radius8.xml new file mode 100644 index 0000000..bb7d402 --- /dev/null +++ b/app/src/main/res/drawable/shape_zxlx_radius8.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_ce_ping.xml b/app/src/main/res/layout/fragment_ce_ping.xml index 0b03906..2ec5e1d 100644 --- a/app/src/main/res/layout/fragment_ce_ping.xml +++ b/app/src/main/res/layout/fragment_ce_ping.xml @@ -3,97 +3,314 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/bgColor" + android:orientation="vertical" tools:context="com.shunzhi.parent.ui.fragment.CePingFragment"> + android:background="@color/titleColor"> + + android:text="杭州" + android:textColor="@color/textColor" + android:textSize="@dimen/textSize16" /> + android:textColor="@color/textColor" /> + android:paddingRight="@dimen/size_dp_15" + android:src="@drawable/camera" /> + android:layout_weight="3" + android:background="@drawable/shape_bg_radius8" + android:orientation="vertical"> + + android:padding="@dimen/size_dp_10"> - + - + + android:layout_height="wrap_content" + android:layout_weight="1"> + android:layout_height="wrap_content" + android:layout_weight="1"> + android:layout_height="wrap_content" + android:layout_weight="1"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_zi_xun.xml b/app/src/main/res/layout/fragment_zi_xun.xml index 507f4d9..6e5869b 100644 --- a/app/src/main/res/layout/fragment_zi_xun.xml +++ b/app/src/main/res/layout/fragment_zi_xun.xml @@ -1,13 +1,213 @@ - - - + android:layout_height="?android:actionBarSize" + android:background="@color/titleColor"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 2599014..11bed27 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -13,4 +13,7 @@ #C6DAFF #F0EFF5 #494947 + #ABC9FF + #1BE2E5 + #ACD1FB diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index adab0e2..6e8e16c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,4 +5,5 @@ Hello blank fragment 测评 + 咨询话题 diff --git a/mvpsdk/build.gradle b/mvpsdk/build.gradle index 30a25ba..1bace24 100644 --- a/mvpsdk/build.gradle +++ b/mvpsdk/build.gradle @@ -99,4 +99,9 @@ dependencies { //jiaozivideoplayer compile 'cn.jzvd:jiaozivideoplayer:6.2.7' // compile(name: 'jiaozivideoplayer-6.2.3', ext: 'aar') + + + //轮播图XBanner + compile 'com.xhb:xbanner:1.3.1' + } -- libgit2 0.21.0