From 6bee8968b060dab58bae8b6e34da52587ecf61cb Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Fri, 16 Mar 2018 18:32:29 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java                     |  2 ++
 app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java                     |  4 ++--
 app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java | 11 ++---------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
index 5d4ec24..d57e8a4 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
@@ -25,6 +25,7 @@ import com.shunzhi.parent.bean.CurrentBean;
 import com.shunzhi.parent.contract.mine.MyChildContract;
 import com.shunzhi.parent.presenter.mine.MyChildPresenter;
 import com.shunzhi.parent.ui.activity.MyChildActivity;
+import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
 
 import java.util.List;
 
@@ -150,6 +151,7 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC
     @Override
     public void addChildSuccess() {
 //        WebViewActivity.start_show(CheckInfoActivity.this,AppConfig.BINDING_SUCCESS_HEZUO);
+        WebViewActivity.getInstance(CheckInfoActivity.this,"http://60.190.202.57:8101/ParentOrderCenter.aspx?userid="+AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID));
         finish();
     }
 
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 37fd7e9..da782db 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
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.webkit.JavascriptInterface;
 import android.webkit.WebChromeClient;
@@ -13,12 +12,13 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
 
+import com.share.mvpsdk.base.activity.BaseCompatActivity;
 import com.share.mvpsdk.utils.AppUtils;
 import com.share.mvpsdk.utils.NetworkConnectionUtils;
 import com.share.mvpsdk.widgets.NestedScrollWebView;
 import com.shunzhi.parent.R;
 
-public class WebViewActivity extends AppCompatActivity {
+public class WebViewActivity extends BaseCompatActivity {
 
     NestedScrollWebView nesteScrollWebView;
 
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 ceb2c12..f57a4c2 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
@@ -20,7 +20,6 @@ import android.widget.TextView;
 import com.makeramen.roundedimageview.RoundedImageView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
-import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
@@ -30,9 +29,6 @@ import com.shunzhi.parent.ui.MainActivity;
 import com.shunzhi.parent.ui.activity.LoginAndRegistActivity;
 import com.shunzhi.parent.views.MyProcessDialog;
 
-import java.util.Calendar;
-import java.util.Date;
-
 
 public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
         implements LoginAndRegisterContract.ILoginView, View.OnClickListener {
@@ -100,13 +96,10 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
         phoneNumber.addTextChangedListener(textWatcher);
         idCode.addTextChangedListener(textWatcher);
         password.addTextChangedListener(textWatcher);
-        mPresenter.loginResult("18358585335", "575335");
-
         passwordLayout_new = view.findViewById(R.id.passwordLayout_new);
         et_password_new = view.findViewById(R.id.et_password_new);
         et_password_new.addTextChangedListener(textWatcher);
-
-
+        mPresenter.loginResult("18358585335", "123456");
         if ("登录".equals(typepage)) {
             idCodeLayout.setVisibility(View.GONE);
             passwordLayout_new.setVisibility(View.GONE);
@@ -143,7 +136,7 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
     public void getUserInfo(int type) {
         progressDialog.dismiss();
         if (type == 0) {
-            startActivity(new Intent().setClass(getActivity(), MainActivity.class));
+            startNewActivity(MainActivity.class);
             getActivity().finish();
         } else if (type == 1) {
             PopupWindow popupWindow = new PopupWindow();
--
libgit2 0.21.0