From be840f59c8df2ad665dc3466c0c4542f922f0c7c Mon Sep 17 00:00:00 2001 From: Logical <598669236@qq.com> Date: Tue, 29 Jun 2021 16:37:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E9=99=8C=E7=94=9F?= =?UTF-8?q?=E4=BA=BA=E8=AF=86=E5=88=AB=20=E5=BC=B9=E7=AA=97=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rocon_remocon/MainActivity.java | 1 + .../rocon_remocon/WelcomActivity.java | 3 +++ .../fall_dectect/FallDetectedActivity.java | 4 ++-- .../fall_dectect/subscriber.java | 4 ++-- .../stranger_detect/NewListener.java | 19 +++++++++++---- .../stranger_detect/StrangerDialog.java | 24 ------------------- 6 files changed, 22 insertions(+), 33 deletions(-) diff --git a/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/MainActivity.java b/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/MainActivity.java index 8a4e047..280290b 100644 --- a/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/MainActivity.java +++ b/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/MainActivity.java @@ -46,6 +46,7 @@ public class MainActivity extends AppCompatActivity{ functionItemList.add(motionControl); FunctionItem medicineAlert = new FunctionItem("服药提醒", R.drawable.directional_arrow); functionItemList.add(medicineAlert); + } diff --git a/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/WelcomActivity.java b/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/WelcomActivity.java index caf250c..dec84f7 100644 --- a/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/WelcomActivity.java +++ b/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/WelcomActivity.java @@ -6,6 +6,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; +import android.util.Log; import android.widget.TextView; import java.util.Timer; @@ -16,6 +17,8 @@ import java.util.TimerTask; */ public class WelcomActivity extends AppCompatActivity { + + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/fall_dectect/FallDetectedActivity.java b/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/fall_dectect/FallDetectedActivity.java index 5c3446f..5067960 100644 --- a/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/fall_dectect/FallDetectedActivity.java +++ b/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/fall_dectect/FallDetectedActivity.java @@ -61,8 +61,8 @@ public class FallDetectedActivity extends AppCompatActivity implements ViewAnima drawerLayout.closeDrawers(); } }); - setActionBar();//设置活动bar - createMenuList();//设置菜单 + setActionBar(); + createMenuList(); viewAnimator = new ViewAnimator<>(this, list, contentFragment, drawerLayout, this); Button buttonStartDetect=(Button)findViewById(R.id.StartFallDetect); diff --git a/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/fall_dectect/subscriber.java b/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/fall_dectect/subscriber.java index c5715cc..561ce43 100644 --- a/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/fall_dectect/subscriber.java +++ b/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/fall_dectect/subscriber.java @@ -15,7 +15,7 @@ import org.ros.node.ConnectedNode; import org.ros.node.topic.Subscriber; public class subscriber extends AbstractNodeMain { - /*本类实现了订阅摔倒检测信息的功能*/ + /*本类实现了订阅陌生人检测信息的功能*/ private static String TAG = "subscriber"; public String text = null; @@ -39,7 +39,7 @@ public class subscriber extends AbstractNodeMain { public void onStart(final ConnectedNode connectedNode) { //create subscriber final Subscriber subscriber = - connectedNode.newSubscriber("chatter", std_msgs.String._TYPE); + connectedNode.newSubscriber("stranger_detect", std_msgs.String._TYPE); subscriber.addMessageListener(new MessageListener() { @Override public void onNewMessage(std_msgs.String message) { diff --git a/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/stranger_detect/NewListener.java b/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/stranger_detect/NewListener.java index f28840f..2e80e95 100644 --- a/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/stranger_detect/NewListener.java +++ b/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/stranger_detect/NewListener.java @@ -9,8 +9,9 @@ import android.view.MenuItem; import com.github.rosjava.android_remocons.common_tools.apps.RosAppActivity; import com.github.rosjava.android_remocons.rocon_remocon.R; -import com.github.rosjava.android_remocons.rocon_remocon.fall_dectect.FallDialog; -import com.github.rosjava.android_remocons.rocon_remocon.fall_dectect.subscriber; +import com.github.rosjava.android_remocons.rocon_remocon.stranger_detect.StrangerDialog; +import com.github.rosjava.android_remocons.rocon_remocon.stranger_detect.subscriber; +import com.github.rosjava.android_remocons.rocon_remocon.stranger_detect.NoStrangerDialog; import org.ros.node.NodeConfiguration; import org.ros.node.NodeMainExecutor; @@ -62,9 +63,17 @@ public class NewListener extends RosAppActivity //sc.getAlertText(); Log.i("listener", "I heard msg from ubuntu : \"" + sc.getAlertText() + "\""); if (sc.getAlertText() != null) { - Log.e("listener", "收到了"); - Intent intent = new Intent(NewListener.this,FallDialog.class); - startActivity(intent); + if (sc.getAlertText() == "有陌生人来访！"){ + Log.e("listener", "收到了"); + Intent intent = new Intent(NewListener.this,StrangerDialog.class); + startActivity(intent); + } + else { + Log.e("listener", "收到了"); + Intent intent = new Intent(NewListener.this, NoStrangerDialog.class); + startActivity(intent); + } + alertConfirm = false; } } diff --git a/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/stranger_detect/StrangerDialog.java b/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/stranger_detect/StrangerDialog.java index 0e747b5..fec6734 100644 --- a/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/stranger_detect/StrangerDialog.java +++ b/src/AndroidApp/android_remocons/rocon_remocon/src/main/java/com/github/rosjava/android_remocons/rocon_remocon/stranger_detect/StrangerDialog.java @@ -14,8 +14,6 @@ import android.view.View; import com.github.rosjava.android_remocons.rocon_remocon.R; import com.github.rosjava.android_remocons.rocon_remocon.Remocon; import com.github.rosjava.android_remocons.rocon_remocon.WelcomActivity; -import com.github.rosjava.android_remocons.rocon_remocon.fall_dectect.FallDetectedActivity; -import com.github.rosjava.android_remocons.rocon_remocon.fall_dectect.FallDialog; public class StrangerDialog extends AppCompatActivity { /*本类实现检测到陌生人后弹出提示对话框的功能*/ @@ -31,26 +29,4 @@ public class StrangerDialog extends AppCompatActivity { alertdialog1.show(); //setContentView(R.layout.fall_alert); } - private DialogInterface.OnClickListener click1=new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface arg0,int arg1) - { - //响应点击返回陌生人检测的主界面 - Intent intent = new Intent(StrangerDialog.this, StrangerlDetectedActivity.class); - startActivity(intent); - //android.os.Process.killProcess(android.os.Process.myPid()); - } - }; - private DialogInterface.OnClickListener click2=new DialogInterface.OnClickListener() - { - //响应点击返回继续监视的界面 - @Override - public void onClick(DialogInterface arg0,int arg1) - { - Intent intent = new Intent(StrangerDialog.this, NewListener.class); - startActivity(intent); - arg0.cancel(); - } - }; } \ No newline at end of file