Ver Fonte

update webview & python

kevin há 3 anos atrás
pai
commit
54a3fa42b1

+ 6 - 5
.gitignore

@@ -1,8 +1,9 @@
-AppBuilder.xcodeproj/xcuserdata/
-AppBuilder.xcworkspace/xcuserdata/
-NexilisLite.xcodeproj/xcuserdata/
-NexilisLite.xcworkspace/xcuserdata/
+appbuilder-ios/AppBuilder/AppBuilder.xcodeproj/xcuserdata/*.xcuserdatad
+appbuilder-ios/AppBuilder/AppBuilder.xcworkspace/xcuserdata/*.xcuserdatad
+appbuilder-ios/NexilisLite/NexilisLite.xcodeproj/xcuserdata/*.xcuserdatad
+appbuilder-ios/NexilisLite/NexilisLite.xcworkspace/xcuserdata/*.xcuserdatad
 Pods/
-venv/
+src/venv/
+.idea/
 .DS_Store
 Podfile.lock

+ 4 - 4
appbuilder-ios/AppBuilder/AppBuilder/Base.lproj/Main.storyboard

@@ -34,7 +34,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zT9-mO-2xu">
-                                <rect key="frame" x="0.0" y="44" width="428" height="848"/>
+                                <rect key="frame" x="0.0" y="44" width="428" height="882"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <wkWebViewConfiguration key="configuration">
                                     <audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/>
@@ -48,7 +48,7 @@
                             <constraint firstItem="zT9-mO-2xu" firstAttribute="leading" secondItem="f2x-TV-t0G" secondAttribute="leading" id="IO4-cU-dmV"/>
                             <constraint firstItem="zT9-mO-2xu" firstAttribute="top" secondItem="f2x-TV-t0G" secondAttribute="top" id="NUS-DV-p70"/>
                             <constraint firstItem="f2x-TV-t0G" firstAttribute="trailing" secondItem="zT9-mO-2xu" secondAttribute="trailing" id="OHq-JX-jnE"/>
-                            <constraint firstItem="f2x-TV-t0G" firstAttribute="bottom" secondItem="zT9-mO-2xu" secondAttribute="bottom" id="OUP-JZ-QoH"/>
+                            <constraint firstAttribute="bottom" secondItem="zT9-mO-2xu" secondAttribute="bottom" id="OUP-JZ-QoH"/>
                         </constraints>
                     </view>
                     <connections>
@@ -254,7 +254,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bvD-XN-Tvh">
-                                <rect key="frame" x="0.0" y="44" width="428" height="848"/>
+                                <rect key="frame" x="0.0" y="44" width="428" height="882"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <wkWebViewConfiguration key="configuration">
                                     <audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/>
@@ -265,7 +265,7 @@
                         <viewLayoutGuide key="safeArea" id="gQh-2u-SN6"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
-                            <constraint firstItem="gQh-2u-SN6" firstAttribute="bottom" secondItem="bvD-XN-Tvh" secondAttribute="bottom" id="7Q0-Pz-a2B"/>
+                            <constraint firstAttribute="bottom" secondItem="bvD-XN-Tvh" secondAttribute="bottom" id="7Q0-Pz-a2B"/>
                             <constraint firstItem="bvD-XN-Tvh" firstAttribute="leading" secondItem="gQh-2u-SN6" secondAttribute="leading" id="Xt6-nC-kXW"/>
                             <constraint firstItem="gQh-2u-SN6" firstAttribute="trailing" secondItem="bvD-XN-Tvh" secondAttribute="trailing" id="d1o-4Y-rDd"/>
                             <constraint firstItem="bvD-XN-Tvh" firstAttribute="top" secondItem="gQh-2u-SN6" secondAttribute="top" id="wKy-eu-cvh"/>

+ 23 - 7
src/mainIOS.py

@@ -11,8 +11,8 @@ from zipfile import ZipFile
 ImageFile.SAFEBLOCK = 2048 * 2048
 
 app = Flask(__name__)
-app.base_project = "/Users/maronakins/appbuilder-ios/AppBuilder"
-app.nexilis_lite = "/Users/maronakins/appbuilder-ios/NexilisLite"
+app.base_project = "/Users/maronakins/Documents/AppBuilder/appbuilder-ios/AppBuilder"
+app.nexilis_lite = "/Users/maronakins/Documents/AppBuilder/appbuilder-ios/NexilisLite"
 app.temp_folder = "/Users/maronakins/BuildIos"
 app.app_folder = "/Users/maronakins/"
 app.verbose = True
@@ -108,11 +108,14 @@ def change_name(path_dest, app_name, package_id):
     with open(xcshareddata, "w") as f:
         f.write(replaced)
     xcuserdata = os.path.join(xcproj, "xcuserdata/{}.xcuserdatad/xcschemes/xcschememanagement.plist".format(app.username))
-    with open(xcuserdata, "r") as f:
-        file_source = f.read()
-    replaced = file_source.replace("AppBuilder", app_name)
-    with open(xcuserdata, "w") as f:
-        f.write(replaced)
+    try:
+        with open(xcuserdata, "r") as f:
+            file_source = f.read()
+        replaced = file_source.replace("AppBuilder", app_name)
+        with open(xcuserdata, "w") as f:
+            f.write(replaced)
+    except FileNotFoundError:
+        pass
     contentsw = os.path.join(xcwork, "contents.xcworkspacedata")
     with open(contentsw, "r") as f:
         file_source = f.read()
@@ -191,6 +194,7 @@ def change_background(c_code_path, background):
     assets_dir = os.path.join(c_code_path, "Assets.xcassets")
     img_src_path_1 = os.path.join(assets_dir, "pb_lbackground_1.imageset")
     if isinstance(background, str):
+        background = []
         background = background.split(",")
         for i, b in enumerate(background):
             n = i + 1
@@ -211,6 +215,18 @@ def change_background(c_code_path, background):
                 logo = Image.open(f)
                 logo = logo.resize((600, 1250))
             logo.save(img_path, "PNG")
+        second_tab = os.path.join(c_code_path, "SecondTabViewController.swift")
+        fourth_tab = os.path.join(c_code_path, "FourthTabViewController.swift")
+        with open(second_tab, "r") as f:
+            file_source = f.read()
+        replaced = file_source.replace("1..<2", "1..<{}".format(len(background) + 1))
+        with open(second_tab, "w") as f:
+            f.write(replaced)
+        with open(fourth_tab, "r") as f:
+            file_source = f.read()
+        replaced = file_source.replace("1..<2", "1..<{}".format(len(background) + 1))
+        with open(fourth_tab, "w") as f:
+            f.write(replaced)
     else:
         img_path = os.path.join(img_src_path_1, "pb_lbackground_1.png")
         logo = Image.open(background)