You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by da...@apache.org on 2017/07/24 12:37:06 UTC
[14/50] incubator-weex git commit: + [ios] update no need logic
+ [ios] update no need logic
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/19294921
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/19294921
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/19294921
Branch: refs/heads/0.16-dev
Commit: 19294921258c4d33c3008dd368eee6ef4344efc4
Parents: 7c3b6cf
Author: 齐山 <su...@163.com>
Authored: Wed Jul 19 10:12:37 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Wed Jul 19 10:12:37 2017 +0800
----------------------------------------------------------------------
ios/playground/WeexDemo.xcodeproj/project.pbxproj | 13 ++++++++-----
ios/playground/WeexDemo/Scanner/WXScannerVC.m | 3 +--
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/19294921/ios/playground/WeexDemo.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/ios/playground/WeexDemo.xcodeproj/project.pbxproj b/ios/playground/WeexDemo.xcodeproj/project.pbxproj
index 4efef91..2edc462 100644
--- a/ios/playground/WeexDemo.xcodeproj/project.pbxproj
+++ b/ios/playground/WeexDemo.xcodeproj/project.pbxproj
@@ -30,6 +30,7 @@
846FC8DB1E1B853600949E7D /* WXATViewHierarchyPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = DCABAFF21D029685001C8592 /* WXATViewHierarchyPlugin.m */; };
84D7CAC71CE3266C00D48D46 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7475ACA01CD8444A0044E96C /* libsqlite3.0.tbd */; };
8A0B5EFFF75BF82EA481983D /* libPods-WeexUITestDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E48C20F443AA337D1FE97622 /* libPods-WeexUITestDemo.a */; };
+ C43CDA031F1C6E01005A6B03 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = C43CDA021F1C6E01005A6B03 /* libz.tbd */; };
DC20B8E61ECADA2500845F39 /* WXConfigCenterDefaultImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = DC20B8E51ECADA2500845F39 /* WXConfigCenterDefaultImpl.m */; };
DC5B53691E8CED9400E02125 /* WXScannerHistoryVC.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5B53681E8CED9400E02125 /* WXScannerHistoryVC.m */; };
DC5E503E1D0D97130059F0EB /* weex.png in Resources */ = {isa = PBXBuildFile; fileRef = DC5E503C1D0D97130059F0EB /* weex.png */; };
@@ -89,6 +90,7 @@
775BEE9A1C1E8ECC008D1629 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
84361D751CA10F8E00F43825 /* WeexUITestDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WeexUITestDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
9420131417A731ED089B0814 /* Pods-WeexDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WeexDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-WeexDemo/Pods-WeexDemo.release.xcconfig"; sourceTree = "<group>"; };
+ C43CDA021F1C6E01005A6B03 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
DC20B8E41ECADA2500845F39 /* WXConfigCenterDefaultImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXConfigCenterDefaultImpl.h; sourceTree = "<group>"; };
DC20B8E51ECADA2500845F39 /* WXConfigCenterDefaultImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXConfigCenterDefaultImpl.m; sourceTree = "<group>"; };
DC5B53671E8CED9400E02125 /* WXScannerHistoryVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WXScannerHistoryVC.h; path = Scanner/WXScannerHistoryVC.h; sourceTree = "<group>"; };
@@ -115,6 +117,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ C43CDA031F1C6E01005A6B03 /* libz.tbd in Frameworks */,
741DFE091DDDD519009B020F /* libstdc++.tbd in Frameworks */,
DC6DD9D21CFE9BC400549297 /* libsqlite3.0.tbd in Frameworks */,
EAEC716BE3E43DBC8494EC51 /* libPods-WeexDemo.a in Frameworks */,
@@ -155,6 +158,7 @@
327BB19797F63D5309FB91BF /* Frameworks */ = {
isa = PBXGroup;
children = (
+ C43CDA021F1C6E01005A6B03 /* libz.tbd */,
741DFE081DDDD519009B020F /* libstdc++.tbd */,
7475ACA01CD8444A0044E96C /* libsqlite3.0.tbd */,
7601607D735D7F8D88971230 /* libPods-WeexDemo.a */,
@@ -390,7 +394,6 @@
TargetAttributes = {
775BEE7A1C1E8ECC008D1629 = {
CreatedOnToolsVersion = 7.1.1;
- DevelopmentTeam = 6GASC5M8PU;
};
775BEE931C1E8ECC008D1629 = {
CreatedOnToolsVersion = 7.1.1;
@@ -708,7 +711,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- DEVELOPMENT_TEAM = 6GASC5M8PU;
+ DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -723,7 +726,7 @@
"$(inherited)",
"-licucore",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.taobao.WeexPlayground.jerry1;
+ PRODUCT_BUNDLE_IDENTIFIER = com.taobao.WeexPlayground;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
TARGETED_DEVICE_FAMILY = 1;
@@ -738,7 +741,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
- DEVELOPMENT_TEAM = 6GASC5M8PU;
+ DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -753,7 +756,7 @@
"$(inherited)",
"-licucore",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.taobao.WeexPlayground.jerry1;
+ PRODUCT_BUNDLE_IDENTIFIER = com.taobao.WeexPlayground;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
TARGETED_DEVICE_FAMILY = 1;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/19294921/ios/playground/WeexDemo/Scanner/WXScannerVC.m
----------------------------------------------------------------------
diff --git a/ios/playground/WeexDemo/Scanner/WXScannerVC.m b/ios/playground/WeexDemo/Scanner/WXScannerVC.m
index 72c09e6..056d678 100644
--- a/ios/playground/WeexDemo/Scanner/WXScannerVC.m
+++ b/ios/playground/WeexDemo/Scanner/WXScannerVC.m
@@ -22,8 +22,7 @@
#import "UIViewController+WXDemoNaviBar.h"
#import "WXDemoViewController.h"
#import "WXDebugTool.h"
-//#import <TBWXDevTool/WXDevTool.h>
-#import "WXDevTool.h"
+#import <TBWXDevTool/WXDevTool.h>
#import <AudioToolbox/AudioToolbox.h>
#import <WeexSDK/WeexSDK.h>