From 8c2638401b896de9a7b0f9daa7c4ced4289adc57 Mon Sep 17 00:00:00 2001
From: 陶汉栋 <2821744554@qq.com>
Date: Wed, 21 Mar 2018 14:42:38 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java                             |  8 ++++----
 app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java |  2 +-
 app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java                       |  7 +++++--
 app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java          |  1 -
 app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java                |  1 -
 app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java                           | 17 +++++++++++------
 app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java                          | 11 ++---------
 app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java                             | 12 ++++++++++--
 app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java                            |  5 ++---
 app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java          |  9 +++------
 app/src/main/java/com/shunzhi/parent/util/GlideUtils.java                                      | 29 +++++++++++++++++++++++++++++
 app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java                             |  4 +++-
 app/src/main/res/drawable-xhdpi/logo.png                                                       | Bin 34716 -> 0 bytes
 app/src/main/res/drwable-xxhdpi/logo.png                                                       | Bin 34716 -> 0 bytes
 app/src/main/res/values/strings.xml                                                            |  2 +-
 15 files changed, 71 insertions(+), 37 deletions(-)
 create mode 100644 app/src/main/java/com/shunzhi/parent/util/GlideUtils.java

diff --git a/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java
index 58d8c83..f0f2464 100644
--- a/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java
+++ b/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java
@@ -3,6 +3,7 @@ package com.shunzhi.parent.adapter;
 import android.content.Context;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,6 +20,7 @@ import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.channel.ChannelContextBean;
 import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
+import com.shunzhi.parent.util.GlideUtils;
 
 /**
  * Created by ToaHanDong on 2018/3/14.
@@ -70,8 +72,7 @@ public class MyConsultAdapter extends BaseRecyclerViewAdapter<ChannelContextBean
             if (object.getIsAds() == 1) {
                 frame_ad.setVisibility(View.VISIBLE);
                 normal_content.setVisibility(View.GONE);
-                Glide.with(mContext).load(object.getImage()).placeholder(R.color.xueqing_blue)
-                        .into(iv_consult);
+                GlideUtils.showImg(mContext,iv_consult,object.getImage());
                 frame_ad.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -83,8 +84,7 @@ public class MyConsultAdapter extends BaseRecyclerViewAdapter<ChannelContextBean
                 normal_content.setVisibility(View.VISIBLE);
                 tvConsultTitle.setText(object.getTitle());
                 tvConsultContent.setText(object.getContent());
-                Glide.with(mContext).load(object.getImage()).placeholder(R.color.xueqing_blue)
-                        .into(iv_consult);
+                GlideUtils.showImg(mContext,iv_consult,object.getImage());
                 normal_content.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
index 3b7e7d8..6dbb602 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
@@ -158,7 +158,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
         mRxManager.register(mIModel.getUserInfo(mobile, school_id, captcha).subscribe(new Consumer<UserInfo>() {
             @Override
             public void accept(UserInfo userInfo) throws Exception {
-                Log.d("6666", "userInfo=" + userInfo.toString());
+//                Log.d("6666", "userInfo=" + userInfo.toString());
                 if (userInfo != null) {
                     CurrentBean currentBean = userInfo.getData();
                     AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, currentBean.getMobile());
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java
index b5e0a73..4ebe66f 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java
@@ -18,6 +18,7 @@ import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.contract.mine.PersonInfoContract;
 import com.shunzhi.parent.presenter.mine.PersonInfoPrasenter;
+import com.shunzhi.parent.util.GlideUtils;
 
 /**
  * Created by Administrator on 2018/3/10 0010.
@@ -56,9 +57,11 @@ public class PersonInfoActivity extends BaseMVPCompatActivity<PersonInfoContract
     private void initInfo() {
         String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE);
         if (!TextUtils.isEmpty(url)) {
-            Glide.with(this).load(url).asBitmap().error(R.drawable.test).centerCrop().into(user_image);
+            GlideUtils.showImg(this,user_image,url);
+//            Glide.with(this).load(url).asBitmap().error(R.drawable.test).centerCrop().into(user_image);
         } else {
-            Glide.with(this).load(R.drawable.test).centerCrop().into(user_image);
+//            Glide.with(this).load(R.drawable.test).centerCrop().into(user_image);
+            GlideUtils.showImg(this,user_image,url);
         }
         user_image.setCornerRadius(20);
         user_image.setOval(true);
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java
index c47fd6d..69f57ac 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java
@@ -56,7 +56,6 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View.
         Bundle bundle = new Bundle();
         bundle.putString("channel", channel);
         consultOneLevelFragment.setArguments(bundle);
-//        ToastUtils.showToast("channel=" + channel);
         fragmentTransaction = getSupportFragmentManager().beginTransaction();
         fragmentTransaction.add(R.id.frame_consult, consultOneLevelFragment)
                 .show(consultOneLevelFragment).commit();
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 16d5e92..3c9765d 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
@@ -111,7 +111,6 @@ public class WebViewActivity extends BaseCompatActivity {
 
         initWebView();
         initWebSetting(nesteScrollWebView.getSettings());
-        ToastUtils.showToast(getIntent().getStringExtra("url"));
         nesteScrollWebView.loadUrl(getIntent().getStringExtra("url"));
     }
 
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 3d254a9..4727120 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
@@ -24,6 +24,7 @@ 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.util.GlideUtils;
 import com.shunzhi.parent.views.TextAndImgShowView;
 
 import java.util.List;
@@ -181,17 +182,21 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
 
     @Override
     public void showTools(List<ToolBean> toolBeanList) {
-        if (toolBeanList.size() == 1) {
+        if (toolBeanList.size() > 0) {
             tvCourse1.setText(toolBeanList.get(0).toolName);
-            Glide.with(getActivity()).load(toolBeanList.get(0).toolImage).into(ivCourse1);
+            GlideUtils.showImg(getActivity(),ivCourse1,toolBeanList.get(0).toolImage);
             tvCourse1.setTag(toolBeanList.get(0).toolUrl);
-        } else if (toolBeanList.size() == 2) {
+        }
+
+        if (toolBeanList.size() > 1) {
             tvCourse2.setText(toolBeanList.get(1).toolName);
-            Glide.with(getActivity()).load(toolBeanList.get(1).toolImage).into(ivCourse1);
+            GlideUtils.showImg(getActivity(),ivCourse2,toolBeanList.get(1).toolImage);
             tvCourse2.setTag(toolBeanList.get(1).toolUrl);
-        } else if (toolBeanList.size() == 3) {
+        }
+
+        if (toolBeanList.size() > 2) {
             tvCourse3.setText(toolBeanList.get(2).toolName);
-            Glide.with(getActivity()).load(toolBeanList.get(2).toolImage).into(ivCourse1);
+            GlideUtils.showImg(getActivity(),ivCourse3,toolBeanList.get(2).toolImage);
             tvCourse3.setTag(toolBeanList.get(2).toolUrl);
         }
     }
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 d081ebe..6e7847a 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
@@ -29,6 +29,7 @@ import com.shunzhi.parent.presenter.consult.ConsultPresenter;
 import com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity;
 import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
 import com.shunzhi.parent.util.AttrsUtils;
+import com.shunzhi.parent.util.GlideUtils;
 import com.shunzhi.parent.views.TextAndImgShowView;
 import com.stx.xhb.xbanner.XBanner;
 
@@ -89,7 +90,6 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
 //        mPresenter.getTools(layout_control);
         mPresenter.getBanners("2", AppContext.getInstance().district);
 
-
         initBroadCast();
 
         initListeners();
@@ -129,8 +129,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
         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);
+                GlideUtils.showImg(getActivity(),(ImageView) view,imgesUrl.get(position));
             }
         });
 
@@ -153,11 +152,6 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
     public void onResume() {
         super.onResume();
         xBanner.startAutoPlay();
-//        if (!tvLocalAddress.getText().toString().equals(AppContext.getInstance().cityName)){
-//            tvLocalAddress.setText(AppContext.getInstance().district);
-//            mPresenter.getBanners("2", AppContext.getInstance().district);
-//            mPresenter.getContextChannel(AppContext.getInstance().district, 0, 1, 1);
-//        }
     }
 
     @Override
@@ -230,7 +224,6 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
                 TextAndImgShowView textAndImgShowView = new TextAndImgShowView(getActivity());
                 textAndImgShowView.setTextColor(R.color.textColor);
                 textAndImgShowView.setText(list.get(i).getChannelName());
-//            textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(list.get(i).getChannelImage()));
                 textAndImgShowView.addImgs(list.get(i).getChannelImage());
                 textAndImgShowView.setSelect(true);
                 textAndImgShowView.setWidth(getActivity(), layout_control);
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 f6a66b9..db513c3 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
@@ -13,6 +13,7 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.makeramen.roundedimageview.RoundedImageView;
+import com.netease.nimlib.sdk.NIMClient;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
 import com.share.mvpsdk.utils.CacheUtils;
@@ -28,6 +29,7 @@ import com.shunzhi.parent.ui.activity.MyChildActivity;
 import com.shunzhi.parent.ui.activity.PersonInfoActivity;
 import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
 import com.shunzhi.parent.ui.activity.orderdetail.OrderDetailActivity;
+import com.shunzhi.parent.util.GlideUtils;
 
 import static java.util.ResourceBundle.clearCache;
 
@@ -77,9 +79,11 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
             String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE);
             ToastUtils.showToast(url);
             if (!TextUtils.isEmpty(url)) {
-                Glide.with(getActivity()).load(url).asBitmap().error(R.drawable.test).centerCrop().into(user_photo);
+                GlideUtils.showImg(getContext(),user_photo,url);
+//                Glide.with(getActivity()).load(url).asBitmap().error(R.drawable.test).centerCrop().into(user_photo);
             } else {
-                Glide.with(getActivity()).load(R.drawable.test).centerCrop().into(user_photo);
+//                Glide.with(getActivity()).load(R.drawable.test).centerCrop().into(user_photo);
+                GlideUtils.showImg(getContext(),user_photo,url);
                 user_photo.setCornerRadius(20);
             }
             user_photo.setCornerRadius(20);
@@ -87,6 +91,9 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
             user_name.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_NAME));
             user_mobile.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME));
             user_mobile.setVisibility(View.VISIBLE);
+        }else {
+            user_name.setVisibility(View.VISIBLE);
+            user_mobile.setVisibility(View.GONE);
         }
     }
 
@@ -156,6 +163,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_IMAGE, "");
         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_NAME, "");
         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, "");
+        AppConfig.ISLOGIN=false;
         setPersonInfo();
     }
 
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
index dbc1b41..8b54404 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
@@ -22,6 +22,7 @@ import com.shunzhi.parent.bean.channel.ChannelContextBean;
 import com.shunzhi.parent.contract.consult.ConsultContract;
 import com.shunzhi.parent.presenter.consult.ConsultPresenter;
 import com.shunzhi.parent.ui.MainActivity;
+import com.shunzhi.parent.util.GlideUtils;
 import com.stx.xhb.xbanner.XBanner;
 
 import java.util.ArrayList;
@@ -99,12 +100,10 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
         xBanner.stopAutoPlay();
         xBanner.setmAutoPalyTime(10000);
 //        xBanner.setSlideScrollMode(View.OVER_SCROLL_NEVER);
-        Log.d("66666","imgUrl="+imgUrl.toString()+"describeList="+describeList.toString());
         xBanner.setmAdapter(new XBanner.XBannerAdapter() {
             @Override
             public void loadBanner(XBanner banner, Object model, View view, int position) {
-                Glide.with(getActivity()).load(imgUrl.get(position)).placeholder(R.drawable.ic_launcher_background)
-                        .into((ImageView) view);
+                GlideUtils.showImg(getActivity(),(ImageView) view,imgUrl.get(position));
             }
         });
 
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
index e022c79..ef9a3d4 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
@@ -13,14 +13,12 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.bumptech.glide.Glide;
 import com.jcodecraeer.xrecyclerview.XRecyclerView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
 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.adapter.MyConsultAdapter;
@@ -32,6 +30,7 @@ import com.shunzhi.parent.presenter.consult.consultone.ConsultOnePresenter;
 import com.shunzhi.parent.ui.activity.consult.ConsultTwoLevelActivity;
 import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
 import com.shunzhi.parent.util.AttrsUtils;
+import com.shunzhi.parent.util.GlideUtils;
 import com.shunzhi.parent.views.TextAndImgShowView;
 
 import java.util.ArrayList;
@@ -214,16 +213,14 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
 
             @Override
             public void onBindViewHolder(final GuangGaoBean object, int position) {
-                Glide.with(getActivity()).load(AppConfig.BASE_URL_FILE + object.fileSrc).error(R.drawable.ic_launcher_foreground).into(iv_grally);
-
+                GlideUtils.showImg(mContext, iv_grally, object.fileSrc);
                 tv_grally_title.setText(object.describe + "");
                 iv_grally.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        WebViewActivity.getInstance(mContext,object.url, -1);
+                        WebViewActivity.getInstance(mContext, object.url, -1);
                     }
                 });
-
             }
         }
     }
diff --git a/app/src/main/java/com/shunzhi/parent/util/GlideUtils.java b/app/src/main/java/com/shunzhi/parent/util/GlideUtils.java
new file mode 100644
index 0000000..2b580ce
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/util/GlideUtils.java
@@ -0,0 +1,29 @@
+package com.shunzhi.parent.util;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.widget.ImageView;
+
+import com.bumptech.glide.Glide;
+import com.shunzhi.parent.AppConfig;
+import com.shunzhi.parent.R;
+
+/**
+ * Created by ToaHanDong on 2018/3/21.
+ */
+
+public class GlideUtils {
+
+    public static void showImg(Context context, ImageView imageView,String url){
+        if (!TextUtils.isEmpty(url)){
+            if (url.startsWith("http"))
+                Glide.with(context).load(url).placeholder(R.color.xueqing_blue)
+                        .into(imageView);
+            else Glide.with(context).load(AppConfig.BASE_URL_FILE+url).placeholder(R.color.xueqing_blue)
+                    .into(imageView);
+        }else {
+            Glide.with(context).load(url).placeholder(R.color.xueqing_blue).centerCrop().into(imageView);
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
index b056c4a..0847003 100644
--- a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
+++ b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
@@ -17,6 +17,7 @@ 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;
 
 
 /**
@@ -57,6 +58,7 @@ public class TextAndImgShowView extends LinearLayout {
     }
 
     public void addImgs(String imgUrl){
+//        Log.d("66666","imgUrl="+imgUrl);
         if (!imgUrl.startsWith("http"))imgUrl= AppConfig.BASE_URL_FILE+imgUrl;
         Glide.with(getContext()).load(imgUrl).error(R.drawable.gxzt).into(image);
     }
@@ -81,7 +83,7 @@ public class TextAndImgShowView extends LinearLayout {
     }
 
     public void setWidth(Activity activity, View layout_control) {
-        Log.d("66666", "layout_control=" + layout_control.getMeasuredWidth());
+//        Log.d("66666", "layout_control=" + layout_control.getMeasuredWidth());
         LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
         params.width = (DisplayUtils.getScreenWidthPixels(activity) -
                 DisplayUtils.dp2px(layout_control.getPaddingLeft() + layout_control.getPaddingRight()
diff --git a/app/src/main/res/drawable-xhdpi/logo.png b/app/src/main/res/drawable-xhdpi/logo.png
index fd04f6e..56b8ba1 100644
Binary files a/app/src/main/res/drawable-xhdpi/logo.png and b/app/src/main/res/drawable-xhdpi/logo.png differ
diff --git a/app/src/main/res/drwable-xxhdpi/logo.png b/app/src/main/res/drwable-xxhdpi/logo.png
index fd04f6e..db6fa90 100644
Binary files a/app/src/main/res/drwable-xxhdpi/logo.png and b/app/src/main/res/drwable-xxhdpi/logo.png differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6612e41..401c694 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">parent</string>
+    <string name="app_name">家长慧</string>
 
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
--
libgit2 0.21.0