diff --git a/app/key/XinJiangUser-release.jks b/app/key/XinJiangUser-release.jks new file mode 100644 index 0000000..6e34409 Binary files /dev/null and b/app/key/XinJiangUser-release.jks differ diff --git a/app/src/main/java/com/xjjk/healthyclients/base/BaseActivity.kt b/app/src/main/java/com/xjjk/healthyclients/base/BaseActivity.kt deleted file mode 100644 index fbecc1c..0000000 --- a/app/src/main/java/com/xjjk/healthyclients/base/BaseActivity.kt +++ /dev/null @@ -1,268 +0,0 @@ -package com.xjjk.healthyclients.base - -import android.app.Activity -import android.app.ActivityManager -import android.app.ActivityManager.RunningAppProcessInfo -import android.app.ProgressDialog -import android.content.Context -import android.content.Intent -import android.graphics.drawable.Drawable -import android.os.Build -import android.os.Bundle -import android.text.InputType -import android.util.AttributeSet -import android.view.View -import android.view.Window -import android.widget.EditText -import android.widget.Toast -import androidx.annotation.IdRes -import androidx.annotation.LayoutRes -import androidx.appcompat.app.AppCompatActivity -import com.sw.healthyclients.view.CustomToast -import com.sw.healthyclients.view.LoadingDialog -import com.xjjk.healthyclients.MyApplication -import com.xjjk.healthyclients.event.GlobalEvent -import com.xjjk.healthyclients.retrofit.NetApi -import com.xjjk.healthyclients.retrofit.RetrofitManager -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.MainScope -import kotlinx.coroutines.cancel -import org.greenrobot.eventbus.EventBus -import org.greenrobot.eventbus.Subscribe -import org.greenrobot.eventbus.ThreadMode -import java.lang.reflect.Method - - -/** - * 可以再基类中 - */ -abstract class BaseActivity : AppCompatActivity(), View.OnClickListener, CoroutineScope by MainScope() { - protected var app: MyApplication? = null - public var mContext: Context? = null - protected set - var newsApi = RetrofitManager.getRetrofits().create(NetApi::class.java) - protected set - public var mActivity: Activity? = null - var dialog: LoadingDialog? = null - protected set - protected var screenWidth = 0 - protected var screenHeight = 0 - var moveTime: Long = 0 - var currentMS: Long = 0 - - override fun onClick(view: View) { - processClick(view) - } - - override fun onCreate(paramBundle: Bundle?) { - super.onCreate(paramBundle) - EventBus.getDefault().register(this) - screenWidth = this.resources.displayMetrics.widthPixels - screenHeight = this.resources.displayMetrics.heightPixels - mContext = this - mActivity = this - createDialog() - } - - override fun onCreateView(name: String, context: Context, attrs: AttributeSet): View? { - return super.onCreateView(name, context, attrs) - } - - /** - * 创建加载弹窗 - */ - private fun createDialog() { - dialog = LoadingDialog( - mActivity, - ProgressDialog.STYLE_SPINNER, "数据加载中" - ) - dialog!!.requestWindowFeature(Window.FEATURE_NO_TITLE) - dialog!!.setCanceledOnTouchOutside(false) - dialog!!.setCancelable(false) - dialog!!.setMessage("请稍后") - } - - override fun setContentView(@LayoutRes layoutResID: Int) { - super.setContentView(layoutResID) - initView() - initData() - bindEvent() - tryToAddBackClick() - } - - override fun setContentView(view: View) { - super.setContentView(view) - initView() - bindEvent() - initData() - tryToAddBackClick() - } - - override fun onStart() { - super.onStart() - } - - override fun onStop() { - super.onStop() - } - - override fun onDestroy() { - super.onDestroy() - cancel() - EventBus.getDefault().unregister(this) - } - - override fun onBackPressed() { - super.onBackPressed() - finish() - } - - /** - * 初始化View - */ - abstract fun initView() - - /** - * 初始化数据 - */ - abstract fun initData() - - /** - * 事件监听 - */ - protected abstract fun bindEvent() - /** - * 点击事件处理 - * - * @param paramView - */ - abstract fun processClick(paramView: View?) - /** - * 返回键的默认点击销毁当前activity - */ - fun tryToAddBackClick() {} - - - fun showLongToast(message: String?) { - CustomToast.makeText(mContext, message, Toast.LENGTH_LONG).show() - } - - fun showToast(message: String?, drawable: Drawable?) { - CustomToast.makeText(mContext, message, Toast.LENGTH_SHORT, drawable).show() - } - - fun showToast(message: String?) { - if (message != null&&message.isNotEmpty()) { - CustomToast.makeText(mContext, message, Toast.LENGTH_SHORT).show() - } - } - - - fun toActivity(clazz: Class<*>?) { - val intent = Intent(mActivity, clazz) - mActivity?.startActivity(intent) - } - - fun toActivityForResult(clazz: Class<*>?,code:Int) { - val intent = Intent(mActivity, clazz) - mActivity?.startActivityForResult(intent, code) - } - fun toActivityForResult(clazz: Class<*>?,bundle: Bundle?,code:Int) { - val intent = Intent(mActivity, clazz) - if (bundle != null) { - intent.putExtras(bundle) - } - mActivity?.startActivityForResult(intent, code) - } - - fun toActivity(clazz: Class<*>?, bundle: Bundle?) { - val intent = Intent(mActivity, clazz) - if (bundle != null) { - intent.putExtras(bundle) - } - mActivity?.startActivity(intent) - } - - protected fun toLoginActivity(clazz: Class<*>?) { - val intent = Intent(mActivity, clazz) - mActivity?.startActivity(intent) - } - - override fun onRestart() { - super.onRestart() - } - - override fun finish() { - super.finish() - } - - protected fun F(@IdRes viewId: Int): E { - return super.findViewById(viewId) as E - } - - protected fun F(view: View, @IdRes viewId: Int): E { - return view.findViewById(viewId) as E - } - - protected fun C(view: E) { - view!!.setOnClickListener(this) - }// The name of the process that this object is associated with.// Returns a list of application processes that are running on the - // device - /** - * 程序是否在前台运行 - * - * @return - */ - val isAppOnForeground: Boolean - get() { - // Returns a list of application processes that are running on the - // device - val activityManager = applicationContext - .getSystemService(ACTIVITY_SERVICE) as ActivityManager - val packageName = applicationContext.packageName - val appProcesses = activityManager - .runningAppProcesses ?: return false - for (appProcess in appProcesses) { - // The name of the process that this object is associated with. - if (appProcess.processName == packageName && appProcess.importance == RunningAppProcessInfo.IMPORTANCE_FOREGROUND) { - return true - } - } - return false - } - - - fun disableShowInput(view: EditText) { - if (Build.VERSION.SDK_INT <= 10) { - view.inputType = InputType.TYPE_NULL - } else { - val cls = EditText::class.java - var method: Method - try { - method = cls.getMethod("setShowSoftInputOnFocus", Boolean::class.javaPrimitiveType) - method.isAccessible = true - method.invoke(view, false) - } catch (e: Exception) { //TODO: handle exception - } - try { - method = cls.getMethod("setSoftInputShownOnFocus", Boolean::class.javaPrimitiveType) - method.isAccessible = true - method.invoke(view, false) - } catch (e: Exception) { //TODO: handle exception - } - } - } - - - @Subscribe(threadMode = ThreadMode.MAIN) - open fun onMessageEvent(event: GlobalEvent?) { - try { - event?.let{ event-> - if (event is GlobalEvent) { - - } - } - } catch (e: Exception) { - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/xjjk/healthyclients/base/BaseFragment.kt b/app/src/main/java/com/xjjk/healthyclients/base/BaseFragment.kt deleted file mode 100644 index dc3f7f8..0000000 --- a/app/src/main/java/com/xjjk/healthyclients/base/BaseFragment.kt +++ /dev/null @@ -1,81 +0,0 @@ -package com.xjjk.healthyclients.base - -import android.annotation.SuppressLint -import android.content.Context -import android.content.Intent -import android.os.Build -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.Toast -import androidx.annotation.RequiresApi -import androidx.fragment.app.Fragment -import com.sw.healthyclients.utils.StatusbarUtil -import com.sw.healthyclients.view.CustomToast -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.MainScope - - -/** - * 可以再基类中 - */ -abstract class BaseFragment : Fragment(), View.OnClickListener, CoroutineScope by MainScope() { - var mContext:Context?=null - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - mContext=context - return inflater.inflate(getContentLayoutId(), container, false); - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - initViews(view); - initData(); - bindEvent() - } - fun fitTransparentStatusBar(view: View?){ - view?.let { - var statusHeight = StatusbarUtil.getStatusBarHeight(requireContext()) - it.setPadding(0, statusHeight, - 0, 0) - var height: Int = it.layoutParams?.height ?: 0 - it.layoutParams.height = height + statusHeight - - } - } - protected abstract fun getContentLayoutId(): Int - protected abstract fun getStatusbarStyle(): Int // 0 主题色+白字 1白底黑字 - protected abstract fun initViews(root: View?) - - protected open fun initData() {} - protected abstract fun bindEvent() - - @RequiresApi(Build.VERSION_CODES.M) - @SuppressLint("ResourceAsColor") - override fun onResume() { - super.onResume() -// try { -// if (getStatusbarStyle()==0) { -// activity?.let { StatusbarUtil.customColorMode(it, "#54eccb",false) } -// }else if (getStatusbarStyle()==1){ -// activity?.let { StatusbarUtil.customColorMode(it, "#FFFFFFFF",true) } -// } -// } catch (e: Exception) { -// } - } - - fun showToast(message: String?) { - if (message != null&&message.isNotEmpty()) { - CustomToast.makeText(mContext, message, Toast.LENGTH_SHORT).show() - } - } - - fun toActivity(clazz: Class<*>?) { - val intent = Intent(activity, clazz) - activity?.startActivity(intent) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/xjjk/healthyclients/bean/CvdWarningHistoryBean.java b/app/src/main/java/com/xjjk/healthyclients/bean/CvdWarningHistoryBean.java index 424b58b..ab255cb 100644 --- a/app/src/main/java/com/xjjk/healthyclients/bean/CvdWarningHistoryBean.java +++ b/app/src/main/java/com/xjjk/healthyclients/bean/CvdWarningHistoryBean.java @@ -33,10 +33,10 @@ public class CvdWarningHistoryBean { } public String getAddress() { - if (TextUtils.isEmpty(gpsErrorMsg)) { - return TextUtils.isEmpty(addressGd) ? address : addressGd; + if (TextUtils.isEmpty(address)) { + return TextUtils.isEmpty(addressGd) ? gpsErrorMsg : addressGd; } else { - return gpsErrorMsg; + return address; } } diff --git a/app/src/main/java/com/xjjk/healthyclients/data/api/HealthCheckNetApi.kt b/app/src/main/java/com/xjjk/healthyclients/data/api/HealthCheckNetApi.kt index 9308948..314fac4 100644 --- a/app/src/main/java/com/xjjk/healthyclients/data/api/HealthCheckNetApi.kt +++ b/app/src/main/java/com/xjjk/healthyclients/data/api/HealthCheckNetApi.kt @@ -205,16 +205,16 @@ interface HealthCheckNetApi { */ @GET("health-watch/watchH5Api/indexDataNew") fun getCvdHomeData(@Query("userId") userId: String): Call> - /** - * 防范心梗 查询是否填写问卷 - */ - @GET("health-intervene/api/risk/riskMyocardialSuddenDeath/selectTfFillQuestion") - fun selectTfFillQuestion(@Query("type") type: String): Call> - /** - * 防范心梗 查询危险因素 - */ - @GET("health-intervene/api/risk/angiocarpyPreventionWarning/selectAngiocarpyPreventionWarningDOByUserId") - fun selectAngiocarpyPreventionWarningDOByUserId(@Query("type") type: String): Call> +// /** +// * 防范心梗 查询是否填写问卷 +// */ +// @GET("health-intervene/api/risk/riskMyocardialSuddenDeath/selectTfFillQuestion") +// fun selectTfFillQuestion(@Query("type") type: String): Call> +// /** +// * 防范心梗 查询危险因素 +// */ +// @GET("health-intervene/api/risk/angiocarpyPreventionWarning/selectAngiocarpyPreventionWarningDOByUserId") +// fun selectAngiocarpyPreventionWarningDOByUserId(@Query("type") type: String): Call> /** * 查询预警历史数据 diff --git a/app/src/main/java/com/xjjk/healthyclients/fragment/MonitorFragment.kt b/app/src/main/java/com/xjjk/healthyclients/fragment/MonitorFragment.kt index d7797a5..355935c 100644 --- a/app/src/main/java/com/xjjk/healthyclients/fragment/MonitorFragment.kt +++ b/app/src/main/java/com/xjjk/healthyclients/fragment/MonitorFragment.kt @@ -13,14 +13,12 @@ import com.xjjk.healthyclients.adapter.CvdMainAdapter import com.xjjk.healthyclients.base.BaseVMBFragment import com.xjjk.healthyclients.base.viewmodel.TestViewModel import com.xjjk.healthyclients.bean.CvdMainBean -import com.xjjk.healthyclients.bean.CvdRiskInfoBean import com.xjjk.healthyclients.bean.TitleTagBean import com.xjjk.healthyclients.chart.DoubleWheelBPicker import com.xjjk.healthyclients.chart.HeartRateProvider import com.xjjk.healthyclients.chart.TemperatureProvider import com.xjjk.healthyclients.data.api.HealthCheckNetApi import com.xjjk.healthyclients.databinding.FragmentMonitorBinding -import com.xjjk.healthyclients.event.WebReloadEvent import com.xjjk.healthyclients.retrofit.getHealthCheckRetrofit import com.xjjk.healthyclients.retrofit.intervention.CallbackInterventionManager import com.xjjk.healthyclients.ui.activity.CvdWarningHistoryActivity @@ -47,9 +45,8 @@ class MonitorFragment: BaseVMBFragment(R. private var mUserId: String = "" private var mToken: String = "" - var mType=2 override fun initView(root: View?, savedInstanceState: Bundle?) { - mBinding.ccdwvAnswer.initView(mType) + } override fun initData() { @@ -70,7 +67,7 @@ class MonitorFragment: BaseVMBFragment(R. override fun lazyLoadData() { super.lazyLoadData() getHomePageUserInfo() - answer() +// answer() } private fun initListData() { @@ -203,7 +200,6 @@ class MonitorFragment: BaseVMBFragment(R. dialog?.dismiss() result?.let { - mBinding.wearTimeTv.text = "佩戴${result.days}天" mBinding.sleepValue2Tv.text = "平均睡眠${result.aveSleep.toInt() / 60}小时${result.aveSleep.toInt() % 60}分钟" @@ -267,57 +263,57 @@ class MonitorFragment: BaseVMBFragment(R. } - fun answer(){ - dialog?.show() - var getCvdHomeData = mApi.selectTfFillQuestion(mType.toString()) - getCvdHomeData.enqueue(object : CallbackInterventionManager() { - - override fun onSuccess( - code: Int, - result: Boolean?, - message: String, - ok: Boolean - ) { - dialog?.dismiss() - result?.let { - if (it) { - //已填写问卷 - mBinding?.ccdwvAnswer?.answerState(true) - getRiskInfo() - }else{ - mBinding?.ccdwvAnswer?.answerState(false) - } - } - } - - override fun onFail(code: Int, errMsg: String?) { - dialog?.dismiss() - showToast(errMsg) - } - - }) - } - - fun getRiskInfo(){ - var getCvdHomeData = mApi.selectAngiocarpyPreventionWarningDOByUserId(mType.toString()) - getCvdHomeData.enqueue(object : CallbackInterventionManager() { - - override fun onSuccess( - code: Int, - result: CvdRiskInfoBean?, - message: String, - ok: Boolean - ) { - dialog?.dismiss() - mBinding?.ccdwvAnswer?.setRiskInfo(result) - } - - override fun onFail(code: Int, errMsg: String?) { - showToast(errMsg) - } - - }) - } +// fun answer(){ +// dialog?.show() +// var getCvdHomeData = mApi.selectTfFillQuestion(mType.toString()) +// getCvdHomeData.enqueue(object : CallbackInterventionManager() { +// +// override fun onSuccess( +// code: Int, +// result: Boolean?, +// message: String, +// ok: Boolean +// ) { +// dialog?.dismiss() +// result?.let { +// if (it) { +// //已填写问卷 +// mBinding?.ccdwvAnswer?.answerState(true) +// getRiskInfo() +// }else{ +// mBinding?.ccdwvAnswer?.answerState(false) +// } +// } +// } +// +// override fun onFail(code: Int, errMsg: String?) { +// dialog?.dismiss() +// showToast(errMsg) +// } +// +// }) +// } +// +// fun getRiskInfo(){ +// var getCvdHomeData = mApi.selectAngiocarpyPreventionWarningDOByUserId(mType.toString()) +// getCvdHomeData.enqueue(object : CallbackInterventionManager() { +// +// override fun onSuccess( +// code: Int, +// result: CvdRiskInfoBean?, +// message: String, +// ok: Boolean +// ) { +// dialog?.dismiss() +// mBinding?.ccdwvAnswer?.setRiskInfo(result) +// } +// +// override fun onFail(code: Int, errMsg: String?) { +// showToast(errMsg) +// } +// +// }) +// } private fun showHeartPicker() { @@ -464,10 +460,10 @@ class MonitorFragment: BaseVMBFragment(R. } - override fun onMessageEvent(event: Any?) { - super.onMessageEvent(event) - if (event is WebReloadEvent) { - answer() - } - } +// override fun onMessageEvent(event: Any?) { +// super.onMessageEvent(event) +// if (event is WebReloadEvent) { +// answer() +// } +// } } \ No newline at end of file diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/activity/InterventionWebActivity.kt b/app/src/main/java/com/xjjk/healthyclients/ui/activity/InterventionWebActivity.kt index 0d07121..76648bc 100644 --- a/app/src/main/java/com/xjjk/healthyclients/ui/activity/InterventionWebActivity.kt +++ b/app/src/main/java/com/xjjk/healthyclients/ui/activity/InterventionWebActivity.kt @@ -192,7 +192,7 @@ class InterventionWebActivity() : } } - fun getToken(idcard: String) { +// fun getToken(idcard: String) { // dialog?.show() // var getToken = mApi.getTokenByIdCard(idcard) // getToken.enqueue(object : CallbackInterventionManager() { @@ -207,7 +207,7 @@ class InterventionWebActivity() : // } // }) - } +// } fun hasNext(dateString: String): Boolean { val date = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).parse(dateString) diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/activity/UserSettingActivity.kt b/app/src/main/java/com/xjjk/healthyclients/ui/activity/UserSettingActivity.kt index ca4b252..ec45fdc 100644 --- a/app/src/main/java/com/xjjk/healthyclients/ui/activity/UserSettingActivity.kt +++ b/app/src/main/java/com/xjjk/healthyclients/ui/activity/UserSettingActivity.kt @@ -37,7 +37,7 @@ class UserSettingActivity : override fun bindEvent() { mBinding?.apply { - addClickViews(settingEditPassword,settingUserAgreement,settingUserPrivacyPolicy,settingUserVersion) + addClickViews(settingEditPassword,settingUserAgreement,settingUserPrivacyPolicy) } } diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index b348578..4bc7880 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -43,27 +43,6 @@ android:layout_marginLeft="@dimen/dp_12" android:layout_width="match_parent" android:layout_height="wrap_content"/> - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_emergency.xml b/app/src/main/res/layout/fragment_emergency.xml index 8a19099..80fa039 100644 --- a/app/src/main/res/layout/fragment_emergency.xml +++ b/app/src/main/res/layout/fragment_emergency.xml @@ -129,7 +129,7 @@ android:layout_marginLeft="@dimen/dp_14" android:layout_marginTop="@dimen/dp_8" android:ellipsize="end" - android:maxLines="1" + android:maxLines="2" android:textColor="#999999" android:textSize="@dimen/txt13" tools:text="--" /> diff --git a/app/src/main/res/layout/fragment_monitor.xml b/app/src/main/res/layout/fragment_monitor.xml index 4bc238d..317bdcc 100644 --- a/app/src/main/res/layout/fragment_monitor.xml +++ b/app/src/main/res/layout/fragment_monitor.xml @@ -263,179 +263,8 @@ android:layout_marginRight="@dimen/dp_14" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -