diff --git a/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java
index bb8be66..751fa1d 100644
--- a/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java
+++ b/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java
@@ -33,7 +33,7 @@ public class ChildAdapter extends BaseRecyclerViewAdapter<ChildBean> {
@Override
public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- View view = LayoutInflater.from(context).inflate(R.layout.activity_web_view, null);
+ View view = LayoutInflater.from(context).inflate(R.layout.item_childlist, null);
return new MyViewHolder(view);
}
diff --git a/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java b/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
index b1bc18d..d9ff489 100644
--- a/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
+++ b/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
@@ -45,6 +45,7 @@ public interface LoginAndRegisterContract {
//更新用户信息
void getUserInfo(int type);
+ void showerror(String error);
}
diff --git a/app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java b/app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java
index 9912039..00985b1 100644
--- a/app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java
+++ b/app/src/main/java/com/shunzhi/parent/contract/mine/MyChildContract.java
@@ -41,7 +41,7 @@ public interface MyChildContract {
interface IMyChildView extends IBaseActivity {
void updateChildList(CurrentBean currentBean);
- void addChildSuccess();
+ void addChildSuccess(String account,String password);
void showClass(List<ChildClass>list);
void showError(String error);
diff --git a/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java b/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java
index 4c418b6..c27ad65 100644
--- a/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java
+++ b/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java
@@ -37,6 +37,10 @@ public class ConsultOneModel extends BaseModel implements ConsultOneContract.ICo
.getConsultContent(areaName,channel,toFirstPage,pageIndex).compose(RxHelper.<JsonObject>rxSchedulerHelper());
}
+ @Override
+ public Observable<JsonObject> getInformationTopic(String keyword, String areaName, String channel, String toFirstPage, int pageIndex) {
+ return null;
+ }
}
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
index 4e8d6db..3b7e7d8 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
@@ -17,11 +17,15 @@ import com.shunzhi.parent.model.loginandregister.LoginAndRegisterModel;
import com.shunzhi.parent.ui.fragment.loginandregistfragment.LoginAndRegistFragment;
import com.shunzhi.parent.util.Utils;
+import org.json.JSONObject;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import io.reactivex.functions.Consumer;
+import okhttp3.ResponseBody;
import retrofit2.HttpException;
+import retrofit2.Response;
import timber.log.Timber;
/**
@@ -35,7 +39,8 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
@Override
public void loginResult(final String loginName, final String loginPwd) {
if (!isMate(loginName, REGEX_MOBILE)) {
- ToastUtils.showToast("请输入正确的手机号！！");
+
+ mIView.showerror("请输入正确的手机号！！");
return;
}
@@ -64,9 +69,21 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
- if (null != throwable)
- OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
-// ToastUtils.showToast(throwable.getMessage());
+ Response response = ((HttpException)throwable).response();
+ if (response==null)return;
+ ResponseBody responseBody = response.errorBody();
+ if (responseBody==null)return;
+ try {
+ JSONObject json = new JSONObject(responseBody.string());
+// ToastUtils.showToast(json.optString("message")+"json="+json);
+ if(TextUtils.isEmpty(json.optString("error"))){
+ mIView.showerror(json.optString("message"));
+ return;
+ }
+ mIView.showerror(json.optString("error"));
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
}
}));
@@ -95,8 +112,17 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
- LoginAndRegistFragment.progressDialog.dismiss();
- OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
+ Response response = ((HttpException)throwable).response();
+ if (response==null)return;
+ ResponseBody responseBody = response.errorBody();
+ if (responseBody==null)return;
+ try {
+ JSONObject json = new JSONObject(responseBody.string());
+// ToastUtils.showToast(json.optString("message")+"json="+json);
+ mIView.showerror(json.optString("message"));
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
}
}));
@@ -160,8 +186,19 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
- LoginAndRegistFragment.progressDialog.dismiss();
- OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
+ Response response = ((HttpException)throwable).response();
+ if (response==null)return;
+ ResponseBody responseBody = response.errorBody();
+ if (responseBody==null)return;
+ try {
+ JSONObject json = new JSONObject(responseBody.string());
+// ToastUtils.showToast(json.optString("message")+"json="+json);
+ mIView.showerror(json.optString("message"));
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+
+// OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
}
}));
}
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java
index 611efb6..1ea2442 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java
@@ -1,5 +1,7 @@
package com.shunzhi.parent.presenter.mine;
+import android.util.Log;
+
import com.google.gson.JsonObject;
import com.share.mvpsdk.utils.OkHttpExceptionUtil;
import com.share.mvpsdk.utils.ToastUtils;
@@ -47,14 +49,14 @@ public class MyChildPresenter extends MyChildContract.MyChildPresenter {
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
- Response response = ((HttpException)throwable).response();
- if (response==null)return;
+ Response response = ((HttpException) throwable).response();
+ if (response == null) return;
ResponseBody responseBody = response.errorBody();
- if (responseBody==null)return;
+ if (responseBody == null) return;
try {
JSONObject json = new JSONObject(responseBody.string());
mIView.showError(json.optString("message"));
- } catch (Exception e1) {
+ } catch (Exception e1) {
e1.printStackTrace();
}
@@ -64,12 +66,19 @@ public class MyChildPresenter extends MyChildContract.MyChildPresenter {
}
@Override
- public void addChild( int sex , String studentName,int parentId, boolean mobileFlag, boolean cooperateFlag, int schoolId, int classId, int studentId, String studentUserId) {
- mRxManager.register(mIModel.addChildResult(sex,studentName,parentId, mobileFlag, cooperateFlag, schoolId, classId, studentId, studentUserId).subscribe(new Consumer<JsonObject>() {
+ public void addChild(int sex, String studentName, int parentId, boolean mobileFlag, boolean cooperateFlag, int schoolId, int classId, int studentId, String studentUserId) {
+ mRxManager.register(mIModel.addChildResult(sex, studentName, parentId, mobileFlag, cooperateFlag, schoolId, classId, studentId, studentUserId).subscribe(new Consumer<JsonObject>() {
@Override
public void accept(JsonObject jsonObject) throws Exception {
ToastUtils.showToast("绑定孩子成功");
- mIView.addChildSuccess();
+ Log.e("asdasda", jsonObject.get("data").toString());
+ if (jsonObject.get("data").toString().equals("null")) {
+ mIView.addChildSuccess("", "");
+ } else {
+ JsonObject data = jsonObject.getAsJsonObject("data");
+ mIView.addChildSuccess(data.get("account").getAsString(), data.get("password").getAsString());
+ }
+
}
}, new Consumer<Throwable>() {
@Override
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java
index e96a5b3..fba3045 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java
@@ -146,7 +146,7 @@ public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChi
}
@Override
- public void addChildSuccess() {
+ public void addChildSuccess(String account,String password) {
}
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 efaa811..2073157 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
@@ -151,7 +151,7 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC
}
@Override
- public void addChildSuccess() {
+ public void addChildSuccess(String account,String password) {
// WebViewActivity.start_show(CheckInfoActivity.this,AppConfig.BINDING_SUCCESS_HEZUO);
WebViewActivity.getInstance(CheckInfoActivity.this,
AppConfig.BASE_URL_ORDER+"/RecommendOrder.aspx?userid="+
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java
index bff7c0c..20934a8 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java
@@ -132,9 +132,9 @@ public class CreateChildInfoActivity extends BaseMVPCompatActivity<MyChildContra
}
@Override
- public void addChildSuccess() {
- WebViewActivity.getInstance(CreateChildInfoActivity.this,AppConfig.BASE_URL_ORDER+"/RecommendOrder.aspx?userid="+
- AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.BINDING_SUCCESS_NOT);
+ public void addChildSuccess(String account,String password) {
+ WebViewActivity.startShow(CreateChildInfoActivity.this,AppConfig.BASE_URL_ORDER+"/RecommendOrder.aspx?userid="+
+ AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.BINDING_SUCCESS_NOT,account,password,child_name.getText().toString());
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 ff4a00d..a0caaff 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
@@ -22,13 +22,14 @@ import com.share.mvpsdk.utils.NetworkConnectionUtils;
import com.share.mvpsdk.widgets.NestedScrollWebView;
import com.shunzhi.parent.AppConfig;
import com.shunzhi.parent.R;
+import com.shunzhi.parent.ui.MainActivity;
public class WebViewActivity extends BaseCompatActivity {
NestedScrollWebView nesteScrollWebView;
LinearLayout binding_success, binding_success2;
ImageView close_btn;
- TextView tv_info,zuoye,title_web;
+ TextView tv_info, zuoye, title_web;
int type;
@@ -41,14 +42,25 @@ public class WebViewActivity extends BaseCompatActivity {
context.startActivity(intent);
}
+ public static void startShow(Context context, String url, int type, String account, String password, String name) {
+ Intent intent = new Intent(context, WebViewActivity.class);
+ intent.putExtra("url", url);
+ intent.putExtra("type", type);
+ intent.putExtra("account", account);
+ intent.putExtra("password", password);
+ intent.putExtra("name", name);
+ context.startActivity(intent);
+ }
+
+
@Override
protected void initView(Bundle savedInstanceState) {
- binding_success=findViewById(R.id.binding_success);
+ binding_success = findViewById(R.id.binding_success);
- binding_success=findViewById(R.id.binding_success1);
+ binding_success = findViewById(R.id.binding_success1);
- binding_success2=findViewById(R.id.binding_success2);
+ binding_success2 = findViewById(R.id.binding_success2);
close_btn = findViewById(R.id.close_btn);
tv_info = findViewById(R.id.tv_info);
zuoye = findViewById(R.id.zuoye);
@@ -78,14 +90,18 @@ public class WebViewActivity extends BaseCompatActivity {
binding_success.setVisibility(View.GONE);
binding_success2.setVisibility(View.VISIBLE);
title_web.setVisibility(View.GONE);
- tv_info.setText("生成孩子“"+""+"”账号为:"+""+"，初始密码为："+""+"（与账号相同）。孩子可以下载“汇作业”app进行使用");
+ String account = getIntent().getStringExtra("account");
+ String name = getIntent().getStringExtra("name");
+ String password = getIntent().getStringExtra("password");
+
+ tv_info.setText("生成孩子“" + name + "”账号为:" + account + "，初始密码为：" + password + "（与账号相同）。孩子可以下载“汇作业”app进行使用");
} else if (type == AppConfig.ORDER_CENTER) {
binding_success.setVisibility(View.GONE);
binding_success2.setVisibility(View.GONE);
title_web.setVisibility(View.VISIBLE);
- }else {
+ } else {
binding_success.setVisibility(View.GONE);
binding_success2.setVisibility(View.GONE);
title_web.setVisibility(View.GONE);
@@ -108,6 +124,7 @@ public class WebViewActivity extends BaseCompatActivity {
nesteScrollWebView.goBack();
} else {
super.onBackPressedSupport();
+ startActivity(new Intent().setClass(this, MainActivity.class));
}
}
@@ -131,6 +148,7 @@ public class WebViewActivity extends BaseCompatActivity {
});
}
}
+
// 调起支付宝并跳转到指定页面
private void startAlipayActivity(String url) {
Intent intent;
@@ -153,8 +171,8 @@ public class WebViewActivity extends BaseCompatActivity {
nesteScrollWebView.setWebViewClient(new WebViewClient() {
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
- Log.d("666666","url="+url);
- if (url.startsWith("http"))view.loadUrl(url);
+ Log.d("666666", "url=" + url);
+ if (url.startsWith("http")) view.loadUrl(url);
// if (url.contains("platformapi/startapp")) {
// startAlipayActivity(url);
// android 6.0 两种方式获取intent都可以跳转支付宝成功,7.1测试不成功
@@ -175,6 +193,13 @@ public class WebViewActivity extends BaseCompatActivity {
// html加载完成之后，添加监听图片的点击js函数
addWebImageClickListner(view);
// toolbar.setTitle(getToolbarTitle());
+ if (nesteScrollWebView.canGoBack()) {
+ binding_success.setVisibility(View.GONE);
+ binding_success2.setVisibility(View.GONE);
+ title_web.setVisibility(View.GONE);
+ } else {
+
+ }
}
@Override
@@ -213,7 +238,6 @@ public class WebViewActivity extends BaseCompatActivity {
}
}
});
-
nesteScrollWebView.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
@@ -232,6 +256,8 @@ public class WebViewActivity extends BaseCompatActivity {
}
+
+
/**
* 初始化WebSetting
*
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 7e47bbe..74d2ffa 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
@@ -179,6 +179,12 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
}
@Override
+ public void showerror(String error) {
+ progressDialog.dismiss();
+ ToastUtils.showToast(error);
+ }
+
+ @Override
public void onClick(View v) {
if (v == loginAndRegister) {
progressDialog.show();
diff --git a/app/src/main/res/drawable/rudiobtn_unclick.xml b/app/src/main/res/drawable/rudiobtn_unclick.xml
index efe25f3..d9ae221 100644
--- a/app/src/main/res/drawable/rudiobtn_unclick.xml
+++ b/app/src/main/res/drawable/rudiobtn_unclick.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:color="#00000000" android:width="1dp"/>
- <solid android:color="@color/xueqing_blue" />
+ <solid android:color="@color/bottomline" />
<corners android:radius="5dp"/>
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
index 108f072..7bf3987 100644
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -12,12 +12,14 @@
>
<ImageView
android:id="@+id/close_btn"
- android:layout_width="30dp"
- android:layout_height="30dp"
- android:layout_marginLeft="10dp"
- android:layout_centerVertical="true"
- android:background="@drawable/close"
- />
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:paddingLeft="@dimen/size_dp_15"
+ android:src="@drawable/back"
+ android:paddingRight="@dimen/size_dp_15"
+ android:textColor="@color/textColor"
+ android:textSize="@dimen/textSize16" />
<TextView
android:id="@+id/title_web"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_login_and_regist.xml b/app/src/main/res/layout/fragment_login_and_regist.xml
index 57ebd48..1339219 100644
--- a/app/src/main/res/layout/fragment_login_and_regist.xml
+++ b/app/src/main/res/layout/fragment_login_and_regist.xml
@@ -200,6 +200,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:background="@drawable/rudiobtn_unclick"
+ android:enabled="false"
android:gravity="center"
android:paddingBottom="10dp"
android:paddingTop="10dp"
--
libgit2 0.21.0