浏览代码

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

hyodong.min 6 年之前
父节点
当前提交
91512158db

+ 3 - 2
app/src/main/assets/on_boarding/new/app.js

@@ -4,7 +4,7 @@ Framer.Extras.Hints.disable();
 
 Framer.Extras.Preloader.disable();
 
-Screen.backgroundColor = "black";
+Screen.backgroundColor = "white";
 
 FlexibleScreen = require("FlexibleScreen").FlexibleScreen;
 
@@ -20,7 +20,8 @@ all = new FlexibleScreen({
   backgroundColor: "white",
   width: 1242,
   height: 2208,
-  _blockEvent: blockEvent
+  _blockEvent: blockEvent,
+  shadowSetting: false
 });
 
 Main_Page = new PageComponent({

+ 3 - 2
app/src/main/assets/on_boarding/zumo/app.js

@@ -4,7 +4,7 @@ Framer.Extras.Hints.disable();
 
 Framer.Extras.Preloader.disable();
 
-Screen.backgroundColor = "black";
+Screen.backgroundColor = "white";
 
 FlexibleScreen = require("FlexibleScreen").FlexibleScreen;
 
@@ -20,7 +20,8 @@ all = new FlexibleScreen({
   backgroundColor: "white",
   width: 1242,
   height: 2208,
-  _blockEvent: blockEvent
+  _blockEvent: blockEvent,
+    shadowSetting: false
 });
 
 Main_Page = new PageComponent({

+ 2 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/FullScreenWithKeyBoardLayout.java

@@ -5,6 +5,7 @@ import android.graphics.Rect;
 import android.view.View;
 import android.widget.FrameLayout;
 
+import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.util.AppUtil;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 
@@ -32,6 +33,7 @@ public class FullScreenWithKeyBoardLayout {
   private FullScreenWithKeyBoardLayout(Activity activity) {
     FrameLayout parentContent = activity.findViewById(android.R.id.content);
     childContent = parentContent.getChildAt(0);
+    parentContent.setBackgroundColor(ResourceUtil.getColor(R.color.C000000));
     childContent.getViewTreeObserver().addOnGlobalLayoutListener(this::possiblyResizeChildOfContent);
 
     frameLayoutParams = (FrameLayout.LayoutParams) childContent.getLayoutParams();