Skip to content

M
MobileManager
Commit 496491cd by Baoxy
Options

fix: 修改证书文件/无法激活试用时更改提示语

parent 0fc4a06e
Showing with 9 additions and 8 deletions
Tool/build.gradle
...@@ -21,7 +21,7 @@ android { ...@@ -21,7 +21,7 @@ android {
keyAlias "CERT" keyAlias "CERT"
keyPassword "123456" //签名密码 keyPassword "123456" //签名密码
v1SigningEnabled true v1SigningEnabled true
v2SigningEnabled false v2SigningEnabled true
println("====== signingConfigs.debug ======") println("====== signingConfigs.debug ======")
} }
release { release {
...@@ -30,7 +30,7 @@ android { ...@@ -30,7 +30,7 @@ android {
keyAlias "CERT" keyAlias "CERT"
keyPassword "123456" keyPassword "123456"
v1SigningEnabled true v1SigningEnabled true
v2SigningEnabled false v2SigningEnabled true
println("====== signingConfigs.release ======") println("====== signingConfigs.release ======")
} }
} }
......
gradle.properties
...@@ -26,8 +26,8 @@ MAVEN_URL=http://192.168.0.170:13000/nexus/content/repositories/releases/ ...@@ -26,8 +26,8 @@ MAVEN_URL=http://192.168.0.170:13000/nexus/content/repositories/releases/
MAVEN_URL_SNAPSHOT=http://192.168.0.170:13000/nexus/content/repositories/releases/ MAVEN_URL_SNAPSHOT=http://192.168.0.170:13000/nexus/content/repositories/releases/
#32位有符号数2147483647（10） #32位有符号数2147483647（10）
versionIntCode=2020041701 versionIntCode=2020050601
versionNameMajor=1 versionNameMajor=1
versionNameMinor=0 versionNameMinor=0
versionNamePatch=0 versionNamePatch=1
\ No newline at end of file \ No newline at end of file
lib_common/build.gradle
...@@ -22,7 +22,7 @@ android { ...@@ -22,7 +22,7 @@ android {
} }
// 更新标准版自测 // 更新标准版自测
buildConfigField "String", "UPDATE_SERVER", "\"https://update.tiankuan.net/SKRAC/\"" buildConfigField "String", "UPDATE_SERVER", "\"https://update.tiankuan.net:8443/SKRAC/\""
// 1- 独立 2- 售后 // 1- 独立 2- 售后
buildConfigField "int", "UPDATE_PLATFORM", "2" buildConfigField "int", "UPDATE_PLATFORM", "2"
// 公司编号 // 公司编号
......
lib_common/src/main/java/com/secspace/lib/common/function/WorkManager.kt
...@@ -65,7 +65,8 @@ class WorkManager private constructor(var context: Context) { ...@@ -65,7 +65,8 @@ class WorkManager private constructor(var context: Context) {
showActivateLoseDialog(activity, activity.getString(R.string.common_remind) showActivateLoseDialog(activity, activity.getString(R.string.common_remind)
, activity.getString(R.string.dialog_tip_activate_lose), object : MessageListener { , activity.getString(R.string.dialog_tip_activate_lose), object : MessageListener {
override fun onPositive() { override fun onPositive() {
IntentUtil.startExitService(activity) removeForbidden()
// IntentUtil.startExitService(activity)
} }
override fun onNegative() {} override fun onNegative() {}
......
lib_common/src/main/res/values/strings.xml
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<string name="close_btn">关闭</string> <string name="close_btn">关闭</string>
<string name="btn_input_code">输入激活码</string> <string name="btn_input_code">输入激活码</string>
<string name="dialog_tip_activate_lose">网络异常，请确认网络后重新进入</string> <string name="dialog_tip_activate_lose">注册失败，请联网进入或进行版本更新</string>
<string name="accessibility_tips">为了确保此应用正常运行，需要开启辅助功能</string> <string name="accessibility_tips">为了确保此应用正常运行，需要开启辅助功能</string>
<string name="edu_item_first_install_tips">长按桌面可进入家长设置</string> <string name="edu_item_first_install_tips">长按桌面可进入家长设置</string>
......
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