diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e2a8148..17ed5c9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -108,6 +108,9 @@
+
diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java
index 16aced6..6a006df 100644
--- a/app/src/main/java/com/shunzhi/parent/AppConfig.java
+++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java
@@ -22,6 +22,9 @@ public class AppConfig {
public static String USER_SEX = "user_sex";
public static String USER_IMAGE = "user_image";
public static String PARENT_ID = "parent_id";
+ public static int BINDING_SUCCESS_HEZUO = 1;
+ public static int BINDING_SUCCESS_NOT= 2;
+ public static int ORDER_CENTER = 3;
//默认日志保存的路径
diff --git a/app/src/main/java/com/shunzhi/parent/bean/ChildBean.java b/app/src/main/java/com/shunzhi/parent/bean/ChildBean.java
index 567b2c8..9e756a4 100644
--- a/app/src/main/java/com/shunzhi/parent/bean/ChildBean.java
+++ b/app/src/main/java/com/shunzhi/parent/bean/ChildBean.java
@@ -27,6 +27,13 @@ public class ChildBean implements Serializable {
private String cityName;
private int sex;
+ public String getCityName() {
+ return cityName;
+ }
+
+ public void setCityName(String cityName) {
+ this.cityName = cityName;
+ }
public String getAreaName() {
return areaName;
@@ -192,6 +199,7 @@ public class ChildBean implements Serializable {
",photo='" + photo + '\'' +
",studentCode='" + studentCode + '\'' +
",areaName='" + areaName + '\'' +
+ ",cityName='" + cityName + '\'' +
", sex=" + sex +
"}";
}
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/ChildDetialActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/ChildDetialActivity.java
index 64cb121..4106d41 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/ChildDetialActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/ChildDetialActivity.java
@@ -44,7 +44,7 @@ public class ChildDetialActivity extends BaseCompatActivity {
child_name.setText(childBean.getStudentName());
child_school.setText(childBean.getSchoolName());
child_class.setText(childBean.getClassName());
- school_area.setText(childBean.getAreaName());
+ school_area.setText(childBean.getCityName()+childBean.getAreaName());
student_code.setText(childBean.getStudentCode());
}
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 883616b..4fef87c 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
@@ -94,8 +94,9 @@ public class MyChildActivity extends BaseMVPCompatActivity list = currentBean.getStudentClass();
currlist.addAll(list);
if (childAdapter == null) {
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/WebViewActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/WebViewActivity.java
new file mode 100644
index 0000000..9f2686a
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/WebViewActivity.java
@@ -0,0 +1,79 @@
+package com.shunzhi.parent.ui.activity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.webkit.WebViewClient;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.share.mvpsdk.base.activity.BaseCompatActivity;
+import com.share.mvpsdk.widgets.NestedScrollWebView;
+import com.shunzhi.parent.AppConfig;
+import com.shunzhi.parent.R;
+
+/**
+ * Created by Administrator on 2018/3/16 0016.
+ */
+
+public class WebViewActivity extends BaseCompatActivity {
+ TextView close_btn, title_web, tv_info, zuoye;
+ LinearLayout binding_success, binding_success2;
+ NestedScrollWebView webView;
+ public int type; //BINDING_SUCCESS_HEZUO=1,INDING_SUCCESS_NOT=2, ORDER_CENTER=3
+
+
+ public static void start_show(Activity activity, int type) {
+ Intent intent = new Intent(activity, WebViewActivity.class);
+ intent.putExtra("type", type);
+ activity.startActivity(intent);
+ }
+
+ @Override
+ protected void initView(Bundle savedInstanceState) {
+ type = getIntent().getIntExtra("type", 0);
+ binding_success = findViewById(R.id.binding_success);
+ binding_success2 = findViewById(R.id.binding_success2);
+ close_btn = findViewById(R.id.close_btn);
+ title_web = findViewById(R.id.title_web);
+ tv_info = findViewById(R.id.tv_info);
+ zuoye = findViewById(R.id.zuoye);
+ close_btn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).setClass(WebViewActivity.this, MyChildActivity.class));
+ }
+ });
+
+
+ webView = findViewById(R.id.webView);
+ webView.setWebViewClient(new WebViewClient());
+ webView.loadUrl("http://blog.csdn.net/lee4755026/article/details/52161035");
+ if (type == AppConfig.BINDING_SUCCESS_HEZUO) {
+ binding_success.setVisibility(View.VISIBLE);
+ binding_success2.setVisibility(View.GONE);
+ title_web.setVisibility(View.GONE);
+ } else if (type == AppConfig.BINDING_SUCCESS_NOT) {
+ binding_success2.setVisibility(View.VISIBLE);
+ binding_success.setVisibility(View.GONE);
+ title_web.setVisibility(View.GONE);
+ initInfo();
+ } else if (type == AppConfig.ORDER_CENTER) {
+
+ }
+
+ }
+
+
+ private void initInfo() {
+
+
+
+ }
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.activity_webview;
+ }
+}
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 5db4377..d6c3620 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.WebViewActivity;
import java.util.List;
@@ -81,7 +82,7 @@ public class CheckInfoActivity extends BaseMVPCompatActivity
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
libgit2 0.21.0