From 864e9f4cb4e84c64988460b80afe3cca9e09ec2b Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Mon, 19 Mar 2018 10:49:05 +0800
Subject: [PATCH] no message

---
 app/src/main/AndroidManifest.xml                                     | 16 ++++++++--------
 app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java |  6 ++----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1c4765b..b21014e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -64,17 +64,17 @@
             android:name="com.amap.api.v2.apikey"
             android:value="1d130afb822d8a1019e6592cbaf10bcc" />
 
-        <activity android:name=".ui.activity.LoginAndRegistActivity">
+        <activity android:name=".ui.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.MainActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
+        <!--<activity-->
+            <!--android:name=".ui.MainActivity"-->
+            <!--android:screenOrientation="portrait"-->
+            <!--android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />-->
         <activity
             android:name=".ui.activity.MyChildActivity"
             android:screenOrientation="portrait" />
@@ -94,9 +94,9 @@
             android:name=".ui.activity.binding.SelectSchoolActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden" />
-         <!--<activity android:name=".ui.activity.LoginAndRegistActivity"-->
-         <!--android:screenOrientation="portrait"-->
-         <!--/>-->
+         <activity android:name=".ui.activity.LoginAndRegistActivity"
+         android:screenOrientation="portrait"
+         />
         <activity
             android:name=".ui.activity.PersonInfoActivity"
             android:screenOrientation="portrait"
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 d6991a0..7c01c3a 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
@@ -8,7 +8,6 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.FloatingActionButton;
-import android.util.Log;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -17,13 +16,12 @@ import android.widget.TextView;
 
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
-import com.share.mvpsdk.utils.DisplayUtils;
 import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.contract.ceping.CepingContract;
 import com.shunzhi.parent.presenter.ceping.CePingPresenter;
-import com.shunzhi.parent.views.DragFloatActionButton;
+import com.shunzhi.parent.ui.activity.MyChildActivity;
 import com.shunzhi.parent.views.TextAndImgShowView;
 
 import me.leefeng.citypicker.CityPicker;
@@ -80,7 +78,7 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
         floatingActionButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-
+                startActivity(new Intent().setClass(getActivity(), MyChildActivity.class));
             }
         });
 //        floatingActionButton.setOnClickListeners(new DragFloatActionButton.OnClickListeners() {
--
libgit2 0.21.0