更新到 v1.1.0

GcsSloop · Dec 18, 2016 · 87df91d · 87df91d
1 parent 9805a3b
commit 87df91d
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,7 @@ captures/
 
 # Keystore files
 *.jks
+
+Sample/src/androidTest/java/com/gcssloop/rocker/ApplicationTest.java
+
+Sample/src/test/java/com/gcssloop/rocker/ExampleUnitTest.java
diff --git a/Sample/src/main/java/com/gcssloop/rockertest/MainActivity.java b/Sample/src/main/java/com/gcssloop/rockertest/MainActivity.java
@@ -1,10 +1,8 @@
 package com.gcssloop.rockertest;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
-import android.view.View;
-import android.widget.TextView;
 
 import com.gcssloop.widget.RockerView;
 
@@ -15,25 +13,34 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        RockerView rocker = (RockerView) findViewById(R.id.rocker);
-        if (null != rocker){
-            rocker.setListener(new RockerView.RockerListener() {
-                @Override
-                public void callback(int eventType, int currentAngle) {
-                    switch (eventType) {
-                        case RockerView.EVENT_ACTION:
-                            // 触摸事件回调
-                            Log.e("EVENT_ACTION-------->", "angle="+currentAngle);
-                            break;
-                        case RockerView.EVENT_CLOCK:
-                            // 定时回调
-                            Log.e("EVENT_CLOCK", "angle="+currentAngle);
-                            break;
+        try{
+            RockerView rocker = (RockerView) findViewById(R.id.rocker);
+            if (null != rocker){
+                rocker.setListener(new RockerView.RockerListener() {
+                    @Override
+                    public void callback(int eventType, int currentAngle) {
                     }
-                }
-            });
+
+                    @Override
+                    public void callback(int eventType, int currentAngle, float currentDistance) {
+                        switch (eventType) {
+                            case RockerView.EVENT_ACTION:
+                                // 触摸事件回调
+                                Log.e("EVENT_ACTION-------->", "angle="+currentAngle+" - distance"+currentDistance);
+                                break;
+                            case RockerView.EVENT_CLOCK:
+                                // 定时回调
+                                Log.e("EVENT_CLOCK", "angle="+currentAngle+" - distance"+currentDistance);
+                                break;
+                        }
+                    }
+                });
+            }
+        }catch (Exception e){
+            e.printStackTrace();
         }
 
 
+
     }
 }
diff --git a/Sample/src/main/res/layout/activity_main.xml b/Sample/src/main/res/layout/activity_main.xml
@@ -15,6 +15,7 @@
         android:layout_height="wrap_content"
         rocker:area_background="@drawable/area_bg"
         rocker:area_radius="80dp"
+        rocker:callback_cycle="300"
         rocker:rocker_background="@drawable/rocker_bg"
         rocker:rocker_radius="30dp"/>
 

diff --git a/library/src/main/java/com/gcssloop/widget/RockerView.java b/library/src/main/java/com/gcssloop/widget/RockerView.java
@@ -289,14 +289,18 @@ public boolean onTouchEvent(MotionEvent event) {
                 }
                 if (mListener != null) {
                     float radian = MathUtils.getRadian(mAreaPosition, new Point((int) event.getX(), (int) event.getY()));
-                    mListener.callback(EVENT_ACTION, getAngleConvert(radian));
+                    int angle = RockerView.this.getAngleConvert(radian);
+                    float distance = MathUtils.getDistance(mAreaPosition.x, mAreaPosition.y, event.getX(), event.getY());
+                    mListener.callback(EVENT_ACTION, angle);
+                    mListener.callback(EVENT_ACTION, angle, distance);
                 }
             }
             //如果手指离开屏幕，则摇杆返回初始位置
             if (event.getAction() == MotionEvent.ACTION_UP) {
                 mRockerPosition = new Point(mAreaPosition);
                 if (mListener != null) {
                     mListener.callback(EVENT_ACTION, -1);
+                    mListener.callback(EVENT_ACTION, -1, 0);
                 }
             }
         } catch (Exception e) {
@@ -373,9 +377,13 @@ private void listenerCallback() {
         if (mListener != null) {
             if (mRockerPosition.x == mAreaPosition.x && mRockerPosition.y == mAreaPosition.y) {
                 mListener.callback(EVENT_CLOCK, -1);
+                mListener.callback(EVENT_CLOCK, -1, 0);
             } else {
                 float radian = MathUtils.getRadian(mAreaPosition, new Point(mRockerPosition.x, mRockerPosition.y));
-                mListener.callback(EVENT_CLOCK, RockerView.this.getAngleConvert(radian));
+                int angle = RockerView.this.getAngleConvert(radian);
+                float distance = MathUtils.getDistance(mAreaPosition.x, mAreaPosition.y, mRockerPosition.x, mRockerPosition.y);
+                mListener.callback(EVENT_CLOCK, angle);
+                mListener.callback(EVENT_CLOCK, angle, distance);
             }
         }
     }
@@ -474,6 +482,9 @@ public void setListener(@NonNull RockerListener listener) {
 
     /*Rocker Listener******************************************************************************/
 
+    /**
+     * rocker listener
+     */
     public interface RockerListener {
         /**
          * you can get some event from this method
@@ -482,5 +493,15 @@ public interface RockerListener {
          * @param currentAngle The current angle
          */
         void callback(int eventType, int currentAngle);
+
+        /**
+         * you can get some event from this method
+         *
+         * @param eventType The event type, EVENT_ACTION or EVENT_CLOCK
+         * @param currentAngle The current angle
+         * @param currentDistance The current distance (px)
+         */
+        void callback(int eventType, int currentAngle, float currentDistance);
     }
+
 }