Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
majora-adr
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
majora
majora-adr
Commits
b28fbe47
Commit
b28fbe47
authored
Sep 18, 2022
by
Administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change symbol
parent
6d668322
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
14 deletions
+9
-14
MajoraClientService.java
...ava/com/virjar/majora/adr/majora/MajoraClientService.java
+1
-1
MainPanelFragment.java
...main/java/com/virjar/majora/adr/ui/MainPanelFragment.java
+1
-1
ClientIdentifier.java
...in/java/com/virjar/majora/adr/utils/ClientIdentifier.java
+0
-1
NavUtil.java
app/src/main/java/com/virjar/majora/adr/utils/NavUtil.java
+0
-4
strings.xml
app/src/main/res/values/strings.xml
+7
-7
No files found.
app/src/main/java/com/virjar/majora/adr/majora/MajoraClientService.java
View file @
b28fbe47
...
...
@@ -137,7 +137,7 @@ public class MajoraClientService {
private
static
void
startProxyService
()
{
SharedPreferences
spf
=
PreferenceManager
.
getDefaultSharedPreferences
(
TheApp
.
getApplication
());
String
serverHost
=
spf
.
getString
(
"server_host"
,
"majora.
virjar.com
"
);
String
serverHost
=
spf
.
getString
(
"server_host"
,
"majora.
iinti.cn
"
);
int
serverPort
=
CommonUtils
.
toInt
(
spf
.
getString
(
"server_port"
,
"5879"
),
5879
);
majoraClient
=
new
MajoraClient
(
serverHost
,
serverPort
,
ClientIdentifier
.
id
());
majoraClient
.
setDeviceAccount
(
spf
.
getString
(
"account_identifier"
,
""
));
...
...
app/src/main/java/com/virjar/majora/adr/ui/MainPanelFragment.java
View file @
b28fbe47
...
...
@@ -107,7 +107,7 @@ public class MainPanelFragment extends Fragment {
private
String
genServerConfigText
()
{
SharedPreferences
spf
=
PreferenceManager
.
getDefaultSharedPreferences
(
TheApp
.
getApplication
());
String
serverHost
=
spf
.
getString
(
"server_host"
,
"majora.
virjar.com
"
);
String
serverHost
=
spf
.
getString
(
"server_host"
,
"majora.
iinti.cn
"
);
int
serverPort
=
CommonUtils
.
toInt
(
spf
.
getString
(
"server_port"
,
"5879"
),
5879
);
return
serverHost
+
":"
+
serverPort
;
}
...
...
app/src/main/java/com/virjar/majora/adr/utils/ClientIdentifier.java
View file @
b28fbe47
...
...
@@ -17,7 +17,6 @@ import java.io.IOException;
import
java.net.NetworkInterface
;
import
java.net.SocketException
;
import
java.util.Enumeration
;
import
java.util.Random
;
import
java.util.UUID
;
public
class
ClientIdentifier
{
...
...
app/src/main/java/com/virjar/majora/adr/utils/NavUtil.java
View file @
b28fbe47
package
com
.
virjar
.
majora
.
adr
.
utils
;
import
android.app.Activity
;
import
android.content.ComponentName
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.pm.PackageManager
;
...
...
@@ -13,9 +12,6 @@ import android.text.Spannable;
import
android.text.SpannableString
;
import
android.text.style.URLSpan
;
import
android.text.util.Linkify
;
import
android.util.Log
;
import
android.widget.Toast
;
import
com.virjar.majora.adr.R
;
import
com.virjar.majora.adr.ui.DefaultSharedPreferenceHolder
;
...
...
app/src/main/res/values/strings.xml
View file @
b28fbe47
<resources>
<string
name=
"app_name"
>
Majora
</string>
<string
name=
"about"
>
关于
</string>
<string
name=
"author"
>
virjar
</string>
<string
name=
"author"
>
成都因体
</string>
<string
name=
"server"
>
服务器
</string>
<string
name=
"server_host"
>
服务器host
</string>
<string
name=
"port"
>
端口
</string>
<string
name=
"default_server_host"
>
majora.
virjar.com
</string>
<string
name=
"default_server_host"
>
majora.
iinti.cn
</string>
<string
name=
"default_server_port"
>
5879
</string>
<string
name=
"majora_app"
>
MajoraApp
</string>
<string
name=
"nav_item_main"
>
面板
</string>
...
...
@@ -21,15 +21,15 @@
<string
name=
"support_faq_label"
>
常见问题/已知问题
</string>
<string
name=
"support_donate_label"
>
捐赠
</string>
<string
name=
"support_donate_description"
>
如果您想感谢Majora作者,可以在此向 virjar 捐赠
</string>
<string
name=
"support_faq_url"
translatable=
"false"
>
https://git
.virjar.com
/majora
</string>
<string
name=
"support_donate_url"
translatable=
"false"
>
https://git
.virjar.com
/majora
</string>
<string
name=
"about_support"
translatable=
"false"
>
https://git
.virjar.com
/majora
</string>
<string
name=
"support_faq_url"
translatable=
"false"
>
https://git
hub.com/yint-tech
/majora
</string>
<string
name=
"support_donate_url"
translatable=
"false"
>
https://git
hub.com/yint-tech
/majora
</string>
<string
name=
"about_support"
translatable=
"false"
>
https://git
hub.com/yint-tech/
/majora
</string>
<string
name=
"navigation_drawer_open"
>
打开导航抽屉
</string>
<string
name=
"navigation_drawer_close"
>
关闭导航抽屉
</string>
<string
name=
"about_developers_label"
>
主要开发者
</string>
<string
name=
"about_developers"
>
<a
href=
"https://github.com/
virjar"
>
virjar
</a>
</string>
<string
name=
"about_source"
translatable=
"false"
>
http
://git.virjar.com
/majora
</string>
<string
name=
"about_developers"
>
<a
href=
"https://github.com/
yint-tech"
>
成都因体信息技术有限公司
</a>
</string>
<string
name=
"about_source"
translatable=
"false"
>
http
s://github.com/yint-tech
/majora
</string>
<string
name=
"settings_theme"
>
主题
</string>
<string
name=
"settings_theme_light"
>
亮色
</string>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment