Panagiotis Triantafyllou

new inbox

...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library' ...@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
2 2
3 ext { 3 ext {
4 PUBLISH_GROUP_ID = 'ly.warp' 4 PUBLISH_GROUP_ID = 'ly.warp'
5 - PUBLISH_VERSION = '4.5.4-cosbeta36' 5 + PUBLISH_VERSION = '4.5.4-cosbeta37i'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
......
...@@ -70,8 +70,8 @@ public class BaseFragmentActivity extends FragmentActivity implements Navigation ...@@ -70,8 +70,8 @@ public class BaseFragmentActivity extends FragmentActivity implements Navigation
70 new Thread(() -> { 70 new Thread(() -> {
71 if (!Thread.currentThread().isInterrupted()) { 71 if (!Thread.currentThread().isInterrupted()) {
72 // WarplyManager.getConsumer(new WarplyConsumerRequest(), mConsumerReceiver); 72 // WarplyManager.getConsumer(new WarplyConsumerRequest(), mConsumerReceiver);
73 - Warply.getInbox(new WarplyInboxRequest().setUseCache(false), mInboxReceiver); 73 +// Warply.getInbox(new WarplyInboxRequest().setUseCache(false), mInboxReceiver);
74 -// WarplyManager.getCampaigns(new WarplyGetCampaignsRequest().setLanguage("en"), mCampaignsCallback); 74 + WarplyManager.getCampaigns(new WarplyGetCampaignsRequest().setLanguage("en"), mCampaignsCallback);
75 } 75 }
76 }).start(); 76 }).start();
77 } 77 }
...@@ -207,9 +207,9 @@ public class BaseFragmentActivity extends FragmentActivity implements Navigation ...@@ -207,9 +207,9 @@ public class BaseFragmentActivity extends FragmentActivity implements Navigation
207 } 207 }
208 }; 208 };
209 209
210 - private CallbackReceiver<NewCampaignList> mCampaignsCallback = new CallbackReceiver<NewCampaignList>() { 210 + private CallbackReceiver<CampaignList> mCampaignsCallback = new CallbackReceiver<CampaignList>() {
211 @Override 211 @Override
212 - public void onSuccess(NewCampaignList result) { 212 + public void onSuccess(CampaignList result) {
213 WarplyManager.getUserCouponsWithCouponsets(new WarplyUserCouponsRequest(), mUserCouponsReceiver); 213 WarplyManager.getUserCouponsWithCouponsets(new WarplyUserCouponsRequest(), mUserCouponsReceiver);
214 } 214 }
215 215
......
...@@ -27,6 +27,9 @@ package ly.warp.sdk.io.callbacks; ...@@ -27,6 +27,9 @@ package ly.warp.sdk.io.callbacks;
27 27
28 import org.json.JSONObject; 28 import org.json.JSONObject;
29 29
30 +import ly.warp.sdk.io.models.Campaign;
31 +import ly.warp.sdk.io.models.CampaignList;
32 +import ly.warp.sdk.io.models.NewCampaign;
30 import ly.warp.sdk.io.models.NewCampaignList; 33 import ly.warp.sdk.io.models.NewCampaignList;
31 34
32 /** 35 /**
...@@ -35,10 +38,10 @@ import ly.warp.sdk.io.models.NewCampaignList; ...@@ -35,10 +38,10 @@ import ly.warp.sdk.io.models.NewCampaignList;
35 38
36 public class NewCampaignsHook implements CallbackReceiver<JSONObject> { 39 public class NewCampaignsHook implements CallbackReceiver<JSONObject> {
37 40
38 - private final CallbackReceiver<NewCampaignList> mListener; 41 + private final CallbackReceiver<CampaignList> mListener;
39 private final String mRequestSignature; 42 private final String mRequestSignature;
40 43
41 - public NewCampaignsHook(CallbackReceiver<NewCampaignList> listener, String requestSignature) { 44 + public NewCampaignsHook(CallbackReceiver<CampaignList> listener, String requestSignature) {
42 this.mListener = listener; 45 this.mListener = listener;
43 this.mRequestSignature = requestSignature; 46 this.mRequestSignature = requestSignature;
44 } 47 }
...@@ -48,7 +51,36 @@ public class NewCampaignsHook implements CallbackReceiver<JSONObject> { ...@@ -48,7 +51,36 @@ public class NewCampaignsHook implements CallbackReceiver<JSONObject> {
48 if (mListener != null) { 51 if (mListener != null) {
49 int status = result.optInt("status", 2); 52 int status = result.optInt("status", 2);
50 if (status == 1) { 53 if (status == 1) {
51 - mListener.onSuccess(new NewCampaignList(result, mRequestSignature)); 54 + NewCampaignList cmpList = new NewCampaignList(result, mRequestSignature);
55 + CampaignList tempCampaigns = new CampaignList();
56 + for (NewCampaign newCamp : cmpList) {
57 + Campaign camp = new Campaign();
58 + camp.setIndexUrl(newCamp.getIndexUrl());
59 + camp.setLogoUrl(newCamp.getLogoUrl());
60 + camp.setMessage(newCamp.getMessage());
61 + camp.setOfferCategory(newCamp.getCommunicationCategory());
62 + camp.setSessionUUID(newCamp.getCommunicationUUID());
63 + camp.setTitle(newCamp.getTitle());
64 + camp.setSubtitle(newCamp.getSubtitle());
65 + camp.setSorting(newCamp.getSorting());
66 + camp.setNew(newCamp.getIsNew());
67 + camp.setType(newCamp.getCampaignType());
68 + try {
69 + camp.setExtraFields(newCamp.getExtraFields().toString());
70 + } catch (NullPointerException e) {
71 + camp.setExtraFields("");
72 + e.printStackTrace();
73 + }
74 +
75 + try {
76 + camp.setCampaignTypeSettings(newCamp.getSettings().toString());
77 + } catch (NullPointerException e) {
78 + camp.setCampaignTypeSettings("");
79 + e.printStackTrace();
80 + }
81 + tempCampaigns.add(camp);
82 + }
83 + mListener.onSuccess(tempCampaigns);
52 } else 84 } else
53 mListener.onFailure(status); 85 mListener.onFailure(status);
54 } 86 }
......
...@@ -32,7 +32,6 @@ import org.json.JSONObject; ...@@ -32,7 +32,6 @@ import org.json.JSONObject;
32 import java.util.ArrayList; 32 import java.util.ArrayList;
33 33
34 import ly.warp.sdk.Warply; 34 import ly.warp.sdk.Warply;
35 -import ly.warp.sdk.activities.BaseFragmentActivity;
36 import ly.warp.sdk.db.WarplyDBHelper; 35 import ly.warp.sdk.db.WarplyDBHelper;
37 import ly.warp.sdk.io.callbacks.AddressHook; 36 import ly.warp.sdk.io.callbacks.AddressHook;
38 import ly.warp.sdk.io.callbacks.CallbackReceiver; 37 import ly.warp.sdk.io.callbacks.CallbackReceiver;
...@@ -129,7 +128,7 @@ import ly.warp.sdk.utils.constants.WarpConstants; ...@@ -129,7 +128,7 @@ import ly.warp.sdk.utils.constants.WarpConstants;
129 */ 128 */
130 129
131 public class WarplyManager { 130 public class WarplyManager {
132 - private static NewCampaignList mNewCampaignList = new NewCampaignList(); 131 + private static CampaignList mNewCampaignList = new CampaignList();
133 132
134 public static void getProducts(WarplyProductsRequest request, final CallbackReceiver<ProductList> receiver) { 133 public static void getProducts(WarplyProductsRequest request, final CallbackReceiver<ProductList> receiver) {
135 // String productCategory = ""; 134 // String productCategory = "";
...@@ -1330,20 +1329,20 @@ public class WarplyManager { ...@@ -1330,20 +1329,20 @@ public class WarplyManager {
1330 }); 1329 });
1331 } 1330 }
1332 1331
1333 - public static void getCampaigns(WarplyGetCampaignsRequest request, final CallbackReceiver<NewCampaignList> receiver) { 1332 + public static void getCampaigns(WarplyGetCampaignsRequest request, final CallbackReceiver<CampaignList> receiver) {
1334 WarpUtils.log("************* WARPLY Get Campaigns Request ********************"); 1333 WarpUtils.log("************* WARPLY Get Campaigns Request ********************");
1335 WarpUtils.log("[WARP Trace] WARPLY Get Campaigns Request is active"); 1334 WarpUtils.log("[WARP Trace] WARPLY Get Campaigns Request is active");
1336 WarpUtils.log("**************************************************"); 1335 WarpUtils.log("**************************************************");
1337 1336
1338 - Warply.postReceiveMicroappData(WarpConstants.MICROAPP_NEW_CAMPAIGNS, false, "campaigns", request.toJson(), new NewCampaignsHook(new CallbackReceiver<NewCampaignList>() { 1337 + Warply.postReceiveMicroappData(WarpConstants.MICROAPP_NEW_CAMPAIGNS, false, "campaigns", request.toJson(), new NewCampaignsHook(new CallbackReceiver<CampaignList>() {
1339 @Override 1338 @Override
1340 - public void onSuccess(NewCampaignList result) { 1339 + public void onSuccess(CampaignList result) {
1341 // receiver.onSuccess(result); 1340 // receiver.onSuccess(result);
1342 mNewCampaignList.clear(); 1341 mNewCampaignList.clear();
1343 mNewCampaignList.addAll(result); 1342 mNewCampaignList.addAll(result);
1344 - getCampaignsPersonalized(request, new CallbackReceiver<NewCampaignList>() { 1343 + getCampaignsPersonalized(request, new CallbackReceiver<CampaignList>() {
1345 @Override 1344 @Override
1346 - public void onSuccess(NewCampaignList resultPersonalized) { 1345 + public void onSuccess(CampaignList resultPersonalized) {
1347 receiver.onSuccess(resultPersonalized); 1346 receiver.onSuccess(resultPersonalized);
1348 } 1347 }
1349 1348
...@@ -1362,549 +1361,535 @@ public class WarplyManager { ...@@ -1362,549 +1361,535 @@ public class WarplyManager {
1362 request.getSignature())); 1361 request.getSignature()));
1363 } 1362 }
1364 1363
1365 - public static void getCampaignsPersonalized(WarplyGetCampaignsRequest request, final CallbackReceiver<NewCampaignList> receiver) { 1364 + public static void getCampaignsPersonalized(WarplyGetCampaignsRequest request, final CallbackReceiver<CampaignList> receiver) {
1366 WarpUtils.log("************* WARPLY Get Campaigns Request ********************"); 1365 WarpUtils.log("************* WARPLY Get Campaigns Request ********************");
1367 WarpUtils.log("[WARP Trace] WARPLY Get Campaigns Request is active"); 1366 WarpUtils.log("[WARP Trace] WARPLY Get Campaigns Request is active");
1368 WarpUtils.log("**************************************************"); 1367 WarpUtils.log("**************************************************");
1369 1368
1370 - Warply.postReceiveMicroappData(WarpConstants.MICROAPP_NEW_CAMPAIGNS, true, "campaignsPersonalized", request.toJson(), new NewCampaignsHook(new CallbackReceiver<NewCampaignList>() { 1369 + Warply.postReceiveMicroappData(WarpConstants.MICROAPP_NEW_CAMPAIGNS, true, "campaignsPersonalized", request.toJson(), new NewCampaignsHook(new CallbackReceiver<CampaignList>() {
1371 @Override 1370 @Override
1372 - public void onSuccess(NewCampaignList result) { 1371 + public void onSuccess(CampaignList result) {
1373 mNewCampaignList.addAll(result); 1372 mNewCampaignList.addAll(result);
1374 - CampaignList tempCampaigns = new CampaignList(); 1373 + CampaignList campaignLoyaltyList = new CampaignList();
1375 - for (NewCampaign newCamp : mNewCampaignList) { 1374 + campaignLoyaltyList.clear();
1376 - Campaign camp = new Campaign(); 1375 + for (Campaign camp : mNewCampaignList) {
1377 - camp.setIndexUrl(newCamp.getIndexUrl());
1378 - camp.setLogoUrl(newCamp.getLogoUrl());
1379 - camp.setMessage(newCamp.getMessage());
1380 - camp.setOfferCategory(newCamp.getCommunicationCategory());
1381 - camp.setSessionUUID(newCamp.getCommunicationUUID());
1382 - camp.setTitle(newCamp.getTitle());
1383 - camp.setSubtitle(newCamp.getSubtitle());
1384 - camp.setSorting(newCamp.getSorting());
1385 - camp.setNew(newCamp.getIsNew());
1386 - camp.setType(newCamp.getCampaignType());
1387 try { 1376 try {
1388 - camp.setExtraFields(newCamp.getExtraFields().toString()); 1377 + JSONObject extraFields = WarpJSONParser.getJSONFromString(camp.getExtraFields());
1389 - } catch (NullPointerException e) { 1378 + if (extraFields != null) {
1390 - camp.setExtraFields(""); 1379 + if (extraFields.length() == 0 || !extraFields.has("ccms_offer")) {
1391 - e.printStackTrace(); 1380 + campaignLoyaltyList.add(camp);
1381 + }
1382 + }
1383 + } catch (Exception exception) {
1384 + campaignLoyaltyList.add(camp);
1392 } 1385 }
1393 - 1386 + }
1394 - try { 1387 + WarplyManagerHelper.setCampaignList(/*mNewCampaignList*/campaignLoyaltyList);
1395 - camp.setCampaignTypeSettings(newCamp.getSettings().toString()); 1388 +
1396 - } catch (NullPointerException e) { 1389 + ArrayList<LoyaltyContextualOfferModel> list = new ArrayList<>();
1397 - camp.setCampaignTypeSettings(""); 1390 + JSONArray jArray = null;
1398 - e.printStackTrace(); 1391 + try {
1392 + jArray = new JSONArray("[\n" +
1393 + " {\n" +
1394 + " \"UACIOfferTrackingCode\": \"5166.e07.fffffffffa10663a.ffffffffda30c76a\",\n" +
1395 + " \"businessAdditionalId\": \"\",\n" +
1396 + " \"dataCategory\": \"Data\",\n" +
1397 + " \"dataValue\": \"None\",\n" +
1398 + " \"discount\": \"None\",\n" +
1399 + " \"eligibleAssets\": [\n" +
1400 + " \"306945218770\",\n" +
1401 + " \"306944333488\",\n" +
1402 + " \"306932222490\",\n" +
1403 + " \"306996824010\",\n" +
1404 + " \"306972713201\",\n" +
1405 + " \"306942496252\",\n" +
1406 + " \"306977316716\",\n" +
1407 + " \"306945433100\",\n" +
1408 + " \"306977403986\",\n" +
1409 + " \"306936581495\",\n" +
1410 + " \"306980689662\",\n" +
1411 + " \"306970101490\",\n" +
1412 + " \"306973396329\",\n" +
1413 + " \"306972577064\",\n" +
1414 + " \"306974923219\",\n" +
1415 + " \"306977513761\",\n" +
1416 + " \"306984220987\",\n" +
1417 + " \"306979949205\",\n" +
1418 + " \"306943134127\",\n" +
1419 + " \"306970437794\",\n" +
1420 + " \"306932535319\",\n" +
1421 + " \"306974063133\",\n" +
1422 + " \"306932520323\",\n" +
1423 + " \"306978733823\",\n" +
1424 + " \"306985995420\",\n" +
1425 + " \"306983879555\",\n" +
1426 + " ],\n" +
1427 + " \"id\": \"000003590\",\n" +
1428 + " \"loyaltyCampaignId\": \"NA\",\n" +
1429 + " \"minsValue\": \"None\",\n" +
1430 + " \"noOfRecurrance\": \"None\",\n" +
1431 + " \"notificationMessage\": \"None\",\n" +
1432 + " \"offerAudienceLevel\": \"msisdn\",\n" +
1433 + " \"offerCode1\": \"000003590\",\n" +
1434 + " \"offerName\": \"CCMS loyalty white label\",\n" +
1435 + " \"price\": \"None\",\n" +
1436 + " \"productType\": \"White Label\",\n" +
1437 + " \"provDuration\": \"0.0\",\n" +
1438 + " \"provStepValueMins\": \"None\",\n" +
1439 + " \"score\": \"50\",\n" +
1440 + " \"treatmentCode\": \"5166.e07.fffffffffa10663a.ffffffffda30c76a\",\n" +
1441 + " \"validity\": \"0\",\n" +
1442 + " \"voiceCategory\": \"None\",\n" +
1443 + " \"wave\": \"1\",\n" +
1444 + " \"zone\": \"COSMOTE_APP_LOYALTY_PROMO\"\n" +
1445 + " },\n" +
1446 + " {\n" +
1447 + " \"UACIOfferTrackingCode\": \"51ed.e10.2c006f18.71e96d08\",\n" +
1448 + " \"businessAdditionalId\": \"\",\n" +
1449 + " \"dataCategory\": \"Data\",\n" +
1450 + " \"dataValue\": \"233\",\n" +
1451 + " \"discount\": \"None\",\n" +
1452 + " \"eligibleAssets\": [\n" +
1453 + " \"306945218770\",\n" +
1454 + " \"306944333488\",\n" +
1455 + " \"306932222490\",\n" +
1456 + " \"306996824010\",\n" +
1457 + " \"306972713201\",\n" +
1458 + " \"306942496252\",\n" +
1459 + " \"306977316716\",\n" +
1460 + " \"306945433100\",\n" +
1461 + " \"306977403986\",\n" +
1462 + " \"306936581495\",\n" +
1463 + " \"306980689662\",\n" +
1464 + " \"306970101490\",\n" +
1465 + " \"306973396329\",\n" +
1466 + " \"306972577064\",\n" +
1467 + " \"306974923219\",\n" +
1468 + " \"306977513761\",\n" +
1469 + " \"306984220987\",\n" +
1470 + " \"306979949205\",\n" +
1471 + " \"306943134127\",\n" +
1472 + " \"306970437794\",\n" +
1473 + " \"306932535319\",\n" +
1474 + " \"306974063133\",\n" +
1475 + " \"306932520323\",\n" +
1476 + " \"306978733823\",\n" +
1477 + " \"306985995420\",\n" +
1478 + " \"306983879555\",\n" +
1479 + " ],\n" +
1480 + " \"id\": \"000003599\",\n" +
1481 + " \"loyaltyCampaignId\": \"9a92d445956145f6bbc5cd20cef543b9\",\n" + //c5cc5f4f65624f47a580b720233fa60d
1482 + " \"minsValue\": \"None\",\n" +
1483 + " \"noOfRecurrance\": \"None\",\n" +
1484 + " \"notificationMessage\": \"None\",\n" +
1485 + " \"offerAudienceLevel\": \"msisdn\",\n" +
1486 + " \"offerCode1\": \"000003599\",\n" +
1487 + " \"offerName\": \"CCMS loyalty white label with campaignId\",\n" +
1488 + " \"price\": \"None\",\n" +
1489 + " \"productType\": \"White Label\",\n" +
1490 + " \"provDuration\": \"0.0\",\n" +
1491 + " \"provStepValueMins\": \"None\",\n" +
1492 + " \"score\": \"50\",\n" +
1493 + " \"treatmentCode\": \"51ed.e10.2c006f18.71e96d08\",\n" +
1494 + " \"validity\": \"0\",\n" +
1495 + " \"voiceCategory\": \"None\",\n" +
1496 + " \"wave\": \"1\",\n" +
1497 + " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1498 + " \"title\": \"Test1\",\n" +
1499 + " \"subtitle\": \"Test1\",\n" +
1500 + " \"description\": \"Test1\",\n" +
1501 + " \"zone\": \"COSMOTE_APP_LOYALTY_PROMO\"\n" +
1502 + " },\n" +
1503 + " {\n" +
1504 + " \"UACIOfferTrackingCode\": \"516c.e05.ffffffffa943695b.79ff470b\",\n" +
1505 + " \"businessAdditionalId\": \"\",\n" +
1506 + " \"businessService\": \"0.0\",\n" +
1507 + " \"eligibleAssets\": [\n" +
1508 + " \"306945218770\",\n" +
1509 + " \"306944333488\",\n" +
1510 + " \"306932222490\",\n" +
1511 + " \"306996824010\",\n" +
1512 + " \"306972713201\",\n" +
1513 + " \"306942496252\",\n" +
1514 + " \"306977316716\",\n" +
1515 + " \"306945433100\",\n" +
1516 + " \"306977403986\",\n" +
1517 + " \"306936581495\",\n" +
1518 + " \"306980689662\",\n" +
1519 + " \"306970101490\",\n" +
1520 + " \"306973396329\",\n" +
1521 + " \"306972577064\",\n" +
1522 + " \"306974923219\",\n" +
1523 + " \"306977513761\",\n" +
1524 + " \"306984220987\",\n" +
1525 + " \"306979949205\",\n" +
1526 + " \"306943134127\",\n" +
1527 + " \"306970437794\",\n" +
1528 + " \"306932535319\",\n" +
1529 + " \"306974063133\",\n" +
1530 + " \"306932520323\",\n" +
1531 + " \"306978733823\",\n" +
1532 + " \"306985995420\",\n" +
1533 + " \"306983879555\",\n" +
1534 + " ],\n" +
1535 + " \"id\": \"000003588\",\n" +
1536 + " \"loyaltyCampaignId\": \"NA\",\n" +
1537 + " \"noOfRecurrance\": \"0\",\n" +
1538 + " \"notificationMessage\": \"None\",\n" +
1539 + " \"offerAudienceLevel\": \"msisdn\",\n" +
1540 + " \"offerCode1\": \"000003588\",\n" +
1541 + " \"offerName\": \"CCMS loyalty postpay addon\",\n" +
1542 + " \"postpayProduct\": \"0.0\",\n" +
1543 + " \"price\": \"None\",\n" +
1544 + " \"productType\": \"MOBILE ADDON\",\n" +
1545 + " \"provDuration\": \"0.0\",\n" +
1546 + " \"score\": \"50\",\n" +
1547 + " \"treatmentCode\": \"516c.e05.ffffffffa943695b.79ff470b\",\n" +
1548 + " \"validity\": \"0\",\n" +
1549 + " \"wave\": \"1\",\n" +
1550 + " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1551 + " \"title\": \"Test2\",\n" +
1552 + " \"subtitle\": \"Test2\",\n" +
1553 + " \"description\": \"Test2\",\n" +
1554 + " \"zone\": \"COSMOTE_APP_LOYALTY_PROMO\"\n" +
1555 + " },\n" +
1556 + " {\n" +
1557 + " \"UACIOfferTrackingCode\": \"5224.e19.30e2f27b.ffffffffeb22b0db\",\n" +
1558 + " \"businessAdditionalId\": \"\",\n" +
1559 + " \"dataCategory\": \"Data\",\n" +
1560 + " \"dataValue\": \"None\",\n" +
1561 + " \"discount\": \"None\",\n" +
1562 + " \"eligibleAssets\": [\n" +
1563 + " \"306945218770\",\n" +
1564 + " \"306944333488\",\n" +
1565 + " \"306932222490\",\n" +
1566 + " \"306996824010\",\n" +
1567 + " \"306972713201\",\n" +
1568 + " \"306942496252\",\n" +
1569 + " \"306977316716\",\n" +
1570 + " \"306945433100\",\n" +
1571 + " \"306977403986\",\n" +
1572 + " \"306936581495\",\n" +
1573 + " \"306980689662\",\n" +
1574 + " \"306970101490\",\n" +
1575 + " \"306973396329\",\n" +
1576 + " \"306972577064\",\n" +
1577 + " \"306974923219\",\n" +
1578 + " \"306977513761\",\n" +
1579 + " \"306984220987\",\n" +
1580 + " \"306979949205\",\n" +
1581 + " \"306943134127\",\n" +
1582 + " \"306970437794\",\n" +
1583 + " \"306932535319\",\n" +
1584 + " \"306974063133\",\n" +
1585 + " \"306932520323\",\n" +
1586 + " \"306978733823\",\n" +
1587 + " \"306985995420\",\n" +
1588 + " \"306983879555\",\n" +
1589 + " ],\n" +
1590 + " \"id\": \"000003608\",\n" +
1591 + " \"loyaltyCampaignId\": \"c134cdeb8a924f8eac38e261acb9caf5\",\n" +
1592 + " \"minsValue\": \"None\",\n" +
1593 + " \"noOfRecurrance\": \"None\",\n" +
1594 + " \"notificationMessage\": \"None\",\n" +
1595 + " \"offerAudienceLevel\": \"msisdn\",\n" +
1596 + " \"offerCode1\": \"000003608\",\n" +
1597 + " \"offerName\": \"CCMS loyalty gifts4u v1\",\n" +
1598 + " \"price\": \"None\",\n" +
1599 + " \"productType\": \"White Label\",\n" +
1600 + " \"provDuration\": \"0.0\",\n" +
1601 + " \"provStepValueMins\": \"None\",\n" +
1602 + " \"score\": \"50\",\n" +
1603 + " \"treatmentCode\": \"5224.e19.30e2f27b.ffffffffeb22b0db\",\n" +
1604 + " \"validity\": \"0\",\n" +
1605 + " \"voiceCategory\": \"None\",\n" +
1606 + " \"wave\": \"1\",\n" +
1607 + " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1608 + " \"title\": \"Test3\",\n" +
1609 + " \"subtitle\": \"Test3\",\n" +
1610 + " \"description\": \"Test3\",\n" +
1611 + " \"zone\": \"COSMOTE_APP_GIFTS4U\"\n" +
1612 + " },\n" +
1613 + " {\n" +
1614 + " \"UACIOfferTrackingCode\": \"5228.e1d.38378e61.750186c1\",\n" +
1615 + " \"businessAdditionalId\": \"\",\n" +
1616 + " \"businessService\": \"0.0\",\n" +
1617 + " \"eligibleAssets\": [\n" +
1618 + " \"306945218770\",\n" +
1619 + " \"306944333488\",\n" +
1620 + " \"306932222490\",\n" +
1621 + " \"306996824010\",\n" +
1622 + " \"306972713201\",\n" +
1623 + " \"306942496252\",\n" +
1624 + " \"306977316716\",\n" +
1625 + " \"306945433100\",\n" +
1626 + " \"306977403986\",\n" +
1627 + " \"306936581495\",\n" +
1628 + " \"306980689662\",\n" +
1629 + " \"306970101490\",\n" +
1630 + " \"306973396329\",\n" +
1631 + " \"306972577064\",\n" +
1632 + " \"306974923219\",\n" +
1633 + " \"306977513761\",\n" +
1634 + " \"306984220987\",\n" +
1635 + " \"306979949205\",\n" +
1636 + " \"306943134127\",\n" +
1637 + " \"306970437794\",\n" +
1638 + " \"306932535319\",\n" +
1639 + " \"306974063133\",\n" +
1640 + " \"306932520323\",\n" +
1641 + " \"306978733823\",\n" +
1642 + " \"306985995420\",\n" +
1643 + " \"306983879555\",\n" +
1644 + " ],\n" +
1645 + " \"id\": \"000003612\",\n" +
1646 + " \"loyaltyCampaignId\": \"8eb71c4ceaff409c896e2d1f6f1c20f3\",\n" +
1647 + " \"noOfRecurrance\": \"0\",\n" +
1648 + " \"notificationMessage\": \"None\",\n" +
1649 + " \"offerAudienceLevel\": \"msisdn\",\n" +
1650 + " \"offerCode1\": \"000003612\",\n" +
1651 + " \"offerName\": \"CCMS loyalty - postpay addon gifts4u\",\n" +
1652 + " \"postpayProduct\": \"0.0\",\n" +
1653 + " \"price\": \"None\",\n" +
1654 + " \"productType\": \"MOBILE ADDON\",\n" +
1655 + " \"provDuration\": \"0.0\",\n" +
1656 + " \"score\": \"50\",\n" +
1657 + " \"treatmentCode\": \"5228.e1d.38378e61.750186c1\",\n" +
1658 + " \"validity\": \"0\",\n" +
1659 + " \"wave\": \"1\",\n" +
1660 + " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1661 + " \"title\": \"Test4\",\n" +
1662 + " \"subtitle\": \"Test4\",\n" +
1663 + " \"description\": \"Test4\",\n" +
1664 + " \"zone\": \"COSMOTE_APP_GIFTS4U\"\n" +
1665 + " },\n" +
1666 + " {\n" +
1667 + " \"UACIOfferTrackingCode\": \"5222.e1b.ffffffffe725d1b3.ffffffffed6d8723\",\n" +
1668 + " \"businessAdditionalId\": \"\",\n" +
1669 + " \"dataCategory\": \"Data\",\n" +
1670 + " \"dataValue\": \"None\",\n" +
1671 + " \"discount\": \"None\",\n" +
1672 + " \"eligibleAssets\": [\n" +
1673 + " \"306945218770\",\n" +
1674 + " \"306944333488\",\n" +
1675 + " \"306932222490\",\n" +
1676 + " \"306996824010\",\n" +
1677 + " \"306972713201\",\n" +
1678 + " \"306942496252\",\n" +
1679 + " \"306977316716\",\n" +
1680 + " \"306945433100\",\n" +
1681 + " \"306977403986\",\n" +
1682 + " \"306936581495\",\n" +
1683 + " \"306980689662\",\n" +
1684 + " \"306970101490\",\n" +
1685 + " \"306973396329\",\n" +
1686 + " \"306972577064\",\n" +
1687 + " \"306974923219\",\n" +
1688 + " \"306977513761\",\n" +
1689 + " \"306984220987\",\n" +
1690 + " \"306979949205\",\n" +
1691 + " \"306943134127\",\n" +
1692 + " \"306970437794\",\n" +
1693 + " \"306932535319\",\n" +
1694 + " \"306974063133\",\n" +
1695 + " \"306932520323\",\n" +
1696 + " \"306978733823\",\n" +
1697 + " \"306985995420\",\n" +
1698 + " \"306983879555\",\n" +
1699 + " ],\n" +
1700 + " \"id\": \"000003610\",\n" +
1701 + " \"loyaltyCampaignId\": \"8e2c88ec94c948d8b51577324ed9a4d5\",\n" +
1702 + " \"minsValue\": \"None\",\n" +
1703 + " \"noOfRecurrance\": \"None\",\n" +
1704 + " \"notificationMessage\": \"None\",\n" +
1705 + " \"offerAudienceLevel\": \"msisdn\",\n" +
1706 + " \"offerCode1\": \"000003610\",\n" +
1707 + " \"offerName\": \"CCMS loyalty more4u v1\",\n" +
1708 + " \"price\": \"20\",\n" +
1709 + " \"productType\": \"White Label\",\n" +
1710 + " \"provDuration\": \"7.0\",\n" +
1711 + " \"provStepValueMins\": \"None\",\n" +
1712 + " \"score\": \"60\",\n" +
1713 + " \"treatmentCode\": \"5222.e1b.ffffffffe725d1b3.ffffffffed6d8723\",\n" +
1714 + " \"validity\": \"0\",\n" +
1715 + " \"voiceCategory\": \"None\",\n" +
1716 + " \"wave\": \"1\",\n" +
1717 + " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1718 + " \"title\": \"Test5\",\n" +
1719 + " \"subtitle\": \"Test5\",\n" +
1720 + " \"description\": \"Test5\",\n" +
1721 + " \"zone\": \"COSMOTE_APP_MORE4U\"\n" +
1722 + " },\n" +
1723 + " {\n" +
1724 + " \"UACIOfferTrackingCode\": \"5226.e1f.728b68c6.ffffffffa6c7b10e\",\n" +
1725 + " \"businessAdditionalId\": \"\",\n" +
1726 + " \"businessService\": \"0.0\",\n" +
1727 + " \"eligibleAssets\": [\n" +
1728 + " \"306945218770\",\n" +
1729 + " \"306944333488\",\n" +
1730 + " \"306932222490\",\n" +
1731 + " \"306996824010\",\n" +
1732 + " \"306972713201\",\n" +
1733 + " \"306942496252\",\n" +
1734 + " \"306977316716\",\n" +
1735 + " \"306945433100\",\n" +
1736 + " \"306977403986\",\n" +
1737 + " \"306936581495\",\n" +
1738 + " \"306980689662\",\n" +
1739 + " \"306970101490\",\n" +
1740 + " \"306973396329\",\n" +
1741 + " \"306972577064\",\n" +
1742 + " \"306974923219\",\n" +
1743 + " \"306977513761\",\n" +
1744 + " \"306984220987\",\n" +
1745 + " \"306979949205\",\n" +
1746 + " \"306943134127\",\n" +
1747 + " \"306970437794\",\n" +
1748 + " \"306932535319\",\n" +
1749 + " \"306974063133\",\n" +
1750 + " \"306932520323\",\n" +
1751 + " \"306978733823\",\n" +
1752 + " \"306985995420\",\n" +
1753 + " \"306983879555\",\n" +
1754 + " ],\n" +
1755 + " \"id\": \"000003614\",\n" +
1756 + " \"loyaltyCampaignId\": \"aaf4022194584f02bb84c7b283c7c51e\",\n" +
1757 + " \"noOfRecurrance\": \"0\",\n" +
1758 + " \"notificationMessage\": \"None\",\n" +
1759 + " \"offerAudienceLevel\": \"msisdn\",\n" +
1760 + " \"offerCode1\": \"000003614\",\n" +
1761 + " \"offerName\": \"CCMS loyalty - postpay addon more4u\",\n" +
1762 + " \"postpayProduct\": \"0.0\",\n" +
1763 + " \"price\": \"None\",\n" +
1764 + " \"productType\": \"MOBILE ADDON\",\n" +
1765 + " \"provDuration\": \"0.0\",\n" +
1766 + " \"score\": \"50\",\n" +
1767 + " \"treatmentCode\": \"5226.e1f.728b68c6.ffffffffa6c7b10e\",\n" +
1768 + " \"validity\": \"0\",\n" +
1769 + " \"wave\": \"1\",\n" +
1770 + " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1771 + " \"title\": \"Test6\",\n" +
1772 + " \"subtitle\": \"Test6\",\n" +
1773 + " \"description\": \"Test6\",\n" +
1774 + " \"zone\": \"COSMOTE_APP_MORE4U\"\n" +
1775 + " },\n" +
1776 + " {\n" +
1777 + " \"UACIOfferTrackingCode\": \"5154.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
1778 + " \"businessAdditionalId\": \"\",\n" +
1779 + " \"eligibleAssets\": [],\n" +
1780 + " \"id\": \"000003586\",\n" +
1781 + " \"loyaltyCampaignId\": \"NA\",\n" +
1782 + " \"offerAudienceLevel\": \"guid\",\n" +
1783 + " \"offerCode1\": \"000003586\",\n" +
1784 + " \"offerName\": \"CCMS loyalty offer 6\",\n" +
1785 + " \"productType\": \"GENERIC\",\n" +
1786 + " \"score\": \"50\",\n" +
1787 + " \"treatmentCode\": \"5154.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
1788 + " \"validity\": \"0\",\n" +
1789 + " \"zone\": \"COSMOTE_APP_LOYALTY_PROMO\"\n" +
1790 + " },\n" +
1791 + " {\n" +
1792 + " \"UACIOfferTrackingCode\": \"51d2.e0c.291f49d9.40d5a689\",\n" +
1793 + " \"businessAdditionalId\": \"\",\n" +
1794 + " \"eligibleAssets\": [],\n" +
1795 + " \"id\": \"000003595\",\n" +
1796 + " \"loyaltyCampaignId\": \"c5cc5f4f65624f47a580b720233fa60d\",\n" +
1797 + " \"offerAudienceLevel\": \"guid\",\n" +
1798 + " \"offerCode1\": \"000003595\",\n" +
1799 + " \"offerName\": \"CCMS Loyal offer campaignId\",\n" +
1800 + " \"productType\": \"GENERIC\",\n" +
1801 + " \"score\": \"50\",\n" +
1802 + " \"treatmentCode\": \"51d2.e0c.291f49d9.40d5a689\",\n" +
1803 + " \"validity\": \"0\",\n" +
1804 + " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1805 + " \"title\": \"Test7\",\n" +
1806 + " \"subtitle\": \"Test7\",\n" +
1807 + " \"description\": \"Test7\",\n" +
1808 + " \"zone\": \"COSMOTE_APP_LOYALTY_PROMO\"\n" +
1809 + " },\n" +
1810 + " {\n" +
1811 + " \"UACIOfferTrackingCode\": \"51d6.e0c.291f49d9.40d5a689\",\n" +
1812 + " \"businessAdditionalId\": \"\",\n" +
1813 + " \"eligibleAssets\": [],\n" +
1814 + " \"id\": \"000003595\",\n" +
1815 + " \"loyaltyCampaignId\": \"c5cc5f4f65624f47a580b720233fa60d\",\n" +
1816 + " \"offerAudienceLevel\": \"guid\",\n" +
1817 + " \"offerCode1\": \"000003595\",\n" +
1818 + " \"offerName\": \"CCMS Loyal offer campaignId\",\n" +
1819 + " \"productType\": \"GENERIC\",\n" +
1820 + " \"score\": \"50\",\n" +
1821 + " \"treatmentCode\": \"51d6.e0c.291f49d9.40d5a689\",\n" +
1822 + " \"validity\": \"0\",\n" +
1823 + " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1824 + " \"title\": \"Test8\",\n" +
1825 + " \"subtitle\": \"Test8\",\n" +
1826 + " \"description\": \"Test8\",\n" +
1827 + " \"zone\": \"COSMOTE_APP_GIFTS4U\"\n" +
1828 + " },\n" +
1829 + " {\n" +
1830 + " \"UACIOfferTrackingCode\": \"5150.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
1831 + " \"businessAdditionalId\": \"\",\n" +
1832 + " \"eligibleAssets\": [],\n" +
1833 + " \"id\": \"000003586\",\n" +
1834 + " \"loyaltyCampaignId\": \"NA\",\n" +
1835 + " \"offerAudienceLevel\": \"guid\",\n" +
1836 + " \"offerCode1\": \"000003586\",\n" +
1837 + " \"offerName\": \"CCMS loyalty offer 6\",\n" +
1838 + " \"productType\": \"GENERIC\",\n" +
1839 + " \"score\": \"50\",\n" +
1840 + " \"treatmentCode\": \"5150.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
1841 + " \"validity\": \"0\",\n" +
1842 + " \"zone\": \"COSMOTE_APP_GIFTS4U\"\n" +
1843 + " },\n" +
1844 + " {\n" +
1845 + " \"UACIOfferTrackingCode\": \"5152.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
1846 + " \"businessAdditionalId\": \"\",\n" +
1847 + " \"eligibleAssets\": [],\n" +
1848 + " \"id\": \"000003586\",\n" +
1849 + " \"loyaltyCampaignId\": \"NA\",\n" +
1850 + " \"offerAudienceLevel\": \"guid\",\n" +
1851 + " \"offerCode1\": \"000003586\",\n" +
1852 + " \"offerName\": \"CCMS loyalty offer 6\",\n" +
1853 + " \"productType\": \"GENERIC\",\n" +
1854 + " \"score\": \"50\",\n" +
1855 + " \"treatmentCode\": \"5152.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
1856 + " \"validity\": \"0\",\n" +
1857 + " \"zone\": \"COSMOTE_APP_MORE4U\"\n" +
1858 + " },\n" +
1859 + " {\n" +
1860 + " \"UACIOfferTrackingCode\": \"51d4.e0c.291f49d9.40d5a689\",\n" +
1861 + " \"businessAdditionalId\": \"\",\n" +
1862 + " \"eligibleAssets\": [],\n" +
1863 + " \"id\": \"000003595\",\n" +
1864 + " \"loyaltyCampaignId\": \"c5cc5f4f65624f47a580b720233fa60d\",\n" +
1865 + " \"offerAudienceLevel\": \"guid\",\n" +
1866 + " \"offerCode1\": \"000003595\",\n" +
1867 + " \"offerName\": \"CCMS Loyal offer campaignId\",\n" +
1868 + " \"productType\": \"GENERIC\",\n" +
1869 + " \"score\": \"50\",\n" +
1870 + " \"treatmentCode\": \"51d4.e0c.291f49d9.40d5a689\",\n" +
1871 + " \"validity\": \"0\",\n" +
1872 + " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1873 + " \"title\": \"Test9\",\n" +
1874 + " \"subtitle\": \"Test9\",\n" +
1875 + " \"description\": \"Test9\",\n" +
1876 + " \"zone\": \"COSMOTE_APP_MORE4U\"\n" +
1877 + " }\n" +
1878 + " ]");
1879 + } catch (JSONException e) {
1880 + e.printStackTrace();
1881 + }
1882 + if (jArray != null && jArray.length() > 0) {
1883 + for (int i = 0; i < jArray.length(); i++) {
1884 + JSONObject jobj = new JSONObject();
1885 + jobj = jArray.optJSONObject(i);
1886 + if (jobj != null) {
1887 + LoyaltyContextualOfferModel model = new LoyaltyContextualOfferModel(jobj);
1888 + list.add(model);
1889 + }
1399 } 1890 }
1400 - tempCampaigns.add(camp);
1401 } 1891 }
1402 - WarplyManagerHelper.setCampaignList(tempCampaigns); 1892 + WarplyManagerHelper.setCCMSLoyaltyCampaigns(list);
1403 -
1404 -// ArrayList<LoyaltyContextualOfferModel> list = new ArrayList<>();
1405 -// JSONArray jArray = null;
1406 -// try {
1407 -// jArray = new JSONArray("[\n" +
1408 -// " {\n" +
1409 -// " \"UACIOfferTrackingCode\": \"5166.e07.fffffffffa10663a.ffffffffda30c76a\",\n" +
1410 -// " \"businessAdditionalId\": \"\",\n" +
1411 -// " \"dataCategory\": \"Data\",\n" +
1412 -// " \"dataValue\": \"None\",\n" +
1413 -// " \"discount\": \"None\",\n" +
1414 -// " \"eligibleAssets\": [\n" +
1415 -// " \"306945218770\",\n" +
1416 -// " \"306944333488\",\n" +
1417 -// " \"306932222490\",\n" +
1418 -// " \"306996824010\",\n" +
1419 -// " \"306972713201\",\n" +
1420 -// " \"306942496252\",\n" +
1421 -// " \"306977316716\",\n" +
1422 -// " \"306945433100\",\n" +
1423 -// " \"306977403986\",\n" +
1424 -// " \"306936581495\",\n" +
1425 -// " \"306980689662\",\n" +
1426 -// " \"306970101490\",\n" +
1427 -// " \"306973396329\",\n" +
1428 -// " \"306972577064\",\n" +
1429 -// " \"306974923219\",\n" +
1430 -// " \"306977513761\",\n" +
1431 -// " \"306984220987\",\n" +
1432 -// " \"306979949205\",\n" +
1433 -// " \"306943134127\",\n" +
1434 -// " \"306970437794\",\n" +
1435 -// " \"306932535319\",\n" +
1436 -// " \"306974063133\",\n" +
1437 -// " \"306932520323\",\n" +
1438 -// " \"306978733823\",\n" +
1439 -// " \"306985995420\",\n" +
1440 -// " \"306983879555\",\n" +
1441 -// " ],\n" +
1442 -// " \"id\": \"000003590\",\n" +
1443 -// " \"loyaltyCampaignId\": \"NA\",\n" +
1444 -// " \"minsValue\": \"None\",\n" +
1445 -// " \"noOfRecurrance\": \"None\",\n" +
1446 -// " \"notificationMessage\": \"None\",\n" +
1447 -// " \"offerAudienceLevel\": \"msisdn\",\n" +
1448 -// " \"offerCode1\": \"000003590\",\n" +
1449 -// " \"offerName\": \"CCMS loyalty white label\",\n" +
1450 -// " \"price\": \"None\",\n" +
1451 -// " \"productType\": \"White Label\",\n" +
1452 -// " \"provDuration\": \"0.0\",\n" +
1453 -// " \"provStepValueMins\": \"None\",\n" +
1454 -// " \"score\": \"50\",\n" +
1455 -// " \"treatmentCode\": \"5166.e07.fffffffffa10663a.ffffffffda30c76a\",\n" +
1456 -// " \"validity\": \"0\",\n" +
1457 -// " \"voiceCategory\": \"None\",\n" +
1458 -// " \"wave\": \"1\",\n" +
1459 -// " \"zone\": \"COSMOTE_APP_LOYALTY_PROMO\"\n" +
1460 -// " },\n" +
1461 -// " {\n" +
1462 -// " \"UACIOfferTrackingCode\": \"51ed.e10.2c006f18.71e96d08\",\n" +
1463 -// " \"businessAdditionalId\": \"\",\n" +
1464 -// " \"dataCategory\": \"Data\",\n" +
1465 -// " \"dataValue\": \"None\",\n" +
1466 -// " \"discount\": \"None\",\n" +
1467 -// " \"eligibleAssets\": [\n" +
1468 -// " \"306945218770\",\n" +
1469 -// " \"306944333488\",\n" +
1470 -// " \"306932222490\",\n" +
1471 -// " \"306996824010\",\n" +
1472 -// " \"306972713201\",\n" +
1473 -// " \"306942496252\",\n" +
1474 -// " \"306977316716\",\n" +
1475 -// " \"306945433100\",\n" +
1476 -// " \"306977403986\",\n" +
1477 -// " \"306936581495\",\n" +
1478 -// " \"306980689662\",\n" +
1479 -// " \"306970101490\",\n" +
1480 -// " \"306973396329\",\n" +
1481 -// " \"306972577064\",\n" +
1482 -// " \"306974923219\",\n" +
1483 -// " \"306977513761\",\n" +
1484 -// " \"306984220987\",\n" +
1485 -// " \"306979949205\",\n" +
1486 -// " \"306943134127\",\n" +
1487 -// " \"306970437794\",\n" +
1488 -// " \"306932535319\",\n" +
1489 -// " \"306974063133\",\n" +
1490 -// " \"306932520323\",\n" +
1491 -// " \"306978733823\",\n" +
1492 -// " \"306985995420\",\n" +
1493 -// " \"306983879555\",\n" +
1494 -// " ],\n" +
1495 -// " \"id\": \"000003599\",\n" +
1496 -// " \"loyaltyCampaignId\": \"9a92d445956145f6bbc5cd20cef543b9\",\n" + //c5cc5f4f65624f47a580b720233fa60d
1497 -// " \"minsValue\": \"None\",\n" +
1498 -// " \"noOfRecurrance\": \"None\",\n" +
1499 -// " \"notificationMessage\": \"None\",\n" +
1500 -// " \"offerAudienceLevel\": \"msisdn\",\n" +
1501 -// " \"offerCode1\": \"000003599\",\n" +
1502 -// " \"offerName\": \"CCMS loyalty white label with campaignId\",\n" +
1503 -// " \"price\": \"None\",\n" +
1504 -// " \"productType\": \"White Label\",\n" +
1505 -// " \"provDuration\": \"0.0\",\n" +
1506 -// " \"provStepValueMins\": \"None\",\n" +
1507 -// " \"score\": \"50\",\n" +
1508 -// " \"treatmentCode\": \"51ed.e10.2c006f18.71e96d08\",\n" +
1509 -// " \"validity\": \"0\",\n" +
1510 -// " \"voiceCategory\": \"None\",\n" +
1511 -// " \"wave\": \"1\",\n" +
1512 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1513 -// " \"title\": \"Test1\",\n" +
1514 -// " \"subtitle\": \"Test1\",\n" +
1515 -// " \"description\": \"Test1\",\n" +
1516 -// " \"zone\": \"COSMOTE_APP_LOYALTY_PROMO\"\n" +
1517 -// " },\n" +
1518 -// " {\n" +
1519 -// " \"UACIOfferTrackingCode\": \"516c.e05.ffffffffa943695b.79ff470b\",\n" +
1520 -// " \"businessAdditionalId\": \"\",\n" +
1521 -// " \"businessService\": \"0.0\",\n" +
1522 -// " \"eligibleAssets\": [\n" +
1523 -// " \"306945218770\",\n" +
1524 -// " \"306944333488\",\n" +
1525 -// " \"306932222490\",\n" +
1526 -// " \"306996824010\",\n" +
1527 -// " \"306972713201\",\n" +
1528 -// " \"306942496252\",\n" +
1529 -// " \"306977316716\",\n" +
1530 -// " \"306945433100\",\n" +
1531 -// " \"306977403986\",\n" +
1532 -// " \"306936581495\",\n" +
1533 -// " \"306980689662\",\n" +
1534 -// " \"306970101490\",\n" +
1535 -// " \"306973396329\",\n" +
1536 -// " \"306972577064\",\n" +
1537 -// " \"306974923219\",\n" +
1538 -// " \"306977513761\",\n" +
1539 -// " \"306984220987\",\n" +
1540 -// " \"306979949205\",\n" +
1541 -// " \"306943134127\",\n" +
1542 -// " \"306970437794\",\n" +
1543 -// " \"306932535319\",\n" +
1544 -// " \"306974063133\",\n" +
1545 -// " \"306932520323\",\n" +
1546 -// " \"306978733823\",\n" +
1547 -// " \"306985995420\",\n" +
1548 -// " \"306983879555\",\n" +
1549 -// " ],\n" +
1550 -// " \"id\": \"000003588\",\n" +
1551 -// " \"loyaltyCampaignId\": \"NA\",\n" +
1552 -// " \"noOfRecurrance\": \"0\",\n" +
1553 -// " \"notificationMessage\": \"None\",\n" +
1554 -// " \"offerAudienceLevel\": \"msisdn\",\n" +
1555 -// " \"offerCode1\": \"000003588\",\n" +
1556 -// " \"offerName\": \"CCMS loyalty postpay addon\",\n" +
1557 -// " \"postpayProduct\": \"0.0\",\n" +
1558 -// " \"price\": \"None\",\n" +
1559 -// " \"productType\": \"MOBILE ADDON\",\n" +
1560 -// " \"provDuration\": \"0.0\",\n" +
1561 -// " \"score\": \"50\",\n" +
1562 -// " \"treatmentCode\": \"516c.e05.ffffffffa943695b.79ff470b\",\n" +
1563 -// " \"validity\": \"0\",\n" +
1564 -// " \"wave\": \"1\",\n" +
1565 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1566 -// " \"title\": \"Test2\",\n" +
1567 -// " \"subtitle\": \"Test2\",\n" +
1568 -// " \"description\": \"Test2\",\n" +
1569 -// " \"zone\": \"COSMOTE_APP_LOYALTY_PROMO\"\n" +
1570 -// " },\n" +
1571 -// " {\n" +
1572 -// " \"UACIOfferTrackingCode\": \"5224.e19.30e2f27b.ffffffffeb22b0db\",\n" +
1573 -// " \"businessAdditionalId\": \"\",\n" +
1574 -// " \"dataCategory\": \"Data\",\n" +
1575 -// " \"dataValue\": \"None\",\n" +
1576 -// " \"discount\": \"None\",\n" +
1577 -// " \"eligibleAssets\": [\n" +
1578 -// " \"306945218770\",\n" +
1579 -// " \"306944333488\",\n" +
1580 -// " \"306932222490\",\n" +
1581 -// " \"306996824010\",\n" +
1582 -// " \"306972713201\",\n" +
1583 -// " \"306942496252\",\n" +
1584 -// " \"306977316716\",\n" +
1585 -// " \"306945433100\",\n" +
1586 -// " \"306977403986\",\n" +
1587 -// " \"306936581495\",\n" +
1588 -// " \"306980689662\",\n" +
1589 -// " \"306970101490\",\n" +
1590 -// " \"306973396329\",\n" +
1591 -// " \"306972577064\",\n" +
1592 -// " \"306974923219\",\n" +
1593 -// " \"306977513761\",\n" +
1594 -// " \"306984220987\",\n" +
1595 -// " \"306979949205\",\n" +
1596 -// " \"306943134127\",\n" +
1597 -// " \"306970437794\",\n" +
1598 -// " \"306932535319\",\n" +
1599 -// " \"306974063133\",\n" +
1600 -// " \"306932520323\",\n" +
1601 -// " \"306978733823\",\n" +
1602 -// " \"306985995420\",\n" +
1603 -// " \"306983879555\",\n" +
1604 -// " ],\n" +
1605 -// " \"id\": \"000003608\",\n" +
1606 -// " \"loyaltyCampaignId\": \"c134cdeb8a924f8eac38e261acb9caf5\",\n" +
1607 -// " \"minsValue\": \"None\",\n" +
1608 -// " \"noOfRecurrance\": \"None\",\n" +
1609 -// " \"notificationMessage\": \"None\",\n" +
1610 -// " \"offerAudienceLevel\": \"msisdn\",\n" +
1611 -// " \"offerCode1\": \"000003608\",\n" +
1612 -// " \"offerName\": \"CCMS loyalty gifts4u v1\",\n" +
1613 -// " \"price\": \"None\",\n" +
1614 -// " \"productType\": \"White Label\",\n" +
1615 -// " \"provDuration\": \"0.0\",\n" +
1616 -// " \"provStepValueMins\": \"None\",\n" +
1617 -// " \"score\": \"50\",\n" +
1618 -// " \"treatmentCode\": \"5224.e19.30e2f27b.ffffffffeb22b0db\",\n" +
1619 -// " \"validity\": \"0\",\n" +
1620 -// " \"voiceCategory\": \"None\",\n" +
1621 -// " \"wave\": \"1\",\n" +
1622 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1623 -// " \"title\": \"Test3\",\n" +
1624 -// " \"subtitle\": \"Test3\",\n" +
1625 -// " \"description\": \"Test3\",\n" +
1626 -// " \"zone\": \"COSMOTE_APP_GIFTS4U\"\n" +
1627 -// " },\n" +
1628 -// " {\n" +
1629 -// " \"UACIOfferTrackingCode\": \"5228.e1d.38378e61.750186c1\",\n" +
1630 -// " \"businessAdditionalId\": \"\",\n" +
1631 -// " \"businessService\": \"0.0\",\n" +
1632 -// " \"eligibleAssets\": [\n" +
1633 -// " \"306945218770\",\n" +
1634 -// " \"306944333488\",\n" +
1635 -// " \"306932222490\",\n" +
1636 -// " \"306996824010\",\n" +
1637 -// " \"306972713201\",\n" +
1638 -// " \"306942496252\",\n" +
1639 -// " \"306977316716\",\n" +
1640 -// " \"306945433100\",\n" +
1641 -// " \"306977403986\",\n" +
1642 -// " \"306936581495\",\n" +
1643 -// " \"306980689662\",\n" +
1644 -// " \"306970101490\",\n" +
1645 -// " \"306973396329\",\n" +
1646 -// " \"306972577064\",\n" +
1647 -// " \"306974923219\",\n" +
1648 -// " \"306977513761\",\n" +
1649 -// " \"306984220987\",\n" +
1650 -// " \"306979949205\",\n" +
1651 -// " \"306943134127\",\n" +
1652 -// " \"306970437794\",\n" +
1653 -// " \"306932535319\",\n" +
1654 -// " \"306974063133\",\n" +
1655 -// " \"306932520323\",\n" +
1656 -// " \"306978733823\",\n" +
1657 -// " \"306985995420\",\n" +
1658 -// " \"306983879555\",\n" +
1659 -// " ],\n" +
1660 -// " \"id\": \"000003612\",\n" +
1661 -// " \"loyaltyCampaignId\": \"8eb71c4ceaff409c896e2d1f6f1c20f3\",\n" +
1662 -// " \"noOfRecurrance\": \"0\",\n" +
1663 -// " \"notificationMessage\": \"None\",\n" +
1664 -// " \"offerAudienceLevel\": \"msisdn\",\n" +
1665 -// " \"offerCode1\": \"000003612\",\n" +
1666 -// " \"offerName\": \"CCMS loyalty - postpay addon gifts4u\",\n" +
1667 -// " \"postpayProduct\": \"0.0\",\n" +
1668 -// " \"price\": \"None\",\n" +
1669 -// " \"productType\": \"MOBILE ADDON\",\n" +
1670 -// " \"provDuration\": \"0.0\",\n" +
1671 -// " \"score\": \"50\",\n" +
1672 -// " \"treatmentCode\": \"5228.e1d.38378e61.750186c1\",\n" +
1673 -// " \"validity\": \"0\",\n" +
1674 -// " \"wave\": \"1\",\n" +
1675 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1676 -// " \"title\": \"Test4\",\n" +
1677 -// " \"subtitle\": \"Test4\",\n" +
1678 -// " \"description\": \"Test4\",\n" +
1679 -// " \"zone\": \"COSMOTE_APP_GIFTS4U\"\n" +
1680 -// " },\n" +
1681 -// " {\n" +
1682 -// " \"UACIOfferTrackingCode\": \"5222.e1b.ffffffffe725d1b3.ffffffffed6d8723\",\n" +
1683 -// " \"businessAdditionalId\": \"\",\n" +
1684 -// " \"dataCategory\": \"Data\",\n" +
1685 -// " \"dataValue\": \"None\",\n" +
1686 -// " \"discount\": \"None\",\n" +
1687 -// " \"eligibleAssets\": [\n" +
1688 -// " \"306945218770\",\n" +
1689 -// " \"306944333488\",\n" +
1690 -// " \"306932222490\",\n" +
1691 -// " \"306996824010\",\n" +
1692 -// " \"306972713201\",\n" +
1693 -// " \"306942496252\",\n" +
1694 -// " \"306977316716\",\n" +
1695 -// " \"306945433100\",\n" +
1696 -// " \"306977403986\",\n" +
1697 -// " \"306936581495\",\n" +
1698 -// " \"306980689662\",\n" +
1699 -// " \"306970101490\",\n" +
1700 -// " \"306973396329\",\n" +
1701 -// " \"306972577064\",\n" +
1702 -// " \"306974923219\",\n" +
1703 -// " \"306977513761\",\n" +
1704 -// " \"306984220987\",\n" +
1705 -// " \"306979949205\",\n" +
1706 -// " \"306943134127\",\n" +
1707 -// " \"306970437794\",\n" +
1708 -// " \"306932535319\",\n" +
1709 -// " \"306974063133\",\n" +
1710 -// " \"306932520323\",\n" +
1711 -// " \"306978733823\",\n" +
1712 -// " \"306985995420\",\n" +
1713 -// " \"306983879555\",\n" +
1714 -// " ],\n" +
1715 -// " \"id\": \"000003610\",\n" +
1716 -// " \"loyaltyCampaignId\": \"8e2c88ec94c948d8b51577324ed9a4d5\",\n" +
1717 -// " \"minsValue\": \"None\",\n" +
1718 -// " \"noOfRecurrance\": \"None\",\n" +
1719 -// " \"notificationMessage\": \"None\",\n" +
1720 -// " \"offerAudienceLevel\": \"msisdn\",\n" +
1721 -// " \"offerCode1\": \"000003610\",\n" +
1722 -// " \"offerName\": \"CCMS loyalty more4u v1\",\n" +
1723 -// " \"price\": \"20\",\n" +
1724 -// " \"productType\": \"White Label\",\n" +
1725 -// " \"provDuration\": \"7.0\",\n" +
1726 -// " \"provStepValueMins\": \"None\",\n" +
1727 -// " \"score\": \"60\",\n" +
1728 -// " \"treatmentCode\": \"5222.e1b.ffffffffe725d1b3.ffffffffed6d8723\",\n" +
1729 -// " \"validity\": \"0\",\n" +
1730 -// " \"voiceCategory\": \"None\",\n" +
1731 -// " \"wave\": \"1\",\n" +
1732 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1733 -// " \"title\": \"Test5\",\n" +
1734 -// " \"subtitle\": \"Test5\",\n" +
1735 -// " \"description\": \"Test5\",\n" +
1736 -// " \"zone\": \"COSMOTE_APP_MORE4U\"\n" +
1737 -// " },\n" +
1738 -// " {\n" +
1739 -// " \"UACIOfferTrackingCode\": \"5226.e1f.728b68c6.ffffffffa6c7b10e\",\n" +
1740 -// " \"businessAdditionalId\": \"\",\n" +
1741 -// " \"businessService\": \"0.0\",\n" +
1742 -// " \"eligibleAssets\": [\n" +
1743 -// " \"306945218770\",\n" +
1744 -// " \"306944333488\",\n" +
1745 -// " \"306932222490\",\n" +
1746 -// " \"306996824010\",\n" +
1747 -// " \"306972713201\",\n" +
1748 -// " \"306942496252\",\n" +
1749 -// " \"306977316716\",\n" +
1750 -// " \"306945433100\",\n" +
1751 -// " \"306977403986\",\n" +
1752 -// " \"306936581495\",\n" +
1753 -// " \"306980689662\",\n" +
1754 -// " \"306970101490\",\n" +
1755 -// " \"306973396329\",\n" +
1756 -// " \"306972577064\",\n" +
1757 -// " \"306974923219\",\n" +
1758 -// " \"306977513761\",\n" +
1759 -// " \"306984220987\",\n" +
1760 -// " \"306979949205\",\n" +
1761 -// " \"306943134127\",\n" +
1762 -// " \"306970437794\",\n" +
1763 -// " \"306932535319\",\n" +
1764 -// " \"306974063133\",\n" +
1765 -// " \"306932520323\",\n" +
1766 -// " \"306978733823\",\n" +
1767 -// " \"306985995420\",\n" +
1768 -// " \"306983879555\",\n" +
1769 -// " ],\n" +
1770 -// " \"id\": \"000003614\",\n" +
1771 -// " \"loyaltyCampaignId\": \"aaf4022194584f02bb84c7b283c7c51e\",\n" +
1772 -// " \"noOfRecurrance\": \"0\",\n" +
1773 -// " \"notificationMessage\": \"None\",\n" +
1774 -// " \"offerAudienceLevel\": \"msisdn\",\n" +
1775 -// " \"offerCode1\": \"000003614\",\n" +
1776 -// " \"offerName\": \"CCMS loyalty - postpay addon more4u\",\n" +
1777 -// " \"postpayProduct\": \"0.0\",\n" +
1778 -// " \"price\": \"None\",\n" +
1779 -// " \"productType\": \"MOBILE ADDON\",\n" +
1780 -// " \"provDuration\": \"0.0\",\n" +
1781 -// " \"score\": \"50\",\n" +
1782 -// " \"treatmentCode\": \"5226.e1f.728b68c6.ffffffffa6c7b10e\",\n" +
1783 -// " \"validity\": \"0\",\n" +
1784 -// " \"wave\": \"1\",\n" +
1785 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1786 -// " \"title\": \"Test6\",\n" +
1787 -// " \"subtitle\": \"Test6\",\n" +
1788 -// " \"description\": \"Test6\",\n" +
1789 -// " \"zone\": \"COSMOTE_APP_MORE4U\"\n" +
1790 -// " },\n" +
1791 -// " {\n" +
1792 -// " \"UACIOfferTrackingCode\": \"5154.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
1793 -// " \"businessAdditionalId\": \"\",\n" +
1794 -// " \"eligibleAssets\": [],\n" +
1795 -// " \"id\": \"000003586\",\n" +
1796 -// " \"loyaltyCampaignId\": \"NA\",\n" +
1797 -// " \"offerAudienceLevel\": \"guid\",\n" +
1798 -// " \"offerCode1\": \"000003586\",\n" +
1799 -// " \"offerName\": \"CCMS loyalty offer 6\",\n" +
1800 -// " \"productType\": \"GENERIC\",\n" +
1801 -// " \"score\": \"50\",\n" +
1802 -// " \"treatmentCode\": \"5154.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
1803 -// " \"validity\": \"0\",\n" +
1804 -// " \"zone\": \"COSMOTE_APP_LOYALTY_PROMO\"\n" +
1805 -// " },\n" +
1806 -// " {\n" +
1807 -// " \"UACIOfferTrackingCode\": \"51d2.e0c.291f49d9.40d5a689\",\n" +
1808 -// " \"businessAdditionalId\": \"\",\n" +
1809 -// " \"eligibleAssets\": [],\n" +
1810 -// " \"id\": \"000003595\",\n" +
1811 -// " \"loyaltyCampaignId\": \"c5cc5f4f65624f47a580b720233fa60d\",\n" +
1812 -// " \"offerAudienceLevel\": \"guid\",\n" +
1813 -// " \"offerCode1\": \"000003595\",\n" +
1814 -// " \"offerName\": \"CCMS Loyal offer campaignId\",\n" +
1815 -// " \"productType\": \"GENERIC\",\n" +
1816 -// " \"score\": \"50\",\n" +
1817 -// " \"treatmentCode\": \"51d2.e0c.291f49d9.40d5a689\",\n" +
1818 -// " \"validity\": \"0\",\n" +
1819 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1820 -// " \"title\": \"Test7\",\n" +
1821 -// " \"subtitle\": \"Test7\",\n" +
1822 -// " \"description\": \"Test7\",\n" +
1823 -// " \"zone\": \"COSMOTE_APP_LOYALTY_PROMO\"\n" +
1824 -// " },\n" +
1825 -// " {\n" +
1826 -// " \"UACIOfferTrackingCode\": \"51d6.e0c.291f49d9.40d5a689\",\n" +
1827 -// " \"businessAdditionalId\": \"\",\n" +
1828 -// " \"eligibleAssets\": [],\n" +
1829 -// " \"id\": \"000003595\",\n" +
1830 -// " \"loyaltyCampaignId\": \"c5cc5f4f65624f47a580b720233fa60d\",\n" +
1831 -// " \"offerAudienceLevel\": \"guid\",\n" +
1832 -// " \"offerCode1\": \"000003595\",\n" +
1833 -// " \"offerName\": \"CCMS Loyal offer campaignId\",\n" +
1834 -// " \"productType\": \"GENERIC\",\n" +
1835 -// " \"score\": \"50\",\n" +
1836 -// " \"treatmentCode\": \"51d6.e0c.291f49d9.40d5a689\",\n" +
1837 -// " \"validity\": \"0\",\n" +
1838 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1839 -// " \"title\": \"Test8\",\n" +
1840 -// " \"subtitle\": \"Test8\",\n" +
1841 -// " \"description\": \"Test8\",\n" +
1842 -// " \"zone\": \"COSMOTE_APP_GIFTS4U\"\n" +
1843 -// " },\n" +
1844 -// " {\n" +
1845 -// " \"UACIOfferTrackingCode\": \"5150.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
1846 -// " \"businessAdditionalId\": \"\",\n" +
1847 -// " \"eligibleAssets\": [],\n" +
1848 -// " \"id\": \"000003586\",\n" +
1849 -// " \"loyaltyCampaignId\": \"NA\",\n" +
1850 -// " \"offerAudienceLevel\": \"guid\",\n" +
1851 -// " \"offerCode1\": \"000003586\",\n" +
1852 -// " \"offerName\": \"CCMS loyalty offer 6\",\n" +
1853 -// " \"productType\": \"GENERIC\",\n" +
1854 -// " \"score\": \"50\",\n" +
1855 -// " \"treatmentCode\": \"5150.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
1856 -// " \"validity\": \"0\",\n" +
1857 -// " \"zone\": \"COSMOTE_APP_GIFTS4U\"\n" +
1858 -// " },\n" +
1859 -// " {\n" +
1860 -// " \"UACIOfferTrackingCode\": \"5152.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
1861 -// " \"businessAdditionalId\": \"\",\n" +
1862 -// " \"eligibleAssets\": [],\n" +
1863 -// " \"id\": \"000003586\",\n" +
1864 -// " \"loyaltyCampaignId\": \"NA\",\n" +
1865 -// " \"offerAudienceLevel\": \"guid\",\n" +
1866 -// " \"offerCode1\": \"000003586\",\n" +
1867 -// " \"offerName\": \"CCMS loyalty offer 6\",\n" +
1868 -// " \"productType\": \"GENERIC\",\n" +
1869 -// " \"score\": \"50\",\n" +
1870 -// " \"treatmentCode\": \"5152.e03.ffffffffeebc476a.ffffffffc5b96f6a\",\n" +
1871 -// " \"validity\": \"0\",\n" +
1872 -// " \"zone\": \"COSMOTE_APP_MORE4U\"\n" +
1873 -// " },\n" +
1874 -// " {\n" +
1875 -// " \"UACIOfferTrackingCode\": \"51d4.e0c.291f49d9.40d5a689\",\n" +
1876 -// " \"businessAdditionalId\": \"\",\n" +
1877 -// " \"eligibleAssets\": [],\n" +
1878 -// " \"id\": \"000003595\",\n" +
1879 -// " \"loyaltyCampaignId\": \"c5cc5f4f65624f47a580b720233fa60d\",\n" +
1880 -// " \"offerAudienceLevel\": \"guid\",\n" +
1881 -// " \"offerCode1\": \"000003595\",\n" +
1882 -// " \"offerName\": \"CCMS Loyal offer campaignId\",\n" +
1883 -// " \"productType\": \"GENERIC\",\n" +
1884 -// " \"score\": \"50\",\n" +
1885 -// " \"treatmentCode\": \"51d4.e0c.291f49d9.40d5a689\",\n" +
1886 -// " \"validity\": \"0\",\n" +
1887 -// " \"imageUrl\": \"https://www.cosmotetvott.gr/assets/images/ogImage.jpg\",\n" +
1888 -// " \"title\": \"Test9\",\n" +
1889 -// " \"subtitle\": \"Test9\",\n" +
1890 -// " \"description\": \"Test9\",\n" +
1891 -// " \"zone\": \"COSMOTE_APP_MORE4U\"\n" +
1892 -// " }\n" +
1893 -// " ]");
1894 -// } catch (JSONException e) {
1895 -// e.printStackTrace();
1896 -// }
1897 -// if (jArray != null && jArray.length() > 0) {
1898 -// for (int i = 0; i < jArray.length(); i++) {
1899 -// JSONObject jobj = new JSONObject();
1900 -// jobj = jArray.optJSONObject(i);
1901 -// if (jobj != null) {
1902 -// LoyaltyContextualOfferModel model = new LoyaltyContextualOfferModel(jobj);
1903 -// list.add(model);
1904 -// }
1905 -// }
1906 -// }
1907 -// WarplyManagerHelper.setCCMSLoyaltyCampaigns(list);
1908 1893
1909 receiver.onSuccess(result); 1894 receiver.onSuccess(result);
1910 } 1895 }
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 xmlns:app="http://schemas.android.com/apk/res-auto" 3 xmlns:app="http://schemas.android.com/apk/res-auto"
4 android:id="@+id/cl_bill_payment" 4 android:id="@+id/cl_bill_payment"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 - android:layout_height="match_parent"> 6 + android:layout_height="match_parent"
7 + android:background="@android:color/white"
8 + android:orientation="vertical">
7 9
8 <androidx.constraintlayout.widget.ConstraintLayout 10 <androidx.constraintlayout.widget.ConstraintLayout
9 android:id="@+id/cl_bill_header" 11 android:id="@+id/cl_bill_header"
10 android:layout_width="match_parent" 12 android:layout_width="match_parent"
11 android:layout_height="80dp" 13 android:layout_height="80dp"
12 - android:background="@android:color/white" 14 + android:background="@android:color/white">
13 - app:layout_constraintTop_toTopOf="parent">
14 15
15 <ImageView 16 <ImageView
16 android:id="@+id/iv_coupons_close" 17 android:id="@+id/iv_coupons_close"
...@@ -38,23 +39,21 @@ ...@@ -38,23 +39,21 @@
38 app:layout_constraintTop_toTopOf="parent" /> 39 app:layout_constraintTop_toTopOf="parent" />
39 </androidx.constraintlayout.widget.ConstraintLayout> 40 </androidx.constraintlayout.widget.ConstraintLayout>
40 41
41 - <androidx.constraintlayout.widget.ConstraintLayout 42 + <RelativeLayout
42 android:layout_width="match_parent" 43 android:layout_width="match_parent"
43 android:layout_height="match_parent" 44 android:layout_height="match_parent"
44 - android:layout_below="@+id/cl_bill_header" 45 + android:background="@drawable/shape_cos_loyalty"
45 - android:layout_marginTop="1dp" 46 + android:orientation="vertical">
46 - android:background="@drawable/shape_cos_loyalty">
47 47
48 <androidx.recyclerview.widget.RecyclerView 48 <androidx.recyclerview.widget.RecyclerView
49 android:id="@+id/rv_active_coupons" 49 android:id="@+id/rv_active_coupons"
50 android:layout_width="match_parent" 50 android:layout_width="match_parent"
51 - android:layout_height="0dp" 51 + android:layout_height="wrap_content"
52 - android:paddingTop="44dp" 52 + android:layout_marginTop="4dp"
53 - app:layout_constraintBottom_toBottomOf="parent" 53 + android:clipToPadding="false"
54 - app:layout_constraintEnd_toEndOf="parent" 54 + android:orientation="vertical"
55 - app:layout_constraintStart_toStartOf="parent" 55 + android:paddingTop="44dp" />
56 - app:layout_constraintTop_toTopOf="parent" /> 56 + </RelativeLayout>
57 - </androidx.constraintlayout.widget.ConstraintLayout>
58 57
59 <TextView 58 <TextView
60 android:id="@+id/tv_no_coupons" 59 android:id="@+id/tv_no_coupons"
...@@ -66,4 +65,4 @@ ...@@ -66,4 +65,4 @@
66 android:textSize="18sp" 65 android:textSize="18sp"
67 android:textStyle="bold" 66 android:textStyle="bold"
68 android:visibility="gone" /> 67 android:visibility="gone" />
69 -</RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
68 +</LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......