Now wokrs on a None uPnP router, need testing in uPnP router.

StevenSunzh · Nov 2, 2012 · 52f5c86 · 52f5c86
1 parent de72e9f
commit 52f5c86
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/teaonly/droideye/MainActivity.java b/src/teaonly/droideye/MainActivity.java
@@ -104,6 +104,9 @@ public void onCreate(Bundle savedInstanceState) {
             videoFrames[i] = new VideoFrame(1024*1024*2);        
         }    
 
+        System.loadLibrary("mp3encoder");
+        System.loadLibrary("natpmp");
+
         initAudio();
         initCamera();
     }
@@ -181,7 +184,6 @@ private void initAudio() {
         if ( audioLoop == null)     
             audioLoop = new StreamingLoop("teaonly.droideye");
 
-        System.loadLibrary("mp3encoder");
     }
 
     private void initCamera() {
@@ -229,6 +231,8 @@ private boolean initWebServer() {
             tvMessage1.setText( getString(R.string.msg_access_local) + " http://" + ipAddr  + ":8080" );
             tvMessage2.setText( getString(R.string.msg_access_query));
             tvMessage2.setVisibility(View.VISIBLE);
+            NatPMPClient natQuery = new NatPMPClient();
+            natQuery.start();  
             return true;
         } else {
             tvMessage1.setText( getString(R.string.msg_error) );
@@ -423,12 +427,13 @@ public void run() {
 
 
     static private native String nativeQueryInternet();    
-    private class NatPMPClinet extends Thread {
-        String ret = nativeQueryInternet();
+    private class NatPMPClient extends Thread {
+        String queryResult;
+        Handler handleQueryResult = new Handler(getMainLooper());  
         @Override
         public void run(){
-            Handler handleQueryResult = new Handler(getMainLooper());  
-            if ( ret.startsWith("error:") ) {
+            queryResult = nativeQueryInternet();
+            if ( queryResult.startsWith("error:") ) {
                 handleQueryResult.post( new Runnable() {
                     @Override
                     public void run() {
@@ -439,7 +444,7 @@ public void run() {
                 handleQueryResult.post( new Runnable() {
                     @Override
                     public void run() {
-                        tvMessage2.setText( getString(R.string.msg_access_internet) + " " + ret );
+                        tvMessage2.setText( getString(R.string.msg_access_internet) + " " + queryResult );
                     }
                 });
             }