Commit 6bee8968b060dab58bae8b6e34da52587ecf61cb
1 parent
658234ab
Exists in
yxb_dev
and in
2 other branches
no message
Showing
3 changed files
with
6 additions
and
11 deletions
Show diff stats
app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
| @@ -25,6 +25,7 @@ import com.shunzhi.parent.bean.CurrentBean; | @@ -25,6 +25,7 @@ import com.shunzhi.parent.bean.CurrentBean; | ||
| 25 | import com.shunzhi.parent.contract.mine.MyChildContract; | 25 | import com.shunzhi.parent.contract.mine.MyChildContract; |
| 26 | import com.shunzhi.parent.presenter.mine.MyChildPresenter; | 26 | import com.shunzhi.parent.presenter.mine.MyChildPresenter; |
| 27 | import com.shunzhi.parent.ui.activity.MyChildActivity; | 27 | import com.shunzhi.parent.ui.activity.MyChildActivity; |
| 28 | +import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity; | ||
| 28 | 29 | ||
| 29 | import java.util.List; | 30 | import java.util.List; |
| 30 | 31 | ||
| @@ -150,6 +151,7 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC | @@ -150,6 +151,7 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC | ||
| 150 | @Override | 151 | @Override |
| 151 | public void addChildSuccess() { | 152 | public void addChildSuccess() { |
| 152 | // WebViewActivity.start_show(CheckInfoActivity.this,AppConfig.BINDING_SUCCESS_HEZUO); | 153 | // WebViewActivity.start_show(CheckInfoActivity.this,AppConfig.BINDING_SUCCESS_HEZUO); |
| 154 | + WebViewActivity.getInstance(CheckInfoActivity.this,"http://60.190.202.57:8101/ParentOrderCenter.aspx?userid="+AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID)); | ||
| 153 | finish(); | 155 | finish(); |
| 154 | } | 156 | } |
| 155 | 157 |
app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
| @@ -4,7 +4,6 @@ import android.content.Context; | @@ -4,7 +4,6 @@ import android.content.Context; | ||
| 4 | import android.content.Intent; | 4 | import android.content.Intent; |
| 5 | import android.graphics.Bitmap; | 5 | import android.graphics.Bitmap; |
| 6 | import android.os.Bundle; | 6 | import android.os.Bundle; |
| 7 | -import android.support.v7.app.AppCompatActivity; | ||
| 8 | import android.view.View; | 7 | import android.view.View; |
| 9 | import android.webkit.JavascriptInterface; | 8 | import android.webkit.JavascriptInterface; |
| 10 | import android.webkit.WebChromeClient; | 9 | import android.webkit.WebChromeClient; |
| @@ -13,12 +12,13 @@ import android.webkit.WebView; | @@ -13,12 +12,13 @@ import android.webkit.WebView; | ||
| 13 | import android.webkit.WebViewClient; | 12 | import android.webkit.WebViewClient; |
| 14 | import android.widget.ProgressBar; | 13 | import android.widget.ProgressBar; |
| 15 | 14 | ||
| 15 | +import com.share.mvpsdk.base.activity.BaseCompatActivity; | ||
| 16 | import com.share.mvpsdk.utils.AppUtils; | 16 | import com.share.mvpsdk.utils.AppUtils; |
| 17 | import com.share.mvpsdk.utils.NetworkConnectionUtils; | 17 | import com.share.mvpsdk.utils.NetworkConnectionUtils; |
| 18 | import com.share.mvpsdk.widgets.NestedScrollWebView; | 18 | import com.share.mvpsdk.widgets.NestedScrollWebView; |
| 19 | import com.shunzhi.parent.R; | 19 | import com.shunzhi.parent.R; |
| 20 | 20 | ||
| 21 | -public class WebViewActivity extends AppCompatActivity { | 21 | +public class WebViewActivity extends BaseCompatActivity { |
| 22 | 22 | ||
| 23 | NestedScrollWebView nesteScrollWebView; | 23 | NestedScrollWebView nesteScrollWebView; |
| 24 | 24 |
app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
| @@ -20,7 +20,6 @@ import android.widget.TextView; | @@ -20,7 +20,6 @@ import android.widget.TextView; | ||
| 20 | import com.makeramen.roundedimageview.RoundedImageView; | 20 | import com.makeramen.roundedimageview.RoundedImageView; |
| 21 | import com.share.mvpsdk.base.BasePresenter; | 21 | import com.share.mvpsdk.base.BasePresenter; |
| 22 | import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; | 22 | import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; |
| 23 | -import com.share.mvpsdk.utils.ToastUtils; | ||
| 24 | import com.shunzhi.parent.AppConfig; | 23 | import com.shunzhi.parent.AppConfig; |
| 25 | import com.shunzhi.parent.AppContext; | 24 | import com.shunzhi.parent.AppContext; |
| 26 | import com.shunzhi.parent.R; | 25 | import com.shunzhi.parent.R; |
| @@ -30,9 +29,6 @@ import com.shunzhi.parent.ui.MainActivity; | @@ -30,9 +29,6 @@ import com.shunzhi.parent.ui.MainActivity; | ||
| 30 | import com.shunzhi.parent.ui.activity.LoginAndRegistActivity; | 29 | import com.shunzhi.parent.ui.activity.LoginAndRegistActivity; |
| 31 | import com.shunzhi.parent.views.MyProcessDialog; | 30 | import com.shunzhi.parent.views.MyProcessDialog; |
| 32 | 31 | ||
| 33 | -import java.util.Calendar; | ||
| 34 | -import java.util.Date; | ||
| 35 | - | ||
| 36 | 32 | ||
| 37 | public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel> | 33 | public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel> |
| 38 | implements LoginAndRegisterContract.ILoginView, View.OnClickListener { | 34 | implements LoginAndRegisterContract.ILoginView, View.OnClickListener { |
| @@ -100,13 +96,10 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist | @@ -100,13 +96,10 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist | ||
| 100 | phoneNumber.addTextChangedListener(textWatcher); | 96 | phoneNumber.addTextChangedListener(textWatcher); |
| 101 | idCode.addTextChangedListener(textWatcher); | 97 | idCode.addTextChangedListener(textWatcher); |
| 102 | password.addTextChangedListener(textWatcher); | 98 | password.addTextChangedListener(textWatcher); |
| 103 | - mPresenter.loginResult("18358585335", "575335"); | ||
| 104 | - | ||
| 105 | passwordLayout_new = view.findViewById(R.id.passwordLayout_new); | 99 | passwordLayout_new = view.findViewById(R.id.passwordLayout_new); |
| 106 | et_password_new = view.findViewById(R.id.et_password_new); | 100 | et_password_new = view.findViewById(R.id.et_password_new); |
| 107 | et_password_new.addTextChangedListener(textWatcher); | 101 | et_password_new.addTextChangedListener(textWatcher); |
| 108 | - | ||
| 109 | - | 102 | + mPresenter.loginResult("18358585335", "123456"); |
| 110 | if ("登录".equals(typepage)) { | 103 | if ("登录".equals(typepage)) { |
| 111 | idCodeLayout.setVisibility(View.GONE); | 104 | idCodeLayout.setVisibility(View.GONE); |
| 112 | passwordLayout_new.setVisibility(View.GONE); | 105 | passwordLayout_new.setVisibility(View.GONE); |
| @@ -143,7 +136,7 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist | @@ -143,7 +136,7 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist | ||
| 143 | public void getUserInfo(int type) { | 136 | public void getUserInfo(int type) { |
| 144 | progressDialog.dismiss(); | 137 | progressDialog.dismiss(); |
| 145 | if (type == 0) { | 138 | if (type == 0) { |
| 146 | - startActivity(new Intent().setClass(getActivity(), MainActivity.class)); | 139 | + startNewActivity(MainActivity.class); |
| 147 | getActivity().finish(); | 140 | getActivity().finish(); |
| 148 | } else if (type == 1) { | 141 | } else if (type == 1) { |
| 149 | PopupWindow popupWindow = new PopupWindow(); | 142 | PopupWindow popupWindow = new PopupWindow(); |