Showing
8 changed files
with
14 additions
and
7 deletions
... | @@ -36,7 +36,7 @@ public class SplashActivity extends BaseActivity { | ... | @@ -36,7 +36,7 @@ public class SplashActivity extends BaseActivity { |
36 | public void onWarplyReady() { | 36 | public void onWarplyReady() { |
37 | if (!WarplyDBHelper.getInstance(SplashActivity.this).isTableNotEmpty("auth")) { | 37 | if (!WarplyDBHelper.getInstance(SplashActivity.this).isTableNotEmpty("auth")) { |
38 | WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest() | 38 | WarplyManager.getCosmoteUser(new WarplyCosmoteUserRequest() |
39 | - .setGuid("6006552990"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons, prod 6006552990 | 39 | + .setGuid("6010962478"), //6012049321, 6012049322, 6012049323, 7000000831 history, 7000000826, 7000000831 shared coupons, prod 6006552990 |
40 | mLoginReceiver); | 40 | mLoginReceiver); |
41 | } else { | 41 | } else { |
42 | startNextActivity(); | 42 | startNextActivity(); | ... | ... |
... | @@ -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-cosbeta85' | 5 | + PUBLISH_VERSION = '4.5.4-cosbeta86' |
6 | PUBLISH_ARTIFACT_ID = 'warply-android-sdk' | 6 | PUBLISH_ARTIFACT_ID = 'warply-android-sdk' |
7 | } | 7 | } |
8 | 8 | ... | ... |
... | @@ -228,11 +228,16 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener | ... | @@ -228,11 +228,16 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener |
228 | mLlBarcodeShown.setOnClickListener(this); | 228 | mLlBarcodeShown.setOnClickListener(this); |
229 | mLlTerms.setOnClickListener(this); | 229 | mLlTerms.setOnClickListener(this); |
230 | 230 | ||
231 | - String tempCoupon = mCoupon.getCoupon(); | 231 | + String tempCoupon = ""; |
232 | int result = 0; | 232 | int result = 0; |
233 | + try { | ||
234 | + tempCoupon = mCoupon.getCoupon(); | ||
233 | for (int i = 0; i < (12 - mCoupon.getCoupon().length()); i++) { | 235 | for (int i = 0; i < (12 - mCoupon.getCoupon().length()); i++) { |
234 | tempCoupon += "0"; | 236 | tempCoupon += "0"; |
235 | } | 237 | } |
238 | + } catch (Exception e) { | ||
239 | + e.printStackTrace(); | ||
240 | + } | ||
236 | 241 | ||
237 | try { | 242 | try { |
238 | for (int i = mCoupon.getCoupon().length() - 1; i >= 0; i--) { | 243 | for (int i = mCoupon.getCoupon().length() - 1; i >= 0; i--) { | ... | ... |
... | @@ -588,7 +588,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene | ... | @@ -588,7 +588,7 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene |
588 | try { | 588 | try { |
589 | JSONObject extraFields = WarpJSONParser.getJSONFromString(camp.getExtraFields()); | 589 | JSONObject extraFields = WarpJSONParser.getJSONFromString(camp.getExtraFields()); |
590 | if (extraFields != null) { | 590 | if (extraFields != null) { |
591 | - if (extraFields.length() == 0 || !(extraFields.has("ccms_offer") || extraFields.has("type"))) { | 591 | + if (extraFields.length() == 0 || !(/*extraFields.has("ccms_offer") || */extraFields.has("type"))) { |
592 | gfyList.add(camp); | 592 | gfyList.add(camp); |
593 | } | 593 | } |
594 | } | 594 | } | ... | ... |
... | @@ -528,7 +528,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener | ... | @@ -528,7 +528,7 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener |
528 | try { | 528 | try { |
529 | JSONObject extraFields = WarpJSONParser.getJSONFromString(camp.getExtraFields()); | 529 | JSONObject extraFields = WarpJSONParser.getJSONFromString(camp.getExtraFields()); |
530 | if (extraFields != null) { | 530 | if (extraFields != null) { |
531 | - if (extraFields.length() == 0 || !(extraFields.has("ccms_offer") || extraFields.has("type"))) { | 531 | + if (extraFields.length() == 0 || !(/*extraFields.has("ccms_offer") || */extraFields.has("type"))) { |
532 | mfyList.add(camp); | 532 | mfyList.add(camp); |
533 | } | 533 | } |
534 | } | 534 | } | ... | ... |
... | @@ -29,6 +29,7 @@ import java.util.Date; | ... | @@ -29,6 +29,7 @@ import java.util.Date; |
29 | import java.util.Locale; | 29 | import java.util.Locale; |
30 | 30 | ||
31 | import ly.warp.sdk.R; | 31 | import ly.warp.sdk.R; |
32 | +import ly.warp.sdk.Warply; | ||
32 | import ly.warp.sdk.io.callbacks.CallbackReceiver; | 33 | import ly.warp.sdk.io.callbacks.CallbackReceiver; |
33 | import ly.warp.sdk.io.models.HealthEventModel; | 34 | import ly.warp.sdk.io.models.HealthEventModel; |
34 | import ly.warp.sdk.io.models.PacingDetails; | 35 | import ly.warp.sdk.io.models.PacingDetails; |
... | @@ -88,6 +89,7 @@ public class WarplyHealthService extends Service implements SensorEventListener | ... | @@ -88,6 +89,7 @@ public class WarplyHealthService extends Service implements SensorEventListener |
88 | mSensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE); | 89 | mSensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE); |
89 | mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER); | 90 | mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER); |
90 | // registerStepSensor(); | 91 | // registerStepSensor(); |
92 | + Warply.getInitializer(this).init(); | ||
91 | WarplyManager.getPacingDetails(new PacingDetailsRequest(), mPacingCallback); | 93 | WarplyManager.getPacingDetails(new PacingDetailsRequest(), mPacingCallback); |
92 | } | 94 | } |
93 | 95 | ... | ... |
... | @@ -1146,7 +1146,7 @@ public class WarplyManagerHelper { | ... | @@ -1146,7 +1146,7 @@ public class WarplyManagerHelper { |
1146 | try { | 1146 | try { |
1147 | JSONObject extraFields = WarpJSONParser.getJSONFromString(camp.getExtraFields()); | 1147 | JSONObject extraFields = WarpJSONParser.getJSONFromString(camp.getExtraFields()); |
1148 | if (extraFields != null) { | 1148 | if (extraFields != null) { |
1149 | - if (extraFields.length() == 0 || !(extraFields.has("ccms_offer") || extraFields.has("type"))) { | 1149 | + if (extraFields.length() == 0 || !(/*extraFields.has("ccms_offer") || */extraFields.has("type"))) { |
1150 | mCampaignList.add(camp); | 1150 | mCampaignList.add(camp); |
1151 | } | 1151 | } |
1152 | } | 1152 | } | ... | ... |
... | @@ -1482,7 +1482,7 @@ public class WarplyManager { | ... | @@ -1482,7 +1482,7 @@ public class WarplyManager { |
1482 | try { | 1482 | try { |
1483 | JSONObject extraFields = WarpJSONParser.getJSONFromString(camp.getExtraFields()); | 1483 | JSONObject extraFields = WarpJSONParser.getJSONFromString(camp.getExtraFields()); |
1484 | if (extraFields != null) { | 1484 | if (extraFields != null) { |
1485 | - if (extraFields.length() == 0 || !(extraFields.has("ccms_offer") || extraFields.has("type"))) { | 1485 | + if (extraFields.length() == 0 || !(/*extraFields.has("ccms_offer") || */extraFields.has("type"))) { |
1486 | campaignLoyaltyList.add(camp); | 1486 | campaignLoyaltyList.add(camp); |
1487 | } | 1487 | } |
1488 | } | 1488 | } | ... | ... |
-
Please register or login to post a comment