Commit 496491cd by Baoxy

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

parent 0fc4a06e
......@@ -21,7 +21,7 @@ android {
keyAlias "CERT"
keyPassword "123456" //签名密码
v1SigningEnabled true
v2SigningEnabled false
v2SigningEnabled true
println("====== signingConfigs.debug ======")
}
release {
......@@ -30,7 +30,7 @@ android {
keyAlias "CERT"
keyPassword "123456"
v1SigningEnabled true
v2SigningEnabled false
v2SigningEnabled true
println("====== signingConfigs.release ======")
}
}
......
......@@ -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/
#32位有符号数2147483647(10)
versionIntCode=2020041701
versionIntCode=2020050601
versionNameMajor=1
versionNameMinor=0
versionNamePatch=0
\ No newline at end of file
versionNamePatch=1
\ No newline at end of file
......@@ -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- 售后
buildConfigField "int", "UPDATE_PLATFORM", "2"
// 公司编号
......
......@@ -65,7 +65,8 @@ class WorkManager private constructor(var context: Context) {
showActivateLoseDialog(activity, activity.getString(R.string.common_remind)
, activity.getString(R.string.dialog_tip_activate_lose), object : MessageListener {
override fun onPositive() {
IntentUtil.startExitService(activity)
removeForbidden()
// IntentUtil.startExitService(activity)
}
override fun onNegative() {}
......
......@@ -39,7 +39,7 @@
<string name="close_btn">关闭</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="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