diff --git a/.gitignore b/.gitignore index a1bdd84..dab938d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ .externalNativeBuild .cxx /app/debug -/app/release \ No newline at end of file +/app/release +/app/cszxy diff --git a/app/build.gradle b/app/build.gradle index 374a43f..b2e1062 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,13 +19,13 @@ android { // minSdkVersion 26 minSdkVersion 21 targetSdkVersion 25 - versionCode 30009 - versionName "3.0.9" + versionCode 30010 + versionName "3.0.10" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" -// ndk { -// abiFilters "armeabi-v7a", "arm64-v8a", "x86" -// } + ndk { + abiFilters "armeabi-v7a", "arm64-v8a", "x86" + } } signingConfigs { yzx { @@ -114,7 +114,7 @@ android { buildConfigField "String", "WS_URL", '"wss://oa.live.educlouddata.com/ws2api/"' applicationIdSuffix ".live" buildConfigField "String", "MP_ID",'"2"' - buildConfigField "String", "ENV_NAME",'"qbj"' + buildConfigField "String", "ENV_NAME",'"kz"' } yzx_test { diff --git a/app/src/main/java/com/yzx/escreen/activity/LoginActivity.kt b/app/src/main/java/com/yzx/escreen/activity/LoginActivity.kt index 3bf975b..5c1744e 100644 --- a/app/src/main/java/com/yzx/escreen/activity/LoginActivity.kt +++ b/app/src/main/java/com/yzx/escreen/activity/LoginActivity.kt @@ -13,6 +13,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUITipDialog.Builder.ICON_TYPE_FAIL import com.yzx.escreen.MainActivity import com.yzx.escreen.R import com.yzx.escreen.activity.base.BaseActivity +import com.yzx.escreen.config.Config import com.yzx.escreen.model.BaseUser import com.yzx.escreen.model.TabEntity import com.yzx.escreen.model.User @@ -22,6 +23,8 @@ import com.yzx.escreen.utils.hideNavigationBar import com.yzx.escreen.utils.setSrc import kotlinx.android.synthetic.main.activity_login.accountEdit import kotlinx.android.synthetic.main.activity_login.accountLayout +import kotlinx.android.synthetic.main.activity_login.img1 +import kotlinx.android.synthetic.main.activity_login.img2 import kotlinx.android.synthetic.main.activity_login.loginBtn import kotlinx.android.synthetic.main.activity_login.pswCheckbox import kotlinx.android.synthetic.main.activity_login.pswEdit @@ -88,6 +91,10 @@ class LoginActivity : BaseActivity(), LoginView { } else { pswCheckbox.isChecked = false } + + var env = Config.getEvn() + img1.setSrc(env.LOGO) + img2.setSrc(env.APP_NAME) } private fun doLogin() { diff --git a/app/src/main/java/com/yzx/escreen/config/Config.kt b/app/src/main/java/com/yzx/escreen/config/Config.kt index 1ab1d26..b38dda7 100644 --- a/app/src/main/java/com/yzx/escreen/config/Config.kt +++ b/app/src/main/java/com/yzx/escreen/config/Config.kt @@ -14,6 +14,51 @@ object Config { var ENV_NAME = BuildConfig.ENV_NAME val APP_ID = 602 + fun getEvn(): YzxEnv { + when (ENV_NAME) { + "qbj" -> { + return YzxEnv( + APP_NAME = "https://oa-edu-1259243469.cos.ap-chengdu.myqcloud.com/public/unit/app/base-logo-txt-qbj.png", + LOGO = "https://oa-edu-1259243469.cos.ap-chengdu.myqcloud.com/public/unit/app/login-logo.png", + ENV_NAME = ENV_NAME, + MP_APPID = MP_APPID, + MP_ID = MP_ID, + WS_URL = WS_URL + ) + } + "cszxy" -> { + return YzxEnv( + APP_NAME = "https://oa-edu-1259243469.cos.ap-chengdu.myqcloud.com/public/unit/app/base-logo-txt-cszxy.png", + LOGO = "https://oa-edu-1259243469.cos.ap-chengdu.myqcloud.com/public/unit/app/login-logo.png", + ENV_NAME = ENV_NAME, + MP_APPID = MP_APPID, + MP_ID = MP_ID, + WS_URL = WS_URL + ) + } + + "kz" -> { + return YzxEnv( + APP_NAME = "https://oa-edu-1259243469.cos.ap-chengdu.myqcloud.com/public/unit/logo/name-kezhong.png", + LOGO = "https://oa-edu-1259243469.cos.ap-chengdu.myqcloud.com/public/unit/logo/logo-kezhong.png", + ENV_NAME = ENV_NAME, + MP_APPID = MP_APPID, + MP_ID = "101", + WS_URL = WS_URL + ) + } + + else -> return YzxEnv( + APP_NAME = "https://oa-edu-1259243469.cos.ap-chengdu.myqcloud.com/public/unit/app/base-logo-txt-qbj.png", + LOGO = "https://oa-edu-1259243469.cos.ap-chengdu.myqcloud.com/public/unit/app/login-logo.png", + ENV_NAME = ENV_NAME, + MP_APPID = MP_APPID, + MP_ID = MP_ID, + WS_URL = WS_URL + ) + } + } + const val STU_CHANGE_STATUS_DROP_OUT = 42001 const val STU_CHANGE_STATUS_LEAVE_SCHOOL = 42002 @@ -27,15 +72,24 @@ object Config { const val STU_CHANGE_STATUS_INTERNSHIP = 42010 val STU_CHANGE_STATUS_LIST = mutableListOf( - StuChangeType(STU_CHANGE_STATUS_DROP_OUT,"辍学",""), - StuChangeType(STU_CHANGE_STATUS_LEAVE_SCHOOL,"休学",""), - StuChangeType(STU_CHANGE_STATUS_RETURN_SCHOOL,"复学",""), - StuChangeType(STU_CHANGE_STATUS_OUT_SCHOOL,"退学",""), - StuChangeType(STU_CHANGE_STATUS_TRANSFER_SCHOOL,"转学",""), - StuChangeType(STU_CHANGE_STATUS_REPEAT,"留级",""), - StuChangeType(STU_CHANGE_STATUS_TRANSFER_OUT,"转出",""), - StuChangeType(STU_CHANGE_STATUS_DOWNGRADE,"降级",""), - StuChangeType(STU_CHANGE_STATUS_INTROSPECTION,"回家反省","反省"), - StuChangeType(STU_CHANGE_STATUS_INTERNSHIP,"实习","反省") + StuChangeType(STU_CHANGE_STATUS_DROP_OUT, "辍学", ""), + StuChangeType(STU_CHANGE_STATUS_LEAVE_SCHOOL, "休学", ""), + StuChangeType(STU_CHANGE_STATUS_RETURN_SCHOOL, "复学", ""), + StuChangeType(STU_CHANGE_STATUS_OUT_SCHOOL, "退学", ""), + StuChangeType(STU_CHANGE_STATUS_TRANSFER_SCHOOL, "转学", ""), + StuChangeType(STU_CHANGE_STATUS_REPEAT, "留级", ""), + StuChangeType(STU_CHANGE_STATUS_TRANSFER_OUT, "转出", ""), + StuChangeType(STU_CHANGE_STATUS_DOWNGRADE, "降级", ""), + StuChangeType(STU_CHANGE_STATUS_INTROSPECTION, "回家反省", "反省"), + StuChangeType(STU_CHANGE_STATUS_INTERNSHIP, "实习", "反省") ) -} \ No newline at end of file +} + +data class YzxEnv( + var APP_NAME: String, + var LOGO: String, + var ENV_NAME: String, + var MP_APPID: String, + var MP_ID: String, + var WS_URL: String +) \ No newline at end of file diff --git a/app/src/main/java/com/yzx/escreen/presenter/LoginPresenter.kt b/app/src/main/java/com/yzx/escreen/presenter/LoginPresenter.kt index c7a78fe..c241be1 100644 --- a/app/src/main/java/com/yzx/escreen/presenter/LoginPresenter.kt +++ b/app/src/main/java/com/yzx/escreen/presenter/LoginPresenter.kt @@ -156,9 +156,10 @@ class LoginPresenter(view: LoginView) : BasePresenter(view) { fun getWXQrCode() { val url = Config.BASE_URL + YzxInterface.INTERFACE_GENERATE_WX_QR_TICKET + var env = Config.getEvn() OkGo.post>(url) .tag(this) - .params("mp_id", Config.MP_ID) + .params("mp_id", env.MP_ID) .execute(object : JsonCallBack>() { override fun onSuccess(response: Response>?) { if (response?.isSuccessful == true) { diff --git a/app/src/main/java/com/yzx/escreen/utils/KotlinX.kt b/app/src/main/java/com/yzx/escreen/utils/KotlinX.kt index f497988..95c93ba 100644 --- a/app/src/main/java/com/yzx/escreen/utils/KotlinX.kt +++ b/app/src/main/java/com/yzx/escreen/utils/KotlinX.kt @@ -11,20 +11,22 @@ import java.text.SimpleDateFormat import java.util.TimeZone fun ImageView.setSrc(identity: String, key: String) { - var url = "https://${identity.ifEmpty { "filea" }}.oa.qbjjyyun.net/edufile/imageView?uniqueKey=${key}" - if(Config.ENV_NAME == 'cszxy'){ + var url = + "https://${identity.ifEmpty { "filea" }}.oa.qbjjyyun.net/edufile/imageView?uniqueKey=${key}" + if ("cszxy" == Config.ENV_NAME || "kz" == Config.ENV_NAME) { url = "https://filea.educlouddata.com/edufile/imageView?uniqueKey=${key}" } Glide.with(this) .load(url) .placeholder(R.color.gray_1) .into(this) - this.setTag(R.id.image_src_tag,url) + this.setTag(R.id.image_src_tag, url) } -fun String.getImgUrl(key: String):String{ - var url = "https://${this.ifEmpty { "filea" }}.oa.qbjjyyun.net/edufile/imageView?uniqueKey=${key}" - if(Config.ENV_NAME == 'cszxy'){ +fun String.getImgUrl(key: String): String { + var url = + "https://${this.ifEmpty { "filea" }}.oa.qbjjyyun.net/edufile/imageView?uniqueKey=${key}" + if ("cszxy" == Config.ENV_NAME || "kz" == Config.ENV_NAME) { url = "https://filea.educlouddata.com/edufile/imageView?uniqueKey=${key}" } return url @@ -37,7 +39,7 @@ fun ImageView.setSrc(url: String) { .into(this) } -fun Int.toTime(format:String = "yyyy-MM-dd HH:mm"): String { +fun Int.toTime(format: String = "yyyy-MM-dd HH:mm"): String { val format = TimeUtils.getSafeDateFormat(format) format.timeZone = TimeZone.getTimeZone("GMT+8:00") return TimeUtils.millis2String(this * 1000L, format) @@ -60,7 +62,7 @@ fun Int.durationStr(): String { } else if (value > 60 * 60 && value <= 24 * 60 * 60) { var hour = value / 3600.0 - if (hour >= 23.5f && hour <25f) { + if (hour >= 23.5f && hour < 25f) { return "1天" } @@ -69,7 +71,7 @@ fun Int.durationStr(): String { var day = value / (24 * 60 * 60) var sub = value % (24 * 60 * 60); var hour = sub / 3600f - if (hour >= 23.5f || hour <25f) { + if (hour >= 23.5f || hour < 25f) { return "${day + 1}天" } if (hour < 1) { @@ -79,7 +81,7 @@ fun Int.durationStr(): String { } } -fun Dialog.hideNavigationBar(){ +fun Dialog.hideNavigationBar() { val window = this.window window?.apply { val uiOptions = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or @@ -95,7 +97,7 @@ fun Dialog.hideNavigationBar(){ } } -fun SimpleDateFormat.zhCn():SimpleDateFormat{ +fun SimpleDateFormat.zhCn(): SimpleDateFormat { timeZone = TimeZone.getTimeZone("GMT+8:00") return this } diff --git a/app/src/main/res/drawable/bg_left.xml b/app/src/main/res/drawable/bg_left.xml new file mode 100644 index 0000000..7f44182 --- /dev/null +++ b/app/src/main/res/drawable/bg_left.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_login_form.xml b/app/src/main/res/drawable/shape_login_form.xml index 415fd77..cd69fb1 100644 --- a/app/src/main/res/drawable/shape_login_form.xml +++ b/app/src/main/res/drawable/shape_login_form.xml @@ -1,6 +1,7 @@ - + - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index f3a5ffd..47bcb9b 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -11,49 +11,63 @@ android:src="@drawable/login_bg" android:scaleType="centerCrop"/> - + + + + android:orientation="horizontal"> + + + + + + + + + + + + - - - + android:gravity="center" + android:padding="0dp"> - + \ No newline at end of file