陶汉栋 / ParentWork

Download as
Browse Code »

Commit ccad951174bbde78cd2270348b1820c81715c7cf

Authored by 姚旭斌
1 parent d045d156
Exists in yxb_dev and in 2 other branches developer, wwx

no message

Showing 6 changed files with 18 additions and 19 deletions   Show diff stats
app/src/main/AndroidManifest.xml
  Diff comments   View file @ccad951
... ... @@ -127,7 +127,6 @@
127 127 <!--android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />-->
128 128 <activity
129 129 android:name=".ui.activity.MyChildActivity"
130   - android:launchMode="singleInstance"
131 130 android:screenOrientation="portrait"/>
132 131 <activity android:name=".ui.activity.consult.ConsultOneLevelActivity"/>
133 132 <!-- <activity android:name=".ui.activity.LoginAndRegistActivity" /> -->
... ... @@ -147,12 +146,10 @@
147 146 android:windowSoftInputMode="adjustPan|stateHidden"/>
148 147 <activity
149 148 android:name=".ui.activity.binding.SelectSchoolActivity"
150   - android:launchMode="singleInstance"
151 149 android:screenOrientation="portrait"
152 150 android:windowSoftInputMode="adjustPan|stateHidden"/>
153 151  
154 152 <activity android:name=".ui.activity.LoginAndRegistActivity"
155   - android:launchMode="singleInstance"
156 153 android:screenOrientation="portrait"
157 154 />
158 155 <activity
... ...
app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
  Diff comments   View file @ccad951
1 1 package com.shunzhi.parent.presenter.consult;
2 2  
3   -import android.content.res.TypedArray;
4   -import android.util.Log;
5   -import android.util.TypedValue;
6 3 import android.view.View;
7 4 import android.widget.LinearLayout;
8 5  
... ... @@ -10,7 +7,6 @@ import com.google.gson.Gson;
10 7 import com.google.gson.JsonArray;
11 8 import com.google.gson.JsonObject;
12 9 import com.share.mvpsdk.utils.OkHttpExceptionUtil;
13   -import com.share.mvpsdk.utils.ToastUtils;
14 10 import com.shunzhi.parent.R;
15 11 import com.shunzhi.parent.bean.GuangGaoBean;
16 12 import com.shunzhi.parent.bean.ToolBean;
... ... @@ -19,12 +15,9 @@ import com.shunzhi.parent.bean.channel.ChannelContextBean;
19 15 import com.shunzhi.parent.bean.channel.ChannelInfo;
20 16 import com.shunzhi.parent.contract.consult.ConsultContract;
21 17 import com.shunzhi.parent.model.consult.ConsultModel;
22   -import com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity;
23 18 import com.shunzhi.parent.util.AttrsUtils;
24 19 import com.shunzhi.parent.views.TextAndImgShowView;
25 20  
26   -import org.json.JSONObject;
27   -
28 21 import java.util.ArrayList;
29 22 import java.util.List;
30 23  
... ...
app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java
  Diff comments   View file @ccad951
1 1 package com.shunzhi.parent.ui.activity;
2 2  
3 3 import android.os.Bundle;
  4 +import android.util.Log;
4 5  
5 6 import com.share.mvpsdk.base.activity.BaseCompatActivity;
6 7 import com.shunzhi.parent.R;
... ... @@ -18,6 +19,7 @@ public class LoginAndRegistActivity extends BaseCompatActivity {
18 19 protected void initView(Bundle savedInstanceState) {
19 20 if (savedInstanceState == null) {
20 21 type = getIntent().getStringExtra("type");
  22 + Log.e("aaa--==",type);
21 23 mFragments[0] = LoginAndRegistFragment.getInstance(type);
22 24 loadRootFragment(R.id.frame, mFragments[0]);
23 25 } else {
... ... @@ -26,6 +28,15 @@ public class LoginAndRegistActivity extends BaseCompatActivity {
26 28 }
27 29  
28 30 @Override
  31 + protected void onResume() {
  32 + super.onResume();
  33 +// type = getIntent().getStringExtra("type");
  34 +// Log.e("aaa--==",type);
  35 +// mFragments[0] = LoginAndRegistFragment.getInstance(type);
  36 +// loadRootFragment(R.id.frame, mFragments[0]);
  37 + }
  38 +
  39 + @Override
29 40 protected int getLayoutId() {
30 41 return R.layout.activity_regist;
31 42 }
... ...
app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
  Diff comments   View file @ccad951
... ... @@ -102,7 +102,7 @@ public class CheckInfoActivity extends BaseMVPCompatActivity&lt;MyChildContract.MyC
102 102 @Override
103 103 public void onClick(View v) {
104 104 popupWindow.dismiss();
105   - startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_CLEAR_TASK).setClass(CheckInfoActivity.this, MyChildActivity.class));
  105 + startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).setClass(CheckInfoActivity.this, MyChildActivity.class));
106 106 finish();
107 107 }
108 108 });
... ...
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
  Diff comments   View file @ccad951
... ... @@ -11,9 +11,7 @@ import android.view.View;
11 11 import android.widget.LinearLayout;
12 12 import android.widget.TextView;
13 13  
14   -import com.bumptech.glide.Glide;
15 14 import com.makeramen.roundedimageview.RoundedImageView;
16   -import com.netease.nimlib.sdk.NIMClient;
17 15 import com.share.mvpsdk.base.BasePresenter;
18 16 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
19 17 import com.share.mvpsdk.utils.CacheUtils;
... ...
app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
  Diff comments   View file @ccad951
... ... @@ -126,12 +126,12 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment&lt;LoginAndRegist
126 126 back_login.setVisibility(View.VISIBLE);
127 127 }
128 128  
129   - roundedImageView.setOnClickListener(new View.OnClickListener() {
130   - @Override
131   - public void onClick(View view) {
132   - mPresenter.loginResult("18358575337", "575337");
133   - }
134   - });
  129 +// roundedImageView.setOnClickListener(new View.OnClickListener() {
  130 +// @Override
  131 +// public void onClick(View view) {
  132 +// mPresenter.loginResult("18358575337", "575337");
  133 +// }
  134 +// });
135 135 }
136 136  
137 137  
... ...