Home Explore Help
Register Sign In
aaron
/
zumo_2.0_android
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'develop' of https://github.com/swict/LifePlusAndroid into develop

Hasemi 7 years ago
parent
896071868b 6334c7281b
commit
a031278f4b
6 changed files with 17 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      app/build.gradle
  2. 4 0
      app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/WebDialog.java
  3. 3 0
      app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsWebFragment.java
  4. 5 0
      app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/couponmall/CouponMallFragment.java
  5. 3 0
      app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/web/WebFromContentsFragment.java
  6. 1 1
      app/src/sandbox/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIService.java

+ 1 - 1
app/build.gradle
View File 

@@ -23,7 +23,7 @@ android {
 
         minSdkVersion 19    // 4.4
 
         targetSdkVersion 27
 
         versionCode 149
 
-        versionName "4.0.0.45"
 
+        versionName "4.0.0.46"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         multiDexEnabled true
 
         vectorDrawables.useSupportLibrary = true

+ 4 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/WebDialog.java
View File 

@@ -10,6 +10,7 @@ import android.support.annotation.StringRes;
 
 import android.view.LayoutInflater;
 
 import android.view.View;
 
 import android.view.ViewGroup;
 
+import android.webkit.WebChromeClient;
 
 import android.webkit.WebView;
 
 import android.webkit.WebViewClient;
 
 
@@ -103,6 +104,9 @@ public class WebDialog extends DialogBase {
 
         return true;
 
       }
 
     });
 
+
 
+    webView.setWebChromeClient(new WebChromeClient());
 
+
 
     webView.getSettings().setJavaScriptEnabled(true);
 
 
     render();

+ 3 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsWebFragment.java
View File 

@@ -12,6 +12,7 @@ import android.support.annotation.Nullable;
 
 import android.view.LayoutInflater;
 
 import android.view.View;
 
 import android.view.ViewGroup;
 
+import android.webkit.WebChromeClient;
 
 import android.webkit.WebView;
 
 import android.webkit.WebViewClient;
 
 
@@ -104,6 +105,8 @@ public class ContentsWebFragment extends FragmentBase<ContentsWebPresenter> impl
 
       });
 
       webView.getSettings().setJavaScriptEnabled(true);
 
 
+      webView.setWebChromeClient(new WebChromeClient());
 
+
 
       webView.loadUrl(url);
 
 
     }

+ 5 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/couponmall/CouponMallFragment.java
View File 

@@ -11,6 +11,7 @@ import android.view.View;
 
 import android.view.ViewGroup;
 
 import android.webkit.JavascriptInterface;
 
 import android.webkit.SslErrorHandler;
 
+import android.webkit.WebChromeClient;
 
 import android.webkit.WebSettings;
 
 import android.webkit.WebView;
 
 import android.webkit.WebViewClient;
 
@@ -61,6 +62,8 @@ public class CouponMallFragment extends FragmentBase<CouponMallPresenter> implem
 
       }
 
     });
 
 
+    webView.setWebChromeClient(new WebChromeClient());
 
+
 
     init(webView);
 
 
     webView.addJavascriptInterface(this, WebConstant.OBJECT_ID);
 
@@ -191,6 +194,7 @@ public class CouponMallFragment extends FragmentBase<CouponMallPresenter> implem
 
     "<head>\n" +
 
     "\t<script language=\"JavaScript\">\n" +
 
     "\tfunction onAuthConfirmed() {\n" +
 
+    "\t\talert(\"인증 완료\");\n" +
 
     " \t\tdocument.getElementById('textMessageFromApp').innerHTML = \"인증 완료\";\n" +
 
     "\t}\n" +
 
     "\tfunction requestAuth(){\n" +
 
@@ -230,6 +234,7 @@ public class CouponMallFragment extends FragmentBase<CouponMallPresenter> implem
 
     "\n" +
 
     "\t회원 가입 :\n" +
 
     "\t<input type=\"button\" value=\"onSubscribeSelected\" onclick=\"onSubscribeSelected()\" style=\"left:50%;\"/>\n" +
 
+    "\t\n" +
 
     "</body>\n" +
 
     "</html>";
 
 }

+ 3 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/web/WebFromContentsFragment.java
View File 

@@ -13,6 +13,7 @@ import android.view.LayoutInflater;
 
 import android.view.View;
 
 import android.view.ViewGroup;
 
 import android.webkit.SslErrorHandler;
 
+import android.webkit.WebChromeClient;
 
 import android.webkit.WebSettings;
 
 import android.webkit.WebView;
 
 import android.webkit.WebViewClient;
 
@@ -63,6 +64,8 @@ public class WebFromContentsFragment extends FragmentBase<WebFromContentsPresent
 
       }
 
     });
 
 
+    webView.setWebChromeClient(new WebChromeClient());
 
+
 
     init(webView);
 
 
     webView.addJavascriptInterface(this, WebConstant.OBJECT_ID);

File diff suppressed because it is too large
+ 1 - 1
app/src/sandbox/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIService.java