Skip to content

Commit fc30507

Browse files
committed
Fixed some more Typos
1 parent 3f33442 commit fc30507

8 files changed

Lines changed: 20 additions & 20 deletions

File tree

Android/app/src/main/java/com/ipcamera/SettingsPreferences.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ class SettingsPreferences(context: Context) {
1919
}
2020

2121
fun getIpAddress() : String? {
22-
return sharedPreferences.getString(IP_KEY, "192.168.0.101:4321")
22+
return sharedPreferences.getString(IP_KEY, "192.168.178.101:4321")
2323
}
24-
}
24+
}

Android/app/src/main/res/layout/settings_fragment.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
android:layout_height="wrap_content"
2323
app:layout_constraintBottom_toBottomOf="parent"
2424
app:layout_constraintTop_toTopOf="parent"
25-
app:helperText="Format: 192.168.168.x:4321"
25+
app:helperText="Example: 192.168.168.x:4321"
2626
android:layout_marginHorizontal="@dimen/horizontal_margin"
2727
>
2828

2929
<com.google.android.material.textfield.TextInputEditText
3030
android:id="@+id/edit_text_ip"
3131
android:layout_width="match_parent"
3232
android:layout_height="wrap_content"
33-
android:hint="Server IP Address"
33+
android:hint="Enter server IP address"
3434
android:inputType="textNoSuggestions"
3535
/>
3636

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ You can either watch this video or follow the steps below.
1616
- Camera Server (runs on port 4321)
1717

1818
2. Install the app on your phone.
19-
3. Navigate to the app's settings screen and set up your camera server's IP. For example: `192.168.0.101:4321`
19+
3. Navigate to the app's settings screen and set up your camera server's IP. For example: `192.168.178.101:4321`
2020
4. Open the stream screen and click the "Start streaming" button.
2121
5. Your phone is now sending video data to your Camera Server.
2222

@@ -27,20 +27,20 @@ The stream can be watched from either your browser, the Web App, or apps like VL
2727

2828
### Browser
2929
Open your favorite web browser and navigate to your MJPEG Server's IP address. For example:
30-
`http://192.168.0.101:4444`
30+
`http://192.168.178.101:4444`
3131

3232
![Preview](https://github.com/BalioFVFX/IP-Camera/blob/main/media/browser.gif?raw=true)
3333

3434
### VLC Media Player
3535
Open VLC Media Player. Go to **File → Open Network → Network** and enter your MJPEG Server's IP address. For example:
36-
`http://192.168.0.101:4444/`
36+
`http://192.168.178.101:4444/`
3737

3838
![Preview](https://github.com/BalioFVFX/IP-Camera/blob/main/media/vlc.gif?raw=true)
3939

4040
### The Web App
4141
1. Navigate to the Web App's root directory and execute `webpack serve` in your terminal.
4242
2. Open your browser and go to `http://localhost:8080/`.
43-
3. Go to the settings page and enter your WebSocket Server's IP address. For example: `192.168.0.101:1234`
43+
3. Go to the settings page and enter your WebSocket Server's IP address. For example: `192.168.178.101:1234`
4444
4. Navigate to the streaming page at `http://localhost:8080/stream.html` and click the "Connect" button.
4545

4646
![Preview](https://github.com/BalioFVFX/IP-Camera/blob/main/media/webapp.gif?raw=true)

VideoServer/src/main/kotlin/CameraServer.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ class CameraServer {
4444
createFrameDelegatorThread().start()
4545

4646
val thread = Thread() {
47-
println("Camera server: Starting camera server")
47+
println("CameraServer: Starting the cameraserver")
4848

49-
println("Camera server: Waiting for clients...")
49+
println("CameraServer: Waiting for clients...")
5050
val client = server.accept()
5151
deviceConnected = true
5252
val connectionTime = System.currentTimeMillis()
@@ -104,7 +104,7 @@ class CameraServer {
104104
iterator.forEach { listener ->
105105
listener.onAvailable(deviceOfflineImage)
106106
}
107-
println("Device offline, sending \"Device offline image\"")
107+
println("Device is offline - sending fallback image")
108108
Thread.sleep(1000 / 24)
109109
}
110110
continue
@@ -140,4 +140,4 @@ class CameraServer {
140140
file.writeText(existingLines)
141141
}
142142

143-
}
143+
}

VideoServer/src/main/kotlin/MJpegServer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ class MJpegServer(private val viewerListener: ViewerConnectionListener) {
6868
val onFrameAvailable = clients.remove(client)!!
6969
viewerListener.onDisconnect(onFrameAvailable)
7070
}
71-
}
71+
}

VideoServer/src/main/kotlin/ViewerWebSocketServer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ViewerWebSocketServer(val connectionListener: Listener) {
1616

1717
private val server = object: WebSocketServer(InetSocketAddress(1234)) {
1818
override fun onOpen(conn: WebSocket?, handshake: ClientHandshake?) {
19-
println("ViewerWebSocketServer: onOpen")
19+
println("ViewerWebSocketServer: New connection opened from ${conn?.remoteSocketAddress}")
2020

2121
val listener = object: CameraServer.OnFrameAvailable {
2222
override fun onAvailable(frame: ByteArray) {
@@ -54,4 +54,4 @@ class ViewerWebSocketServer(val connectionListener: Listener) {
5454
server.start()
5555
}
5656

57-
}
57+
}

WebApp/public/common.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const BACKEND_URL = 'http://192.168.0.101:3000';
1+
const BACKEND_URL = 'http://192.168.178.101:3000';
22

33
let username = ''
44
let password = ''
@@ -13,7 +13,7 @@ function getServerIp() {
1313
const storedIp = localStorage.getItem("server_ip");
1414

1515
if (storedIp == null) {
16-
return "192.168.0.101:1234";
16+
return "192.168.178.101:1234";
1717
} else {
1818
return storedIp
1919
}
@@ -40,4 +40,4 @@ function setAuthorization(username, password) {
4040

4141
function clearAuthorization() {
4242
localStorage.setItem('auth', '')
43-
}
43+
}

WebApp/public/settings.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h1 style="text-align: center;">IP Camera</h1>
2828
<div id="container">
2929
<md-outlined-text-field
3030
label="Server IP address"
31-
supportingText="In format: 192.168.0.101:4321"
31+
supportingText="Example: 192.168.178.101:4321"
3232
style="margin-top:32px;
3333
"
3434
id="text-field-ip"
@@ -58,4 +58,4 @@ <h1 style="text-align: center;">IP Camera</h1>
5858

5959
</script>
6060
</body>
61-
</html>
61+
</html>

0 commit comments

Comments
 (0)