open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
c2727e79 1 parent 56944184

huawei map

Expand all
Inline Side-by-side
Showing 13 changed files with 95 additions and 13 deletions
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
116 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_more_for_you.xml" value="0.22" /> 116 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_more_for_you.xml" value="0.22" />
117 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_past_coupons.xml" value="0.358695652173913" /> 117 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_past_coupons.xml" value="0.358695652173913" />
118 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_shops.xml" value="0.36666666666666664" /> 118 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_shops.xml" value="0.36666666666666664" />
119 + <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_shops_huawei.xml" value="0.23157894736842105" />
119 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_steps.xml" value="0.358695652173913" /> 120 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_steps.xml" value="0.358695652173913" />
120 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_telco.xml" value="0.36666666666666664" /> 121 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_telco.xml" value="0.36666666666666664" />
121 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_webview.xml" value="0.4282238442822384" /> 122 <entry key="..\:/Users/Warply/Documents/Warply/Android/warply_android_sdk_maven_plugin/warply_android_sdk/src/main/res/layout/activity_webview.xml" value="0.4282238442822384" />
......
1 apply plugin: 'com.android.application' 1 apply plugin: 'com.android.application'
2 //apply plugin: 'com.google.gms.google-services' 2 //apply plugin: 'com.google.gms.google-services'
3 +//apply plugin: 'com.huawei.agconnect'
3 4
4 android { 5 android {
5 compileSdkVersion 31 6 compileSdkVersion 31
...@@ -23,16 +24,22 @@ android { ...@@ -23,16 +24,22 @@ android {
23 signingConfigs { 24 signingConfigs {
24 config { 25 config {
25 // Set the parameters based on the actual signing information. 26 // Set the parameters based on the actual signing information.
26 - keyAlias 'warplydemo' 27 + keyAlias 'democosmote'
27 - keyPassword 'warplydemo' 28 + keyPassword 'democosmote'
28 - storeFile file('../keystore/warplydemo.jks') 29 + storeFile file('../keystore/democosmote.jks')
29 - storePassword 'warplydemo' 30 + storePassword 'democosmote'
31 + }
32 + debug {
33 + keyAlias 'androiddebugkey'
34 + keyPassword 'android'
35 + storeFile file('../keystore/debug.keystore')
36 + storePassword 'android'
30 } 37 }
31 } 38 }
32 39
33 buildTypes { 40 buildTypes {
34 debug { 41 debug {
35 - 42 + signingConfig signingConfigs.debug
36 } 43 }
37 release { 44 release {
38 signingConfig signingConfigs.config 45 signingConfig signingConfigs.config
......
...@@ -10,7 +10,7 @@ buildscript { ...@@ -10,7 +10,7 @@ buildscript {
10 dependencies { 10 dependencies {
11 classpath 'com.android.tools.build:gradle:7.0.4' 11 classpath 'com.android.tools.build:gradle:7.0.4'
12 classpath 'com.google.gms:google-services:4.3.10' 12 classpath 'com.google.gms:google-services:4.3.10'
13 - classpath 'com.huawei.agconnect:agcp:1.6.2.300' 13 + classpath 'com.huawei.agconnect:agcp:1.7.2.300'
14 classpath 'io.github.gradle-nexus:publish-plugin:1.1.0' 14 classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
15 15
16 // NOTE: Do not place your application dependencies here; they belong 16 // NOTE: Do not place your application dependencies here; they belong
......
No preview for this file type
...@@ -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.6rc41' 5 + PUBLISH_VERSION = '4.5.4.6rc42'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
...@@ -89,6 +89,8 @@ dependencies { ...@@ -89,6 +89,8 @@ dependencies {
89 implementation 'com.huawei.hms:base:6.6.0.300' 89 implementation 'com.huawei.hms:base:6.6.0.300'
90 implementation 'com.huawei.hms:push:6.7.0.300' 90 implementation 'com.huawei.hms:push:6.7.0.300'
91 implementation 'com.huawei.hms:ads-identifier:3.4.56.300' 91 implementation 'com.huawei.hms:ads-identifier:3.4.56.300'
92 + implementation 'com.huawei.hms:maps:6.9.0.300'
93 + implementation 'com.huawei.hms:maps-basic:6.9.0.300'
92 94
93 //------------------------------ SQLCipher -----------------------------// 95 //------------------------------ SQLCipher -----------------------------//
94 api "net.zetetic:android-database-sqlcipher:4.5.2" 96 api "net.zetetic:android-database-sqlcipher:4.5.2"
......
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
12 <uses-permission 12 <uses-permission
13 android:name="android.permission.REQUEST_INSTALL_PACKAGES" 13 android:name="android.permission.REQUEST_INSTALL_PACKAGES"
14 tools:node="remove" /> 14 tools:node="remove" />
15 + <uses-permission android:name="com.huawei.appmarket.service.commondata.permission.GET_COMMON_DATA"/>
16 + <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
15 17
16 <application android:largeHeap="true"> 18 <application android:largeHeap="true">
17 <!-- <meta-data--> 19 <!-- <meta-data-->
...@@ -88,6 +90,12 @@ ...@@ -88,6 +90,12 @@
88 android:theme="@style/SDKAppTheme" /> 90 android:theme="@style/SDKAppTheme" />
89 91
90 <activity 92 <activity
93 + android:name="ly.warp.sdk.activities.ShopsHuaweiActivity"
94 + android:exported="false"
95 + android:screenOrientation="portrait"
96 + android:theme="@style/SDKAppTheme" />
97 +
98 + <activity
91 android:name="ly.warp.sdk.activities.CouponShareActivity" 99 android:name="ly.warp.sdk.activities.CouponShareActivity"
92 android:exported="false" 100 android:exported="false"
93 android:screenOrientation="portrait" 101 android:screenOrientation="portrait"
......
...@@ -36,6 +36,7 @@ import ly.warp.sdk.io.models.Coupon; ...@@ -36,6 +36,7 @@ import ly.warp.sdk.io.models.Coupon;
36 import ly.warp.sdk.io.models.Couponset; 36 import ly.warp.sdk.io.models.Couponset;
37 import ly.warp.sdk.io.models.Merchant; 37 import ly.warp.sdk.io.models.Merchant;
38 import ly.warp.sdk.services.EventCouponsService; 38 import ly.warp.sdk.services.EventCouponsService;
39 +import ly.warp.sdk.utils.WarplyDeviceInfoCollector;
39 import ly.warp.sdk.utils.WarplyManagerHelper; 40 import ly.warp.sdk.utils.WarplyManagerHelper;
40 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager; 41 import ly.warp.sdk.utils.managers.WarplyAnalyticsManager;
41 42
...@@ -131,10 +132,17 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener ...@@ -131,10 +132,17 @@ public class CouponInfoActivity extends Activity implements View.OnClickListener
131 if (view.getId() == R.id.ll_shops) { 132 if (view.getId() == R.id.ll_shops) {
132 WarplyAnalyticsManager.logTrackersEvent(this, "click", "SeeShops"); 133 WarplyAnalyticsManager.logTrackersEvent(this, "click", "SeeShops");
133 134
134 - Intent intent = new Intent(CouponInfoActivity.this, ShopsActivity.class); 135 + if (WarplyDeviceInfoCollector.isPackageInstalled("com.android.vending", getPackageManager())) {
135 - intent.putExtra("couponset", (Serializable) mCouponset); 136 + Intent intent = new Intent(CouponInfoActivity.this, ShopsActivity.class);
136 - startActivity(intent); 137 + intent.putExtra("couponset", (Serializable) mCouponset);
137 - return; 138 + startActivity(intent);
139 + return;
140 + } else {
141 + Intent intent = new Intent(CouponInfoActivity.this, ShopsHuaweiActivity.class);
142 + intent.putExtra("couponset", (Serializable) mCouponset);
143 + startActivity(intent);
144 + return;
145 + }
138 } 146 }
139 if (view.getId() == R.id.ll_website) { 147 if (view.getId() == R.id.ll_website) {
140 WarplyAnalyticsManager.logTrackersEvent(this, "click", "SeeShopWebsite"); 148 WarplyAnalyticsManager.logTrackersEvent(this, "click", "SeeShopWebsite");
......
...@@ -69,7 +69,7 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe ...@@ -69,7 +69,7 @@ public class ShopsActivity extends FragmentActivity implements View.OnClickListe
69 private Couponset mCouponset; 69 private Couponset mCouponset;
70 private GoogleMap mMap; 70 private GoogleMap mMap;
71 private ClusterManager<Merchant> mClusterManager; 71 private ClusterManager<Merchant> mClusterManager;
72 - SupportMapFragment mMapView; 72 + private SupportMapFragment mMapView;
73 private MerchantList mMerchantList = new MerchantList(); 73 private MerchantList mMerchantList = new MerchantList();
74 private AlertDialog mAlertDialogNoShopsAvailable; 74 private AlertDialog mAlertDialogNoShopsAvailable;
75 private Merchant mMerchant; 75 private Merchant mMerchant;
......
...@@ -385,7 +385,7 @@ public class WarplyDeviceInfoCollector { ...@@ -385,7 +385,7 @@ public class WarplyDeviceInfoCollector {
385 return json; 385 return json;
386 } 386 }
387 387
388 - public boolean isPackageInstalled(String packageName, PackageManager packageManager) { 388 + public static boolean isPackageInstalled(String packageName, PackageManager packageManager) {
389 try { 389 try {
390 return packageManager.getApplicationInfo(packageName, 0).enabled; 390 return packageManager.getApplicationInfo(packageName, 0).enabled;
391 } catch (PackageManager.NameNotFoundException e) { 391 } catch (PackageManager.NameNotFoundException e) {
......
...@@ -83,6 +83,11 @@ public class WarpConstants { ...@@ -83,6 +83,11 @@ public class WarpConstants {
83 new LatLng(41.97761, 28.62522) 83 new LatLng(41.97761, 28.62522)
84 ); 84 );
85 85
86 + public static final com.huawei.hms.maps.model.LatLngBounds GREECE_BOUNDS_HUAWEI = new com.huawei.hms.maps.model.LatLngBounds(
87 + new com.huawei.hms.maps.model.LatLng(34.75261, 19.33079),
88 + new com.huawei.hms.maps.model.LatLng(41.97761, 28.62522)
89 + );
90 +
86 /* Result codes */ 91 /* Result codes */
87 92
88 public static final int RESULT_CODE_SUCCESS = 1; 93 public static final int RESULT_CODE_SUCCESS = 1;
......
1 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 + xmlns:app="http://schemas.android.com/apk/res-auto"
3 + xmlns:tools="http://schemas.android.com/tools"
4 + android:layout_width="match_parent"
5 + android:layout_height="match_parent"
6 + android:background="@android:color/white">
7 +
8 + <androidx.constraintlayout.widget.ConstraintLayout
9 + android:id="@+id/cl_loyalty_wallet_header"
10 + android:layout_width="match_parent"
11 + android:layout_height="48dp"
12 + android:background="@android:color/white">
13 +
14 + <ImageView
15 + android:id="@+id/iv_shops_back"
16 + android:layout_width="48dp"
17 + android:layout_height="48dp"
18 + android:layout_marginStart="16dp"
19 + android:scaleType="centerInside"
20 + android:src="@drawable/ic_back"
21 + app:layout_constraintBottom_toBottomOf="parent"
22 + app:layout_constraintStart_toStartOf="parent"
23 + app:layout_constraintTop_toTopOf="parent" />
24 +
25 + <TextView
26 + fontPath="fonts/pf_square_sans_pro_medium.ttf"
27 + android:layout_width="wrap_content"
28 + android:layout_height="wrap_content"
29 + android:text="@string/cos_coupon_shops_title"
30 + android:textColor="@color/grey"
31 + android:textSize="17sp"
32 + app:layout_constraintBottom_toBottomOf="parent"
33 + app:layout_constraintEnd_toEndOf="parent"
34 + app:layout_constraintStart_toStartOf="parent"
35 + app:layout_constraintTop_toTopOf="parent" />
36 + </androidx.constraintlayout.widget.ConstraintLayout>
37 +
38 + <RelativeLayout
39 + android:id="@+id/cl_loyalty_info_view_inner"
40 + android:layout_width="match_parent"
41 + android:layout_height="match_parent"
42 + android:layout_below="@+id/cl_loyalty_wallet_header">
43 +
44 + <fragment
45 + android:id="@+id/mv_shops_huawei"
46 + class="com.huawei.hms.maps.SupportMapFragment"
47 + android:layout_width="match_parent"
48 + android:layout_height="match_parent"/>
49 + </RelativeLayout>
50 +</RelativeLayout>
...@@ -146,6 +146,7 @@ ...@@ -146,6 +146,7 @@
146 <string name="cos_dlg_coupon_depleted_title">Το κουπόνι εξαντλήθηκε</string> 146 <string name="cos_dlg_coupon_depleted_title">Το κουπόνι εξαντλήθηκε</string>
147 <string name="cos_dlg_coupon_depleted_message">Μείνε συντονισμένος για νέες προσφορές και κουπόνια.</string> 147 <string name="cos_dlg_coupon_depleted_message">Μείνε συντονισμένος για νέες προσφορές και κουπόνια.</string>
148 <string name="cos_dlg_no_shops">Ο συνεργάτης διαθέτει μόνο ηλεκτρονικό κατάστημα για ηλεκτρονικές παραγγελίες.</string> 148 <string name="cos_dlg_no_shops">Ο συνεργάτης διαθέτει μόνο ηλεκτρονικό κατάστημα για ηλεκτρονικές παραγγελίες.</string>
149 + <string name="cos_dlg_no_map">Το πρόγραμμα Χάρτες Petal λείπει.</string>
149 <string name="cos_dlg_no_shops_title">Καταστήματα συνεργάτη</string> 150 <string name="cos_dlg_no_shops_title">Καταστήματα συνεργάτη</string>
150 <string name="cos_dlg_no_shops_positive">Δες το eshop</string> 151 <string name="cos_dlg_no_shops_positive">Δες το eshop</string>
151 152
......