更新了陌生人识别 弹窗部分代码

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);
+
     }
 
 

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);

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);

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<std_msgs.String> subscriber =
-                connectedNode.newSubscriber("chatter", std_msgs.String._TYPE);
+                connectedNode.newSubscriber("stranger_detect", std_msgs.String._TYPE);
         subscriber.addMessageListener(new MessageListener<std_msgs.String>() {
             @Override
             public void onNewMessage(std_msgs.String message) {

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;
                 }
             }

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();
-        }
-    };
 }