From 0a707989b1e298d6c22575ef573b6a4f65d0e036 Mon Sep 17 00:00:00 2001
From: whychdw <49690745@qq.com>
Date: 星期五, 20 十二月 2019 14:44:19 +0800
Subject: [PATCH] Merge branch 'FBS9600' of http://whychdw@118.89.139.230:10101/r/FBS9600App.git into FBS9600
---
platforms/android/app/src/main/java/io/cordova/hellocordova/MainActivity.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/platforms/android/app/src/main/java/io/cordova/hellocordova/MainActivity.java b/platforms/android/app/src/main/java/io/cordova/hellocordova/MainActivity.java
index 2c91a89..f1a0977 100644
--- a/platforms/android/app/src/main/java/io/cordova/hellocordova/MainActivity.java
+++ b/platforms/android/app/src/main/java/io/cordova/hellocordova/MainActivity.java
@@ -19,16 +19,16 @@
package io.cordova.hellocordova;
-import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Rect;
import android.os.Bundle;
import android.util.Log;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.WindowManager;
import android.webkit.WebView;
import com.fgkj.action.JsInterface;
import com.fgkj.dao.DBHelper;
-import com.fgkj.dao.SQLdm;
-import com.fgkj.dto.Battresdata;
-import com.fgkj.dto.Batttestdata_inf;
import com.fgkj.service.Battalram_dataService;
import com.fgkj.service.BattinfService;
import com.fgkj.service.BattresdataService;
@@ -43,6 +43,7 @@
{
public WebView webview;
public DBHelper dbHelper;
+ boolean isShow = false;
@Override
public void onCreate(Bundle savedInstanceState)
@@ -57,15 +58,15 @@
// Set by <content src="index.html" /> in config.xml
loadUrl(launchUrl);
-
+
dbHelper=new DBHelper(this,"fbs9600.db", null, 1);
-
+
webview = findViewById(appView.getView().getId());
// 娣诲姞浜嬩欢
webview.addJavascriptInterface(new JsInterface(this, webview,MainActivity.this), JsInterface.JS_INTERFACE_NAME);
//娣诲姞璁惧閫氳鐩稿叧鎺ュ彛
webview.addJavascriptInterface(new FBS9600S_DeviceService(webview,dbHelper), FBS9600S_DeviceService.JS_INTERFACE_NAME);
- //tb_battinf琛ㄧ殑鎿嶄綔
+ //tb_battinf琛ㄧ殑鎿嶄綔
webview.addJavascriptInterface(new BattinfService(webview, dbHelper),BattinfService.BATTINFSERVICE_NAME);
//tb_batttestdata琛ㄧ殑鎿嶄綔
webview.addJavascriptInterface(new BatttestdataService(webview, dbHelper),BatttestdataService.BATTTESTDATASERVICE_NAME);
@@ -77,6 +78,31 @@
webview.addJavascriptInterface(new Battresdata_infService(webview, dbHelper),Battresdata_infService.BATTRESDATA_INFSERVICE_NAME);
//娣诲姞鍛婅鎺ュ彛
webview.addJavascriptInterface(new Battalram_dataService(webview,dbHelper),Battalram_dataService.BATTALRAM_DATASERVICE_NAME);
+
+
+ //鐩戝惉閿洏鏄剧ず鍜岄殣钘忎簨浠�
+ this.webview.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+ @Override
+ public void onGlobalLayout() {
+ Rect rect = new Rect();
+ webview.getWindowVisibleDisplayFrame(rect);
+ int displayHeight = rect.bottom - rect.top;
+ int height = webview.getHeight();
+ boolean visible = (double) displayHeight / height < 0.8;
+ if (visible) {
+ if(!isShow){
+ //闅愯棌鐘舵�佹爮锛屽苟涓斾笉鏄剧ず瀛椾綋
+ getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+ Log.e(TAG, "杞敭鐩樻樉绀�");
+ isShow = true;
+ }
+ } else {
+ isShow = false;
+ Log.e(TAG, "杞敭鐩橀殣钘�");
+ hideSystemMenu();
+ }
+ }
+ });
}
@Override
@@ -84,4 +110,22 @@
dbHelper.close();
super.onDestroy();
}
+
+ /**
+ * 闅愯棌绯荤粺鑿滃崟鏍�
+ */
+ public void hideSystemMenu(){
+ int uiOptions = View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
+ //甯冨眬浣嶄簬鐘舵�佹爮涓嬫柟
+ View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+ //鍏ㄥ睆
+ View.SYSTEM_UI_FLAG_FULLSCREEN |
+ //闅愯棌瀵艰埅鏍�
+ View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
+ View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
+ uiOptions |= 0x00001000;
+ getWindow().getDecorView().setSystemUiVisibility(uiOptions);
+ }
+
+
}
--
Gitblit v1.9.1