添加生命周期管理

longqingzhao · Mar 15, 2019 · b5fe1ad · b5fe1ad
1 parent 3aec48d
commit b5fe1ad
Show file tree

Hide file tree

Showing 14 changed files with 92 additions and 233 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,4 @@ app/libs/
 /autosize
 /electrocardiogram
 /libDEMO4Oximeter_BLE
+/app
diff --git a/app/src/main/java/zlq/com/myapplication/ArrayQueue.java b/app/src/main/java/zlq/com/myapplication/ArrayQueue.java
diff --git a/app/src/main/java/zlq/com/myapplication/MainActivity.java b/app/src/main/java/zlq/com/myapplication/MainActivity.java
@@ -5,6 +5,9 @@
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
+import com.zhaogege.ecgviewlibrary.ArrayQueue;
+import com.zhaogege.ecgviewlibrary.ECGPathWaveView;
+
 import java.util.Random;
 
 public class MainActivity extends AppCompatActivity {
@@ -20,7 +23,7 @@ public class MainActivity extends AppCompatActivity {
     final Runnable runnable = new Runnable() {
         @Override
         public void run() {
-            arrayQueue.pop( random.nextDouble() * 100);
+            arrayQueue.pop(random.nextDouble() * 100);
             ecgScrollView.drawXLine();
             handler.postDelayed(runnable, 10);
         }
@@ -31,8 +34,6 @@ public void run() {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
-
     }
 
     @Override
@@ -45,8 +46,8 @@ protected void onResume() {
         ecgScrollView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                handler.removeCallbacks(null);
                 handler.postDelayed(runnable, 20);
-                handler.post(runnable);
                /* for (int i = 0; i < 50; i++) {
                     arrayQueue.pop(i * xj);
                 }

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <zlq.com.myapplication.ECGPathWaveView
+    <com.zhaogege.ecgviewlibrary.ECGPathWaveView
         android:id="@+id/ecg_view"
         android:layout_width="0dp"
         android:layout_height="0dp"

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">My Application</string>
+    <string name="button">Button</string>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,6 @@ buildscript {
     repositories {
         google()
         jcenter()
-
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.3.0'
@@ -18,7 +17,7 @@ allprojects {
     repositories {
         google()
         jcenter()
-
+        maven { url 'https://jitpack.io' }
     }
 }
 

diff --git a/ecgviewlibrary/build.gradle b/ecgviewlibrary/build.gradle
@@ -7,9 +7,6 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
 
     buildTypes {
@@ -22,9 +19,4 @@ android {
 }
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
diff --git a/ecgviewlibrary/src/androidTest/java/com/zhaogege/ecgviewlibrary/ExampleInstrumentedTest.java b/ecgviewlibrary/src/androidTest/java/com/zhaogege/ecgviewlibrary/ExampleInstrumentedTest.java
diff --git a/ecgviewlibrary/src/main/java/com/zhaogege/ecgviewlibrary/ArrayQueue.java b/ecgviewlibrary/src/main/java/com/zhaogege/ecgviewlibrary/ArrayQueue.java
@@ -1,4 +1,4 @@
-package zlq.com.myapplication;
+package com.zhaogege.ecgviewlibrary;
 
 import android.util.Log;
 
@@ -84,6 +84,13 @@ private void selectEnd() {
         }
     }
 
+    public void clear() {
+        addLength = 0;
+        cursor = -1;
+        end = 0;
+        start = 0;
+    }
+
 
     /**
      * 查询