Skip to content

Commit

Permalink
Scan issue for screen got freeze, login API issue FIXED
Browse files Browse the repository at this point in the history
  • Loading branch information
@Test-msp
Test-msp committed Jul 10, 2020
1 parent fd6ab0b commit abf8758
Show file tree
Hide file tree
Showing 430 changed files with 23,884 additions and 12,857 deletions.
8 changes: 4 additions & 4 deletions FoodScan.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
000A852322115C640097B022 /* Embed Frameworks */,
CA4BE67B6D1DCA73F2776419 /* [CP] Embed Pods Frameworks */,
5B318DBA2286887F008CB362 /* ShellScript */,
A165839650F6B60AC7621F83 /* [CP] Copy Pods Resources */,
8FB03674B2FEDA926FD4AA61 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -893,7 +893,7 @@
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/FirebaseCrashlytics/run\"\n";
};
A165839650F6B60AC7621F83 /* [CP] Copy Pods Resources */ = {
8FB03674B2FEDA926FD4AA61 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand Down Expand Up @@ -1227,7 +1227,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = S2A23S7R4S;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -1282,7 +1282,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 3;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = S2A23S7R4S;
ENABLE_BITCODE = NO;
Expand Down
10 changes: 8 additions & 2 deletions FoodScan/Controller/HomeTabVC/ScanProductVC.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ class ScanProductVC: UIViewController{
override func viewDidLoad() {
super.viewDidLoad()
self.setUpCamera()

}

override func viewWillAppear(_ animated: Bool) {
Expand Down Expand Up @@ -371,13 +372,14 @@ extension ScanProductVC: AVCaptureMetadataOutputObjectsDelegate{
return
}
// Get the metadata object.
self.session.stopRunning()
// self.session.stopRunning()
if let metadataObject = metadataObjects.first {
guard let readableObject = metadataObject as? AVMetadataMachineReadableCodeObject
else { return }
guard let stringValue = readableObject.stringValue else { return }
AudioServicesPlaySystemSound(SystemSoundID(kSystemSoundID_Vibrate))
self.productCode = stringValue
self.session.stopRunning()
checkLoginAlert()
}
}
Expand Down Expand Up @@ -420,11 +422,15 @@ extension ScanProductVC
self.videoCapture.start()
}
}

})
}
else{
self.generateAlertWithOkButton(text: no_internet_connection)
if self.scanOptions == 1{
self.session.startRunning()
}else{
self.videoCapture.start()
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ target 'FoodScan' do
pod 'Cosmos', '~> 20.0'

# Text Recognization
# pod 'Firebase/Core'
pod 'Firebase/Core'
pod 'Firebase/MLVision'
pod 'Firebase/MLVisionTextModel'
pod 'Firebase/Crashlytics'
Expand Down
190 changes: 111 additions & 79 deletions Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,73 +1,90 @@
PODS:
- Alamofire (4.7.3)
- Cosmos (20.0.1)
- Firebase/CoreOnly (6.18.0):
- FirebaseCore (= 6.6.3)
- Firebase/Crashlytics (6.18.0):
- Firebase/Core (6.27.0):
- Firebase/CoreOnly
- FirebaseCrashlytics (~> 4.0.0-beta.4)
- Firebase/MLVision (6.18.0):
- FirebaseAnalytics (= 6.6.1)
- Firebase/CoreOnly (6.27.0):
- FirebaseCore (= 6.8.0)
- Firebase/Crashlytics (6.27.0):
- Firebase/CoreOnly
- FirebaseMLVision (~> 0.19.0)
- Firebase/MLVisionTextModel (6.18.0):
- FirebaseCrashlytics (~> 4.2.0)
- Firebase/MLVision (6.27.0):
- Firebase/CoreOnly
- FirebaseMLVisionTextModel (~> 0.19.0)
- FirebaseAnalyticsInterop (1.5.0)
- FirebaseCore (6.6.3):
- FirebaseCoreDiagnostics (~> 1.2)
- FirebaseCoreDiagnosticsInterop (~> 1.2)
- FirebaseMLVision (~> 0.20.1)
- Firebase/MLVisionTextModel (6.27.0):
- Firebase/CoreOnly
- FirebaseMLVisionTextModel (~> 0.20.0)
- FirebaseAnalytics (6.6.1):
- FirebaseCore (~> 6.8)
- FirebaseInstallations (~> 1.4)
- GoogleAppMeasurement (= 6.6.1)
- GoogleUtilities/AppDelegateSwizzler (~> 6.0)
- GoogleUtilities/MethodSwizzler (~> 6.0)
- GoogleUtilities/Network (~> 6.0)
- "GoogleUtilities/NSData+zlib (~> 6.0)"
- nanopb (~> 1.30905.0)
- FirebaseCore (6.8.0):
- FirebaseCoreDiagnostics (~> 1.3)
- GoogleUtilities/Environment (~> 6.5)
- GoogleUtilities/Logger (~> 6.5)
- FirebaseCoreDiagnostics (1.2.1):
- FirebaseCoreDiagnosticsInterop (~> 1.2)
- GoogleDataTransportCCTSupport (~> 1.3)
- FirebaseCoreDiagnostics (1.4.0):
- GoogleDataTransportCCTSupport (~> 3.1)
- GoogleUtilities/Environment (~> 6.5)
- GoogleUtilities/Logger (~> 6.5)
- nanopb (~> 0.3.901)
- FirebaseCoreDiagnosticsInterop (1.2.0)
- FirebaseCrashlytics (4.0.0-beta.4):
- FirebaseAnalyticsInterop (~> 1.2)
- FirebaseCore (~> 6.6)
- FirebaseInstanceID (~> 4.3)
- nanopb (~> 1.30905.0)
- FirebaseCrashlytics (4.2.0):
- FirebaseCore (~> 6.8)
- FirebaseInstallations (~> 1.1)
- GoogleDataTransport (~> 6.1)
- GoogleDataTransportCCTSupport (~> 3.1)
- nanopb (~> 1.30905.0)
- PromisesObjC (~> 1.2)
- FirebaseInstallations (1.1.0):
- FirebaseCore (~> 6.6)
- GoogleUtilities/UserDefaults (~> 6.5)
- FirebaseInstallations (1.4.0):
- FirebaseCore (~> 6.8)
- GoogleUtilities/Environment (~> 6.6)
- GoogleUtilities/UserDefaults (~> 6.6)
- PromisesObjC (~> 1.2)
- FirebaseInstanceID (4.3.2):
- FirebaseCore (~> 6.6)
- FirebaseInstanceID (4.4.0):
- FirebaseCore (~> 6.8)
- FirebaseInstallations (~> 1.0)
- GoogleUtilities/Environment (~> 6.5)
- GoogleUtilities/UserDefaults (~> 6.5)
- FirebaseMLCommon (0.19.0):
- FirebaseCore (~> 6.3)
- FirebaseInstanceID (~> 4.2)
- FirebaseMLCommon (0.20.1):
- FirebaseCore (~> 6.7)
- FirebaseInstanceID (~> 4.3)
- GoogleToolboxForMac/Logger (~> 2.1)
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
- "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)"
- GoogleUtilities/UserDefaults (~> 6.0)
- GTMSessionFetcher/Core (~> 1.1)
- Protobuf (~> 3.5)
- FirebaseMLVision (0.19.0):
- FirebaseCore (~> 6.3)
- FirebaseMLCommon (~> 0.19)
- Protobuf (~> 3.12)
- FirebaseMLVision (0.20.1):
- FirebaseCore (~> 6.7)
- FirebaseMLCommon (~> 0.20)
- GoogleAPIClientForREST/Core (~> 1.3)
- GoogleAPIClientForREST/Vision (~> 1.3)
- GoogleToolboxForMac/Logger (~> 2.1)
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
- GTMSessionFetcher/Core (~> 1.1)
- Protobuf (~> 3.5)
- FirebaseMLVisionTextModel (0.19.0):
- FirebaseMLVision (~> 0.19)
- GoogleAPIClientForREST/Core (1.3.11):
- Protobuf (~> 3.12)
- FirebaseMLVisionTextModel (0.20.0):
- FirebaseMLVision (~> 0.20)
- GoogleAPIClientForREST/Core (1.4.2):
- GTMSessionFetcher (>= 1.1.7)
- GoogleAPIClientForREST/Vision (1.3.11):
- GoogleAPIClientForREST/Vision (1.4.2):
- GoogleAPIClientForREST/Core
- GTMSessionFetcher (>= 1.1.7)
- GoogleDataTransport (4.0.1)
- GoogleDataTransportCCTSupport (1.4.1):
- GoogleDataTransport (~> 4.0)
- nanopb (~> 0.3.901)
- GoogleAppMeasurement (6.6.1):
- GoogleUtilities/AppDelegateSwizzler (~> 6.0)
- GoogleUtilities/MethodSwizzler (~> 6.0)
- GoogleUtilities/Network (~> 6.0)
- "GoogleUtilities/NSData+zlib (~> 6.0)"
- nanopb (~> 1.30905.0)
- GoogleDataTransport (6.2.1)
- GoogleDataTransportCCTSupport (3.2.0):
- GoogleDataTransport (~> 6.1)
- nanopb (~> 1.30905.0)
- GoogleToolboxForMac/DebugUtils (2.2.2):
- GoogleToolboxForMac/Defines (= 2.2.2)
- GoogleToolboxForMac/Defines (2.2.2)
Expand All @@ -80,29 +97,43 @@ PODS:
- GoogleToolboxForMac/Defines (= 2.2.2)
- "GoogleToolboxForMac/NSString+URLArguments (= 2.2.2)"
- "GoogleToolboxForMac/NSString+URLArguments (2.2.2)"
- GoogleUtilities/Environment (6.5.1)
- GoogleUtilities/Logger (6.5.1):
- GoogleUtilities/AppDelegateSwizzler (6.6.0):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Environment (6.6.0):
- PromisesObjC (~> 1.2)
- GoogleUtilities/Logger (6.6.0):
- GoogleUtilities/Environment
- GoogleUtilities/UserDefaults (6.5.1):
- GoogleUtilities/MethodSwizzler (6.6.0):
- GoogleUtilities/Logger
- GoogleUtilities/Network (6.6.0):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (6.6.0)"
- GoogleUtilities/Reachability (6.6.0):
- GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (6.6.0):
- GoogleUtilities/Logger
- GTMSessionFetcher (1.3.1):
- GTMSessionFetcher/Full (= 1.3.1)
- GTMSessionFetcher/Core (1.3.1)
- GTMSessionFetcher/Full (1.3.1):
- GTMSessionFetcher/Core (= 1.3.1)
- GTMSessionFetcher (1.4.0):
- GTMSessionFetcher/Full (= 1.4.0)
- GTMSessionFetcher/Core (1.4.0)
- GTMSessionFetcher/Full (1.4.0):
- GTMSessionFetcher/Core (= 1.4.0)
- IQKeyboardManagerSwift (6.2.0)
- MarqueeLabel/Swift (3.2.0)
- nanopb (0.3.9011):
- nanopb/decode (= 0.3.9011)
- nanopb/encode (= 0.3.9011)
- nanopb/decode (0.3.9011)
- nanopb/encode (0.3.9011)
- nanopb (1.30905.0):
- nanopb/decode (= 1.30905.0)
- nanopb/encode (= 1.30905.0)
- nanopb/decode (1.30905.0)
- nanopb/encode (1.30905.0)
- NotificationBannerSwift (1.7.3):
- MarqueeLabel/Swift (~> 3.2.0)
- SnapKit (~> 4.0.1)
- Popover (1.2.2)
- PromisesObjC (1.2.8)
- Protobuf (3.11.4)
- PromisesObjC (1.2.9)
- Protobuf (3.12.0)
- SDWebImage (4.4.2):
- SDWebImage/Core (= 4.4.2)
- SDWebImage/Core (4.4.2)
Expand All @@ -113,6 +144,7 @@ PODS:
DEPENDENCIES:
- Alamofire
- Cosmos (~> 20.0)
- Firebase/Core
- Firebase/Crashlytics
- Firebase/MLVision
- Firebase/MLVisionTextModel
Expand All @@ -128,17 +160,17 @@ SPEC REPOS:
- Alamofire
- Cosmos
- Firebase
- FirebaseAnalyticsInterop
- FirebaseAnalytics
- FirebaseCore
- FirebaseCoreDiagnostics
- FirebaseCoreDiagnosticsInterop
- FirebaseCrashlytics
- FirebaseInstallations
- FirebaseInstanceID
- FirebaseMLCommon
- FirebaseMLVision
- FirebaseMLVisionTextModel
- GoogleAPIClientForREST
- GoogleAppMeasurement
- GoogleDataTransport
- GoogleDataTransportCCTSupport
- GoogleToolboxForMac
Expand All @@ -159,35 +191,35 @@ SPEC REPOS:
SPEC CHECKSUMS:
Alamofire: c7287b6e5d7da964a70935e5db17046b7fde6568
Cosmos: b47fddf2102bb48580cd3025d9ce0a5c658a65da
Firebase: 0490eca762a72e4f1582319539153897f1508dee
FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae
FirebaseCore: 78276943ad85e616dfa54dafa6c89512987d9d60
FirebaseCoreDiagnostics: 2109d10c35e8289b1ee6cabf44d9ffb055620194
FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850
FirebaseCrashlytics: 1dff71c846a3a138f524f79d4740ffed5fdd0c04
FirebaseInstallations: 575cd32f2aec0feeb0e44f5d0110a09e5e60b47b
FirebaseInstanceID: 7ee0d6777013bb952f377b41965bf132b6a075be
FirebaseMLCommon: 074a67e05122b1c9f6401a4e33b2cea3b4efd224
FirebaseMLVision: 7a456009787690e3b53436092ae9b635563de8f3
FirebaseMLVisionTextModel: c264caa3100ca804580bf2a7c1cb9ff390d1f471
GoogleAPIClientForREST: 0f19a8280dfe6471f76016645d26eb5dae305101
GoogleDataTransport: 653963cf5be60fb59cf051e070f0836fdc305f81
GoogleDataTransportCCTSupport: 84e4d4bbab642f2e9d83ee65d78aca2b5527d314
Firebase: fc4cbf6f1592636431821ef9a3c557e4dfd9f268
FirebaseAnalytics: 0ea640473474f036cabbc2576e20c2d63671c92f
FirebaseCore: feda061cb1ee6d8ad4824f4a4a8ffbcfe284f595
FirebaseCoreDiagnostics: 4505e4d4009b1d93f605088ee7d7764d5f0d1c84
FirebaseCrashlytics: 7d0fa02ea8842cc4b2ab07b0735edafde1ad77d6
FirebaseInstallations: 293f567159b6d66d1c990f13bb868066096c94ec
FirebaseInstanceID: 3b119bfe90e904851218159c9a4ecb847cc51d18
FirebaseMLCommon: 5e1184cfdddbd097f55cad75b598881d348d900f
FirebaseMLVision: 485358b97d3332669ecc4fed55ee360aaef2813d
FirebaseMLVisionTextModel: 2ec9bf2287b29ef2b7d79152aad454cce5bc3040
GoogleAPIClientForREST: 9f49df9fac7867b459187e687fed3066b2be049a
GoogleAppMeasurement: 2fd5c5a56c069db635c8e7b92d4809a9591d0a69
GoogleDataTransport: 9a8a16f79feffc7f42096743de2a7c4815e84020
GoogleDataTransportCCTSupport: 489c1265d2c85b68187a83a911913d190012158d
GoogleToolboxForMac: 800648f8b3127618c1b59c7f97684427630c5ea3
GoogleUtilities: 06eb53bb579efe7099152735900dd04bf09e7275
GTMSessionFetcher: cea130bbfe5a7edc8d06d3f0d17288c32ffe9925
GoogleUtilities: 39530bc0ad980530298e9c4af8549e991fd033b1
GTMSessionFetcher: 6f5c8abbab8a9bce4bb3f057e317728ec6182b10
IQKeyboardManagerSwift: b07ccf9d8cafe993dcd6cb794eb4ba34611a0c4e
MarqueeLabel: 440a502b91a9179bd98f9fff00ba1150650a1c0e
nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd
nanopb: c43f40fadfe79e8b8db116583945847910cbabc9
NotificationBannerSwift: c9f4bc868d78df975ed59c0b2fccdbbe0e863efe
Popover: 21e357f86d45c8d9e29a41a4adbca3664d6e511f
PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6
Protobuf: 176220c526ad8bd09ab1fb40a978eac3fef665f7
PromisesObjC: b48e0338dbbac2207e611750777895f7a5811b75
Protobuf: 2793fcd0622a00b546c60e7cbbcc493e043e9bb9
SDWebImage: 624d6e296c69b244bcede364c72ae0430ac14681
SnapKit: 0de968a9fec17499afa29683b05d0c775b6d1c29
SwiftyJSON: c4bcba26dd9ec7a027fc8eade48e2c911f229e96
UILoadControl: e742ddbe4c67ba1f13b00b7d462d4141307d021f

PODFILE CHECKSUM: 8c713f5133988e4ef9222c95efa9cf1d9b3f112c
PODFILE CHECKSUM: 89c1cd1b108b9932cfe1cd5e08880e958ddcff2c

COCOAPODS: 1.8.4
Loading

0 comments on commit abf8758

Please sign in to comment.