Skip to content

S
SwapIt
Commit d2a2a29b authored by Maksymilian Chodacki's avatar Maksymilian Chodacki
Browse files
Options

client odpalany osobno

parent 42198d34
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 32 deletions
peepers/app/src/main/java/com/foxdogstudios/peepers/StreamCameraActivity.java
View file @ d2a2a29b
...@@ -37,11 +37,12 @@ import android.view.Menu; ...@@ -37,11 +37,12 @@ import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import android.view.SurfaceView; import android.view.SurfaceView;
import android.view.View;
import android.webkit.WebSettings; import android.webkit.WebSettings;
import android.webkit.WebView; import android.webkit.WebView;
import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import org.apache.http.conn.util.InetAddressUtils;
public final class StreamCameraActivity extends Activity public final class StreamCameraActivity extends Activity
implements SurfaceHolder.Callback implements SurfaceHolder.Callback
...@@ -78,6 +79,9 @@ public final class StreamCameraActivity extends Activity ...@@ -78,6 +79,9 @@ public final class StreamCameraActivity extends Activity
private SharedPreferences mPrefs = null; private SharedPreferences mPrefs = null;
private MenuItem mSettingsMenuItem = null; private MenuItem mSettingsMenuItem = null;
private WakeLock mWakeLock = null; private WakeLock mWakeLock = null;
private WebView myWebView = null;
private String clientAddressIp = "";
private Button webViewButton = null;
public StreamCameraActivity() public StreamCameraActivity()
{ {
...@@ -92,7 +96,7 @@ public final class StreamCameraActivity extends Activity ...@@ -92,7 +96,7 @@ public final class StreamCameraActivity extends Activity
Intent iin= getIntent(); Intent iin= getIntent();
Bundle b = iin.getExtras(); Bundle b = iin.getExtras();
String address = (String) b.get("ip"); clientAddressIp = (String) b.get("ip"); // client ip
new LoadPreferencesTask().execute(); new LoadPreferencesTask().execute();
...@@ -101,36 +105,16 @@ public final class StreamCameraActivity extends Activity ...@@ -101,36 +105,16 @@ public final class StreamCameraActivity extends Activity
mPreviewDisplay.addCallback(this); mPreviewDisplay.addCallback(this);
mIpAddress = (String) b.get("myIp"); mIpAddress = (String) b.get("myIp");
mIpAddressView = (TextView) findViewById(R.id.ip_address);
updatePrefCacheAndUi(); updatePrefCacheAndUi();
final PowerManager powerManager = final PowerManager powerManager =
(PowerManager) getSystemService(POWER_SERVICE); (PowerManager) getSystemService(POWER_SERVICE);
mWakeLock = powerManager.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, mWakeLock = powerManager.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK,
WAKE_LOCK_TAG); WAKE_LOCK_TAG);
myWebView = (WebView) findViewById(R.id.webview);
webViewButton = (Button) findViewById(R.id.client_mode);
WebView myWebView = (WebView) findViewById(R.id.webview);
String mDescText = "<head>\n" +
"\n" +
"</head>\n" +
"<body>\n" +
"\t<div style='width:50%;display:inline-block;height:auto'>\n" +
"\t\t<img style='width:100%' src='" + "http://" + address +"'/>\n" +
"\t</div>\n" +
"\t<div style='float:right;width:50%;display:inline-block;height:auto'> \n" +
"\t\t<img style='width:100%' src='" + "http://" + address +"'/>\n" +
"\t</div>\n" +
"\n" +
"</body>";
WebSettings settings = myWebView.getSettings();
settings.setDefaultTextEncodingName("utf-8");
settings.setJavaScriptEnabled(true);
myWebView.loadData(mDescText, "text/html; charset=utf-8",null);
} // onCreate(Bundle) } // onCreate(Bundle)
@Override @Override
...@@ -324,7 +308,6 @@ public final class StreamCameraActivity extends Activity ...@@ -324,7 +308,6 @@ public final class StreamCameraActivity extends Activity
{ {
mJpegQuality = 100; mJpegQuality = 100;
} // else if } // else if
mIpAddressView.setText("http://" + mIpAddress + ":" + mPort + "/");
} // updatePrefCacheAndUi() } // updatePrefCacheAndUi()
private boolean hasFlashLight() private boolean hasFlashLight()
...@@ -333,6 +316,28 @@ public final class StreamCameraActivity extends Activity ...@@ -333,6 +316,28 @@ public final class StreamCameraActivity extends Activity
PackageManager.FEATURE_CAMERA_FLASH); PackageManager.FEATURE_CAMERA_FLASH);
} // hasFlashLight() } // hasFlashLight()
public void showWebView(View myView){
webViewButton.setVisibility(View.INVISIBLE);
String mDescText = "<head>\n" +
"\n" +
"</head>\n" +
"<body>\n" +
"\t<div style='width:50%;display:inline-block;height:auto'>\n" +
"\t\t<img style='width:100%' src='" + "http://" + clientAddressIp +"'/>\n" +
"\t</div>\n" +
"\t<div style='float:right;width:50%;display:inline-block;height:auto'> \n" +
"\t\t<img style='width:100%' src='" + "http://" + clientAddressIp +"'/>\n" +
"\t</div>\n" +
"\n" +
"</body>";
WebSettings settings = myWebView.getSettings();
settings.setDefaultTextEncodingName("utf-8");
settings.setJavaScriptEnabled(true);
myWebView.loadData(mDescText, "text/html; charset=utf-8",null);
}
} // class StreamCameraActivity } // class StreamCameraActivity
......
peepers/app/src/main/res/layout/activity_main.xml
View file @ d2a2a29b
...@@ -27,6 +27,6 @@ ...@@ -27,6 +27,6 @@
android:onClick="startView" android:onClick="startView"
android:text="Dupa" android:text="Dupa"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"></Button> android:layout_alignParentEnd="true"/>
</RelativeLayout> </RelativeLayout>
peepers/app/src/main/res/layout/main.xml
View file @ d2a2a29b
...@@ -27,13 +27,16 @@ ...@@ -27,13 +27,16 @@
/> />
<Button
<TextView
android:id="@+id/ip_address"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|top" android:text="dupa blada !"
android:background="@android:color/black" /> android:id="@+id/client_mode"
android:onClick="showWebView"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
/>
</merge> </merge>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment