open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
3249405a 1 parent ed4958b5

telco gifts

Expand all
Inline Side-by-side
Showing 9 changed files with 249 additions and 63 deletions
......@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
ext {
PUBLISH_GROUP_ID = 'ly.warp'
PUBLISH_VERSION = '4.5.4-cosbeta34'
PUBLISH_VERSION = '4.5.4-cosbeta35i'
PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
}
......
......@@ -179,17 +179,18 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
try {
JSONObject extraFields = WarpJSONParser.getJSONFromString(dataItem.getCampaign().getExtraFields());
if (extraFields != null) {
// if (extraFields.has("type") && extraFields.optString("type").equals("telco")) {
// for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
// if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) {
// Intent intent = new Intent(GiftsForYouActivity.this, TelcoActivity.class);
// intent.putExtra("ccms", ccms);
// startActivity(intent);
// break;
// }
// }
// return;
// }
if (extraFields.has("type") && extraFields.optString("type").equals("telco")) {
for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) {
Intent intent = new Intent(GiftsForYouActivity.this, TelcoActivity.class);
intent.putExtra("ccms", ccms);
intent.putExtra("loyalty", (Serializable) dataItem.getCampaign());
startActivity(intent);
break;
}
}
return;
}
if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) {
for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) {
......@@ -271,17 +272,18 @@ public class GiftsForYouActivity extends Activity implements View.OnClickListene
try {
JSONObject extraFields = WarpJSONParser.getJSONFromString(dataItem.getCampaign().getExtraFields());
if (extraFields != null) {
// if (extraFields.has("type") && extraFields.optString("type").equals("telco")) {
// for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
// if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) {
// Intent intent = new Intent(GiftsForYouActivity.this, TelcoActivity.class);
// intent.putExtra("ccms", ccms);
// startActivity(intent);
// break;
// }
// }
// return;
// }
if (extraFields.has("type") && extraFields.optString("type").equals("telco")) {
for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) {
Intent intent = new Intent(GiftsForYouActivity.this, TelcoActivity.class);
intent.putExtra("ccms", ccms);
intent.putExtra("loyalty", (Serializable) dataItem.getCampaign());
startActivity(intent);
break;
}
}
return;
}
if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) {
for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
if (ccms.getLoyaltyCampaignId().equals(dataItem.getCampaign().getSessionUUID())) {
......
......@@ -3,6 +3,7 @@ package ly.warp.sdk.activities;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.os.Parcelable;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
......@@ -16,6 +17,7 @@ import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.json.JSONObject;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashSet;
......@@ -123,17 +125,18 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
try {
JSONObject extraFields = WarpJSONParser.getJSONFromString(gift.getExtraFields());
if (extraFields != null) {
// if (extraFields.has("type") && extraFields.optString("type").equals("telco")) {
// for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
// if (ccms.getLoyaltyCampaignId().equals(gift.getSessionUUID())) {
// Intent intent = new Intent(MoreForYouActivity.this, TelcoActivity.class);
// intent.putExtra("ccms", ccms);
// startActivity(intent);
// break;
// }
// }
// return;
// }
if (extraFields.has("type") && extraFields.optString("type").equals("telco")) {
for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
if (ccms.getLoyaltyCampaignId().equals(gift.getSessionUUID())) {
Intent intent = new Intent(MoreForYouActivity.this, TelcoActivity.class);
intent.putExtra("ccms", ccms);
intent.putExtra("loyalty", (Serializable) gift);
startActivity(intent);
break;
}
}
return;
}
if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) {
for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
if (ccms.getLoyaltyCampaignId().equals(gift.getSessionUUID())) {
......@@ -184,17 +187,18 @@ public class MoreForYouActivity extends Activity implements View.OnClickListener
try {
JSONObject extraFields = WarpJSONParser.getJSONFromString(gift.getExtraFields());
if (extraFields != null) {
// if (extraFields.has("type") && extraFields.optString("type").equals("telco")) {
// for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
// if (ccms.getLoyaltyCampaignId().equals(gift.getSessionUUID())) {
// Intent intent = new Intent(MoreForYouActivity.this, TelcoActivity.class);
// intent.putExtra("ccms", ccms);
// startActivity(intent);
// break;
// }
// }
// return;
// }
if (extraFields.has("type") && extraFields.optString("type").equals("telco")) {
for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
if (ccms.getLoyaltyCampaignId().equals(gift.getSessionUUID())) {
Intent intent = new Intent(MoreForYouActivity.this, TelcoActivity.class);
intent.putExtra("ccms", ccms);
intent.putExtra("loyalty", (Serializable) gift);
startActivity(intent);
break;
}
}
return;
}
if (extraFields.has("ccms_offer") && extraFields.optString("ccms_offer").equals("true")) {
for (LoyaltyContextualOfferModel ccms : WarplyManagerHelper.getCCMSLoyaltyCampaigns()) {
if (ccms.getLoyaltyCampaignId().equals(gift.getSessionUUID())) {
......
package ly.warp.sdk.activities;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import ly.warp.sdk.R;
import ly.warp.sdk.io.callbacks.CallbackReceiver;
import ly.warp.sdk.io.models.Campaign;
import ly.warp.sdk.io.models.Consumer;
import ly.warp.sdk.io.models.LoyaltyContextualOfferModel;
import ly.warp.sdk.io.request.CosmoteSubmitOrderRequest;
import ly.warp.sdk.io.request.WarplyConsumerRequest;
import ly.warp.sdk.utils.managers.WarplyManager;
public class TelcoActivity extends Activity implements View.OnClickListener {
......@@ -21,14 +38,20 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
// Constants
// ===========================================================
private final String MSISDN_LIST = "msisdnList";
// ===========================================================
// Fields
// ===========================================================
private ImageView mIvBack, mIvCampaignPhoto;
private TextView mTvCampaignTitle, mTvCampaignSubtitle;
private LoyaltyContextualOfferModel mCCMS;
private LoyaltyContextualOfferModel mCCMS = new LoyaltyContextualOfferModel();
private Campaign mLoyalty = new Campaign();
private LinearLayout mLlActivateOffer;
private Consumer mConsumer;
private String mSender = "";
private AlertDialog mAlertDialogAskActivate, mAlertDialogErrorActivating, mAlertDialogSuccessActivating;
// ===========================================================
// Methods for/from SuperClass/Interfaces
......@@ -40,6 +63,7 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
setContentView(R.layout.activity_telco);
mCCMS = (LoyaltyContextualOfferModel) getIntent().getSerializableExtra("ccms");
mLoyalty = (Campaign) getIntent().getSerializableExtra("loyalty");
mIvBack = findViewById(R.id.iv_telco_back);
mTvCampaignTitle = findViewById(R.id.textView13);
......@@ -53,6 +77,14 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
@Override
public void onResume() {
super.onResume();
new Thread(() -> {
if (!Thread.currentThread().isInterrupted()) {
WarplyManager.getConsumer(new WarplyConsumerRequest()
, mConsumerCallback);
}
Thread.currentThread().interrupt();
}).start();
}
@Override
......@@ -62,7 +94,7 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
return;
}
if (view.getId() == R.id.ll_activate_button) {
//TODO: make submitOrder
showActivationDialog();
}
}
......@@ -92,8 +124,134 @@ public class TelcoActivity extends Activity implements View.OnClickListener {
mLlActivateOffer.setOnClickListener(this);
}
private void showActivationDialog() {
final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this);
bottomSheetDialog.setContentView(R.layout.dl_share);
LinearLayout parent = bottomSheetDialog.findViewById(R.id.ll_share_dialog_view_inner);
ImageView dialogClose = (ImageView) bottomSheetDialog.findViewById(R.id.iv_sender_list_close);
dialogClose.setOnClickListener(view -> bottomSheetDialog.dismiss());
if (mConsumer != null) {
try {
JSONObject profMeta = new JSONObject(mConsumer.getProfileMetadata());
if (profMeta != null) {
JSONArray msisdnList = new JSONArray();
msisdnList = profMeta.optJSONArray(MSISDN_LIST);
if (msisdnList != null && msisdnList.length() > 0) {
for (int i = 0; i < msisdnList.length(); i++) {
LayoutInflater vi = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
LinearLayout v = (LinearLayout) vi.inflate(R.layout.item_share, null);
TextView textView = (TextView) v.findViewById(R.id.tv_phone_share);
textView.setText(msisdnList.optString(i));
textView.setOnClickListener(view -> {
TextView tv = (TextView) view;
mSender = tv.getText().toString();
bottomSheetDialog.dismiss();
askActivateDialog();
});
parent.addView(v, 0, new ViewGroup.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT));
}
}
}
} catch (JSONException e) {
e.printStackTrace();
}
}
bottomSheetDialog.show();
}
private void activateGift() {
new Thread(() -> {
if (!Thread.currentThread().isInterrupted()) {
WarplyManager.submitOrder(new CosmoteSubmitOrderRequest()
.setCommunicationUuid(mLoyalty.getSessionUUID())
.setUserMsisdn(mSender)
.setBusinessService(mCCMS.getBusinessService())
.setOfferName(mCCMS.getOfferName())
.setProductType(mCCMS.getProductType())
.setProvDuration(mCCMS.getProvDuration())
.setNoOfRecurrance(mCCMS.getNoOfRecurrance())
.setPrice(mCCMS.getPrice())
.setDiscount(mCCMS.getDiscount())
.setVoiceCategory(mCCMS.getVoiceCategory())
.setDataCategory(mCCMS.getDataCategory())
.setMinsValue(mCCMS.getMinsValue())
.setDataValue(mCCMS.getDataValue())
.setProvStepValueMins(mCCMS.getProvStepValueMins()),
mSubmitCallback);
}
Thread.currentThread().interrupt();
}).start();
}
private void askActivateDialog() {
mAlertDialogAskActivate = new AlertDialog.Builder(this)
.setTitle(R.string.cos_dlg_activate_telco_title)
.setMessage(R.string.cos_dlg_activate_telco_subtitle)
.setPositiveButton(R.string.cos_dlg_positive_button, (dialogPositive, whichPositive) -> {
activateGift();
})
.setNegativeButton(R.string.cos_dlg_negative_button2, (dialogNegative, whichNegative) -> {
dialogNegative.dismiss();
})
.show();
}
private void errorActivatingDialog() {
mAlertDialogErrorActivating = new AlertDialog.Builder(this)
.setTitle(R.string.cos_dlg_error_title)
.setMessage(R.string.cos_dlg_error_subtitle)
.setPositiveButton(R.string.cos_dlg_positive_button2, (dialogPositive, whichPositive) -> {
dialogPositive.dismiss();
})
.show();
}
private void successActivatingDialog() {
mAlertDialogSuccessActivating = new AlertDialog.Builder(this)
.setTitle(R.string.cos_dlg_activate_success_title)
.setMessage(R.string.cos_dlg_activate_success_subtitle)
.setPositiveButton(R.string.cos_dlg_positive_button2, (dialogPositive, whichPositive) -> {
dialogPositive.dismiss();
})
.show();
}
// ===========================================================
// Inner and Anonymous Classes
// ===========================================================
private final CallbackReceiver<Consumer> mConsumerCallback = new CallbackReceiver<Consumer>() {
@Override
public void onSuccess(Consumer result) {
mConsumer = result;
}
@Override
public void onFailure(int errorCode) {
Log.v("TELCO_ACTIVITY", String.valueOf(errorCode));
}
};
private CallbackReceiver<JSONObject> mSubmitCallback = new CallbackReceiver<JSONObject>() {
@Override
public void onSuccess(JSONObject result) {
int status = result.optInt("status", 2);
runOnUiThread(() -> {
if (status == 1)
successActivatingDialog();
else
errorActivatingDialog();
});
}
@Override
public void onFailure(int errorCode) {
runOnUiThread(() -> errorActivatingDialog());
}
};
}
......
......@@ -109,72 +109,72 @@ public class CosmoteSubmitOrderRequest {
// ===========================================================
public CosmoteSubmitOrderRequest setCommunicationUuid(String communicationUuid) {
mCommunicationUuid = communicationUuid;
this.mCommunicationUuid = communicationUuid;
return this;
}
public CosmoteSubmitOrderRequest setUserMsisdn(String userMsisdn) {
mUserMsisdn = userMsisdn;
this.mUserMsisdn = userMsisdn;
return this;
}
public CosmoteSubmitOrderRequest setBusinessService(String businessService) {
mBusinessService = businessService;
this.mBusinessService = businessService;
return this;
}
public CosmoteSubmitOrderRequest setOfferName(String offerName) {
mOfferName = offerName;
this.mOfferName = offerName;
return this;
}
public CosmoteSubmitOrderRequest setProductType(String productType) {
mProductType = productType;
this.mProductType = productType;
return this;
}
public CosmoteSubmitOrderRequest setProvDuration(String provDuration) {
mProvDuration = provDuration;
this.mProvDuration = provDuration;
return this;
}
public CosmoteSubmitOrderRequest setNoOfRecurrance(String noOfRecurrance) {
mNoOfRecurrance = noOfRecurrance;
this.mNoOfRecurrance = noOfRecurrance;
return this;
}
public CosmoteSubmitOrderRequest setPrice(String price) {
mPrice = price;
this.mPrice = price;
return this;
}
public CosmoteSubmitOrderRequest setDiscount(String discount) {
mDiscount = discount;
this.mDiscount = discount;
return this;
}
public CosmoteSubmitOrderRequest setVoiceCategory(String voiceCategory) {
mVoiceCategory = voiceCategory;
this.mVoiceCategory = voiceCategory;
return this;
}
public CosmoteSubmitOrderRequest setDataCategory(String dataCategory) {
mDataCategory = dataCategory;
this.mDataCategory = dataCategory;
return this;
}
public CosmoteSubmitOrderRequest setMinsValue(String minsValue) {
mMinsValue = minsValue;
this.mMinsValue = minsValue;
return this;
}
public CosmoteSubmitOrderRequest setDataValue(String dataValue) {
mDataValue = dataValue;
this.mDataValue = dataValue;
return this;
}
public CosmoteSubmitOrderRequest setProvStepValueMins(String provStepValueMins) {
mProvStepValueMins = provStepValueMins;
this.mProvStepValueMins = provStepValueMins;
return this;
}
......@@ -241,7 +241,24 @@ public class CosmoteSubmitOrderRequest {
JSONObject extraJson = new JSONObject();
extraJson.putOpt(KEY_ACTION, KEY_ACTION_VALUE);
extraJson.putOpt(KEY_PRODUCT_UUID, KEY_PRODUCT_UUID_VALUE);
extraJson.putOpt(KEY_COMMUNICATION_UUID, mCommunicationUuid);
JSONObject extraData = new JSONObject();
extraData.putOpt(KEY_USER_MSISDN, mUserMsisdn);
extraData.putOpt(KEY_BUSINESS_SERVICE, mBusinessService);
extraData.putOpt(KEY_OFFER_NAME, mOfferName);
extraData.putOpt(KEY_PRODUCT_TYPE, mProductType);
extraData.putOpt(KEY_PROV_DURATION, mProvDuration);
extraData.putOpt(KEY_NO_OF_RECURRANCE, mNoOfRecurrance);
extraData.putOpt(KEY_PRICE, mPrice);
extraData.putOpt(KEY_DISCOUNT, mDiscount);
extraData.putOpt(KEY_VOICE_CATEGORY, mVoiceCategory);
extraData.putOpt(KEY_DATA_CATEGORY, mDataCategory);
extraData.putOpt(KEY_MINS_VALUE, mMinsValue);
extraData.putOpt(KEY_DATA_VALUE, mDataValue);
extraData.putOpt(KEY_PROV_STEP_VALUE_MINS, mProvStepValueMins);
extraJson.putOpt(KEY_EXTRA_DATA, extraData);
bodyJsonObject.putOpt(KEY_MAPP, extraJson);
} catch (JSONException e) {
if (WarpConstants.DEBUG)
......
......@@ -2256,7 +2256,7 @@ public class WarplyManager {
public void onSuccess(JSONObject result) {
int status = result.optInt("status", 2);
if (status == 1) {
receiver.onSuccess(result);
} else
receiver.onFailure(status);
}
......
......@@ -90,6 +90,7 @@
android:paddingHorizontal="32dp"
android:textColor="#415564"
android:textSize="16sp"
tools:text="test test"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView13" />
......
......@@ -104,6 +104,10 @@
<string name="cos_dlg_error_subtitle2">Τα πεδία δεν είναι σωστά</string>
<string name="cos_dlg_success_couponset_title">Το κουπόνι σου ενεργοποιήθηκε</string>
<string name="cos_dlg_success_couponset_subtitle">Μπορείς να το βρεις στην αρχική οθόνη της εφαρμογής και στην ενότητα ενεργά δώρα!</string>
<string name="cos_dlg_activate_telco_title">Ενεργοποίηση υπηρεσίας</string>
<string name="cos_dlg_activate_telco_subtitle">Θέλετε να γίνει ενεργοποίηση στο Κινητό μου;</string>
<string name="cos_dlg_activate_success_title">Το αίτημά σου ολοκληρώθηκε επιτυχώς!</string>
<string name="cos_dlg_activate_success_subtitle">Θα ενημερωθείς άμεσα για την ενεργοποίηση του πακέτου σου.</string>
<string-array name="coupons_array">
<item>Κουπόνια</item>
......