From 4065e67bd2368637ab79dbec03c7d650e26c41b5 Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Fri, 23 Mar 2018 15:37:40 +0800
Subject: [PATCH] no message

---
 app/src/main/AndroidManifest.xml                                                                    | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------
 app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java                               |   1 +
 app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java                                |   2 +-
 app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java                                 |   3 +--
 app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java |  25 ++++++++++++++-----------
 app/src/main/res/drawable-xhdpi/camera.png                                                          | Bin 1070 -> 0 bytes
 app/src/main/res/drawable-xhdpi/pull.png                                                            | Bin 603 -> 0 bytes
 app/src/main/res/layout/fragment_ce_ping.xml                                                        |   2 +-
 app/src/main/res/layout/fragment_login_and_regist.xml                                               |  18 +++---------------
 app/src/main/res/layout/fragment_report.xml                                                         |   2 +-
 app/src/main/res/layout/layout_search.xml                                                           |   2 +-
 11 files changed, 88 insertions(+), 93 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3ac22ec..71a2480 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.shunzhi.parent">
+    package="com.shunzhi.parent">
 
     <!-- 用于进行网络定位 -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <!-- 用于访问GPS定位 -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="android.permission.GET_TASKS"/>
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <!-- Android 6.0版本可去除，用于选举信息（通道复用）的同步 -->
-    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <!-- 进行网络访问和网络状态监控相关的权限声明 -->
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
     <!-- 用于获取运营商信息，用于支持提供运营商信息相关的接口 -->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <!-- 用于访问wifi网络信息，wifi信息会用于进行网络定位 -->
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <!-- 用于获取wifi的获取权限，wifi信息会用来进行网络定位 -->
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <!-- 允许对sd卡进行读写操作 -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <!-- 用于申请调用A-GPS模块 -->
-    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
     <!-- 网络库使用，当网络操作时需要确保事务完成不被杀掉 -->
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <!-- 用于读取手机硬件信息等，用于机型过滤 -->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <!-- 选举使用，当应用有删除或者更新时需要重新选举，复用推送通道 -->
-    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_CHANGED"/>
-    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_REPLACED"/>
-    <uses-permission android:name="android.permission.RESTART_PACKAGES"/>
+    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_CHANGED" />
+    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_REPLACED" />
+    <uses-permission android:name="android.permission.RESTART_PACKAGES" />
     <!-- 补偿通道小米PUSH使用，不用可去除 -->
     <!-- <uses-permission android:name="android.permission.GET_TASKS" /> -->
     <!-- 补偿通道GCM使用，不使用可去除 -->
-    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <!-- 允许监听启动完成事件 -->
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <!-- 允许访问震动器 -->
-    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
     <!-- 允许task重排序 -->
-    <uses-permission android:name="android.permission.REORDER_TASKS"/>
+    <uses-permission android:name="android.permission.REORDER_TASKS" />
     <!-- 用于申请获取蓝牙信息进行室内定位 -->
-    <uses-permission android:name="android.permission.BLUETOOTH"/>
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 
     <!-- 接收 SDK 消息广播权限， 第三方 APP 接入时，请将 com.netease.nim.demo 替换为自己的包名 -->
-    <uses-permission android:name="com.shunzhi.parent.permission.RECEIVE_MSG"/>
-    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <uses-permission android:name="com.shunzhi.parent.permission.RECEIVE_MSG" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
 
     <application
         android:name=".AppContext"
@@ -59,7 +59,7 @@
         android:theme="@style/Theme.AppCompat.Light.NoActionBar">
 
         <!-- 高德地图服务 -->
-        <service android:name="com.amap.api.location.APSService"/>
+        <service android:name="com.amap.api.location.APSService" />
         <!-- 高德地图密钥 -->
         <!-- <meta-data -->
         <!-- android:name="com.amap.api.v2.apikey" -->
@@ -68,28 +68,28 @@
         <!--家长慧测试APPkey-->
         <meta-data
             android:name="com.netease.nim.appKey"
-            android:value="330158c080acdf4dc1092d6a74576c2c"/>
+            android:value="330158c080acdf4dc1092d6a74576c2c" />
 
         <meta-data
             android:name="android.max_aspect"
-            android:value="2.1"/>
+            android:value="2.1" />
 
         <!-- 声明云信后台服务 -->
         <service
             android:name="com.netease.nimlib.service.NimService"
-            android:process=":core"/>
+            android:process=":core" />
 
         <!-- 运行后台辅助服务 -->
         <service
             android:name="com.netease.nimlib.service.NimService$Aux"
-            android:process=":core"/>
+            android:process=":core" />
 
         <!-- 声明云信后台辅助服务 -->
         <service
             android:name="com.netease.nimlib.job.NIMJobService"
             android:exported="true"
             android:permission="android.permission.BIND_JOB_SERVICE"
-            android:process=":core"/>
+            android:process=":core" />
 
         <!-- 云信SDK的监视系统启动和网络变化的广播接收器，用户开机自启动以及网络变化时候重新登录 -->
         <receiver
@@ -97,46 +97,47 @@
             android:exported="false"
             android:process=":core">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED"/>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
             </intent-filter>
         </receiver>
 
         <!-- 云信进程间通信receiver -->
-        <receiver android:name="com.netease.nimlib.service.ResponseReceiver"/>
+        <receiver android:name="com.netease.nimlib.service.ResponseReceiver" />
 
         <!-- 云信进程间通信service -->
-        <service android:name="com.netease.nimlib.service.ResponseService"/>
+        <service android:name="com.netease.nimlib.service.ResponseService" />
 
         <meta-data
             android:name="com.amap.api.v2.apikey"
-            android:value="1d130afb822d8a1019e6592cbaf10bcc"/>
+            android:value="1d130afb822d8a1019e6592cbaf10bcc" />
 
-        <activity android:name=".ui.activity.StartActivity"
+        <activity
+            android:name=".ui.activity.StartActivity"
             android:launchMode="singleInstance"
             android:windowSoftInputMode="adjustPan|stateAlwaysHidden">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <!--<activity-->
-            <!--android:name=".ui.MainActivity"-->
-            <!--android:screenOrientation="portrait"-->
-            <!--android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />-->
+        <!--android:name=".ui.MainActivity"-->
+        <!--android:screenOrientation="portrait"-->
+        <!--android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />-->
         <activity
             android:name=".ui.activity.MyChildActivity"
-            android:screenOrientation="portrait"/>
-        <activity android:name=".ui.activity.consult.ConsultOneLevelActivity"
-            android:windowSoftInputMode="adjustPan|stateAlwaysHidden"
-            />
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".ui.activity.consult.ConsultOneLevelActivity"
+            android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
         <!-- <activity android:name=".ui.activity.LoginAndRegistActivity" /> -->
         <activity
             android:name=".ui.MainActivity"
             android:launchMode="singleInstance"
-            android:windowSoftInputMode="adjustPan|stateAlwaysHidden"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
         <activity
             android:name=".ui.activity.ChildDetialActivity"
             android:launchMode="singleInstance"
@@ -145,26 +146,27 @@
             android:name=".ui.activity.binding.CreateChildInfoActivity"
             android:launchMode="singleInstance"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan|stateHidden"/>
+            android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".ui.activity.binding.SelectSchoolActivity"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan|stateHidden"/>
+            android:windowSoftInputMode="adjustPan|stateHidden" />
 
-         <activity android:name=".ui.activity.LoginAndRegistActivity"
-         android:screenOrientation="portrait"
-         />
+        <activity
+            android:name=".ui.activity.LoginAndRegistActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".ui.activity.PersonInfoActivity"
             android:launchMode="singleInstance"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan|stateHidden"/>
+            android:windowSoftInputMode="adjustPan|stateHidden" />
 
         <activity
             android:name=".ui.activity.binding.CheckInfoActivity"
             android:launchMode="singleInstance"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan|stateHidden"/>
+            android:windowSoftInputMode="adjustPan|stateHidden" />
 
         <activity
             android:name=".ui.activity.binding.InviteCodeActivity"
@@ -175,12 +177,14 @@
             android:name=".ui.activity.mywebview.WebViewActivity"
             android:screenOrientation="portrait" />
 
-        <activity android:name=".ui.activity.consult.ConsultTwoLevelActivity"
-            android:windowSoftInputMode="adjustPan|stateAlwaysHidden"
-            android:launchMode="singleInstance"/>
+        <activity
+            android:name=".ui.activity.consult.ConsultTwoLevelActivity"
+            android:launchMode="singleInstance"
+            android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
 
-        <activity android:name=".ui.activity.orderdetail.OrderDetailActivity"
-            android:launchMode="singleInstance"/>
+        <activity
+            android:name=".ui.activity.orderdetail.OrderDetailActivity"
+            android:launchMode="singleInstance" />
     </application>
 
 </manifest>
\ No newline at end of file
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 2a4f4c7..326c1f1 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
@@ -130,6 +130,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
 
     private void initBanners() {
         xBanner.setData(imgesUrl, describeList);
+        xBanner.setPointsIsVisible(false);
         xBanner.setmAdapter(new XBanner.XBannerAdapter() {
             @Override
             public void loadBanner(XBanner banner, Object model, View view, int position) {
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
index bcea39f..7072afd 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
@@ -100,7 +100,7 @@ public class ReportFragment extends BaseMVPCompatFragment<ReportContract.ReportP
     }
 
     private void showDate() {
-        tvDate.setText(selectedDate.getYear() + "年" + (selectedDate.getMonth() + 1) + "月");
+//        tvDate.setText(selectedDate.getYear() + "年" + (selectedDate.getMonth() + 1) + "月");
     }
 
     private void initReportList() {
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 7f65e72..cdad70d 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
@@ -12,7 +12,6 @@ import android.widget.TextView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
 import com.shunzhi.parent.AppConfig;
-import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.GuangGaoBean;
 import com.shunzhi.parent.bean.channel.ChannelBean;
@@ -132,7 +131,7 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
                 xBanner.setData(imgUrl, describeList);
                 xBanner.stopAutoPlay();
                 xBanner.setmAutoPalyTime(10000);
-//        xBanner.setSlideScrollMode(View.OVER_SCROLL_NEVER);
+                xBanner.setPointsIsVisible(false);
                 xBanner.setmAdapter(new XBanner.XBannerAdapter() {
                     @Override
                     public void loadBanner(XBanner banner, Object model, View view, int position) {
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
index 1803260..e8b94fa 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
@@ -7,7 +7,6 @@ import android.support.annotation.Nullable;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -37,9 +36,9 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
 
     public RoundedImageView roundedImageView;
     public EditText phoneNumber, idCode, password, et_password_new;
-    public TextView get_idCode, loginAndRegister, tv_info, tv_goto, tv_goto_zhuce, tv_goto_mima;
+    public TextView get_idCode, loginAndRegister, tv_info, tv_goto, tv_goto_zhuce, tv_goto_mima,center_title;
     public LinearLayout phoneLayout, idCodeLayout, passwordLayout, main_login, passwordLayout_new;
-    public ImageView img_eye, img_eye_new, back_login;
+    public ImageView img_eye, img_eye_new, back_top;
     public static String typepage;
     public boolean open = false;
     public boolean opennew = false;
@@ -70,7 +69,8 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
         progressDialog = new MyProcessDialog(getActivity());
         tv_goto_zhuce = view.findViewById(R.id.tv_goto_zhuce);
         tv_goto_mima = view.findViewById(R.id.tv_goto_mima);
-        back_login = view.findViewById(R.id.back_login);
+        center_title = view.findViewById(R.id.center_title);
+        back_top = view.findViewById(R.id.back_top);
         denglu = view.findViewById(R.id.denglu);
         zhuce = view.findViewById(R.id.zhuce);
         main_login = view.findViewById(R.id.main_login);
@@ -94,7 +94,7 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
         loginAndRegister.setOnClickListener(this);
         img_eye.setOnClickListener(this);
         img_eye_new.setOnClickListener(this);
-        back_login.setOnClickListener(this);
+        back_top.setOnClickListener(this);
         phoneNumber.addTextChangedListener(textWatcher);
         idCode.addTextChangedListener(textWatcher);
         password.addTextChangedListener(textWatcher);
@@ -103,28 +103,25 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
         passwordLayout_new = view.findViewById(R.id.passwordLayout_new);
         et_password_new = view.findViewById(R.id.et_password_new);
         et_password_new.addTextChangedListener(textWatcher);
-
+        center_title.setText(typepage);
         if ("登录".equals(typepage)) {
             idCodeLayout.setVisibility(View.GONE);
             passwordLayout_new.setVisibility(View.GONE);
             loginAndRegister.setText("登录");
             denglu.setVisibility(View.VISIBLE);
             zhuce.setVisibility(View.GONE);
-            back_login.setVisibility(View.INVISIBLE);
         } else if ("注册".equals(typepage)) {
             idCodeLayout.setVisibility(View.VISIBLE);
             passwordLayout_new.setVisibility(View.GONE);
             loginAndRegister.setText("注册");
             denglu.setVisibility(View.GONE);
             zhuce.setVisibility(View.VISIBLE);
-            back_login.setVisibility(View.INVISIBLE);
         } else if ("找回密码".equals(typepage)) {
             idCodeLayout.setVisibility(View.VISIBLE);
             passwordLayout_new.setVisibility(View.VISIBLE);
             loginAndRegister.setText("确定");
             denglu.setVisibility(View.GONE);
             zhuce.setVisibility(View.GONE);
-            back_login.setVisibility(View.VISIBLE);
         }
 
 //        roundedImageView.setOnClickListener(new View.OnClickListener() {
@@ -237,8 +234,14 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
                 et_password_new.setInputType(0x90);
                 opennew = true;
             }
-        } else if (v == back_login) {
-            startActivity(new Intent().putExtra("type", "登录").setClass(getActivity(), LoginAndRegistActivity.class));
+        } else if (v == back_top) {
+            if("找回密码".equals(typepage)) {
+                startActivity(new Intent().putExtra("type", "登录").setClass(getActivity(), LoginAndRegistActivity.class));
+            }else if("登录".equals(typepage)){
+
+            }else if("注册".equals(typepage)){
+                startActivity(new Intent().putExtra("type", "登录").setClass(getActivity(), LoginAndRegistActivity.class));
+            }
             getActivity().finish();
         }
     }
diff --git a/app/src/main/res/drawable-xhdpi/camera.png b/app/src/main/res/drawable-xhdpi/camera.png
index d3acf84..0e87bd0 100644
Binary files a/app/src/main/res/drawable-xhdpi/camera.png and b/app/src/main/res/drawable-xhdpi/camera.png differ
diff --git a/app/src/main/res/drawable-xhdpi/pull.png b/app/src/main/res/drawable-xhdpi/pull.png
index 10fe0b4..38f54dc 100644
Binary files a/app/src/main/res/drawable-xhdpi/pull.png and b/app/src/main/res/drawable-xhdpi/pull.png differ
diff --git a/app/src/main/res/layout/fragment_ce_ping.xml b/app/src/main/res/layout/fragment_ce_ping.xml
index 065d1ba..d53615d 100644
--- a/app/src/main/res/layout/fragment_ce_ping.xml
+++ b/app/src/main/res/layout/fragment_ce_ping.xml
@@ -26,7 +26,7 @@
                 android:gravity="center"
                 android:paddingLeft="@dimen/size_dp_15"
                 android:text="杭州"
-                android:textColor="@color/textColor"
+                android:textColor="@color/white"
                 android:textSize="@dimen/textSize16" />
 
             <TextView
diff --git a/app/src/main/res/layout/fragment_login_and_regist.xml b/app/src/main/res/layout/fragment_login_and_regist.xml
index 1a99a91..1faad20 100644
--- a/app/src/main/res/layout/fragment_login_and_regist.xml
+++ b/app/src/main/res/layout/fragment_login_and_regist.xml
@@ -12,18 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <ImageView
-                android:layout_marginTop="10dp"
-                android:id="@+id/back_login"
-                android:layout_width="60dp"
-                android:layout_height="20dp"
-                android:visibility="invisible"
-                android:src="@drawable/back"
-                />
-        </LinearLayout>
+       <include layout="@layout/top"/>
 
         <com.makeramen.roundedimageview.RoundedImageView
             android:id="@+id/photoImage"
@@ -32,10 +21,9 @@
             android:layout_gravity="center"
             android:layout_marginTop="80dp"
             android:scaleType="centerCrop"
-            android:src="@drawable/logo"
+            android:src="@drawable/defphoto"
             app:riv_border_width="0dp"
-            app:riv_corner_radius="10dp"
-            app:riv_oval="false" />
+            app:riv_corner_radius="60dp" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml
index e7d5a69..bf5d335 100644
--- a/app/src/main/res/layout/fragment_report.xml
+++ b/app/src/main/res/layout/fragment_report.xml
@@ -54,7 +54,7 @@
         android:layout_height="match_parent"
         android:textSize="@dimen/size_dp_16"
         android:textColor="@color/xueqing_blue"
-        android:text="功能暂不开放"
+        android:text="敬请期待"
         android:gravity="center"
         android:lineSpacingExtra="@dimen/size_dp_5"
         android:id="@+id/tvNoData"
diff --git a/app/src/main/res/layout/layout_search.xml b/app/src/main/res/layout/layout_search.xml
index 81efc86..74231c5 100644
--- a/app/src/main/res/layout/layout_search.xml
+++ b/app/src/main/res/layout/layout_search.xml
@@ -13,7 +13,7 @@
         android:gravity="center"
         android:paddingLeft="@dimen/size_dp_15"
         android:text="杭州"
-        android:textColor="@color/textColor"
+        android:textColor="@color/white"
         android:textSize="@dimen/textSize16" />
 
     <FrameLayout
--
libgit2 0.21.0