From e71dbb40dfb4e99a3118f2bf5e0a27062505ec5f Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Mon, 19 Mar 2018 17:29:45 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java                                      | 15 +++++++++++++++
 app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java                                |  4 ----
 app/src/main/java/com/shunzhi/parent/ui/activity/ChildDetialActivity.java                           |  4 +++-
 app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java                               | 12 +++++++++++-
 app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java                     |  4 +++-
 app/src/main/java/com/shunzhi/parent/ui/activity/binding/CreateChildInfoActivity.java               |  4 +++-
 app/src/main/java/com/shunzhi/parent/ui/activity/binding/InviteCodeActivity.java                    |  4 +++-
 app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java                  |  4 +++-
 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 |  2 +-
 app/src/main/res/layout/activity_web_view.xml                                                       | 16 +++++++++-------
 app/src/main/res/layout/fragment_zi_xun.xml                                                         |  5 ++++-
 app/src/main/res/layout/top.xml                                                                     | 16 ++++++++++------
 13 files changed, 68 insertions(+), 26 deletions(-)

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 0437ddd..811fad8 100644
--- a/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java
+++ b/app/src/main/java/com/shunzhi/parent/adapter/ChildAdapter.java
@@ -11,9 +11,12 @@ import android.widget.TextView;
 import com.google.gson.Gson;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
+import com.shunzhi.parent.AppConfig;
+import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.ChildBean;
 import com.shunzhi.parent.ui.activity.ChildDetialActivity;
+import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
 
 /**
  * Created by Administrator on 2018/3/9 0009.
@@ -37,12 +40,15 @@ public class ChildAdapter extends BaseRecyclerViewAdapter<ChildBean> {
     private class MyViewHolder extends BaseRecyclerViewHolder<ChildBean> {
 
         TextView txt_childname, txt_childclass;
+        TextView go_buy;
 
 
         public MyViewHolder(View view) {
             super(view);
             txt_childname = view.findViewById(R.id.txt_childname);
             txt_childclass = view.findViewById(R.id.txt_childclass);
+            go_buy = view.findViewById(R.id.go_buy);
+
         }
 
         @Override
@@ -57,6 +63,15 @@ public class ChildAdapter extends BaseRecyclerViewAdapter<ChildBean> {
                     context.startActivity(new Intent().putExtra("childJson", jsonString).setClass(context, ChildDetialActivity.class));
                 }
             });
+
+            go_buy.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    WebViewActivity.getInstance(context,
+                            AppConfig.BASE_URL_ORDER+"/ParentOrderCenter.aspx?userid="+
+                                    AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.ORDER_CENTER);
+                }
+            });
         }
 
     }
diff --git a/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java b/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java
index 66c5ed5..cf20faf 100644
--- a/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java
+++ b/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java
@@ -6,8 +6,6 @@ import com.share.mvpsdk.helper.RetrofitCreateHelper;
 import com.share.mvpsdk.helper.RxHelper;
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.api.Consult;
-import com.shunzhi.parent.api.LoginRegisterApi;
-import com.shunzhi.parent.bean.UserInfo;
 import com.shunzhi.parent.contract.consult.ConsultContract;
 
 import io.reactivex.Observable;
@@ -32,8 +30,6 @@ public class ConsultModel extends BaseModel implements ConsultContract.IConsultM
 
     @Override
     public Observable<JsonObject> getContextChannel(String areaName, int channel, int toFirstPage, int pageIndex) {
-//        return RetrofitCreateHelper.getInstance().createApi(Consult.class, AppConfig.BASE_URL)
-//                .getConsultContent(areaName,channel,toFirstPage,pageIndex);
         return RetrofitCreateHelper.getInstance().createApi(Consult.class,AppConfig.BASE_URL).getConsultContent(areaName,channel,toFirstPage,pageIndex)
                 .compose(RxHelper.<JsonObject>rxSchedulerHelper());
     }
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 4106d41..357e977 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
@@ -3,6 +3,7 @@ package com.shunzhi.parent.ui.activity;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.google.gson.Gson;
@@ -15,7 +16,8 @@ import com.shunzhi.parent.bean.ChildBean;
  */
 
 public class ChildDetialActivity extends BaseCompatActivity {
-    TextView child_name, child_school, child_class, school_area, student_code,center_title,back;
+    TextView child_name, child_school, child_class, school_area, student_code,center_title;
+    ImageView back;
 
     @Override
     protected void initView(Bundle savedInstanceState) {
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 4fef87c..e96a5b3 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
@@ -11,6 +11,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.widget.ImageView;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
@@ -26,6 +27,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.binding.SelectSchoolActivity;
+import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
 import com.yanzhenjie.recyclerview.swipe.SwipeMenu;
 import com.yanzhenjie.recyclerview.swipe.SwipeMenuBridge;
 import com.yanzhenjie.recyclerview.swipe.SwipeMenuCreator;
@@ -43,7 +45,8 @@ import java.util.List;
 public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChildPresenter, MyChildContract.IMyChildModel>
         implements MyChildContract.IMyChildView, View.OnClickListener {
     SwipeMenuRecyclerView child_recycle;
-    TextView back, center_title, add_child;
+    TextView  center_title, add_child, go_buy;
+    ImageView back;
     ChildAdapter childAdapter;
     List<ChildBean> currlist = new ArrayList<>();
 
@@ -59,6 +62,7 @@ public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChi
         add_child = findViewById(R.id.add_child);
         child_recycle = findViewById(R.id.child_recycle);
         back = findViewById(R.id.back_top);
+
         center_title = findViewById(R.id.center_title);
         center_title.setText("我的孩子");
         add_child.setOnClickListener(this);
@@ -119,6 +123,12 @@ public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChi
             finish();
         } else if (v == add_child) {
             startActivity(new Intent().setClass(MyChildActivity.this, SelectSchoolActivity.class));
+        } else if (v == go_buy) {
+            Bundle bundle = new Bundle();
+            bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" +
+                    AppConfig.getAppConfig(this).get(AppConfig.USER_ID));
+            bundle.putInt("type",AppConfig.ORDER_CENTER);
+            startNewActivity(WebViewActivity.class, bundle);
         }
     }
 
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 56badd3..237cb46 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
@@ -9,6 +9,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.TextView;
@@ -38,8 +39,9 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC
     int school_id = 0, isNew, classId, studentId;
     String captcha = "";
     LinearLayout iphone_layout;
-    TextView child_name, child_sex, child_grade, child_class, add_child, user_mobile, back, center_title;
+    TextView child_name, child_sex, child_grade, child_class, add_child, user_mobile, center_title;
     ChildBean childBean;
+    ImageView back;
 
     @NonNull
     @Override
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 83f9913..9517a93 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
@@ -9,6 +9,7 @@ import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.share.mvpsdk.base.BasePresenter;
@@ -35,8 +36,9 @@ public class CreateChildInfoActivity extends BaseMVPCompatActivity<MyChildContra
         implements MyChildContract.IMyChildView, View.OnClickListener {
 
     int type, school_id, sexId, gradeId, classId;
-    TextView select_sex, select_grade, select_class, add_child, center_title, back;
+    TextView select_sex, select_grade, select_class, add_child, center_title;
     EditText child_name;
+    ImageView back;
     Map<String, Integer> currMap = new ArrayMap<>();
     List<ChildClass> gradeList = new ArrayList<>();
     List<ChildClass> classList = new ArrayList<>();
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/InviteCodeActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/InviteCodeActivity.java
index 108a486..3517dac 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/InviteCodeActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/InviteCodeActivity.java
@@ -6,6 +6,7 @@ import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.share.mvpsdk.base.BasePresenter;
@@ -19,9 +20,10 @@ import com.shunzhi.parent.presenter.mine.MyChildPresenter;
  */
 
 public class InviteCodeActivity extends BaseMVPCompatActivity {
-    TextView add_child,center_title,back;
+    TextView add_child,center_title;
     EditText et_invite_code;
     int school_id;
+    ImageView back;
 
     @NonNull
     @Override
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
index 01681e6..f78ca57 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
@@ -6,6 +6,7 @@ import android.support.annotation.NonNull;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.share.mvpsdk.base.BasePresenter;
@@ -39,7 +40,8 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity<SchoolListContra
         View.OnClickListener, SchoolListContract.ISchoolListView, CityPickerListener {
 
     private SideBar sideBar;
-    private TextView dialog, go_next, tvLocalAddress, center_title, back;
+    private TextView dialog, go_next, tvLocalAddress, center_title;
+    ImageView back;
     private RecyclerView schoollist;
     private List<String> list = new ArrayList<>();
     SchoolListAdapter schoolListAdapter;
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 8e3dade..c829287 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
@@ -10,6 +10,7 @@ import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -25,7 +26,8 @@ public class WebViewActivity extends BaseCompatActivity {
 
     NestedScrollWebView nesteScrollWebView;
     LinearLayout binding_success, binding_success2;
-    TextView close,tv_info,zuoye,title_web;
+    TextView tv_info,zuoye,title_web;
+    ImageView close;
     int type;
 
     private ProgressBar pvWeb;
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 995179a..7e47bbe 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
@@ -97,7 +97,7 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
         phoneNumber.addTextChangedListener(textWatcher);
         idCode.addTextChangedListener(textWatcher);
         password.addTextChangedListener(textWatcher);
-        mPresenter.loginResult("18358585335", "575335");
+//        mPresenter.loginResult("18358585335", "575335");
 
         passwordLayout_new = view.findViewById(R.id.passwordLayout_new);
         et_password_new = view.findViewById(R.id.et_password_new);
diff --git a/app/src/main/res/layout/activity_web_view.xml b/app/src/main/res/layout/activity_web_view.xml
index 5625c0e..54f3164 100644
--- a/app/src/main/res/layout/activity_web_view.xml
+++ b/app/src/main/res/layout/activity_web_view.xml
@@ -14,14 +14,16 @@
         android:layout_height="?android:actionBarSize"
         android:orientation="horizontal"
         >
-        <TextView
+        <ImageView
             android:id="@+id/close_btn"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_marginLeft="10dp"
-            android:layout_centerVertical="true"
-            android:background="@drawable/arrow_left"
-            />
+            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_zi_xun.xml b/app/src/main/res/layout/fragment_zi_xun.xml
index 21ec6f7..40308c0 100644
--- a/app/src/main/res/layout/fragment_zi_xun.xml
+++ b/app/src/main/res/layout/fragment_zi_xun.xml
@@ -15,13 +15,16 @@
         android:layout_weight="2"></com.stx.xhb.xbanner.XBanner>
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingTop="@dimen/size_dp_10"
         android:layout_marginLeft="@dimen/size_dp_10"
         android:layout_marginRight="@dimen/size_dp_10"
         >
+
 <include layout="@layout/layout_textandimgshow"
     />
+
     </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/top.xml b/app/src/main/res/layout/top.xml
index eb787c7..5305e79 100644
--- a/app/src/main/res/layout/top.xml
+++ b/app/src/main/res/layout/top.xml
@@ -5,12 +5,16 @@
     android:background="@color/back_top"
     android:padding="10dp">
 
-    <TextView
+    <ImageView
         android:id="@+id/back_top"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_gravity="center_vertical"
-        android:background="@drawable/arrow_left" />
+        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/center_title"
@@ -19,7 +23,7 @@
         android:layout_weight="1"
         android:text="主题"
         android:gravity="center"
-        android:textColor="@color/textColor"
+        android:textColor="@color/white"
         android:textSize="@dimen/textSize16" />
     <TextView
         android:layout_width="30dp"
--
libgit2 0.21.0