cosmote intent dl fixes

Panagiotis Triantafyllou
Commit 0057d46b5bfb0f103684cb80745360365fbd3462 0057d46b 1 parent dcf414db
Showing 4 changed files with 108 additions and 24 deletions
warply_android_sdk/build.gradle
warply_android_sdk/src/main/java/ly/warp/sdk/activities/TelematicsActivity.java
warply_android_sdk/src/main/java/ly/warp/sdk/views/WarpView.java
warply_android_sdk/src/main/res/layout/activity_telematics.xml
--- a/warply_android_sdk/build.gradle
View file @0057d46
+++ b/warply_android_sdk/build.gradle
View file @0057d46
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 ext {
     PUBLISH_GROUP_ID = 'ly.warp'
-    PUBLISH_VERSION = '4.5.4.6rc63'
+    PUBLISH_VERSION = '4.5.4.6rc64'
     PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
 }
--- a/warply_android_sdk/src/main/java/ly/warp/sdk/activities/TelematicsActivity.java
View file @0057d46
+++ b/warply_android_sdk/src/main/java/ly/warp/sdk/activities/TelematicsActivity.java
View file @0057d46
@@ -22,6 +22,7 @@ import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
@@ -90,6 +91,7 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
     private String mStartTimestamp = "", mStopTimestamp = "";
     private final int RECORDS_INTERVAL = 5000;
     private EditText mEtLimit, mEtSampleTime;
+    private RelativeLayout mRlMainScroll;
     // ===========================================================
@@ -105,6 +107,7 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
         mIvBack = findViewById(R.id.iv_telematics_close);
         mLlTripButton = findViewById(R.id.ll_activate_button);
         mLlTripButton.setOnClickListener(this);
+        mLlTripButton.setOnTouchListener(mTripTouchListener);
         mTvTripButton = findViewById(R.id.tv_trip_button);
         mLlTelematicsMain = findViewById(R.id.ll_telematics_main);
         mTvSensorData = findViewById(R.id.tv_sensor_data);
@@ -116,6 +119,8 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
         mTvTouchCount = findViewById(R.id.tv_touch);
         mEtLimit = findViewById(R.id.et_acceleration);
         mEtSampleTime = findViewById(R.id.et_save);
+        mRlMainScroll = findViewById(R.id.rl_main_scroll);
+        mRlMainScroll.setOnTouchListener(mScrollTouchListener);
         locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
         previousLocation = null;
@@ -200,6 +205,8 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
         }
         if (view.getId() == R.id.ll_activate_button) {
             if (mIsTripStarted) {
+                mEtLimit.setEnabled(true);
+                mEtSampleTime.setEnabled(true);
                 unregisterSensor();
                 stopLocationUpdates();
                 initViews();
@@ -210,6 +217,8 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
                     Snackbar.make(mLlTelematicsMain, "Please fill the Cut off field", Snackbar.LENGTH_SHORT).show();
                     return;
                 }
+                mEtLimit.setEnabled(false);
+                mEtSampleTime.setEnabled(false);
                 mTouchHandler = new Handler();
                 mTouchRunnable = new Runnable() {
                     @Override
@@ -292,28 +301,45 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
         }
     }
-    @Override
+//    @Override
-    public boolean onTouchEvent(MotionEvent event) {
+//    public boolean dispatchTouchEvent(MotionEvent event) {
-//        return super.onTouchEvent(event);
+//        if (mIsTripStarted) {
-        if (mIsTripStarted) {
+//            switch (event.getAction()) {
+//                case MotionEvent.ACTION_DOWN:
 //                    touchCount++;
 //                    mTvTouchCount.setText(String.valueOf(touchCount));
+//                    mTouchHandler.post(mTouchRunnable);
 //                    return true;
+//                case MotionEvent.ACTION_UP:
+//                    mTouchHandler.removeCallbacks(mTouchRunnable);
+//                    return true;
+//            }
+//        }
+//        return super.dispatchTouchEvent(event);
+//    }
-            switch (event.getAction()) {
+//    @Override
-                case MotionEvent.ACTION_DOWN:
+//    public boolean onTouchEvent(MotionEvent event) {
-                    touchCount++;
+////        return super.onTouchEvent(event);
-                    mTvTouchCount.setText(String.valueOf(touchCount));
+//        if (mIsTripStarted) {
-                    mTouchHandler.post(mTouchRunnable);
+////            touchCount++;
-                    return true;
+////            mTvTouchCount.setText(String.valueOf(touchCount));
-                case MotionEvent.ACTION_UP:
+////            return true;
-                    mTouchHandler.removeCallbacks(mTouchRunnable);
+//
-                    return true;
+//            switch (event.getAction()) {
-            }
+//                case MotionEvent.ACTION_DOWN:
-            return false;
+//                    touchCount++;
-        }
+//                    mTvTouchCount.setText(String.valueOf(touchCount));
-        return false;
+//                    mTouchHandler.post(mTouchRunnable);
-    }
+//                    return true;
+//                case MotionEvent.ACTION_UP:
+//                    mTouchHandler.removeCallbacks(mTouchRunnable);
+//                    return true;
+//            }
+//            return false;
+//        }
+//        return false;
+//    }
     // ===========================================================
     // Methods
@@ -495,6 +521,39 @@ public class TelematicsActivity extends Activity implements View.OnClickListener
         }
     }
+    private final View.OnTouchListener mTripTouchListener = new View.OnTouchListener() {
+        @Override
+        public boolean onTouch(View view, MotionEvent motionEvent) {
+            if (mIsTripStarted) {
+                if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
+                    mTouchHandler.removeCallbacks(mTouchRunnable);
+                    onClick(view);
+                    return true;
+                }
+            }
+            return false;
+        }
+    };
+
+    private final View.OnTouchListener mScrollTouchListener = new View.OnTouchListener() {
+        @Override
+        public boolean onTouch(View view, MotionEvent motionEvent) {
+            if (mIsTripStarted) {
+                switch (motionEvent.getAction()) {
+                    case MotionEvent.ACTION_DOWN:
+                        touchCount++;
+                        mTvTouchCount.setText(String.valueOf(touchCount));
+                        mTouchHandler.post(mTouchRunnable);
+                        return true;
+                    case MotionEvent.ACTION_UP:
+                        mTouchHandler.removeCallbacks(mTouchRunnable);
+                        return true;
+                }
+            }
+            return false;
+        }
+    };
+
 //    // Low-pass filter function using Exponential Moving Average (EMA)
 //    private float lowPassFilter(float currentValue) {
 //        float filteredValue = alpha * currentValue + (1 - alpha) * previousFilteredValue;
--- a/warply_android_sdk/src/main/java/ly/warp/sdk/views/WarpView.java
View file @0057d46
+++ b/warply_android_sdk/src/main/java/ly/warp/sdk/views/WarpView.java
View file @0057d46
@@ -43,6 +43,7 @@ import android.net.http.SslError;
 import android.os.Build;
 import android.text.TextUtils;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.webkit.GeolocationPermissions.Callback;
 import android.webkit.JavascriptInterface;
 import android.webkit.SslErrorHandler;
@@ -75,6 +76,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import java.io.UnsupportedEncodingException;
+import java.net.URISyntaxException;
 import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -107,6 +109,7 @@ public class WarpView extends WebView implements DefaultLifecycleObserver {
     private static final String URL_ACTION_RSMS = "rsms";
     private static final String URL_ACTION_MAIL = "mailto";
     private static final String URL_ACTION_MARKET = "market";
+    private static final String URL_ACTION_INTENT = "intent";
     private static final String URL_ACTION_MARKET_AUTHORITY = "play.google.com";
     private static final String TAG_STEPS_WORKER = "ly.warp.sdk.services.WarplyHealthService";
@@ -789,6 +792,21 @@ public class WarpView extends WebView implements DefaultLifecycleObserver {
                 Intent intent = new Intent(Intent.ACTION_VIEW, webpage);
                 getContext().startActivity(intent);
                 return true;
+            } else if (scheme.equalsIgnoreCase(URL_ACTION_INTENT)) {
+                try {
+                    Intent intent = Intent.parseUri(strUrl, Intent.URI_INTENT_SCHEME);
+//                    String fallbackUrl = intent.getStringExtra("browser_fallback_url");
+                    String data = intent.getData().toString();
+                    if (!TextUtils.isEmpty(data)) {
+//                        view.loadUrl(fallbackUrl);
+                        Uri webpage = Uri.parse(data);
+                        Intent intentWebpage = new Intent(Intent.ACTION_VIEW, webpage);
+                        getContext().startActivity(intentWebpage);
+                        return true;
+                    }
+                } catch (URISyntaxException e) {
+                    return true;
+                }
             }
             return false;
         }
--- a/warply_android_sdk/src/main/res/layout/activity_telematics.xml
View file @0057d46
+++ b/warply_android_sdk/src/main/res/layout/activity_telematics.xml
View file @0057d46
@@ -40,11 +40,17 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
     <ScrollView
-        android:fillViewport="true"
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/cos_light_grey3"
+            android:orientation="vertical">
+
             <RelativeLayout
+                android:id="@+id/rl_main_scroll"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@color/cos_light_grey3"
@@ -152,8 +158,8 @@
                     android:layout_below="@+id/tv_avg"
                     android:layout_alignParentEnd="true"
                     android:layout_marginTop="24dp"
-                android:paddingEnd="24dp"
                     android:layout_marginEnd="24dp"
+                    android:paddingEnd="24dp"
                     android:text="Touch Count"
                     android:textColor="@color/blue_dark"
                     android:textSize="16sp" />
@@ -201,8 +207,8 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/tv_records"
                     android:layout_alignParentStart="true"
-                android:layout_marginTop="24dp"
                     android:layout_marginStart="24dp"
+                    android:layout_marginTop="24dp"
                     android:hint="Cut off in m/s^2"
                     android:inputType="phone"
                     android:textColor="@color/blue_dark"
@@ -215,12 +221,13 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/tv_records"
                     android:layout_alignParentEnd="true"
-                android:paddingEnd="24dp"
                     android:layout_marginTop="24dp"
                     android:hint="Sample Interval in ms"
                     android:inputType="phone"
+                    android:paddingEnd="24dp"
                     android:textColor="@color/blue_dark"
                     android:textSize="16sp" />
+            </RelativeLayout>
             <LinearLayout
                 android:id="@+id/ll_activate_button"
@@ -244,6 +251,6 @@
                     android:textColor="@color/blue_dark"
                     android:textSize="16sp" />
             </LinearLayout>
-        </RelativeLayout>
+        </LinearLayout>
     </ScrollView>
 </LinearLayout>
\ No newline at end of file