From e56d2f35898d0928b7d8dfa656dc4d656f029aba Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Fri, 23 Mar 2018 15:55:12 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java | 14 +++++++++++++-
 app/src/main/res/drawable-xhdpi/close.png                                       | Bin 655 -> 0 bytes
 app/src/main/res/layout/activity_web_view.xml                                   | 11 +++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

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 d6bac0f..3848b67 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
@@ -28,7 +28,7 @@ public class WebViewActivity extends BaseCompatActivity {
 
     NestedScrollWebView nesteScrollWebView;
     LinearLayout binding_success, binding_success2;
-    ImageView close_btn;
+    ImageView close_btn,close_btn_right;
     TextView tv_info, zuoye, title_web;
 
     int type;
@@ -62,11 +62,23 @@ public class WebViewActivity extends BaseCompatActivity {
 
         binding_success2 = findViewById(R.id.binding_success2);
         close_btn = findViewById(R.id.close_btn);
+        close_btn_right = findViewById(R.id.close_btn_right);
         tv_info = findViewById(R.id.tv_info);
         zuoye = findViewById(R.id.zuoye);
         title_web = findViewById(R.id.title_web);
 
 
+        close_btn_right.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if(type!=-1&&type!= AppConfig.ORDER_CENTER) {
+                    startActivity(new Intent().setClass(WebViewActivity.this, MainActivity.class));
+                }else{
+                    finish();
+                }
+            }
+        });
+
         close_btn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/res/drawable-xhdpi/close.png b/app/src/main/res/drawable-xhdpi/close.png
index 5ab60d1..8c671ab 100644
Binary files a/app/src/main/res/drawable-xhdpi/close.png and b/app/src/main/res/drawable-xhdpi/close.png differ
diff --git a/app/src/main/res/layout/activity_web_view.xml b/app/src/main/res/layout/activity_web_view.xml
index bf144e2..c05e5ff 100644
--- a/app/src/main/res/layout/activity_web_view.xml
+++ b/app/src/main/res/layout/activity_web_view.xml
@@ -35,6 +35,17 @@
             android:textColor="@color/textColor"
 
             />
+        <ImageView
+            android:id="@+id/close_btn_right"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:paddingLeft="@dimen/size_dp_15"
+            android:src="@drawable/close"
+            android:layout_alignParentRight="true"
+            android:paddingRight="@dimen/size_dp_15"
+            android:textColor="@color/textColor"
+            android:textSize="@dimen/textSize16" />
 
     </RelativeLayout>
 
--
libgit2 0.21.0