From dec4c9a0da329f4a3d2464c8190aef927bef9abd Mon Sep 17 00:00:00 2001
From: LAPTOP-4C7T0D8N\lenovo <15805828761@163.com>
Date: Fri, 16 Mar 2018 23:04:48 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/AppConfig.java                             |   1 +
 app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java      |   2 +-
 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 |  42 +++++++++++++++++++++++++++++++++++++-----
 app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java              |   3 ++-
 app/src/main/res/layout/activity_web_view.xml                                   | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 gradle.properties                                                               |   2 +-
 7 files changed, 146 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java
index d10bafb..38284a5 100644
--- a/app/src/main/java/com/shunzhi/parent/AppConfig.java
+++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java
@@ -33,6 +33,7 @@ public class AppConfig {
     //http://campus.myjxt.com/
     public static String BASE_URL="http://60.190.202.57:1000/";
     public static String BASE_URL_IMG="http://60.190.202.57:1000";
+    public static String WAP_URL="http://60.190.202.57:8101/";
 
 
 
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java
index 822a191..bed8fd8 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java
@@ -55,7 +55,7 @@ public class CePingPresenter extends CepingContract.CePingPresenter {
                             @Override
                             public void onClick(View view) {
                                 ToolBean toolBean1= (ToolBean) view.getTag();
-                                WebViewActivity.getInstance(mIView.getBindActivity(),toolBean1.toolUrl);
+                                WebViewActivity.getInstance(mIView.getBindActivity(),toolBean1.toolUrl,0);
                             }
                         });
                         layout_control.addView(textAndImgShowView);
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 d57e8a4..bd6f7d9 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() {
 //        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));
+        WebViewActivity.getInstance(CheckInfoActivity.this,"http://60.190.202.57:8101/ParentOrderCenter.aspx?userid="+AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.BINDING_SUCCESS_HEZUO);
         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 da782db..92e7cf5 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,30 +10,62 @@ import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
+import android.widget.TextView;
 
 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.AppConfig;
 import com.shunzhi.parent.R;
 
 public class WebViewActivity extends BaseCompatActivity {
 
     NestedScrollWebView nesteScrollWebView;
+    LinearLayout binding_success, binding_success2;
+    TextView close,tv_info,zuoye,title_web;
+    int type;
 
     private ProgressBar pvWeb;
 
-    public static void getInstance(Context context,String url) {
+    public static void getInstance(Context context, String url, int type) {
         Intent intent = new Intent(context, WebViewActivity.class);
         intent.putExtra("url", url);
+        intent.putExtra("type", type);
         context.startActivity(intent);
     }
 
     @Override
     protected void initView(Bundle savedInstanceState) {
-        nesteScrollWebView=findViewById(R.id.nesteScrollWebView);
-        pvWeb=findViewById(R.id.pb_web);
+        binding_success=findViewById(R.id.binding_success);
+        binding_success2=findViewById(R.id.binding_success2);
+        close = findViewById(R.id.close_btn);
+        tv_info = findViewById(R.id.tv_info);
+        zuoye = findViewById(R.id.zuoye);
+        title_web = findViewById(R.id.title_web);
+
+        nesteScrollWebView = findViewById(R.id.nesteScrollWebView);
+        pvWeb = findViewById(R.id.pb_web);
+        type = getIntent().getIntExtra("type", 0);
+        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_success.setVisibility(View.GONE);
+            binding_success2.setVisibility(View.VISIBLE);
+            title_web.setVisibility(View.GONE);
+
+        } else if (type == AppConfig.ORDER_CENTER) {
+            binding_success.setVisibility(View.GONE);
+            binding_success2.setVisibility(View.GONE);
+            title_web.setVisibility(View.VISIBLE);
+
+        }
+
         initWebView();
         initWebSetting(nesteScrollWebView.getSettings());
         nesteScrollWebView.loadUrl(getIntent().getStringExtra("url"));
@@ -46,9 +78,9 @@ public class WebViewActivity extends BaseCompatActivity {
 
     @Override
     public void onBackPressedSupport() {
-        if (nesteScrollWebView.canGoBack()){
+        if (nesteScrollWebView.canGoBack()) {
             nesteScrollWebView.goBack();
-        }else {
+        } else {
             super.onBackPressedSupport();
         }
     }
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
index fd2f892..1124a11 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
@@ -89,8 +89,9 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
                 break;
             case R.id.layout_order:
                 Bundle bundle=new Bundle();
-                bundle.putString("url",AppConfig.BASE_URL+"ParentOrderCenter.aspx?userid="+
+                bundle.putString("url",AppConfig.WAP_URL+"ParentOrderCenter.aspx?userid="+
                 AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID));
+                bundle.putInt("type",AppConfig.ORDER_CENTER);
                 startNewActivity(WebViewActivity.class,bundle);
                 break;
             default:
diff --git a/app/src/main/res/layout/activity_web_view.xml b/app/src/main/res/layout/activity_web_view.xml
index d88e811..c9b545d 100644
--- a/app/src/main/res/layout/activity_web_view.xml
+++ b/app/src/main/res/layout/activity_web_view.xml
@@ -7,6 +7,109 @@
     android:orientation="vertical"
     android:background="@color/bgColor"
     tools:context="com.shunzhi.parent.ui.activity.mywebview.WebViewActivity">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:background="@color/back_top"
+        android:layout_height="?android:actionBarSize"
+        android:orientation="horizontal"
+        >
+        <TextView
+            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"
+            />
+        <TextView
+            android:id="@+id/title_web"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="订购中心"
+            android:textSize="@dimen/txtsize_title"
+            android:layout_centerInParent="true"
+            android:visibility="gone"
+            android:textColor="@color/textColor"
+
+            />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/binding_success"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:background="@color/white"
+        android:layout_marginLeft="20dp"
+        android:padding="30dp"
+        android:layout_marginRight="20dp"
+
+        >
+
+        <ImageView
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:background="@drawable/success_big" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="20dp"
+            android:text="绑定成功"
+            android:gravity="center"
+            android:textColor="@color/textColor"
+            android:textSize="@dimen/txtsize_headline" />
+
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/binding_success2"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:background="@color/white"
+        android:layout_marginLeft="20dp"
+        android:padding="30dp"
+        android:orientation="vertical"
+        android:layout_marginRight="20dp"
+
+        >
+        <TextView
+            android:id="@+id/tv_info"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="20dp"
+            android:text="生成孩子“汇作业”账号为：sz1803081515，初始密码为：sz1803081515（与账号相同）。孩子可以下载“汇作业”app进行使用"
+            android:gravity="center"
+            android:textColor="@color/textColor"
+            android:textSize="@dimen/txtsize_headline" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:gravity="center"
+            >
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="20dp"
+                android:text="下载地址:"
+                android:textColor="@color/textColor"
+                android:textSize="@dimen/txtsize_headline" />
+            <TextView
+                android:id="@+id/zuoye"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="20dp"
+                android:text="汇作业"
+                android:gravity="center"
+                android:textColor="@color/textBlue"
+                android:textSize="@dimen/txtsize_headline" />
+        </LinearLayout>
+
+    </LinearLayout>
     <ProgressBar
         android:id="@+id/pb_web"
         style="?android:attr/progressBarStyleHorizontal"
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..766b2f9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx512m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
--
libgit2 0.21.0