diff --git a/.idea/modules.xml b/.idea/modules.xml index 45d1910..eac7886 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -4,8 +4,8 @@ - + diff --git a/app/src/main/java/com/shunzhi/parent/bean/ToolBean.java b/app/src/main/java/com/shunzhi/parent/bean/ToolBean.java index ae84a3d..b98ab75 100644 --- a/app/src/main/java/com/shunzhi/parent/bean/ToolBean.java +++ b/app/src/main/java/com/shunzhi/parent/bean/ToolBean.java @@ -5,17 +5,17 @@ import java.io.Serializable; /** * Created by ToaHanDong on 2018/3/14. * toolId (integer, optional): 工具ID , - toolName (string, optional): 工具名称 , - toolImage (string, optional): 工具图片 , - toolUrl (string, optional): 工具链接 , - orderById (integer, optional): 工具排序 + * toolName (string, optional): 工具名称 , + * toolImage (string, optional): 工具图片 , + * toolUrl (string, optional): 工具链接 , + * orderById (integer, optional): 工具排序 */ public class ToolBean implements Serializable { - public ToolBean(String toolImg,String toolName){ - this.toolImage=toolImg; - this.toolName=toolName; + public ToolBean(String toolImg, String toolName) { + this.toolImage = toolImg; + this.toolName = toolName; } @@ -25,7 +25,11 @@ public class ToolBean implements Serializable { public String toolUrl; + public String toolId; + public String columnType; + + public String orderById; @Override public String toString() { diff --git a/app/src/main/java/com/shunzhi/parent/contract/ceping/CepingContract.java b/app/src/main/java/com/shunzhi/parent/contract/ceping/CepingContract.java index f6fea55..797ee79 100644 --- a/app/src/main/java/com/shunzhi/parent/contract/ceping/CepingContract.java +++ b/app/src/main/java/com/shunzhi/parent/contract/ceping/CepingContract.java @@ -31,7 +31,7 @@ public interface CepingContract { interface ICePingView extends IBaseFragment{ - void showTools(); + void showTools(List toolBeanList); } diff --git a/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java index a42e5e7..49a0c13 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java @@ -14,6 +14,9 @@ import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity; import com.shunzhi.parent.util.AttrsUtils; import com.shunzhi.parent.views.TextAndImgShowView; +import java.util.ArrayList; +import java.util.List; + import io.reactivex.functions.Consumer; /** @@ -41,26 +44,32 @@ public class CePingPresenter extends CepingContract.CePingPresenter { if (jsonObject.get("status").getAsString().equals("1")){ JsonArray jsonArray=jsonObject.getAsJsonArray("data"); layout_control.removeAllViews(); + List toolBeanList=new ArrayList<>(); for (int i = 0; i < jsonArray.size(); i++) { ToolBean toolBean=new Gson().fromJson(jsonArray.get(i).getAsJsonObject(),ToolBean.class); - TextAndImgShowView textAndImgShowView=new TextAndImgShowView(mIView.getBindActivity()); - textAndImgShowView.setTextColor(R.color.textColor); - textAndImgShowView.setText(toolBean.toolName); - textAndImgShowView.addImgs(toolBean.toolImage); - textAndImgShowView.setSelect(true); - textAndImgShowView.setWidth(mIView.getBindActivity(),layout_control); - textAndImgShowView.setBackground(AttrsUtils.getAttrs(mIView.getBindActivity()).getDrawable(0)); - textAndImgShowView.setTag(toolBean); - textAndImgShowView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - ToolBean toolBean1= (ToolBean) view.getTag(); - WebViewActivity.getInstance(mIView.getBindActivity(),toolBean1.toolUrl,-1); - } - }); - layout_control.addView(textAndImgShowView); - mIView.showTools(); + if (toolBean.columnType.equals("2")){ + TextAndImgShowView textAndImgShowView=new TextAndImgShowView(mIView.getBindActivity()); + textAndImgShowView.setTextColor(R.color.textColor); + textAndImgShowView.setText(toolBean.toolName); + textAndImgShowView.addImgs(toolBean.toolImage); + textAndImgShowView.setSelect(true); + textAndImgShowView.setWidth(mIView.getBindActivity(),layout_control); + textAndImgShowView.setBackground(AttrsUtils.getAttrs(mIView.getBindActivity()).getDrawable(0)); + textAndImgShowView.setTag(toolBean); + textAndImgShowView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + ToolBean toolBean1= (ToolBean) view.getTag(); + WebViewActivity.getInstance(mIView.getBindActivity(),toolBean1.toolUrl,-1); + } + }); + layout_control.addView(textAndImgShowView); + } else if (toolBean.columnType.equals("1")){ + //活动 + toolBeanList.add(toolBean); + } } + mIView.showTools(toolBeanList); }else { } diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java index e5986ed..0fd8097 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java @@ -133,6 +133,7 @@ public class WebViewActivity extends BaseCompatActivity { nesteScrollWebView.setWebViewClient(new WebViewClient() { @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { + Log.d("666666","url="+url); if (url.startsWith("http"))view.loadUrl(url); // if (url.contains("platformapi/startapp")) { // startAlipayActivity(url); @@ -158,6 +159,8 @@ public class WebViewActivity extends BaseCompatActivity { @Override public void onPageStarted(WebView view, String url, Bitmap favicon) { +// Log.d("666666","onPageStartedurl="+url); + if (url.startsWith("http"))view.loadUrl(url); view.getSettings().setJavaScriptEnabled(true); super.onPageStarted(view, url, favicon); } 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 7c01c3a..797261f 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 @@ -14,36 +14,39 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import com.bumptech.glide.Glide; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; import com.share.mvpsdk.utils.ToastUtils; import com.shunzhi.parent.AppContext; import com.shunzhi.parent.R; +import com.shunzhi.parent.bean.ToolBean; import com.shunzhi.parent.contract.ceping.CepingContract; import com.shunzhi.parent.presenter.ceping.CePingPresenter; import com.shunzhi.parent.ui.activity.MyChildActivity; +import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity; import com.shunzhi.parent.views.TextAndImgShowView; +import java.util.List; + import me.leefeng.citypicker.CityPicker; import me.leefeng.citypicker.CityPickerListener; -public class CePingFragment extends BaseMVPCompatFragment implements CepingContract.ICePingView - ,View.OnClickListener,CityPickerListener{ - - TextView tvLocalAddress; +public class CePingFragment extends BaseMVPCompatFragment implements CepingContract.ICePingView + , View.OnClickListener, CityPickerListener { - ImageView ivCamera; + TextView tvLocalAddress, tvCourse1, tvCourse2, tvCourse3; - TextAndImgShowView textAndImg_xqjc,textAndImg_zxlx; + ImageView ivCamera, ivCourse1, ivCourse2, ivCourse3; - FrameLayout frame_hot1; + TextAndImgShowView textAndImg_xqjc, textAndImg_zxlx; FloatingActionButton floatingActionButton; LinearLayout layout_control; - CityPicker cityPicker=null; + CityPicker cityPicker = null; @Override public int getLayoutId() { @@ -53,25 +56,30 @@ public class CePingFragment extends BaseMVPCompatFragment toolBeanList) { + if (toolBeanList.size() == 1) { + tvCourse1.setText(toolBeanList.get(0).toolName); + Glide.with(getActivity()).load(toolBeanList.get(0).toolImage).into(ivCourse1); + tvCourse1.setTag(toolBeanList.get(0).toolUrl); + } else if (toolBeanList.size() == 2) { + tvCourse2.setText(toolBeanList.get(1).toolName); + Glide.with(getActivity()).load(toolBeanList.get(1).toolImage).into(ivCourse1); + tvCourse2.setTag(toolBeanList.get(1).toolUrl); + } else if (toolBeanList.size() == 3) { + tvCourse3.setText(toolBeanList.get(2).toolName); + Glide.with(getActivity()).load(toolBeanList.get(2).toolImage).into(ivCourse1); + tvCourse3.setTag(toolBeanList.get(2).toolUrl); + } } } 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 3a5403b..5d64a4f 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 @@ -30,7 +30,7 @@ public class MineFragment extends BaseMVPCompatFragment - + - + - + - + -- libgit2 0.21.0