diff --git a/app/build.gradle b/app/build.gradle index e0cb3b2..d7c65f2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,9 +23,9 @@ android { versionName "3.0.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - ndk { - abiFilters "armeabi-v7a", "arm64-v8a", "x86" - } +// ndk { +// abiFilters "armeabi-v7a", "arm64-v8a", "x86" +// } } signingConfigs { yzx { @@ -76,6 +76,39 @@ android { // buildConfigField "String", "BASE_URL", '"http://192.168.69.99:9009"' // buildConfigField "String", "M_URL", '"http://192.168.69.99:8098"' // buildConfigField "String", "APP_NAME", '"家校互通（测试）"' + buildConfigField "String", "MP_ID",'"4"' + buildConfigField "String", "ENV_NAME",'"qbj"' + buildConfigField "String", "APP_ID",'"701"' + } + + cszxy { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release + buildConfigField "String", "BASE_URL", '"https://oa.educlouddata.com/api"' + buildConfigField "String", "M_URL", '"https://m.educlouddata.com"' + buildConfigField "String", "OA_URL", '"https://oa.educlouddata.com"' + buildConfigField "String", "APP_NAME", '"一体化平台"' + buildConfigField "String", "MP_APPID", '"wxbb397ddae71bb14c"' + buildConfigField "String", "WS_URL", '"wss://oa.educlouddata.com/ws2api/"' + buildConfigField "String", "MP_ID",'"2"' + buildConfigField "String", "ENV_NAME",'"cszxy"' + buildConfigField "String", "APP_ID",'"701"' + } + + kz { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release + buildConfigField "String", "BASE_URL", '"https://oa.educlouddata.com/api"' + buildConfigField "String", "M_URL", '"https://m.educlouddata.com"' + buildConfigField "String", "OA_URL", '"https://oa.educlouddata.com"' + buildConfigField "String", "APP_NAME", '"一体化平台"' + buildConfigField "String", "MP_APPID", '"wx8f1f33673a8e9de4"' + buildConfigField "String", "WS_URL", '"wss://oa.educlouddata.com/ws2api/"' + buildConfigField "String", "MP_ID",'"101"' + buildConfigField "String", "ENV_NAME",'"kz"' + buildConfigField "String", "APP_ID",'"7011"' } debug { @@ -96,6 +129,10 @@ android { buildConfigField "String", "MP_APPID", '"wxbb397ddae71bb14c"' // buildConfigField "String", "WS_URL", '"ws://192.168.69.114:9801/"' buildConfigField "String", "WS_URL", '"wss://oa.live.educlouddata.com/ws2api/"' + applicationIdSuffix ".live" + buildConfigField "String", "MP_ID",'"2"' + buildConfigField "String", "ENV_NAME",'"qbj"' + buildConfigField "String", "APP_ID",'"602"' } yzx_test { @@ -189,7 +226,7 @@ dependencies { // implementation deps.reactivex.rxandroid // implementation deps.reactivex.rxjava2 - implementation 'es.voghdev.pdfviewpager:library:1.1.2' +// implementation 'es.voghdev.pdfviewpager:library:1.1.2' implementation 'io.github.h07000223:flycoTabLayout:3.0.0' implementation 'com.qmuiteam:qmui:2.0.0-alpha10' diff --git a/app/src/main/java/com/yzx/ebrand/activity/LoginActivity.kt b/app/src/main/java/com/yzx/ebrand/activity/LoginActivity.kt index bdc77a7..b3ff865 100644 --- a/app/src/main/java/com/yzx/ebrand/activity/LoginActivity.kt +++ b/app/src/main/java/com/yzx/ebrand/activity/LoginActivity.kt @@ -13,6 +13,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUITipDialog.Builder.ICON_TYPE_FAIL import com.yzx.ebrand.MainActivity import com.yzx.ebrand.R import com.yzx.ebrand.activity.base.BaseActivity +import com.yzx.ebrand.config.Config import com.yzx.ebrand.model.BaseUser import com.yzx.ebrand.model.TabEntity import com.yzx.ebrand.model.User @@ -22,6 +23,8 @@ import com.yzx.ebrand.utils.hideNavigationBar import com.yzx.ebrand.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,11 @@ class LoginActivity : BaseActivity(), LoginView { } else { pswCheckbox.isChecked = false } + + var env = Config.getEvn() + img1.setSrc(env.LOGO) + LogUtils.d("env.APP_NAME",env.APP_NAME) + img2.setSrc(env.APP_NAME) } private fun doLogin() { @@ -163,22 +171,16 @@ class LoginActivity : BaseActivity(), LoginView { mPresenter?.loginQuery(ticket) } - private var mBindDialog: QMUIDialog? = null - private var mOverTimeDialog: QMUIDialog? = null - private var mRun = Runnable { - if(isPageShow){ - mPresenter?.loginQuery(mTicket) + override fun onDestroy() { + qrCodeImg?.apply { + removeCallbacks(mRun) } + super.onDestroy() } override fun onResume() { super.onResume() this.isPageShow = true - if(this.mTicket.isNotEmpty()){ - qrCodeImg?.apply { - postDelayed(mRun,1000) - } - } } override fun onStop() { @@ -186,11 +188,13 @@ class LoginActivity : BaseActivity(), LoginView { this.isPageShow = false } - override fun onDestroy() { - qrCodeImg?.apply { - removeCallbacks(mRun) + private var mBindDialog: QMUIDialog? = null + private var mOverTimeDialog: QMUIDialog? = null + + private var mRun = Runnable { + if(isPageShow){ + mPresenter?.loginQuery(mTicket) } - super.onDestroy() } override fun onLoginQuerySuccess(user: BaseUser, code: Int) { @@ -217,12 +221,10 @@ class LoginActivity : BaseActivity(), LoginView { } else if (!mBindDialog!!.isShowing) { mBindDialog?.show() } - qrCodeImg.removeCallbacks(mRun) qrCodeImg.postDelayed(mRun, 1000) } 452 -> { - qrCodeImg.removeCallbacks(mRun) qrCodeImg.postDelayed(mRun, 1000) } diff --git a/app/src/main/java/com/yzx/ebrand/config/Config.kt b/app/src/main/java/com/yzx/ebrand/config/Config.kt index f0ee91c..4425683 100644 --- a/app/src/main/java/com/yzx/ebrand/config/Config.kt +++ b/app/src/main/java/com/yzx/ebrand/config/Config.kt @@ -10,7 +10,54 @@ object Config { var OA_URL = BuildConfig.OA_URL var WS_URL = BuildConfig.WS_URL var MP_APPID = BuildConfig.MP_APPID - val APP_ID = 701 + val APP_ID = BuildConfig.APP_ID + var MP_ID = BuildConfig.MP_ID + var ENV_NAME = BuildConfig.ENV_NAME + + 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 @@ -36,4 +83,13 @@ object Config { 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/ebrand/fragment/ClassBrandFragment.kt b/app/src/main/java/com/yzx/ebrand/fragment/ClassBrandFragment.kt index 730ab5f..386fd76 100644 --- a/app/src/main/java/com/yzx/ebrand/fragment/ClassBrandFragment.kt +++ b/app/src/main/java/com/yzx/ebrand/fragment/ClassBrandFragment.kt @@ -265,7 +265,7 @@ class ClassBrandFragment : BaseFragment(), ClassBrandView { classTeaNameTv?.let { classTeaNameTv.text = info.class_teacher.user_name classStuCountTv.text = "本班人数：${info.class_student_num}人" - faceCountTv.text = "刷脸入校：${info.brushed_face_num}人" + faceCountTv.text = "实到：${info.brushed_face_num}人" noFaceCountTv.text = "未刷脸：${info.unbrushed_face_num}人" leaveCountTv.text = "请假：${info.leave_num}人" diff --git a/app/src/main/java/com/yzx/ebrand/fragment/HomeFragment.kt b/app/src/main/java/com/yzx/ebrand/fragment/HomeFragment.kt index 8ce8bfe..777256e 100644 --- a/app/src/main/java/com/yzx/ebrand/fragment/HomeFragment.kt +++ b/app/src/main/java/com/yzx/ebrand/fragment/HomeFragment.kt @@ -14,8 +14,8 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import com.blankj.utilcode.util.* -import com.huantansheng.easyphotos.EasyPhotos -import com.huantansheng.easyphotos.models.album.entity.Photo +//import com.huantansheng.easyphotos.EasyPhotos +//import com.huantansheng.easyphotos.models.album.entity.Photo import com.qmuiteam.qmui.widget.dialog.QMUIDialog import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton @@ -271,9 +271,9 @@ class HomeFragment : BaseFragment(), HomeView, } private fun openCamera() { - EasyPhotos.createCamera(this, true) - .setFileProviderAuthority("${activity?.packageName}.fileProvider") - .start(CAMER_REQUEST_CODE)//也可以选择链式调用写法 +// EasyPhotos.createCamera(this, true) +// .setFileProviderAuthority("${activity?.packageName}.fileProvider") +// .start(CAMER_REQUEST_CODE)//也可以选择链式调用写法 } @@ -527,17 +527,17 @@ class HomeFragment : BaseFragment(), HomeView, override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { if (resultCode == Activity.RESULT_OK) { - if (requestCode == CAMER_REQUEST_CODE) { - val photos = data?.getParcelableArrayListExtra(EasyPhotos.RESULT_PHOTOS) - LogUtils.d("photos", photos) - photos?.apply { - if (this.size > 0) { - mVacationAttachment.name = this[0].name - FileUpload.upload(this[0].path, this@HomeFragment) - } - } - - } +// if (requestCode == CAMER_REQUEST_CODE) { +// val photos = data?.getParcelableArrayListExtra(EasyPhotos.RESULT_PHOTOS) +// LogUtils.d("photos", photos) +// photos?.apply { +// if (this.size > 0) { +// mVacationAttachment.name = this[0].name +// FileUpload.upload(this[0].path, this@HomeFragment) +// } +// } +// +// } } super.onActivityResult(requestCode, resultCode, data) diff --git a/app/src/main/java/com/yzx/ebrand/presenter/LoginPresenter.kt b/app/src/main/java/com/yzx/ebrand/presenter/LoginPresenter.kt index 17c495d..56e522a 100644 --- a/app/src/main/java/com/yzx/ebrand/presenter/LoginPresenter.kt +++ b/app/src/main/java/com/yzx/ebrand/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", 4) + .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/ebrand/utils/KotlinX.kt b/app/src/main/java/com/yzx/ebrand/utils/KotlinX.kt index 5123966..5ec6d3a 100644 --- a/app/src/main/java/com/yzx/ebrand/utils/KotlinX.kt +++ b/app/src/main/java/com/yzx/ebrand/utils/KotlinX.kt @@ -6,27 +6,38 @@ import android.widget.ImageView import com.blankj.utilcode.util.TimeUtils import com.bumptech.glide.Glide import com.yzx.ebrand.R +import com.yzx.ebrand.config.Config import java.text.SimpleDateFormat import java.util.TimeZone fun ImageView.setSrc(identity: String, key: String) { - val url = "https://${identity.ifEmpty { "filea" }}.oa.qbjjyyun.net/edufile/imageView?uniqueKey=${key}" + var url = + "https://${identity.ifEmpty { "filea" }}.oa.qbjjyyun.net/edufile/imageView?uniqueKey=${key}" + if ("cszxy" == Config.ENV_NAME || "kz" == Config.ENV_NAME) { + url = "https://file.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{ - return "https://${this.ifEmpty { "filea" }}.oa.qbjjyyun.net/edufile/imageView?uniqueKey=${key}" + var url = + "https://${this.ifEmpty { "filea" }}.oa.qbjjyyun.net/edufile/imageView?uniqueKey=${key}" + if ("cszxy" == Config.ENV_NAME || "kz" == Config.ENV_NAME) { + url = "https://file.educlouddata.com/edufile/imageView?uniqueKey=${key}" + } + return url } fun ImageView.setSrc(url: String) { Glide.with(this) .load(url) - .placeholder(R.color.gray_1) + .centerInside() .into(this) + } fun Int.toTime(format:String = "yyyy-MM-dd HH:mm"): String { diff --git a/app/src/main/java/com/yzx/ebrand/widget/YzxPDFViewPager.kt b/app/src/main/java/com/yzx/ebrand/widget/YzxPDFViewPager.kt deleted file mode 100644 index c909dea..0000000 --- a/app/src/main/java/com/yzx/ebrand/widget/YzxPDFViewPager.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.yzx.ebrand.widget - -import android.content.Context -import android.view.MotionEvent -import es.voghdev.pdfviewpager.library.PDFViewPager - -class YzxPDFViewPager(context:Context,path:String):PDFViewPager(context,path){ - - - override fun setCurrentItem(item: Int, smoothScroll: Boolean) { - super.setCurrentItem(item, false) - } - - override fun setCurrentItem(item: Int) { - super.setCurrentItem(item,false) - } - - override fun onInterceptTouchEvent(ev: MotionEvent?): Boolean { - return false - } - - override fun onTouchEvent(ev: MotionEvent?): Boolean { - return false - } - -} \ No newline at end of file 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/login_bg.xml b/app/src/main/res/drawable/login_bg.xml index 1626ff9..0c94804 100644 --- a/app/src/main/res/drawable/login_bg.xml +++ b/app/src/main/res/drawable/login_bg.xml @@ -2,7 +2,7 @@ \ 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..9175f3e 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..7ffb9c1 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -11,171 +11,185 @@ android:src="@drawable/login_bg" android:scaleType="centerCrop"/> - + + + + + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:gravity="center"> - + + android:layout_width="500dp" + android:layout_height="400dp" + android:orientation="vertical" + android:gravity="center" + android:background="@drawable/bg_left"> + + + + android:text="------------------------ 欢迎登录 ------------------------" + android:textColor="#fff" + android:textSize="20dp" + android:textStyle="normal" + android:layout_marginTop="20dp"/> + + - + + + + + + + + + android:layout_marginTop="@dimen/d_20" + android:orientation="vertical" + android:gravity="center_horizontal" + android:paddingHorizontal="@dimen/d_30" + android:visibility="gone"> + + + + + + + android:paddingHorizontal="@dimen/d_30" + android:visibility="visible"> - - - + android:background="#f0f3f5" + android:padding="@dimen/d_10" + android:gravity="center_vertical"> - - + android:src="@mipmap/ic_psw" /> - - - + + + + android:layout_marginTop="@dimen/d_30" + android:background="#f0f3f5" + android:padding="@dimen/d_10" + android:gravity="center_vertical"> - - - - - - - - - - - - - - - + android:src="@mipmap/ic_account" /> - + android:layout_marginLeft="@dimen/d_10" + android:layout_weight="1" + android:background="@null" + android:inputType="textPassword" + android:hint="密码" + android:text="" + android:singleLine="true" /> + + + + + - - - + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_brand_class_info.xml b/app/src/main/res/layout/layout_brand_class_info.xml index 0e04598..f5aa87b 100644 --- a/app/src/main/res/layout/layout_brand_class_info.xml +++ b/app/src/main/res/layout/layout_brand_class_info.xml @@ -9,7 +9,7 @@