From 8510cba8ad85a904a2477185ab03eae7eccb7052 Mon Sep 17 00:00:00 2001
From: 陶汉栋 <2821744554@qq.com>
Date: Fri, 16 Mar 2018 17:55:36 +0800
Subject: [PATCH] no message

---
 app/src/main/AndroidManifest.xml                                                |   3 +--
 app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java      |   2 +-
 app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java |   3 +--
 app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/src/main/java/com/shunzhi/parent/ui/activity/web/WebViewActivity.java       | 200 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java              |  11 ++++++++++-
 app/src/main/res/layout/activity_web_view.xml                                   |   2 +-
 app/src/main/res/layout/fragment_mine.xml                                       |   1 +
 8 files changed, 215 insertions(+), 207 deletions(-)
 create mode 100644 app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
 delete mode 100644 app/src/main/java/com/shunzhi/parent/ui/activity/web/WebViewActivity.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9f57333..650def1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -109,11 +109,10 @@
             android:name=".ui.activity.binding.InviteCodeActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.activity.web.WebViewActivity"
+            android:name=".ui.activity.mywebview.WebViewActivity"
             android:screenOrientation="portrait" />
         <activity android:name=".ui.activity.consult.ConsultTwoLevelActivity" />
         <activity android:name=".ui.activity.orderdetail.OrderDetailActivity" />
-        <activity android:name=".ui.activity.web.WebViewActivity"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
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 00f24fd..822a191 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
@@ -10,7 +10,7 @@ import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.ToolBean;
 import com.shunzhi.parent.contract.ceping.CepingContract;
 import com.shunzhi.parent.model.CePingModel;
-import com.shunzhi.parent.ui.activity.web.WebViewActivity;
+import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
 import com.shunzhi.parent.util.AttrsUtils;
 import com.shunzhi.parent.views.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 80e3c8e..5d4ec24 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,7 +25,6 @@ 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.web.WebViewActivity;
 
 import java.util.List;
 
@@ -150,7 +149,7 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC
 
     @Override
     public void addChildSuccess() {
-        WebViewActivity.start_show(CheckInfoActivity.this,AppConfig.BINDING_SUCCESS_HEZUO);
+//        WebViewActivity.start_show(CheckInfoActivity.this,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
new file mode 100644
index 0000000..37fd7e9
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
@@ -0,0 +1,200 @@
+package com.shunzhi.parent.ui.activity.mywebview;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.webkit.JavascriptInterface;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.ProgressBar;
+
+import com.share.mvpsdk.utils.AppUtils;
+import com.share.mvpsdk.utils.NetworkConnectionUtils;
+import com.share.mvpsdk.widgets.NestedScrollWebView;
+import com.shunzhi.parent.R;
+
+public class WebViewActivity extends AppCompatActivity {
+
+    NestedScrollWebView nesteScrollWebView;
+
+    private ProgressBar pvWeb;
+
+    public static void getInstance(Context context,String url) {
+        Intent intent = new Intent(context, WebViewActivity.class);
+        intent.putExtra("url", url);
+        context.startActivity(intent);
+    }
+
+    @Override
+    protected void initView(Bundle savedInstanceState) {
+        nesteScrollWebView=findViewById(R.id.nesteScrollWebView);
+        pvWeb=findViewById(R.id.pb_web);
+        initWebView();
+        initWebSetting(nesteScrollWebView.getSettings());
+        nesteScrollWebView.loadUrl(getIntent().getStringExtra("url"));
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_web_view;
+    }
+
+    @Override
+    public void onBackPressedSupport() {
+        if (nesteScrollWebView.canGoBack()){
+            nesteScrollWebView.goBack();
+        }else {
+            super.onBackPressedSupport();
+        }
+    }
+
+    /**
+     * js接口
+     */
+    public class SupportJavascriptInterface {
+        private Context context;
+
+        public SupportJavascriptInterface(Context context) {
+            this.context = context;
+        }
+
+        @JavascriptInterface
+        public void openImage(final String img) {
+            AppUtils.runOnUIThread(new Runnable() {
+                @Override
+                public void run() {
+//                    gotoImageBrowse(img);
+                }
+            });
+        }
+    }
+
+    protected void initWebView() {
+        // 添加js交互接口类，并起别名 imagelistner
+        nesteScrollWebView.addJavascriptInterface(new SupportJavascriptInterface(this),
+                "imagelistner");
+        nesteScrollWebView.setWebViewClient(new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                view.loadUrl(url);
+                return true;
+            }
+
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                view.getSettings().setJavaScriptEnabled(true);
+                super.onPageFinished(view, url);
+                // html加载完成之后，添加监听图片的点击js函数
+                addWebImageClickListner(view);
+//                toolbar.setTitle(getToolbarTitle());
+            }
+
+            @Override
+            public void onPageStarted(WebView view, String url, Bitmap favicon) {
+                view.getSettings().setJavaScriptEnabled(true);
+                super.onPageStarted(view, url, favicon);
+            }
+
+            // 注入js函数监听
+            protected void addWebImageClickListner(WebView webView) {
+                // 这段js函数的功能就是，遍历所有的img节点，并添加onclick函数，
+                // 函数的功能是在图片点击的时候调用本地java接口并传递url过去
+                webView.loadUrl("javascript:(function(){" +
+                        "var objs = document.getElementsByTagName(\"img\"); " +
+                        "for(var i=0;i<objs.length;i++)  " +
+                        "{"
+                        + "    objs[i].onclick=function()  " +
+                        "    {  "
+                        + "        window.imagelistner.openImage(this.src);  " +
+                        "    }  " +
+                        "}" +
+                        "})()");
+            }
+        });
+
+        nesteScrollWebView.setWebChromeClient(new WebChromeClient() {
+            @Override
+            public void onProgressChanged(WebView view, int newProgress) {
+                if (newProgress == 100) {
+                    pvWeb.setVisibility(View.GONE);//加载完网页进度条消失
+                } else {
+                    pvWeb.setVisibility(View.VISIBLE);//开始加载网页时显示进度条
+                    pvWeb.setProgress(newProgress);//设置进度值
+                }
+            }
+        });
+
+        nesteScrollWebView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                WebView.HitTestResult result = ((WebView) v).getHitTestResult();
+                if (null == result)
+                    return false;
+
+//                mPresenter.imageLongClicked(result);
+//                mImgurl = result.getExtra();
+
+                return true;
+            }
+        });
+
+//        nswvDetailContent.setOnTouchListener(WebViewOnTouchListener);
+    }
+
+
+    /**
+     * 初始化WebSetting
+     *
+     * @param settings WebSetting
+     */
+    protected void initWebSetting(WebSettings settings) {
+        // 缩放至屏幕的大小
+        settings.setLoadWithOverviewMode(true);
+        // 保存表单数据
+        settings.setSaveFormData(true);
+        // 是否应该支持使用其屏幕缩放控件和手势缩放
+        settings.setSupportZoom(true);
+        //        //是否支持手势缩放控制
+        //        settings.setBuiltInZoomControls(true);
+        //        是否隐藏原生的缩放控件
+        //        settings.setDisplayZoomControls(false);
+        // 启动应用缓存
+        settings.setAppCacheEnabled(true);
+        // 排版适应屏幕，只显示一列
+        settings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
+        //        settings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
+        //  页面加载好以后，再放开图片
+        settings.setBlockNetworkImage(false);
+        // 使用localStorage则必须打开
+        settings.setDomStorageEnabled(true);
+        settings.setDatabaseEnabled(true);
+        // WebView启用JavaScript执行。默认的是false。
+        settings.setJavaScriptEnabled(true); // 设置支持javascript脚本
+        settings.setJavaScriptCanOpenWindowsAutomatically(true);//设置支持js脚本
+        if (NetworkConnectionUtils.isConnected(mContext)) {
+            settings.setCacheMode(WebSettings.LOAD_DEFAULT);
+        } else {
+            settings.setCacheMode(WebSettings.LOAD_CACHE_ONLY);
+        }
+
+        //        settings.setBlockNetworkImage(false);
+        //        settings.setAppCacheEnabled(true);
+        //        settings.setDomStorageEnabled(true);
+        //        settings.setDatabaseEnabled(true);
+        //        if (NetworkConnectionUtils.isConnected(mContext)) {
+        //            settings.setCacheMode(WebSettings.LOAD_DEFAULT);
+        //        } else {
+        //            settings.setCacheMode(WebSettings.LOAD_CACHE_ONLY);
+        //        }
+        //        settings.setJavaScriptEnabled(true);
+        //        settings.setLoadWithOverviewMode(true);
+        //        settings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
+        //        settings.setSupportZoom(true);
+    }
+
+}
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/web/WebViewActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/web/WebViewActivity.java
deleted file mode 100644
index f140413..0000000
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/web/WebViewActivity.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package com.shunzhi.parent.ui.activity.web;
-
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.view.View;
-import android.webkit.JavascriptInterface;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.ProgressBar;
-
-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.R;
-
-public class WebViewActivity extends BaseCompatActivity {
-
-    NestedScrollWebView nesteScrollWebView;
-
-    private ProgressBar pvWeb;
-
-    public static void getInstance(Context context,String url) {
-        Intent intent = new Intent(context, WebViewActivity.class);
-        intent.putExtra("url", url);
-        context.startActivity(intent);
-    }
-
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        nesteScrollWebView=findViewById(R.id.nesteScrollWebView);
-        pvWeb=findViewById(R.id.pb_web);
-        initWebView();
-        initWebSetting(nesteScrollWebView.getSettings());
-        nesteScrollWebView.loadUrl(getIntent().getStringExtra("url"));
-    }
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_web_view;
-    }
-
-    @Override
-    public void onBackPressedSupport() {
-        if (nesteScrollWebView.canGoBack()){
-            nesteScrollWebView.goBack();
-        }else {
-            super.onBackPressedSupport();
-        }
-    }
-
-    /**
-     * js接口
-     */
-    public class SupportJavascriptInterface {
-        private Context context;
-
-        public SupportJavascriptInterface(Context context) {
-            this.context = context;
-        }
-
-        @JavascriptInterface
-        public void openImage(final String img) {
-            AppUtils.runOnUIThread(new Runnable() {
-                @Override
-                public void run() {
-//                    gotoImageBrowse(img);
-                }
-            });
-        }
-    }
-
-    protected void initWebView() {
-        // 添加js交互接口类，并起别名 imagelistner
-        nesteScrollWebView.addJavascriptInterface(new SupportJavascriptInterface(this),
-                "imagelistner");
-        nesteScrollWebView.setWebViewClient(new WebViewClient() {
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                view.loadUrl(url);
-                return true;
-            }
-
-            @Override
-            public void onPageFinished(WebView view, String url) {
-                view.getSettings().setJavaScriptEnabled(true);
-                super.onPageFinished(view, url);
-                // html加载完成之后，添加监听图片的点击js函数
-                addWebImageClickListner(view);
-//                toolbar.setTitle(getToolbarTitle());
-            }
-
-            @Override
-            public void onPageStarted(WebView view, String url, Bitmap favicon) {
-                view.getSettings().setJavaScriptEnabled(true);
-                super.onPageStarted(view, url, favicon);
-            }
-
-            // 注入js函数监听
-            protected void addWebImageClickListner(WebView webView) {
-                // 这段js函数的功能就是，遍历所有的img节点，并添加onclick函数，
-                // 函数的功能是在图片点击的时候调用本地java接口并传递url过去
-                webView.loadUrl("javascript:(function(){" +
-                        "var objs = document.getElementsByTagName(\"img\"); " +
-                        "for(var i=0;i<objs.length;i++)  " +
-                        "{"
-                        + "    objs[i].onclick=function()  " +
-                        "    {  "
-                        + "        window.imagelistner.openImage(this.src);  " +
-                        "    }  " +
-                        "}" +
-                        "})()");
-            }
-        });
-
-        nesteScrollWebView.setWebChromeClient(new WebChromeClient() {
-            @Override
-            public void onProgressChanged(WebView view, int newProgress) {
-                if (newProgress == 100) {
-                    pvWeb.setVisibility(View.GONE);//加载完网页进度条消失
-                } else {
-                    pvWeb.setVisibility(View.VISIBLE);//开始加载网页时显示进度条
-                    pvWeb.setProgress(newProgress);//设置进度值
-                }
-            }
-        });
-
-        nesteScrollWebView.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
-                WebView.HitTestResult result = ((WebView) v).getHitTestResult();
-                if (null == result)
-                    return false;
-
-//                mPresenter.imageLongClicked(result);
-//                mImgurl = result.getExtra();
-
-                return true;
-            }
-        });
-
-//        nswvDetailContent.setOnTouchListener(WebViewOnTouchListener);
-    }
-
-
-    /**
-     * 初始化WebSetting
-     *
-     * @param settings WebSetting
-     */
-    protected void initWebSetting(WebSettings settings) {
-        // 缩放至屏幕的大小
-        settings.setLoadWithOverviewMode(true);
-        // 保存表单数据
-        settings.setSaveFormData(true);
-        // 是否应该支持使用其屏幕缩放控件和手势缩放
-        settings.setSupportZoom(true);
-        //        //是否支持手势缩放控制
-        //        settings.setBuiltInZoomControls(true);
-        //        是否隐藏原生的缩放控件
-        //        settings.setDisplayZoomControls(false);
-        // 启动应用缓存
-        settings.setAppCacheEnabled(true);
-        // 排版适应屏幕，只显示一列
-        settings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
-        //        settings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
-        //  页面加载好以后，再放开图片
-        settings.setBlockNetworkImage(false);
-        // 使用localStorage则必须打开
-        settings.setDomStorageEnabled(true);
-        settings.setDatabaseEnabled(true);
-        // WebView启用JavaScript执行。默认的是false。
-        settings.setJavaScriptEnabled(true); // 设置支持javascript脚本
-        settings.setJavaScriptCanOpenWindowsAutomatically(true);//设置支持js脚本
-        if (NetworkConnectionUtils.isConnected(mContext)) {
-            settings.setCacheMode(WebSettings.LOAD_DEFAULT);
-        } else {
-            settings.setCacheMode(WebSettings.LOAD_CACHE_ONLY);
-        }
-
-        //        settings.setBlockNetworkImage(false);
-        //        settings.setAppCacheEnabled(true);
-        //        settings.setDomStorageEnabled(true);
-        //        settings.setDatabaseEnabled(true);
-        //        if (NetworkConnectionUtils.isConnected(mContext)) {
-        //            settings.setCacheMode(WebSettings.LOAD_DEFAULT);
-        //        } else {
-        //            settings.setCacheMode(WebSettings.LOAD_CACHE_ONLY);
-        //        }
-        //        settings.setJavaScriptEnabled(true);
-        //        settings.setLoadWithOverviewMode(true);
-        //        settings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
-        //        settings.setSupportZoom(true);
-    }
-
-}
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 3321474..fd2f892 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
@@ -23,10 +23,11 @@ import com.shunzhi.parent.presenter.mine.MinePresenter;
 import com.shunzhi.parent.ui.activity.MyChildActivity;
 import com.shunzhi.parent.ui.activity.PersonInfoActivity;
 import com.shunzhi.parent.ui.activity.orderdetail.OrderDetailActivity;
+import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
 
 public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
         implements MineContract.IMineView, View.OnClickListener {
-    LinearLayout childlayout, personinfo,layout_orderDetail;
+    LinearLayout childlayout, personinfo,layout_orderDetail,layout_order;
     RoundedImageView user_photo;
     TextView user_name, user_mobile;
 
@@ -45,9 +46,11 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
         childlayout = view.findViewById(R.id.childlayout);
         personinfo = view.findViewById(R.id.personinfo);
+        layout_order=view.findViewById(R.id.layout_order);
         layout_orderDetail=view.findViewById(R.id.layout_orderDetail);
         childlayout.setOnClickListener(this);
         personinfo.setOnClickListener(this);
+        layout_order.setOnClickListener(this);
         layout_orderDetail.setOnClickListener(this);
         user_photo = view.findViewById(R.id.user_photo);
         user_name = view.findViewById(R.id.user_name);
@@ -84,6 +87,12 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
             case R.id.layout_orderDetail:
                 startNewActivity(OrderDetailActivity.class);
                 break;
+            case R.id.layout_order:
+                Bundle bundle=new Bundle();
+                bundle.putString("url",AppConfig.BASE_URL+"ParentOrderCenter.aspx?userid="+
+                AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID));
+                startNewActivity(WebViewActivity.class,bundle);
+                break;
             default:
                 break;
         }
diff --git a/app/src/main/res/layout/activity_web_view.xml b/app/src/main/res/layout/activity_web_view.xml
index 985e452..d88e811 100644
--- a/app/src/main/res/layout/activity_web_view.xml
+++ b/app/src/main/res/layout/activity_web_view.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/bgColor"
-    tools:context="com.shunzhi.parent.ui.activity.web.WebViewActivity">
+    tools:context="com.shunzhi.parent.ui.activity.mywebview.WebViewActivity">
     <ProgressBar
         android:id="@+id/pb_web"
         style="?android:attr/progressBarStyleHorizontal"
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 1491005..8ed8221 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -163,6 +163,7 @@
                     android:layout_marginRight="15dp"
                     android:background="@color/bottomline" />
                 <LinearLayout
+                    android:id="@+id/layout_order"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:gravity="center_vertical"
--
libgit2 0.21.0