Commit 864e9f4cb4e84c64988460b80afe3cca9e09ec2b
1 parent
ac3c7edc
Exists in
yxb_dev
and in
2 other branches
no message
Showing
2 changed files
with
10 additions
and
12 deletions
Show diff stats
app/src/main/AndroidManifest.xml
| @@ -64,17 +64,17 @@ | @@ -64,17 +64,17 @@ | ||
| 64 | android:name="com.amap.api.v2.apikey" | 64 | android:name="com.amap.api.v2.apikey" |
| 65 | android:value="1d130afb822d8a1019e6592cbaf10bcc" /> | 65 | android:value="1d130afb822d8a1019e6592cbaf10bcc" /> |
| 66 | 66 | ||
| 67 | - <activity android:name=".ui.activity.LoginAndRegistActivity"> | 67 | + <activity android:name=".ui.MainActivity"> |
| 68 | <intent-filter> | 68 | <intent-filter> |
| 69 | <action android:name="android.intent.action.MAIN" /> | 69 | <action android:name="android.intent.action.MAIN" /> |
| 70 | 70 | ||
| 71 | <category android:name="android.intent.category.LAUNCHER" /> | 71 | <category android:name="android.intent.category.LAUNCHER" /> |
| 72 | </intent-filter> | 72 | </intent-filter> |
| 73 | </activity> | 73 | </activity> |
| 74 | - <activity | ||
| 75 | - android:name=".ui.MainActivity" | ||
| 76 | - android:screenOrientation="portrait" | ||
| 77 | - android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> | 74 | + <!--<activity--> |
| 75 | + <!--android:name=".ui.MainActivity"--> | ||
| 76 | + <!--android:screenOrientation="portrait"--> | ||
| 77 | + <!--android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />--> | ||
| 78 | <activity | 78 | <activity |
| 79 | android:name=".ui.activity.MyChildActivity" | 79 | android:name=".ui.activity.MyChildActivity" |
| 80 | android:screenOrientation="portrait" /> | 80 | android:screenOrientation="portrait" /> |
| @@ -94,9 +94,9 @@ | @@ -94,9 +94,9 @@ | ||
| 94 | android:name=".ui.activity.binding.SelectSchoolActivity" | 94 | android:name=".ui.activity.binding.SelectSchoolActivity" |
| 95 | android:screenOrientation="portrait" | 95 | android:screenOrientation="portrait" |
| 96 | android:windowSoftInputMode="adjustPan|stateHidden" /> | 96 | android:windowSoftInputMode="adjustPan|stateHidden" /> |
| 97 | - <!--<activity android:name=".ui.activity.LoginAndRegistActivity"--> | ||
| 98 | - <!--android:screenOrientation="portrait"--> | ||
| 99 | - <!--/>--> | 97 | + <activity android:name=".ui.activity.LoginAndRegistActivity" |
| 98 | + android:screenOrientation="portrait" | ||
| 99 | + /> | ||
| 100 | <activity | 100 | <activity |
| 101 | android:name=".ui.activity.PersonInfoActivity" | 101 | android:name=".ui.activity.PersonInfoActivity" |
| 102 | android:screenOrientation="portrait" | 102 | android:screenOrientation="portrait" |
app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
| @@ -8,7 +8,6 @@ import android.os.Bundle; | @@ -8,7 +8,6 @@ import android.os.Bundle; | ||
| 8 | import android.support.annotation.NonNull; | 8 | import android.support.annotation.NonNull; |
| 9 | import android.support.annotation.Nullable; | 9 | import android.support.annotation.Nullable; |
| 10 | import android.support.design.widget.FloatingActionButton; | 10 | import android.support.design.widget.FloatingActionButton; |
| 11 | -import android.util.Log; | ||
| 12 | import android.view.View; | 11 | import android.view.View; |
| 13 | import android.widget.FrameLayout; | 12 | import android.widget.FrameLayout; |
| 14 | import android.widget.ImageView; | 13 | import android.widget.ImageView; |
| @@ -17,13 +16,12 @@ import android.widget.TextView; | @@ -17,13 +16,12 @@ import android.widget.TextView; | ||
| 17 | 16 | ||
| 18 | import com.share.mvpsdk.base.BasePresenter; | 17 | import com.share.mvpsdk.base.BasePresenter; |
| 19 | import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; | 18 | import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; |
| 20 | -import com.share.mvpsdk.utils.DisplayUtils; | ||
| 21 | import com.share.mvpsdk.utils.ToastUtils; | 19 | import com.share.mvpsdk.utils.ToastUtils; |
| 22 | import com.shunzhi.parent.AppContext; | 20 | import com.shunzhi.parent.AppContext; |
| 23 | import com.shunzhi.parent.R; | 21 | import com.shunzhi.parent.R; |
| 24 | import com.shunzhi.parent.contract.ceping.CepingContract; | 22 | import com.shunzhi.parent.contract.ceping.CepingContract; |
| 25 | import com.shunzhi.parent.presenter.ceping.CePingPresenter; | 23 | import com.shunzhi.parent.presenter.ceping.CePingPresenter; |
| 26 | -import com.shunzhi.parent.views.DragFloatActionButton; | 24 | +import com.shunzhi.parent.ui.activity.MyChildActivity; |
| 27 | import com.shunzhi.parent.views.TextAndImgShowView; | 25 | import com.shunzhi.parent.views.TextAndImgShowView; |
| 28 | 26 | ||
| 29 | import me.leefeng.citypicker.CityPicker; | 27 | import me.leefeng.citypicker.CityPicker; |
| @@ -80,7 +78,7 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP | @@ -80,7 +78,7 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP | ||
| 80 | floatingActionButton.setOnClickListener(new View.OnClickListener() { | 78 | floatingActionButton.setOnClickListener(new View.OnClickListener() { |
| 81 | @Override | 79 | @Override |
| 82 | public void onClick(View view) { | 80 | public void onClick(View view) { |
| 83 | - | 81 | + startActivity(new Intent().setClass(getActivity(), MyChildActivity.class)); |
| 84 | } | 82 | } |
| 85 | }); | 83 | }); |
| 86 | // floatingActionButton.setOnClickListeners(new DragFloatActionButton.OnClickListeners() { | 84 | // floatingActionButton.setOnClickListeners(new DragFloatActionButton.OnClickListeners() { |