merge

manifest.json

@@ -2,8 +2,8 @@
     "name" : "抖火数字化咨询服务平台",
     "appid" : "__UNI__C305C03",
     "description" : "纵有疾风起，人生不言弃",
-    "versionName" : "1.4.9",
-    "versionCode" : 149,
+    "versionName" : "1.5.0",
+    "versionCode" : 150,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -44,7 +44,8 @@
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
                 ],
                 "schemes" : "doufire",
-                "minSdkVersion" : 21
+                "minSdkVersion" : 21,
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */
             "ios" : {