Merge pull request #24 in BPHVB/mvm_core from feature/fix_canned_json_flow to develop

* commit '80ba74c932817b14c9e35367ad9435215fa2a8c2':
  MVMCoreLog import
  Remove unused canned.json from resources. HardCodedServerResponse uses the one from the main bundle if enabled and file exists.
This commit is contained in:
Sommer, Patrick 2018-07-20 09:47:11 -04:00
commit cc4fd0a1f9
3 changed files with 2 additions and 683 deletions

View File

@ -118,7 +118,6 @@
AFBB96B81FBA3CEC0008D868 /* MVMCoreActionDelegateProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = AFBB96B51FBA3CEC0008D868 /* MVMCoreActionDelegateProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
AFBB96B91FBA3CEC0008D868 /* MVMCoreActionHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = AFBB96B61FBA3CEC0008D868 /* MVMCoreActionHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
AFBB96BA1FBA3CEC0008D868 /* MVMCoreActionHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = AFBB96B71FBA3CEC0008D868 /* MVMCoreActionHandler.m */; };
AFBB96EB1FBA4A260008D868 /* canned.json in Resources */ = {isa = PBXBuildFile; fileRef = AFBB96E81FBA4A260008D868 /* canned.json */; };
AFBB96EC1FBA4A260008D868 /* MFHardCodedServerResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = AFBB96E91FBA4A260008D868 /* MFHardCodedServerResponse.h */; };
AFBB96ED1FBA4A260008D868 /* MFHardCodedServerResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = AFBB96EA1FBA4A260008D868 /* MFHardCodedServerResponse.m */; };
AFC5FA161FFC2E2A00C244CF /* MVMCoreGlobalTopAlertDelegateProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = AFC5FA141FFC2E2A00C244CF /* MVMCoreGlobalTopAlertDelegateProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
@ -248,7 +247,6 @@
AFBB96B61FBA3CEC0008D868 /* MVMCoreActionHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MVMCoreActionHandler.h; sourceTree = "<group>"; };
AFBB96B71FBA3CEC0008D868 /* MVMCoreActionHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MVMCoreActionHandler.m; sourceTree = "<group>"; };
AFBB96D21FBA44420008D868 /* VZWAuthentication.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VZWAuthentication.framework; path = ../../SharedFrameworks/VZWAuthentication.framework; sourceTree = "<group>"; };
AFBB96E81FBA4A260008D868 /* canned.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = canned.json; sourceTree = "<group>"; };
AFBB96E91FBA4A260008D868 /* MFHardCodedServerResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFHardCodedServerResponse.h; sourceTree = "<group>"; };
AFBB96EA1FBA4A260008D868 /* MFHardCodedServerResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFHardCodedServerResponse.m; sourceTree = "<group>"; };
AFC5FA141FFC2E2A00C244CF /* MVMCoreGlobalTopAlertDelegateProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreGlobalTopAlertDelegateProtocol.h; sourceTree = "<group>"; };
@ -574,7 +572,6 @@
AFBB96E71FBA4A260008D868 /* HardCodedServerResponse */ = {
isa = PBXGroup;
children = (
AFBB96E81FBA4A260008D868 /* canned.json */,
AFBB96E91FBA4A260008D868 /* MFHardCodedServerResponse.h */,
AFBB96EA1FBA4A260008D868 /* MFHardCodedServerResponse.m */,
);
@ -733,7 +730,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
AFBB96EB1FBA4A260008D868 /* canned.json in Resources */,
AF26DDAE1FCE6A37004E8F65 /* Localizable.strings in Resources */,
AFBB96561FBA3A570008D868 /* freebee.json in Resources */,
AFBB96591FBA3A570008D868 /* freebeelaunchApp.json in Resources */,

View File

@ -9,6 +9,7 @@
#import "MFHardCodedServerResponse.h"
#import "MVMCoreRequestParameters.h"
#import "NSDictionary+MFConvenience.h"
#import "MVMCoreLoggingHandler.h"
#if ENABLE_HARD_CODED_RESPONSE
@ -48,7 +49,7 @@
if(error) {
MVMCoreLog(@"Error creating JSON!");
} else {
//DLog(@"Canned json responses:%@", jsonObj);
//MVMCoreLog(@"Loaded canned json responses:\n%@", jsonObj);
}
}
}

View File

@ -1,678 +0,0 @@
{
"selectFeedbackSource": {
"ResponseInfo": {
"locale": "EN",
"server": "twswcmvmzad03.tdc.vzwcorp.com-srv01_nmobilefirst01",
"userMessage": "0",
"code": "00000",
"message": "0",
"mdn": "7323798012",
"buildNumber": "9633",
"type": "Success",
"requestId": "990372c1-19de-44b1-935f-6cedfbe36d41"
},
"Page": {
"pageType": "exploreZoneRtl",
"parentPageType": "visitUsRtl",
"tab": [
{
"actionType": "openPage",
"pageType": "exploreZoneRtl",
"extraParameters": {
"zoneId": "90",
"zoneName": "GetFitZone"
},
"itemName": "Get Fit",
"title": "Get Fit",
"appContext": "mobileFirstSS",
"modules": [
"GetFitZone"
]
},
{
"actionType": "openPage",
"pageType": "exploreZoneRtl",
"extraParameters": {
"zoneId": "91",
"zoneName": "AmplifyItZone"
},
"itemName": "Amplify It",
"title": "Amplify It",
"appContext": "mobileFirstSS",
"modules": [
"AmplifyItZone"
]
},
{
"actionType": "openPage",
"pageType": "exploreZoneRtl",
"extraParameters": {
"zoneId": "93",
"zoneName": "HomeServicesZone"
},
"itemName": "Home Service",
"title": "Home Service",
"appContext": "mobileFirstSS",
"modules": [
"HomeServicesZone"
]
}
],
"beaconids": [
{
"tabIndex": 0,
"minor": 23233,
"zoneId": 90,
"major": 7203,
"locationCode": "W078801",
"header": null
},
{
"tabIndex": 1,
"minor": 23424,
"zoneId": 91,
"major": 7203,
"locationCode": "W078801",
"header": null
},
{
"tabIndex": 2,
"minor": 24016,
"zoneId": 93,
"major": 7203,
"locationCode": "W078801",
"header": null
}
],
"title": "Title",
"message": "Please enable your Bluetooth to detect the zone you are exploring",
"currentTabIndex": 1,
"ButtonMap": {
"AsyncCallButton": {
"actionType": "openPage",
"pageType": "exploreZoneModAsyncRtl",
"tryToReplaceFirst": false,
"title": "Explore Zone Async Call",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
}
},
"screenHeading": "Explore Products"
},
"ModuleMap": {
"AmplifyItZone": {
"mappoint": "AmplifyItZone",
"zoneId": "91",
"name": "Amplify It",
"ResponseInfo": {
"locale": "EN",
"code": "00000",
"message": "0",
"userMessage": "0",
"type": "Success"
},
"skuList": [
[
{
"deviceTitle": "Flip 2",
"stockInWarehouse": false,
"colorCode": "#003399",
"colorName": "Blue",
"isDevice": false,
"discountFlag": false,
"imageUrl": "https://mobile-edev.vzw.com/dev01/geofencing/instore/images/smart/s7/is/image/VerizonWireless/jbl-flip-2-blue-FLIPIIBLUAM-imageset?$acc-lg$",
"preSelected": false,
"qty": 349991,
"skuId": "FLIPIIBLUAM",
"ButtonMap": {
"PrimaryButton": {
"actionType": "openPage",
"pageType": "addToSharedCartRtl",
"extraParameters": {
"cmd": "add",
"cart": [
{
"sku": "FLIPIIBLUAM",
"qty": 1
}
]
},
"presentationStyle": "push",
"tryToReplaceFirst": false,
"title": "Add to cart",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
},
"MoreColors": {
"actionType": "openPage",
"pageType": "exploreZoneMoreClrsRtl",
"extraParameters": {
"sku": "FLIPIIBLUAM"
},
"tryToReplaceFirst": false,
"title": "More colors",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
},
"SecondaryButton": {
"actionType": "openPage",
"pageType": "getPDPBySKURtl",
"extraParameters": {
"sku": "FLIPIIBLUAM"
},
"presentationStyle": "push",
"tryToReplaceFirst": false,
"title": "Learn more",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
}
},
"inStorePurchase": false,
"fallBackImageUrl": "ICON_DFLT_ACCESSORY_IMG",
"accessoryId": "acc2040005",
"inventoryMsg": "In stock, take it with you today.",
"priceMap": {
"netPrice": {
"price": "79.98"
},
"discountPrice": {
"price": "0"
},
"originalPrice": {
"price": "79.98"
}
},
"device": false,
"sorId": "sku870003",
"stockInStore": true
},
{
"deviceTitle": "Flip 2",
"stockInWarehouse": false,
"colorCode": "#000000",
"colorName": "Black",
"isDevice": false,
"discountFlag": false,
"imageUrl": "https://mobile-edev.vzw.com/dev01/geofencing/instore/images/smart/s7/is/image/VerizonWireless/jbl-flip-2-black-FLIPIIBLKAM-imageset?$acc-lg$",
"preSelected": true,
"qty": 349880,
"skuId": "FLIPIIBLKAM",
"ButtonMap": {
"PrimaryButton": {
"actionType": "openPage",
"pageType": "addToSharedCartRtl",
"extraParameters": {
"cmd": "add",
"cart": [
{
"sku": "FLIPIIBLKAM",
"qty": 1
}
]
},
"presentationStyle": "push",
"tryToReplaceFirst": false,
"title": "Add to cart",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
},
"MoreColors": {
"actionType": "openPage",
"pageType": "exploreZoneMoreClrsRtl",
"extraParameters": {
"sku": "FLIPIIBLKAM"
},
"tryToReplaceFirst": false,
"title": "More colors",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
},
"SecondaryButton": {
"actionType": "openPage",
"pageType": "getPDPBySKURtl",
"extraParameters": {
"sku": "FLIPIIBLKAM"
},
"presentationStyle": "push",
"tryToReplaceFirst": false,
"title": "Learn more",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
}
},
"inStorePurchase": false,
"fallBackImageUrl": "ICON_DFLT_ACCESSORY_IMG",
"accessoryId": "acc2040005",
"inventoryMsg": "In stock, take it with you today.",
"priceMap": {
"netPrice": {
"price": "69.98"
},
"discountPrice": {
"price": "0"
},
"originalPrice": {
"price": "69.98"
}
},
"device": false,
"sorId": "sku870008",
"stockInStore": true
},
{
"deviceTitle": "Flip 2",
"stockInWarehouse": false,
"colorCode": "#ff0000",
"colorName": "Red",
"isDevice": false,
"discountFlag": false,
"imageUrl": "https://mobile-edev.vzw.com/dev01/geofencing/instore/images/smart/s7/is/image/VerizonWireless/jbl-flip-2-red-FLIPIIREDAM-imageset?$acc-lg$",
"preSelected": false,
"qty": 349989,
"skuId": "FLIPIIREDAM",
"ButtonMap": {
"PrimaryButton": {
"actionType": "openPage",
"pageType": "addToSharedCartRtl",
"extraParameters": {
"cmd": "add",
"cart": [
{
"sku": "FLIPIIREDAM",
"qty": 1
}
]
},
"presentationStyle": "push",
"tryToReplaceFirst": false,
"title": "Add to cart",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
},
"MoreColors": {
"actionType": "openPage",
"pageType": "exploreZoneMoreClrsRtl",
"extraParameters": {
"sku": "FLIPIIREDAM"
},
"tryToReplaceFirst": false,
"title": "More colors",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
},
"SecondaryButton": {
"actionType": "openPage",
"pageType": "getPDPBySKURtl",
"extraParameters": {
"sku": "FLIPIIREDAM"
},
"presentationStyle": "push",
"tryToReplaceFirst": false,
"title": "Learn more",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
}
},
"inStorePurchase": false,
"fallBackImageUrl": "ICON_DFLT_ACCESSORY_IMG",
"accessoryId": "acc2040005",
"inventoryMsg": "In stock, take it with you today.",
"priceMap": {
"netPrice": {
"price": "79.98"
},
"discountPrice": {
"price": "0"
},
"originalPrice": {
"price": "79.98"
}
},
"device": false,
"sorId": "sku870005",
"stockInStore": true
},
{
"deviceTitle": "Flip 2",
"stockInWarehouse": false,
"colorCode": "#FFFF00",
"colorName": "Yellow",
"isDevice": false,
"discountFlag": false,
"imageUrl": "https://mobile-edev.vzw.com/dev01/geofencing/instore/images/smart/s7/is/image/VerizonWireless/jbl-flip-2-yellow-FLIPIIYELAM-imageset?$acc-lg$",
"preSelected": false,
"qty": 350000,
"skuId": "FLIPIIYELAM",
"ButtonMap": {
"PrimaryButton": {
"actionType": "openPage",
"pageType": "addToSharedCartRtl",
"extraParameters": {
"cmd": "add",
"cart": [
{
"sku": "FLIPIIYELAM",
"qty": 1
}
]
},
"presentationStyle": "push",
"tryToReplaceFirst": false,
"title": "Add to cart",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
},
"MoreColors": {
"actionType": "openPage",
"pageType": "exploreZoneMoreClrsRtl",
"extraParameters": {
"sku": "FLIPIIYELAM"
},
"tryToReplaceFirst": false,
"title": "More colors",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
},
"SecondaryButton": {
"actionType": "openPage",
"pageType": "getPDPBySKURtl",
"extraParameters": {
"sku": "FLIPIIYELAM"
},
"presentationStyle": "push",
"tryToReplaceFirst": false,
"title": "Learn more",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
}
},
"inStorePurchase": false,
"fallBackImageUrl": "ICON_DFLT_ACCESSORY_IMG",
"accessoryId": "acc2040005",
"inventoryMsg": "In stock, take it with you today.",
"priceMap": {
"netPrice": {
"price": "79.98"
},
"discountPrice": {
"price": "0"
},
"originalPrice": {
"price": "79.98"
}
},
"device": false,
"sorId": "sku870006",
"stockInStore": true
},
{
"deviceTitle": "Flip 2",
"stockInWarehouse": false,
"colorCode": "#FFFFFF",
"colorName": "White",
"isDevice": false,
"discountFlag": false,
"imageUrl": "https://mobile-edev.vzw.com/dev01/geofencing/instore/images/smart/s7/is/image/VerizonWireless/jbl-flip-2-white-FLIPIIWHTAM-imageset?$acc-lg$",
"preSelected": false,
"qty": 349999,
"skuId": "FLIPIIWHTAM",
"ButtonMap": {
"PrimaryButton": {
"actionType": "openPage",
"pageType": "addToSharedCartRtl",
"extraParameters": {
"cmd": "add",
"cart": [
{
"sku": "FLIPIIWHTAM",
"qty": 1
}
]
},
"presentationStyle": "push",
"tryToReplaceFirst": false,
"title": "Add to cart",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
},
"MoreColors": {
"actionType": "openPage",
"pageType": "exploreZoneMoreClrsRtl",
"extraParameters": {
"sku": "FLIPIIWHTAM"
},
"tryToReplaceFirst": false,
"title": "More colors",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
},
"SecondaryButton": {
"actionType": "openPage",
"pageType": "getPDPBySKURtl",
"extraParameters": {
"sku": "FLIPIIWHTAM"
},
"presentationStyle": "push",
"tryToReplaceFirst": false,
"title": "Learn more",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
}
},
"inStorePurchase": false,
"fallBackImageUrl": "ICON_DFLT_ACCESSORY_IMG",
"accessoryId": "acc2040005",
"inventoryMsg": "In stock, take it with you today.",
"priceMap": {
"netPrice": {
"price": "79.98"
},
"discountPrice": {
"price": "0"
},
"originalPrice": {
"price": "79.98"
}
},
"device": false,
"sorId": "sku870007",
"stockInStore": true
}
],
[
{
"deviceTitle": "QuietComfort 25 Acoustic Noise Cancelling headphones - Apple devices",
"stockInWarehouse": false,
"colorCode": "#FFFFFF",
"colorName": "White",
"isDevice": false,
"discountFlag": false,
"imageUrl": "https://mobile-edev.vzw.com/dev01/geofencing/instore/images/smart/s7/is/image/VerizonWireless/bose-quietcomfort-25-acoustic-noise-cancelling-headphones-white-iset-715053-0020?$acc-lg$",
"preSelected": false,
"qty": 99986,
"skuId": "715053-0020",
"ButtonMap": {
"PrimaryButton": {
"actionType": "openPage",
"pageType": "addToSharedCartRtl",
"extraParameters": {
"cmd": "add",
"cart": [
{
"sku": "715053-0020",
"qty": 1
}
]
},
"presentationStyle": "push",
"tryToReplaceFirst": false,
"title": "Add to cart",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
},
"MoreColors": {
"actionType": "openPage",
"pageType": "exploreZoneMoreClrsRtl",
"extraParameters": {
"sku": "715053-0020"
},
"tryToReplaceFirst": false,
"title": "More colors",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
},
"SecondaryButton": {
"actionType": "openPage",
"pageType": "getPDPBySKURtl",
"extraParameters": {
"sku": "715053-0020"
},
"presentationStyle": "push",
"tryToReplaceFirst": false,
"title": "Learn more",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
}
},
"inStorePurchase": false,
"fallBackImageUrl": "ICON_DFLT_ACCESSORY_IMG",
"accessoryId": "acc4120007",
"inventoryMsg": "In stock, take it with you today.",
"priceMap": {
"netPrice": {
"price": "299.99"
},
"discountPrice": {
"price": "0"
},
"originalPrice": {
"price": "299.99"
}
},
"device": false,
"sorId": "sku1450111",
"stockInStore": true
},
{
"deviceTitle": "QuietComfort 25 Acoustic Noise Cancelling headphones - Apple devices",
"stockInWarehouse": false,
"colorCode": "#000000",
"colorName": "Black",
"isDevice": false,
"discountFlag": false,
"imageUrl": "https://mobile-edev.vzw.com/dev01/geofencing/instore/images/smart/s7/is/image/VerizonWireless/bose-quietcomfort-25-acoustic-noise-cancelling-headphones-black-iset-715053-0010?$acc-lg$",
"preSelected": true,
"qty": 99974,
"skuId": "715053-0010",
"ButtonMap": {
"PrimaryButton": {
"actionType": "openPage",
"pageType": "addToSharedCartRtl",
"extraParameters": {
"cmd": "add",
"cart": [
{
"sku": "715053-0010",
"qty": 1
}
]
},
"presentationStyle": "push",
"tryToReplaceFirst": false,
"title": "Add to cart",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
},
"MoreColors": {
"actionType": "openPage",
"pageType": "exploreZoneMoreClrsRtl",
"extraParameters": {
"sku": "715053-0010"
},
"tryToReplaceFirst": false,
"title": "More colors",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
},
"SecondaryButton": {
"actionType": "openPage",
"pageType": "getPDPBySKURtl",
"extraParameters": {
"sku": "715053-0010"
},
"presentationStyle": "push",
"tryToReplaceFirst": false,
"title": "Learn more",
"selected": false,
"disableAction": false,
"appContext": "mobileFirstSS",
"isSelected": false
}
},
"inStorePurchase": false,
"fallBackImageUrl": "ICON_DFLT_ACCESSORY_IMG",
"accessoryId": "acc4120007",
"inventoryMsg": "In stock, take it with you today.",
"priceMap": {
"netPrice": {
"price": "299.99"
},
"discountPrice": {
"price": "0"
},
"originalPrice": {
"price": "299.99"
}
},
"device": false,
"sorId": "sku1450115",
"stockInStore": true
}
]
]
}
}
}
}