no message

陶汉栋
2 parents ce7abc12 f9d17f1b
Showing 8 changed files with 58 additions and 33 deletions Show diff stats
app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java
app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
app/src/main/res/drawable-xhdpi/xiaoxi.png
app/src/main/res/layout/fragment_mine.xml
app/src/main/res/layout/fragment_report.xml
 package com.shunzhi.parent.ui.activity;
 import android.os.Bundle;
-import android.util.Log;
 import com.share.mvpsdk.base.activity.BaseCompatActivity;
 import com.shunzhi.parent.R;
@@ -23,7 +22,6 @@ public class LoginAndRegistActivity extends BaseCompatActivity {
                 mFragments[0] = LoginAndRegistFragment.getInstance(type);
                 loadRootFragment(R.id.frame, mFragments[0]);
             }
-
         } else {
             mFragments[0] = findFragment(LoginAndRegistFragment.class);
         }
@@ -13,7 +13,6 @@ 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;
@@ -74,11 +73,13 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
         textAndImg_xqjc.setTextColor(R.color.white);
         textAndImg_xqjc.setText("学情检测");
         textAndImg_xqjc.setImgs(R.drawable.xqjc, R.drawable.xqjc);
+        textAndImg_xqjc.setOnClickListener(this);
         textAndImg_xqjc.setSelect(true);
         textAndImg_zxlx.setText("专项训练");
         textAndImg_zxlx.setTextColor(R.color.white);
         textAndImg_zxlx.setImgs(R.drawable.zxlx, R.drawable.zxlx);
+        textAndImg_zxlx.setOnClickListener(this);
         textAndImg_zxlx.setSelect(true);
         initListeners(view);
@@ -92,7 +93,7 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
     private void addTools() {
         layout_control.measure(0, 0);
-        mPresenter.getTools(layout_control, AppContext.getInstance().district);
+        mPresenter.getTools(layout_control, "余杭区");
     }
@@ -100,8 +101,8 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
     public void onResume() {
         super.onResume();
 //        if (!tvLocalAddress.getText().toString().equals(AppContext.getInstance().cityName)){
-            tvLocalAddress.setText(AppContext.getInstance().district);
-            addTools();
+        tvLocalAddress.setText(AppContext.getInstance().district);
+        addTools();
 //        }
     }
@@ -133,16 +134,16 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.frame_hot1://热门课程
-                if (tvCourse1.getTag()!=null)
-                WebViewActivity.getInstance(getActivity(),tvCourse1.getTag().toString(),-1);
+                if (tvCourse1.getTag() != null)
+                    WebViewActivity.getInstance(getActivity(), tvCourse1.getTag().toString(), -1);
                 break;
             case R.id.frame_hot2:
-                if (tvCourse2.getTag()!=null)
-                WebViewActivity.getInstance(getActivity(),tvCourse2.getTag().toString(),-1);
+                if (tvCourse2.getTag() != null)
+                    WebViewActivity.getInstance(getActivity(), tvCourse2.getTag().toString(), -1);
                 break;
             case R.id.frame_hot3:
-                if (tvCourse3.getTag()!=null)
-                WebViewActivity.getInstance(getActivity(),tvCourse3.getTag().toString(),-1);
+                if (tvCourse3.getTag() != null)
+                    WebViewActivity.getInstance(getActivity(), tvCourse3.getTag().toString(), -1);
                 break;
             case R.id.tvLocalAddress:
 //                AppContext.getInstance().startLocation();
@@ -153,6 +154,14 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
             case R.id.ivCamera:
                 ToastUtils.showToast("功能暂未上线");
                 break;
+            case R.id.textAndImg_xqjc:
+                ToastUtils.showToast("功能暂未上线");
+                break;
+            case R.id.textAndImg_zxlx:
+                ToastUtils.showToast("功能暂未上线");
+                break;
+            default:
+                break;
         }
     }
@@ -176,27 +185,27 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
     public void getCity(String name) {
         tvLocalAddress.setText(name.split(" ")[2]);
         mPresenter.getTools(layout_control, name.split(" ")[2]);
-        AppContext.getInstance().cityName=name.split(" ")[1];
-        AppContext.getInstance().district=name.split(" ")[2];
+        AppContext.getInstance().cityName = name.split(" ")[1];
+        AppContext.getInstance().district = name.split(" ")[2];
     }
     @Override
     public void showTools(List<ToolBean> toolBeanList) {
         if (toolBeanList.size() > 0) {
             tvCourse1.setText(toolBeanList.get(0).toolName);
-            GlideUtils.showImg(getActivity(),ivCourse1,toolBeanList.get(0).toolImage);
+            GlideUtils.showImg(getActivity(), ivCourse1, toolBeanList.get(0).toolImage);
             tvCourse1.setTag(toolBeanList.get(0).toolUrl);
         }
         if (toolBeanList.size() > 1) {
             tvCourse2.setText(toolBeanList.get(1).toolName);
-            GlideUtils.showImg(getActivity(),ivCourse2,toolBeanList.get(1).toolImage);
+            GlideUtils.showImg(getActivity(), ivCourse2, toolBeanList.get(1).toolImage);
             tvCourse2.setTag(toolBeanList.get(1).toolUrl);
         }
         if (toolBeanList.size() > 2) {
             tvCourse3.setText(toolBeanList.get(2).toolName);
-            GlideUtils.showImg(getActivity(),ivCourse3,toolBeanList.get(2).toolImage);
+            GlideUtils.showImg(getActivity(), ivCourse3, toolBeanList.get(2).toolImage);
             tvCourse3.setTag(toolBeanList.get(2).toolUrl);
         }
     }
@@ -30,7 +30,9 @@ import com.shunzhi.parent.util.GlideUtils;
 public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
         implements MineContract.IMineView, View.OnClickListener {
-    LinearLayout childlayout, personinfo, layout_orderDetail, layout_order, layout_cache, layout_about, layoutAdvice;
+
+    LinearLayout childlayout, personinfo, layout_orderDetail, layout_order, layout_cache, layout_about, layout_feedback,top_layout,layout_afterLogin;
+
     RoundedImageView user_photo;
     TextView user_name, user_mobile, tvExit, binding_state;
@@ -48,14 +50,16 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
     @Override
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
         childlayout = view.findViewById(R.id.childlayout);
+        layout_afterLogin = view.findViewById(R.id.layout_afterLogin);
+        top_layout = view.findViewById(R.id.top_layout);
         personinfo = view.findViewById(R.id.personinfo);
         layout_order = view.findViewById(R.id.layout_order);
         layout_orderDetail = view.findViewById(R.id.layout_orderDetail);
         layout_cache = view.findViewById(R.id.layout_cache);
         layout_about = view.findViewById(R.id.layout_about);
-        layoutAdvice = view.findViewById(R.id.layoutAdvice);
-        layoutAdvice.setOnClickListener(this);
+        layout_feedback = view.findViewById(R.id.layout_feedback);
         layout_about.setOnClickListener(this);
+        layout_feedback.setOnClickListener(this);
         layout_cache.setOnClickListener(this);
         childlayout.setOnClickListener(this);
         personinfo.setOnClickListener(this);
@@ -65,8 +69,10 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
         user_name = view.findViewById(R.id.user_name);
         user_mobile = view.findViewById(R.id.user_mobile);
         tvExit = view.findViewById(R.id.tvExit);
+        tvExit.setVisibility(View.GONE);
         tvExit.setOnClickListener(this);
         binding_state = view.findViewById(R.id.binding_state);
+        layout_afterLogin.setVisibility(View.GONE);
         if (AppConfig.ISBINDING) {
             binding_state.setText("");
         }
@@ -86,10 +92,16 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
             user_photo.setOval(true);
             user_name.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_NAME));
             user_mobile.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME));
+            top_layout.setBackgroundResource(R.drawable.backgroud_top);
             user_mobile.setVisibility(View.VISIBLE);
+            layout_afterLogin.setVisibility(View.VISIBLE);
+            tvExit.setVisibility(View.VISIBLE);
+
         } else {
             user_name.setVisibility(View.VISIBLE);
             user_mobile.setVisibility(View.GONE);
+            layout_afterLogin.setVisibility(View.GONE);
+            tvExit.setVisibility(View.GONE);
         }
     }
@@ -125,8 +137,10 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
             case R.id.layout_about:
                 WebViewActivity.getInstance(getActivity(), AppConfig.BASE_URL_ORDER + "About.html", -1);
                 break;
-            case R.id.layoutAdvice:
-                WebViewActivity.getInstance(getActivity(), AppConfig.BASE_URL_ORDER + "FeedBack.aspx?userid=" + AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID), -1);
+
+            case R.id.layout_feedback:
+                WebViewActivity.getInstance(getActivity(), AppConfig.BASE_URL_ORDER + "FeedBack.aspx?userid=" + AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID), -1);
+
                 break;
             default:
                 break;
@@ -68,6 +68,7 @@ public class StartFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consult
             mPresenter.getBanners("1",  AppContext.getInstance().district==""?"越城区":AppContext.getInstance().district);
         }
+        tvJump=view.findViewById(R.id.tvJump);
         tvJump.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -5,7 +5,6 @@ import android.content.Context;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -15,9 +14,7 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.share.mvpsdk.utils.DisplayUtils;
 import com.shunzhi.parent.AppConfig;
-import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
-import com.shunzhi.parent.util.GlideUtils;
 /**
@@ -84,10 +81,12 @@ public class TextAndImgShowView extends LinearLayout {
     public void setWidth(Activity activity, View layout_control) {
 //        Log.d("66666", "layout_control=" + layout_control.getMeasuredWidth());
-        LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+        LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT,LayoutParams.MATCH_PARENT);
         params.width = (DisplayUtils.getScreenWidthPixels(activity) -
                 DisplayUtils.dp2px(layout_control.getPaddingLeft() + layout_control.getPaddingRight()
         )) / 4;
         layout.setLayoutParams(params);
+        LayoutParams params1 = new LayoutParams(52,52);
+        image.setLayoutParams(params1);
     }
 }
@@ -17,7 +17,7 @@
             android:paddingTop="20dp"
             android:layout_width="match_parent"
             android:layout_height="180dp"
-            android:background="@drawable/backgroud_top"
+            android:background="@color/back_top"
             android:orientation="vertical">
             <TextView
@@ -91,6 +91,7 @@
             android:orientation="vertical">
             <LinearLayout
+                android:id="@+id/layout_afterLogin"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
@@ -103,17 +104,17 @@
                     <TextView
                         android:layout_width="25dp"
-                        android:layout_height="20dp"
+                        android:layout_height="30dp"
                         android:layout_marginLeft="15dp"
                         android:layout_marginRight="30dp"
-                        android:background="@drawable/tiaoxing" />
+                        android:background="@drawable/xiaoxi" />
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:layout_weight="1"
-                        android:text="我的订阅消息"
+                        android:text="消息"
                         android:textSize="@dimen/txtsize_title" />
                     <TextView
@@ -239,7 +240,7 @@
                 android:orientation="vertical">
                 <LinearLayout
-                    android:id="@+id/layoutAdvice"
+                    android:id="@+id/layout_feedback"
                     android:layout_width="match_parent"
                     android:gravity="center_vertical"
                     android:layout_height="?android:actionBarSize">
@@ -22,6 +22,7 @@
             android:drawablePadding="10dp"
             android:drawableRight="@drawable/pull"
             android:text=""
+            android:visibility="gone"
             android:textColor="@color/textColor"
             android:textSize="@dimen/textSize16" />
@@ -32,7 +33,7 @@
             android:layout_weight="1"
             android:gravity="center_horizontal"
             android:id="@+id/tvDate"
-            android:text="2018年3月"
+            android:text="报告"
             android:textColor="@color/white"
             android:textSize="@dimen/textSize18" />
@@ -42,6 +43,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:drawableRight="@drawable/screen"
+            android:visibility="gone"
             android:text="筛选"
             android:textColor="@color/textColor"
             android:textSize="@dimen/textSize16" />
@@ -52,7 +54,7 @@
         android:layout_height="match_parent"
         android:textSize="@dimen/size_dp_16"
         android:textColor="@color/xueqing_blue"
-        android:text="没有绑定孩子，\n请去个人中心绑定孩子"
+        android:text="功能暂不开放"
         android:gravity="center"
         android:lineSpacingExtra="@dimen/size_dp_5"
         android:id="@+id/tvNoData"
@@ -61,6 +63,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:visibility="gone"
         android:orientation="vertical">
         <!--<include layout="@layout/layout_week" /> android:layout_below="@+id/linearlayout"-->
	@@ -68,6 +68,7 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult		@@ -68,6 +68,7 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
68	mPresenter.getBanners("1", AppContext.getInstance().district==""?"越城区":AppContext.getInstance().district);	68	mPresenter.getBanners("1", AppContext.getInstance().district==""?"越城区":AppContext.getInstance().district);
69	}	69	}
70		70
		71	+ tvJump=view.findViewById(R.id.tvJump);
71		72
72	tvJump.setOnClickListener(new View.OnClickListener() {	73	tvJump.setOnClickListener(new View.OnClickListener() {
73	@Override	74	@Override