Skip to content

Commit eae83e2

Browse files
committed
支持网页版(仅Edge接口) & 添加{打开网页版}菜单
1 parent 1f73123 commit eae83e2

File tree

5 files changed

+43
-15
lines changed

5 files changed

+43
-15
lines changed

.idea/deploymentTargetDropDown.xml

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/java/com/github/jing332/tts_server_android/MainActivity.kt

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class MainActivity : AppCompatActivity() {
5252
logList.add("服务已在运行, 监听地址: localhost:${TtsIntentService.port}")
5353
} else {
5454
logList.add("请点击启动按钮, 然后在通知查看服务状态。")
55+
logList.add("网页版(Edge)可在右上角菜单一键打开\n")
5556
logList.add("关闭请点关闭按钮, 并等待响应。")
5657
logList.add("启动后可直接返回桌面,只要通知在就代表服务在运行中。")
5758
}
@@ -115,21 +116,37 @@ class MainActivity : AppCompatActivity() {
115116
tv.movementMethod = LinkMovementMethod()
116117

117118
val htmlStr = "特别感谢(他们的代码对我帮助很大): <br />" +
119+
"&emsp;<a href= 'https://github.com/asters1/tts'>asters1/tts(Go实现)</a>" +
120+
"&emsp;<a href= 'https://github.com/wxxxcxx/ms-ra-forwarder'>ms-ra-forwarder</a>" +
118121
"<a href='https://github.com/ag2s20150909/TTS'>TTS APP</a>" +
119122
"&emsp;<a href= 'https://github.com/gedoor/legado'>阅读APP</a>"
123+
124+
120125
tv.text = Html.fromHtml(htmlStr)
121-
tv.gravity = Gravity.CENTER /*居中*/
126+
tv.gravity = Gravity.CENTER /* 居中 */
122127
dlg.setView(tv)
123128

124129
dlg.setTitle("关于")
125130
.setMessage("本应用界面使用Kotlin开发,底层服务由Go开发.")
126131
.create().show()
127132
true
128133
}
129-
R.id.menu_checkUpdate -> { /*{检查更新}按钮*/
134+
R.id.menu_checkUpdate -> { /* {检查更新}按钮 */
130135
checkUpdate()
131136
true
132137
}
138+
R.id.menu_openWeb -> { /* {打开网页版} 按钮 */
139+
if (TtsIntentService.IsRunning) {
140+
val intent = Intent(Intent.ACTION_VIEW)
141+
intent.data = Uri.parse("http://localhost:${TtsIntentService.port}")
142+
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
143+
startActivity(intent)
144+
} else {
145+
Toast.makeText(this, "请先启动服务!", Toast.LENGTH_LONG).show()
146+
}
147+
148+
true
149+
}
133150
else -> super.onOptionsItemSelected(item)
134151
}
135152
}
@@ -206,7 +223,7 @@ class MainActivity : AppCompatActivity() {
206223
downLoadAndInstall(body, downloadUrl, tag)
207224
} else {
208225
runOnUiThread {
209-
Toast.makeText(this@MainActivity, "不需要更新", Toast.LENGTH_LONG).show()
226+
Toast.makeText(this@MainActivity, "不需要更新", Toast.LENGTH_SHORT).show()
210227
}
211228
}
212229
} catch (e: Exception) {

app/src/main/java/com/github/jing332/tts_server_android/TtsIntentService.kt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,6 @@ class TtsIntentService(name: String = "TtsIntentService") : IntentService(name)
2626
if (err.isNotEmpty()) {
2727
Toast.makeText(context, "关闭失败:$err", Toast.LENGTH_SHORT).show()
2828
}
29-
/*if (serverClosing) {
30-
Toast.makeText(context, "莫要再点了 正在关闭中", Toast.LENGTH_SHORT).show()
31-
} else {
32-
serverClosing = true
33-
val err = Tts_server_lib.closeServer(0)*//* 5s *//*
34-
if (err.isNotEmpty()) {
35-
Toast.makeText(context, "关闭失败:$err", Toast.LENGTH_SHORT).show()
36-
}
37-
serverClosing = false
38-
}*/
39-
4029
}
4130
}
4231

app/src/main/res/menu/menu_main.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<menu xmlns:android="http://schemas.android.com/apk/res/android">
2+
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
3+
xmlns:android="http://schemas.android.com/apk/res/android">
34

5+
<item
6+
android:id="@+id/menu_openWeb"
7+
android:title="打开网页版" />
48
<item
59
android:id="@+id/menu_checkUpdate"
610
android:title="检查更新" />

0 commit comments

Comments
 (0)