diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/app/.gitignore b/app/.gitignore old mode 100644 new mode 100755 diff --git a/app/build.gradle b/app/build.gradle old mode 100644 new mode 100755 diff --git a/app/libs/SangforSDK.aar b/app/libs/SangforSDK.aar old mode 100644 new mode 100755 diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro old mode 100644 new mode 100755 diff --git a/app/src/androidTest/java/com/rehome/dywoa/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/rehome/dywoa/ExampleInstrumentedTest.kt old mode 100644 new mode 100755 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml old mode 100644 new mode 100755 index 480638a..cccff4c --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -79,6 +79,7 @@ tools:targetApi="s"> + + + + () { + + private var stime: String = "" + private var etime: String = "" + private lateinit var calendar:Calendar + private lateinit var calendarSunday:Calendar; + + private lateinit var adapter: MjApplyAdapter + private var datas: MutableList = mutableListOf() + + //格式化日期的对象(转化成习惯的时间格式) + private val sdFormat = SimpleDateFormat("yyyy-MM-dd") + + override fun getViewBinding() = ActivityXjMjApplyBinding.inflate(layoutInflater) + + override fun getToolbar() = binding.toolbarView.toolbar + + override fun initView() { + initToolbar("免检申请", "") { + + } + + adapter = MjApplyAdapter(context, datas + ) { position -> + val item: MjApplyBean.Row = datas[position]; + val intentMjApplySumbit = Intent( + context, + XjMjApplySubmitActivity::class.java + ) + intentMjApplySumbit.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + intentMjApplySumbit.putExtra("item",GsonUtils.GsonString(item)) + startActivity(intentMjApplySumbit) + } + binding.lv.adapter = adapter + binding.tvNodata.visibility= View.VISIBLE + binding.lv.visibility=View.GONE + + //MjApplyAdapter adapter_mj_apply MjApplyBean + + //MjApplySubmitActivity + + resetCurrentMonth() + + binding.tvSt.setOnClickListener(View.OnClickListener { view: View? -> + + val dialog = DatePickDialog( + context, calendar + ) { outPutDate: String?,calendarBack:Calendar? -> + if (calendarBack != null) { + if(calendarBack.after(calendarSunday)){ + showToast("开始时间不能在结束时间之后") + }else{ + stime = binding.tvSt.getText().toString().trim { it <= ' ' } + binding.tvSt.text = outPutDate + calendar = calendarBack; + } + } + //checkServerConnectStatus() + } + dialog.show() + }) +// +// binding.tvEt.setOnClickListener(View.OnClickListener { view: View? -> +// +// val dialog = DatePickDialog( +// context, calendarSunday +// ) { outPutDate: String?,calendarBack:Calendar? -> +// if (calendarBack != null) { +// if(calendarBack.before(calendar)){ +// showToast("结束时间不能在开始时间之前") +// }else{ +// etime = binding.tvEt.getText().toString().trim { it <= ' ' } +// binding.tvEt.text = outPutDate +// calendarSunday = calendarBack; +// } +// } +// +// //checkServerConnectStatus() +// } +// dialog.show() +// }) + + binding.tvLastMonth.setOnClickListener { + resetLastMonth() + getListData() + } + binding.tvCurrentMonth.setOnClickListener { + resetCurrentMonth() + getListData() + } + binding.tvLastWeek.setOnClickListener { + resetLastWeek() + getListData() + } + binding.tvCurrentWeek.setOnClickListener { + resetCurrentWeek() + getListData() + } + binding.tvLastDay.setOnClickListener { + resetYesterday() + getListData() + } + binding.tvCurrentQuarter.setOnClickListener { + resetCurrentQuarter() + getListData() + } + binding.tvLastQuarter.setOnClickListener { + resetLastQuarter() + getListData() + } + binding.tvCurrentYear.setOnClickListener { + resetCurrentYear() + getListData() + } + binding.tvMjApplyManage.setOnClickListener { + val intentMjApplyManage = Intent( + context, + XjMjApplyManageActivity::class.java + ) + intentMjApplyManage.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + startActivity(intentMjApplyManage) + } + } + + override fun initData() { + checkServerConnectStatus() + } + + override fun onRestart() { + super.onRestart() + checkServerConnectStatus() + } + + private fun resetCurrentWeek(){ + calendar = Calendar.getInstance() + val dayOfWeek: Int = calendar.get(Calendar.DAY_OF_WEEK) // 获取当前是周几（1代表周日，2代表周一，依次类推） + + if (dayOfWeek == Calendar.SUNDAY) { + calendar.add(Calendar.DAY_OF_MONTH, -6) // 如果是周日，向前推6天 + } else { + calendar.add( + Calendar.DAY_OF_MONTH, + -dayOfWeek + 2 + ) // 向前推dayOfWeek-2天（dayOfWeek减2代表前一周的周一） + } + + val startDateStr = sdFormat.format(calendar.time) + showLog("周一：") + showLog(startDateStr) + + calendarSunday = Calendar.getInstance() + calendarSunday.time=calendar.time; + calendarSunday.add(Calendar.DAY_OF_MONTH, 6) // 如果是周日，向前推6天 + + val sundayStr = sdFormat.format(calendarSunday.time) + + showLog("本周日：") + showLog(sundayStr) + + binding.tvSt.text = startDateStr + binding.tvEt.text = sundayStr + } + private fun resetLastWeek(){ + calendar = Calendar.getInstance() + val dayOfWeek: Int = calendar.get(Calendar.DAY_OF_WEEK) // 获取当前是周几（1代表周日，2代表周一，依次类推） + + if (dayOfWeek == Calendar.SUNDAY) { + calendar.add(Calendar.DAY_OF_MONTH, -6) // 如果是周日，向前推6天 + } else { + calendar.add( + Calendar.DAY_OF_MONTH, + -dayOfWeek + 2 + ) // 向前推dayOfWeek-2天（dayOfWeek减2代表前一周的周一） + } + + calendar.add(Calendar.DAY_OF_MONTH, -7) + val startDateStr = sdFormat.format(calendar.time) + showLog("上周一：") + showLog(startDateStr) + + calendarSunday = Calendar.getInstance() + calendarSunday.time=calendar.time; + calendarSunday.add(Calendar.DAY_OF_MONTH, 6) // 如果是周日，向前推6天 + + val sundayStr = sdFormat.format(calendarSunday.time) + showLog("上周日：") + showLog(sundayStr) + + binding.tvSt.text = startDateStr + binding.tvEt.text = sundayStr + } + private fun resetCurrentMonth(){ + + // 获取当前日期 + calendar = Calendar.getInstance() + // 将日期设置为本月1号 + calendar[Calendar.DAY_OF_MONTH] = 1 + + val startDateStr = sdFormat.format(calendar.time) + showLog("本月1号：") + showLog(startDateStr) + + + // 获取当前日期 + calendarSunday = Calendar.getInstance() + // 将日期设置为本月第一天 + calendarSunday[Calendar.DAY_OF_MONTH] = 1 + // 将日期向前推一天，即上个月的最后一天 + calendarSunday.add(Calendar.MONTH, 1) + calendarSunday.add(Calendar.DAY_OF_MONTH, -1) + + val sundayStr = sdFormat.format(calendarSunday.time) + showLog("本月最后一天：") + showLog(sundayStr) + binding.tvSt.text = startDateStr + binding.tvEt.text = sundayStr + } + private fun resetLastMonth(){ + // 获取当前日期 + calendar = Calendar.getInstance() + // 将日期设置为本月1号 + calendar[Calendar.DAY_OF_MONTH] = 1 + calendar.add(Calendar.MONTH, -1) + + val startDateStr = sdFormat.format(calendar.time) + showLog("上月1号：") + showLog(startDateStr) + + + // 获取当前日期 + calendarSunday = Calendar.getInstance() + // 将日期设置为本月第一天 + calendarSunday[Calendar.DAY_OF_MONTH] = 1 + // 将日期向前推一天，即上个月的最后一天 + calendarSunday.add(Calendar.DAY_OF_MONTH, -1) + + val sundayStr = sdFormat.format(calendarSunday.time) + showLog("上月最后一天：") + showLog(sundayStr) + binding.tvSt.text = startDateStr + binding.tvEt.text = sundayStr + } + + private fun resetYesterday(){ + calendar = Calendar.getInstance() + calendar.add(Calendar.DAY_OF_MONTH, -1) + + val startDateStr = sdFormat.format(calendar.time) + showLog("昨天：") + showLog(startDateStr) + + calendarSunday = Calendar.getInstance() + calendarSunday.add(Calendar.DAY_OF_MONTH, -1) + + val sundayStr = sdFormat.format(calendarSunday.time) + showLog("昨天：") + showLog(sundayStr) + + binding.tvSt.text = startDateStr + binding.tvEt.text = sundayStr + } + + private fun resetCurrentQuarter(){ + + // 获取当前日期 + calendar = Calendar.getInstance() + // 获取当前月份 + val month = calendar[Calendar.MONTH] + // 计算当前季度的第一个月 + val firstMonthOfQuarter = (month / 3) * 3 + // 设置日期为本季度的第一天 + calendar[Calendar.MONTH] = firstMonthOfQuarter + calendar[Calendar.DAY_OF_MONTH] = 1 + + val startDateStr = sdFormat.format(calendar.time) + showLog("季度的第一天：") + showLog(startDateStr) + + + // 获取当前日期 + calendarSunday = Calendar.getInstance() + // 获取当前月份 + val monthEnd = calendarSunday[Calendar.MONTH] + // 计算当前季度的最后一个月 + val lastMonthOfQuarter = ((monthEnd / 3) + 1) * 3 - 1 + // 设置月份为当前季度的最后一个月 + calendarSunday[Calendar.MONTH] = lastMonthOfQuarter + // 获取当前季度的最后一天 + val lastDayOfQuarter = calendarSunday.getActualMaximum(Calendar.DAY_OF_MONTH) + // 设置日期为当前季度的最后一天 + calendarSunday[Calendar.DAY_OF_MONTH] = lastDayOfQuarter + + val sundayStr = sdFormat.format(calendarSunday.time) + showLog("当前季度的最后一天：") + showLog(sundayStr) + + binding.tvSt.text = startDateStr + binding.tvEt.text = sundayStr + + } + + private fun resetLastQuarter(){ + + // 获取当前日期 + calendar = Calendar.getInstance() + // 获取当前月份 + val currentMonth = calendar[Calendar.MONTH] + // 计算上一季度的月份 + var previousQuarterMonth = ((currentMonth / 3) * 3) - 3 + if (previousQuarterMonth < 0) { + previousQuarterMonth += 12 + calendar.add(Calendar.YEAR, -1) // 如果上一季度在上一年，年份减一 + } + // 设置月份为上一季度的第一个月 + calendar[Calendar.MONTH] = previousQuarterMonth + // 设置日期为1号 + calendar[Calendar.DAY_OF_MONTH] = 1 + + val startDateStr = sdFormat.format(calendar.time) + showLog("上一季度的第一天：") + showLog(startDateStr) + + + // 获取当前日期 + calendarSunday = Calendar.getInstance() + // 获取当前月份 + val currentMonthEnd = calendarSunday[Calendar.MONTH] + // 计算上一季度的最后一个月 + var lastQuarterEndMonth = ((currentMonthEnd / 3) * 3) - 1 + // 如果上一季度的最后一个月是负数，说明当前季度是第一季度，上一季度就是去年的第四季度 + if (lastQuarterEndMonth < 0) { + lastQuarterEndMonth = Calendar.DECEMBER // 12月 + calendarSunday.add(Calendar.YEAR, -1) // 年份减一 + } + // 设置月份为上一季度的最后一个月 + calendarSunday[Calendar.MONTH] = lastQuarterEndMonth + // 获取上一季度的最后一天 + val lastDayOfLastQuarter = calendarSunday.getActualMaximum(Calendar.DAY_OF_MONTH) + // 设置日期为上一季度的最后一天 + calendarSunday[Calendar.DAY_OF_MONTH] = lastDayOfLastQuarter + + val sundayStr = sdFormat.format(calendarSunday.time) + showLog("上一季度的最后一天：") + showLog(sundayStr) + + binding.tvSt.text = startDateStr + binding.tvEt.text = sundayStr + } + + private fun resetCurrentYear(){ + + // 获取当前日期实例 + calendar = Calendar.getInstance() + // 将日期设置为今年的第一天 + calendar[Calendar.DAY_OF_YEAR] = 1 + + val startDateStr = sdFormat.format(calendar.time) + showLog("今年的第一天：") + showLog(startDateStr) + + + // 获取当前日期 + calendarSunday = Calendar.getInstance() + + + // 设置年份为当前年份，月份为12月（11表示12月，因为月份从0开始），日期为1日 + calendarSunday[Calendar.YEAR] = calendarSunday[Calendar.YEAR] + calendarSunday[Calendar.MONTH] = Calendar.DECEMBER + calendarSunday[Calendar.DAY_OF_MONTH] = 1 + // 获取今年最后一天 + val lastDayOfYear = calendarSunday.getActualMaximum(Calendar.DAY_OF_YEAR) + // 设置日期为今年最后一天 + calendarSunday[Calendar.DAY_OF_YEAR] = lastDayOfYear + + val sundayStr = sdFormat.format(calendarSunday.time) + showLog("今年的最后一天：") + showLog(sundayStr) + + binding.tvSt.text = startDateStr + binding.tvEt.text = sundayStr + } + + //检查服务器连接状态 + private fun checkServerConnectStatus() { + var param = HashMap() + param["login"] = "dywoa"; + val json = GsonUtils.GsonString(param) + val url = Contans.IP + Contans.check_server_connect + Log.i("app",url) + Log.i("app",json) + val request = NoHttp.createStringRequest( + url, + RequestMethod.POST + ) + request.setDefineRequestBodyForJson(json) + NoProgresshttpUtils.getInstance().add(this, 0, request, object : HttpListener { + override fun onSucceed(what: Int, response: Response?) { + val result = response?.get() + if (result != null) { + showLog("-----onSucceed----") + showLog(result) + if(result == "1"){ + showLog("connect server success") + //获取数据 + getListData() + } + } + } + + override fun onFailed(what: Int, response: Response?) { + showLog("connect server onFailed") + showToast("无法连接到服务器，请检查网络环境") + } + }) + } + + private fun getListData() { + + var param = HashMap() + param["startDate"] = binding.tvSt.text.toString().trim(); + param["endDate"] = binding.tvEt.text.toString().trim(); + val json = GsonUtils.GsonString(param) + showLog(json) + + val url: String = Contans.IP + Contans.GET_NEED_XJ_MJ_LIST + val request = NoHttp.createStringRequest(url, RequestMethod.POST) + request.setDefineRequestBodyForJson(json) + NohttpUtils.getInstance().add(this, 0, request, object : HttpListener { + @SuppressLint("SetTextI18n") + override fun onSucceed(what: Int, response: Response?) { + if (response != null) { + val result = response.get() + showLog(result) + val bean = GsonUtils.GsonToBean(result, MjApplyBean::class.java) + if (bean != null && bean.total != 0) { + if (bean.rows != null && bean.rows.size>0) { + binding.lv.visibility= View.VISIBLE + binding.tvNodata.visibility= View.GONE + datas.clear() + datas.addAll(bean.rows) + adapter.notifyDataSetChanged() + binding.tvLjzrws.text=bean.total.toString() + //binding.lv.smoothScrollToPosition(0) + }else { + datas.clear() + adapter.notifyDataSetChanged() + binding.tvNodata.visibility= View.VISIBLE + binding.lv.visibility= View.GONE + } + }else { + datas.clear() + adapter.notifyDataSetChanged() + binding.tvNodata.visibility= View.VISIBLE + binding.lv.visibility=View.GONE + } + } + } + + override fun onFailed(what: Int, response: Response?) { + + } + + }, true, true, "正在加载数据...") + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjMjApplyManageActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjMjApplyManageActivity.kt new file mode 100644 index 0000000..7a34e15 --- /dev/null +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjMjApplyManageActivity.kt @@ -0,0 +1,430 @@ +package com.rehome.dywoa.ui.activity.sbxj + + + +import android.os.Bundle +import android.util.Log +import android.view.View +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat +import com.rehome.dywoa.Contans +import com.rehome.dywoa.R +import com.rehome.dywoa.adapter.MjApplyAdapter +import com.rehome.dywoa.adapter.MjApplyManageAdapter +import com.rehome.dywoa.base.BaseActivityOaToolbarViewBinding +import com.rehome.dywoa.bean.MjApplyBean +import com.rehome.dywoa.bean.MjApplyManageBean +import com.rehome.dywoa.databinding.ActivityMjApplyManageBinding +import com.rehome.dywoa.databinding.ActivityXjMjApplyManageBinding +import com.rehome.dywoa.utils.GsonUtils +import com.rehome.dywoa.utils.HttpListener +import com.rehome.dywoa.utils.NoProgresshttpUtils +import com.rehome.dywoa.utils.NohttpUtils +import com.rehome.dywoa.weiget.OAToolbar +import com.yolanda.nohttp.NoHttp +import com.yolanda.nohttp.RequestMethod +import com.yolanda.nohttp.rest.Response +import java.text.SimpleDateFormat +import java.util.Calendar + +class XjMjApplyManageActivity : BaseActivityOaToolbarViewBinding() { + + private var stime: String = "" + private var etime: String = "" + private lateinit var calendar: Calendar + private lateinit var calendarSunday: Calendar; + + private lateinit var adapter: MjApplyManageAdapter + private var datas: MutableList = mutableListOf() + + //格式化日期的对象(转化成习惯的时间格式) + private val sdFormat = SimpleDateFormat("yyyy-MM-dd") + + + override fun getViewBinding() = ActivityXjMjApplyManageBinding.inflate(layoutInflater) + + override fun getToolbar() = binding.toolbarView.toolbar + + override fun initView() { + initToolbar("免检申请管理", "") { + + } + + adapter = MjApplyManageAdapter(context, datas) + binding.lv.adapter = adapter + binding.tvNodata.visibility= View.VISIBLE + binding.lv.visibility= View.GONE + + + resetCurrentYear() + + + binding.tvLastMonth.setOnClickListener { + resetLastMonth() + getListData() + } + binding.tvCurrentMonth.setOnClickListener { + resetCurrentMonth() + getListData() + } + binding.tvLastWeek.setOnClickListener { + resetLastWeek() + getListData() + } + binding.tvCurrentWeek.setOnClickListener { + resetCurrentWeek() + getListData() + } + binding.tvLastDay.setOnClickListener { + resetYesterday() + getListData() + } + binding.tvCurrentQuarter.setOnClickListener { + resetCurrentQuarter() + getListData() + } + binding.tvLastQuarter.setOnClickListener { + resetLastQuarter() + getListData() + } + binding.tvCurrentYear.setOnClickListener { + resetCurrentYear() + getListData() + } + } + + override fun initData() { + checkServerConnectStatus() + } + + private fun resetCurrentWeek(){ + calendar = Calendar.getInstance() + val dayOfWeek: Int = calendar.get(Calendar.DAY_OF_WEEK) // 获取当前是周几（1代表周日，2代表周一，依次类推） + + if (dayOfWeek == Calendar.SUNDAY) { + calendar.add(Calendar.DAY_OF_MONTH, -6) // 如果是周日，向前推6天 + } else { + calendar.add( + Calendar.DAY_OF_MONTH, + -dayOfWeek + 2 + ) // 向前推dayOfWeek-2天（dayOfWeek减2代表前一周的周一） + } + + val startDateStr = sdFormat.format(calendar.time) + showLog("周一：") + showLog(startDateStr) + + calendarSunday = Calendar.getInstance() + calendarSunday.time=calendar.time; + calendarSunday.add(Calendar.DAY_OF_MONTH, 6) // 如果是周日，向前推6天 + + val sundayStr = sdFormat.format(calendarSunday.time) + + showLog("本周日：") + showLog(sundayStr) + + binding.tvSt.text = startDateStr + binding.tvEt.text = sundayStr + } + private fun resetLastWeek(){ + calendar = Calendar.getInstance() + val dayOfWeek: Int = calendar.get(Calendar.DAY_OF_WEEK) // 获取当前是周几（1代表周日，2代表周一，依次类推） + + if (dayOfWeek == Calendar.SUNDAY) { + calendar.add(Calendar.DAY_OF_MONTH, -6) // 如果是周日，向前推6天 + } else { + calendar.add( + Calendar.DAY_OF_MONTH, + -dayOfWeek + 2 + ) // 向前推dayOfWeek-2天（dayOfWeek减2代表前一周的周一） + } + + calendar.add(Calendar.DAY_OF_MONTH, -7) + val startDateStr = sdFormat.format(calendar.time) + showLog("上周一：") + showLog(startDateStr) + + calendarSunday = Calendar.getInstance() + calendarSunday.time=calendar.time; + calendarSunday.add(Calendar.DAY_OF_MONTH, 6) // 如果是周日，向前推6天 + + val sundayStr = sdFormat.format(calendarSunday.time) + showLog("上周日：") + showLog(sundayStr) + + binding.tvSt.text = startDateStr + binding.tvEt.text = sundayStr + } + private fun resetCurrentMonth(){ + + // 获取当前日期 + calendar = Calendar.getInstance() + // 将日期设置为本月1号 + calendar[Calendar.DAY_OF_MONTH] = 1 + + val startDateStr = sdFormat.format(calendar.time) + showLog("本月1号：") + showLog(startDateStr) + + + // 获取当前日期 + calendarSunday = Calendar.getInstance() + // 将日期设置为本月第一天 + calendarSunday[Calendar.DAY_OF_MONTH] = 1 + // 将日期向前推一天，即上个月的最后一天 + calendarSunday.add(Calendar.MONTH, 1) + calendarSunday.add(Calendar.DAY_OF_MONTH, -1) + + val sundayStr = sdFormat.format(calendarSunday.time) + showLog("本月最后一天：") + showLog(sundayStr) + binding.tvSt.text = startDateStr + binding.tvEt.text = sundayStr + } + private fun resetLastMonth(){ + // 获取当前日期 + calendar = Calendar.getInstance() + // 将日期设置为本月1号 + calendar[Calendar.DAY_OF_MONTH] = 1 + calendar.add(Calendar.MONTH, -1) + + val startDateStr = sdFormat.format(calendar.time) + showLog("上月1号：") + showLog(startDateStr) + + + // 获取当前日期 + calendarSunday = Calendar.getInstance() + // 将日期设置为本月第一天 + calendarSunday[Calendar.DAY_OF_MONTH] = 1 + // 将日期向前推一天，即上个月的最后一天 + calendarSunday.add(Calendar.DAY_OF_MONTH, -1) + + val sundayStr = sdFormat.format(calendarSunday.time) + showLog("上月最后一天：") + showLog(sundayStr) + binding.tvSt.text = startDateStr + binding.tvEt.text = sundayStr + } + + private fun resetYesterday(){ + calendar = Calendar.getInstance() + calendar.add(Calendar.DAY_OF_MONTH, -1) + + val startDateStr = sdFormat.format(calendar.time) + showLog("昨天：") + showLog(startDateStr) + + calendarSunday = Calendar.getInstance() + calendarSunday.add(Calendar.DAY_OF_MONTH, -1) + + val sundayStr = sdFormat.format(calendarSunday.time) + showLog("昨天：") + showLog(sundayStr) + + binding.tvSt.text = startDateStr + binding.tvEt.text = sundayStr + } + + private fun resetCurrentQuarter(){ + + // 获取当前日期 + calendar = Calendar.getInstance() + // 获取当前月份 + val month = calendar[Calendar.MONTH] + // 计算当前季度的第一个月 + val firstMonthOfQuarter = (month / 3) * 3 + // 设置日期为本季度的第一天 + calendar[Calendar.MONTH] = firstMonthOfQuarter + calendar[Calendar.DAY_OF_MONTH] = 1 + + val startDateStr = sdFormat.format(calendar.time) + showLog("季度的第一天：") + showLog(startDateStr) + + + // 获取当前日期 + calendarSunday = Calendar.getInstance() + // 获取当前月份 + val monthEnd = calendarSunday[Calendar.MONTH] + // 计算当前季度的最后一个月 + val lastMonthOfQuarter = ((monthEnd / 3) + 1) * 3 - 1 + // 设置月份为当前季度的最后一个月 + calendarSunday[Calendar.MONTH] = lastMonthOfQuarter + // 获取当前季度的最后一天 + val lastDayOfQuarter = calendarSunday.getActualMaximum(Calendar.DAY_OF_MONTH) + // 设置日期为当前季度的最后一天 + calendarSunday[Calendar.DAY_OF_MONTH] = lastDayOfQuarter + + val sundayStr = sdFormat.format(calendarSunday.time) + showLog("当前季度的最后一天：") + showLog(sundayStr) + + binding.tvSt.text = startDateStr + binding.tvEt.text = sundayStr + + } + + private fun resetLastQuarter(){ + + // 获取当前日期 + calendar = Calendar.getInstance() + // 获取当前月份 + val currentMonth = calendar[Calendar.MONTH] + // 计算上一季度的月份 + var previousQuarterMonth = ((currentMonth / 3) * 3) - 3 + if (previousQuarterMonth < 0) { + previousQuarterMonth += 12 + calendar.add(Calendar.YEAR, -1) // 如果上一季度在上一年，年份减一 + } + // 设置月份为上一季度的第一个月 + calendar[Calendar.MONTH] = previousQuarterMonth + // 设置日期为1号 + calendar[Calendar.DAY_OF_MONTH] = 1 + + val startDateStr = sdFormat.format(calendar.time) + showLog("上一季度的第一天：") + showLog(startDateStr) + + + // 获取当前日期 + calendarSunday = Calendar.getInstance() + // 获取当前月份 + val currentMonthEnd = calendarSunday[Calendar.MONTH] + // 计算上一季度的最后一个月 + var lastQuarterEndMonth = ((currentMonthEnd / 3) * 3) - 1 + // 如果上一季度的最后一个月是负数，说明当前季度是第一季度，上一季度就是去年的第四季度 + if (lastQuarterEndMonth < 0) { + lastQuarterEndMonth = Calendar.DECEMBER // 12月 + calendarSunday.add(Calendar.YEAR, -1) // 年份减一 + } + // 设置月份为上一季度的最后一个月 + calendarSunday[Calendar.MONTH] = lastQuarterEndMonth + // 获取上一季度的最后一天 + val lastDayOfLastQuarter = calendarSunday.getActualMaximum(Calendar.DAY_OF_MONTH) + // 设置日期为上一季度的最后一天 + calendarSunday[Calendar.DAY_OF_MONTH] = lastDayOfLastQuarter + + val sundayStr = sdFormat.format(calendarSunday.time) + showLog("上一季度的最后一天：") + showLog(sundayStr) + + binding.tvSt.text = startDateStr + binding.tvEt.text = sundayStr + } + + private fun resetCurrentYear(){ + + // 获取当前日期实例 + calendar = Calendar.getInstance() + // 将日期设置为今年的第一天 + calendar[Calendar.DAY_OF_YEAR] = 1 + + val startDateStr = sdFormat.format(calendar.time) + showLog("今年的第一天：") + showLog(startDateStr) + + + // 获取当前日期 + calendarSunday = Calendar.getInstance() + + + // 设置年份为当前年份，月份为12月（11表示12月，因为月份从0开始），日期为1日 + calendarSunday[Calendar.YEAR] = calendarSunday[Calendar.YEAR] + calendarSunday[Calendar.MONTH] = Calendar.DECEMBER + calendarSunday[Calendar.DAY_OF_MONTH] = 1 + // 获取今年最后一天 + val lastDayOfYear = calendarSunday.getActualMaximum(Calendar.DAY_OF_YEAR) + // 设置日期为今年最后一天 + calendarSunday[Calendar.DAY_OF_YEAR] = lastDayOfYear + + val sundayStr = sdFormat.format(calendarSunday.time) + showLog("今年的最后一天：") + showLog(sundayStr) + + binding.tvSt.text = startDateStr + binding.tvEt.text = sundayStr + } + + //检查服务器连接状态 + private fun checkServerConnectStatus() { + var param = HashMap() + param["login"] = "dywoa"; + val json = GsonUtils.GsonString(param) + val url = Contans.IP + Contans.check_server_connect + Log.i("app",url) + Log.i("app",json) + val request = NoHttp.createStringRequest( + url, + RequestMethod.POST + ) + request.setDefineRequestBodyForJson(json) + NoProgresshttpUtils.getInstance().add(this, 0, request, object : HttpListener { + override fun onSucceed(what: Int, response: Response?) { + val result = response?.get() + if (result != null) { + showLog("-----onSucceed----") + showLog(result) + if(result == "1"){ + showLog("connect server success") + //获取数据 + getListData() + } + } + } + + override fun onFailed(what: Int, response: Response?) { + showLog("connect server onFailed") + showToast("无法连接到服务器，请检查网络环境") + } + }) + } + + private fun getListData() { + + var param = HashMap() + param["startDate"] = binding.tvSt.text.toString().trim(); + param["endDate"] = binding.tvEt.text.toString().trim(); + val json = GsonUtils.GsonString(param) + showLog(json) + + val url: String = Contans.IP + Contans.GET_NEED_XJ_MJ_MANAGE_LIST + val request = NoHttp.createStringRequest(url, RequestMethod.POST) + request.setDefineRequestBodyForJson(json) + NohttpUtils.getInstance().add(this, 0, request, object : HttpListener { + override fun onSucceed(what: Int, response: Response?) { + if (response != null) { + val result = response.get() + showLog(result) + val bean = GsonUtils.GsonToBean(result, MjApplyManageBean::class.java) + if (bean != null && bean.total != 0) { + if (bean.rows != null && bean.rows.size>0) { + binding.lv.visibility= View.VISIBLE + binding.tvNodata.visibility= View.GONE + datas.clear() + datas.addAll(bean.rows) + adapter.notifyDataSetChanged() + }else { + datas.clear() + adapter.notifyDataSetChanged() + binding.tvNodata.visibility= View.VISIBLE + binding.lv.visibility= View.GONE + } + }else { + datas.clear() + adapter.notifyDataSetChanged() + binding.tvNodata.visibility= View.VISIBLE + binding.lv.visibility=View.GONE + } + } + } + + override fun onFailed(what: Int, response: Response?) { + + } + + }, true, true, "正在加载数据...") + } +} \ No newline at end of file diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjMjApplySubmitActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjMjApplySubmitActivity.kt new file mode 100644 index 0000000..a5533dd --- /dev/null +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjMjApplySubmitActivity.kt @@ -0,0 +1,154 @@ +package com.rehome.dywoa.ui.activity.sbxj + + +import android.content.DialogInterface +import android.graphics.Color +import android.text.TextUtils +import android.util.Log +import com.rehome.dywoa.App +import com.rehome.dywoa.Contans +import com.rehome.dywoa.base.BaseActivityOaToolbarViewBinding +import com.rehome.dywoa.bean.MjApplyBean +import com.rehome.dywoa.bean.StatusInfo +import com.rehome.dywoa.databinding.ActivityMjApplySubmitBinding +import com.rehome.dywoa.databinding.ActivityXjMjApplySubmitBinding +import com.rehome.dywoa.utils.GsonUtils +import com.rehome.dywoa.utils.HttpListener +import com.rehome.dywoa.utils.NohttpUtils +import com.rehome.dywoa.weiget.ConfirmDialog +import com.yolanda.nohttp.NoHttp +import com.yolanda.nohttp.RequestMethod +import com.yolanda.nohttp.rest.Response + +class XjMjApplySubmitActivity : BaseActivityOaToolbarViewBinding() { + + private lateinit var item: MjApplyBean.Row + + private lateinit var username: String + private lateinit var sqrName: String + + + override fun getViewBinding() = ActivityXjMjApplySubmitBinding.inflate(layoutInflater) + + override fun getToolbar() = binding.toolbarView.toolbar + + override fun initView() { + initToolbar("免检申请提交", "提交") { + if (TextUtils.isEmpty(binding.etMjReason.getContentText())) { + showToast("免检原因必填，请填写免检原因后再提交") + }else{ + val builder = android.app.AlertDialog.Builder(context) + builder.setMessage("您确定要提交免检申请吗?") + builder.setTitle("提示") + builder.setPositiveButton( + "确定" + ) { dialog, _ -> + dialog.dismiss() + checkServerConnectStatus() + } + builder.setNegativeButton( + "取消" + ) { dialog, _ -> dialog.dismiss()} + val dialog = builder.create() + dialog.show() + + //确定按钮 + val btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE) + //取消按钮 + val btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE) + btnPos.setTextColor(Color.BLACK) + btnNeg.setTextColor(Color.BLACK) + } + } + + item = GsonUtils.GsonToBean(intent.getStringExtra("item")!!,MjApplyBean.Row::class.java) + username = App.getInstance().userInfo.manid + sqrName = App.getInstance().userInfo.usernames + + binding.ilSqr.content = sqrName + binding.ilJhmc.content = item.jhmc + binding.ilMjdj.content = item.ljds + binding.ilZxsj.content = item.zxsj + + } + + override fun initData() { + + + + } + + //检查服务器连接状态 + private fun checkServerConnectStatus() { + var param = HashMap() + param["login"] = "dywoa"; + val json = GsonUtils.GsonString(param) + val url = Contans.IP + Contans.check_server_connect + Log.i("app",url) + Log.i("app",json) + val request = NoHttp.createStringRequest( + url, + RequestMethod.POST + ) + request.setDefineRequestBodyForJson(json) + NohttpUtils.getInstance().add(this, 0, request, object : HttpListener { + override fun onSucceed(what: Int, response: Response?) { + val result = response?.get() + if (result != null) { + showLog("-----onSucceed----") + showLog(result) + if(result == "1"){ + showLog("connect server success") + //提交免检 + submitData() + } + } + } + + override fun onFailed(what: Int, response: Response?) { + showLog("connect server onFailed") + showToast("无法连接到服务器，请检查网络环境") + } + }) + } + + private fun submitData() { + + var param = HashMap() + param["JHID"] = item.jhid + param["reason"] = binding.etMjReason.contentText.trim(); + param["gh"] = username + val json = GsonUtils.GsonString(param) + showLog(json) + + val url: String = Contans.IP + Contans.SUBMIT_XJ_MJ_APPLY_API + val request = NoHttp.createStringRequest(url, RequestMethod.POST) + request.setDefineRequestBodyForJson(json) + NohttpUtils.getInstance().add(this, 0, request, object : HttpListener { + override fun onSucceed(what: Int, response: Response?) { + if (response != null) { + val result = response.get() + showLog(result) + val bean = GsonUtils.GsonToBean(result, StatusInfo::class.java) + if (bean != null && bean.state == 1) { + //提交成功 + val confirmDialog = ConfirmDialog( + context, "免检申请提交成功" + ) { finish() } + confirmDialog.setTvTitle("提示") + confirmDialog.setCancelable(true) + confirmDialog.show() + }else { + //免检申请提交失败 + showToast("免检申请提交失败") + } + } + } + + override fun onFailed(what: Int, response: Response?) { + + } + + }, true, true, "数据处理中,请稍候...") + } +} \ No newline at end of file diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjYulActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjYulActivity.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjZhTjActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XjZhTjActivity.kt old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XscbglActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XscbglActivity.java index d523631..d24961e 100755 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XscbglActivity.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XscbglActivity.java @@ -25,6 +25,7 @@ import com.rehome.dywoa.R; import com.rehome.dywoa.bean.GridViewBean; import com.rehome.dywoa.bean.XsRequestInfo; import com.rehome.dywoa.ui.activity.sbxdjgl.SQxgdlrfActivity; +import com.rehome.dywoa.ui.activity.sbxdjgl.SbxdjglActivity; import com.rehome.dywoa.utils.GsonUtils; import com.rehome.dywoa.utils.HttpListener; import com.rehome.dywoa.utils.NoProgresshttpUtils; @@ -51,9 +52,13 @@ public class XscbglActivity extends BaseActivity2 { private String username; - private String[] str = {"待办任务", "巡检工作", "统计", "读取NFC数据", "缺陷工单录入"}; - private int[] imageId = {R.mipmap.icon_xs1, R.mipmap.icon6, R.mipmap.icon_xj_tj, R.mipmap.icon11, R.drawable.icon15}; - private int[] colors = {R.drawable.radius_b1, R.drawable.radius_a4, R.drawable.radius_b3, R.drawable.radius_d1, R.drawable.radius_e4}; + private String[] str = {"待办任务", "巡检工作", "统计", "读取NFC数据", "缺陷工单录入", "免检申请"}; + private int[] imageId = {R.mipmap.icon_xs1, R.mipmap.icon6, R.mipmap.icon_xj_tj, R.mipmap.icon11, + R.drawable.icon15,R.mipmap.icon_mjsq}; + private int[] colors = {R.drawable.radius_b1, R.drawable.radius_a4, R.drawable.radius_b3, R.drawable.radius_d1, + R.drawable.radius_e4, R.drawable.radius_mjsq}; + + //#188842 private GridViewAdapter adapter; private BroadcastReceiver myReceiver = new BroadcastReceiver() { @@ -120,6 +125,11 @@ public class XscbglActivity extends BaseActivity2 { intent = new Intent(XscbglActivity.this, SQxgdlrfActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); break; + case 5: + intent = new Intent(XscbglActivity.this, XjMjApplyActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); + startActivity(intent); + break; } if (intent != null) { startActivity(intent); diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XzxsjhFragment.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxj/XzxsjhFragment.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/vpn/AuthSuccessActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/vpn/AuthSuccessActivity.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/vpn/PrimaryAuthActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/vpn/PrimaryAuthActivity.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java b/app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/ui/fragment/MineFragment.java b/app/src/main/java/com/rehome/dywoa/ui/fragment/MineFragment.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/Api.java b/app/src/main/java/com/rehome/dywoa/utils/Api.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/AppManager.java b/app/src/main/java/com/rehome/dywoa/utils/AppManager.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/AutoFocusManager.java b/app/src/main/java/com/rehome/dywoa/utils/AutoFocusManager.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/BitmapCompressUtils.java b/app/src/main/java/com/rehome/dywoa/utils/BitmapCompressUtils.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/BitmapUtil.java b/app/src/main/java/com/rehome/dywoa/utils/BitmapUtil.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/BitmapUtils.java b/app/src/main/java/com/rehome/dywoa/utils/BitmapUtils.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/CameraManager.java b/app/src/main/java/com/rehome/dywoa/utils/CameraManager.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/CanBanScrollViewPager.java b/app/src/main/java/com/rehome/dywoa/utils/CanBanScrollViewPager.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/CompressImageUtils.java b/app/src/main/java/com/rehome/dywoa/utils/CompressImageUtils.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/Constants.java b/app/src/main/java/com/rehome/dywoa/utils/Constants.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/ControllerActivity.java b/app/src/main/java/com/rehome/dywoa/utils/ControllerActivity.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/CustomImageButton.java b/app/src/main/java/com/rehome/dywoa/utils/CustomImageButton.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/DataPassUtils.java b/app/src/main/java/com/rehome/dywoa/utils/DataPassUtils.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/DpPxSpTransformUtil.java b/app/src/main/java/com/rehome/dywoa/utils/DpPxSpTransformUtil.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/FileUtils.java b/app/src/main/java/com/rehome/dywoa/utils/FileUtils.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/FlashUtil.java b/app/src/main/java/com/rehome/dywoa/utils/FlashUtil.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/FullyGridLayoutManager.java b/app/src/main/java/com/rehome/dywoa/utils/FullyGridLayoutManager.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/GsonUtils.java b/app/src/main/java/com/rehome/dywoa/utils/GsonUtils.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/HttpListener.java b/app/src/main/java/com/rehome/dywoa/utils/HttpListener.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/HttpResponseListener.java b/app/src/main/java/com/rehome/dywoa/utils/HttpResponseListener.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/HttpResponseListenerNoProgress.java b/app/src/main/java/com/rehome/dywoa/utils/HttpResponseListenerNoProgress.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/HttpUtils.java b/app/src/main/java/com/rehome/dywoa/utils/HttpUtils.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/ModuleDatas.java b/app/src/main/java/com/rehome/dywoa/utils/ModuleDatas.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/MqttSSLPublishServer.java b/app/src/main/java/com/rehome/dywoa/utils/MqttSSLPublishServer.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/MqttSSLSocketFactory.java b/app/src/main/java/com/rehome/dywoa/utils/MqttSSLSocketFactory.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/NetworkAvailableUtils.java b/app/src/main/java/com/rehome/dywoa/utils/NetworkAvailableUtils.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/NetworkUtil.java b/app/src/main/java/com/rehome/dywoa/utils/NetworkUtil.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/NfcUtil.java b/app/src/main/java/com/rehome/dywoa/utils/NfcUtil.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/NoProgresshttpUtils.java b/app/src/main/java/com/rehome/dywoa/utils/NoProgresshttpUtils.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/NohttpUtils.java b/app/src/main/java/com/rehome/dywoa/utils/NohttpUtils.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/OkhttpUtils.java b/app/src/main/java/com/rehome/dywoa/utils/OkhttpUtils.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/RSAAndroid.java b/app/src/main/java/com/rehome/dywoa/utils/RSAAndroid.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/RSAUtils.java b/app/src/main/java/com/rehome/dywoa/utils/RSAUtils.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/RetrofitHttpUtils.java b/app/src/main/java/com/rehome/dywoa/utils/RetrofitHttpUtils.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/SFDialogHelper.java b/app/src/main/java/com/rehome/dywoa/utils/SFDialogHelper.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/SPUtils.java b/app/src/main/java/com/rehome/dywoa/utils/SPUtils.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/SignatureUtils.java b/app/src/main/java/com/rehome/dywoa/utils/SignatureUtils.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/StatusBarUtil.java b/app/src/main/java/com/rehome/dywoa/utils/StatusBarUtil.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/utils/UiUtlis.java b/app/src/main/java/com/rehome/dywoa/utils/UiUtlis.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/vpn/AppInfoUtils.java b/app/src/main/java/com/rehome/dywoa/vpn/AppInfoUtils.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/vpn/AuthSessionDialog.java b/app/src/main/java/com/rehome/dywoa/vpn/AuthSessionDialog.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/vpn/GlobalListenerManager.java b/app/src/main/java/com/rehome/dywoa/vpn/GlobalListenerManager.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/vpn/SubAppManager.java b/app/src/main/java/com/rehome/dywoa/vpn/SubAppManager.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/AuditDialog.java b/app/src/main/java/com/rehome/dywoa/weiget/AuditDialog.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/AutoGridView.java b/app/src/main/java/com/rehome/dywoa/weiget/AutoGridView.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/AutoListView.java b/app/src/main/java/com/rehome/dywoa/weiget/AutoListView.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/AutoRadioGroup.java b/app/src/main/java/com/rehome/dywoa/weiget/AutoRadioGroup.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/AutoToolbar.java b/app/src/main/java/com/rehome/dywoa/weiget/AutoToolbar.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/ClearEditText.java b/app/src/main/java/com/rehome/dywoa/weiget/ClearEditText.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/ConfirmDialog.java b/app/src/main/java/com/rehome/dywoa/weiget/ConfirmDialog.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/ConfirmFaceDialog.java b/app/src/main/java/com/rehome/dywoa/weiget/ConfirmFaceDialog.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/CountdownView.java b/app/src/main/java/com/rehome/dywoa/weiget/CountdownView.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/DatePickDialog.java b/app/src/main/java/com/rehome/dywoa/weiget/DatePickDialog.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/DateTimeMinutePickDialog.java b/app/src/main/java/com/rehome/dywoa/weiget/DateTimeMinutePickDialog.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/DateTimePickDialog.java b/app/src/main/java/com/rehome/dywoa/weiget/DateTimePickDialog.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/InputLayout.java b/app/src/main/java/com/rehome/dywoa/weiget/InputLayout.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/JiZhuStatusDialog.java b/app/src/main/java/com/rehome/dywoa/weiget/JiZhuStatusDialog.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/ListDialog.java b/app/src/main/java/com/rehome/dywoa/weiget/ListDialog.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/MeasureDialog.java b/app/src/main/java/com/rehome/dywoa/weiget/MeasureDialog.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/NoscrollViewPager.java b/app/src/main/java/com/rehome/dywoa/weiget/NoscrollViewPager.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/NumAddSubView.java b/app/src/main/java/com/rehome/dywoa/weiget/NumAddSubView.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/OAToolbar.java b/app/src/main/java/com/rehome/dywoa/weiget/OAToolbar.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/RandCodeCircleView.java b/app/src/main/java/com/rehome/dywoa/weiget/RandCodeCircleView.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/RandCodeLayout.java b/app/src/main/java/com/rehome/dywoa/weiget/RandCodeLayout.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/RegexEditText.java b/app/src/main/java/com/rehome/dywoa/weiget/RegexEditText.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/SFEditText.java b/app/src/main/java/com/rehome/dywoa/weiget/SFEditText.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/SangforTextView.java b/app/src/main/java/com/rehome/dywoa/weiget/SangforTextView.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/ScanView.kt b/app/src/main/java/com/rehome/dywoa/weiget/ScanView.kt old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/WaitDialog.java b/app/src/main/java/com/rehome/dywoa/weiget/WaitDialog.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/WebLayout.java b/app/src/main/java/com/rehome/dywoa/weiget/WebLayout.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/luck/CustomCompleteSelectView.java b/app/src/main/java/com/rehome/dywoa/weiget/luck/CustomCompleteSelectView.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/luck/CustomPreviewBottomNavBar.java b/app/src/main/java/com/rehome/dywoa/weiget/luck/CustomPreviewBottomNavBar.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/luck/CustomPreviewTitleBar.java b/app/src/main/java/com/rehome/dywoa/weiget/luck/CustomPreviewTitleBar.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/luck/WaitDialog.java b/app/src/main/java/com/rehome/dywoa/weiget/luck/WaitDialog.java old mode 100644 new mode 100755 diff --git a/app/src/main/java/com/rehome/dywoa/weiget/toastviewbymyself.java b/app/src/main/java/com/rehome/dywoa/weiget/toastviewbymyself.java old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ac_back_icon.png b/app/src/main/res/drawable-xhdpi/ac_back_icon.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/del.png b/app/src/main/res/drawable-xhdpi/del.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/forbid.png b/app/src/main/res/drawable-xhdpi/forbid.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/gh_icon.png b/app/src/main/res/drawable-xhdpi/gh_icon.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/head_photo.png b/app/src/main/res/drawable-xhdpi/head_photo.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/head_photo_new.png b/app/src/main/res/drawable-xhdpi/head_photo_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon1.png b/app/src/main/res/drawable-xhdpi/icon1.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon11.png b/app/src/main/res/drawable-xhdpi/icon11.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon15.png b/app/src/main/res/drawable-xhdpi/icon15.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon18.png b/app/src/main/res/drawable-xhdpi/icon18.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon3.png b/app/src/main/res/drawable-xhdpi/icon3.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon6.png b/app/src/main/res/drawable-xhdpi/icon6.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_apply.png b/app/src/main/res/drawable-xhdpi/icon_apply.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_audio.png b/app/src/main/res/drawable-xhdpi/icon_audio.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_bfww.png b/app/src/main/res/drawable-xhdpi/icon_bfww.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_bi.png b/app/src/main/res/drawable-xhdpi/icon_bi.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_bi_new.png b/app/src/main/res/drawable-xhdpi/icon_bi_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_change_shift.png b/app/src/main/res/drawable-xhdpi/icon_change_shift.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_check.png b/app/src/main/res/drawable-xhdpi/icon_check.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_clcrz.png b/app/src/main/res/drawable-xhdpi/icon_clcrz.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_clean_cache.png b/app/src/main/res/drawable-xhdpi/icon_clean_cache.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_date.png b/app/src/main/res/drawable-xhdpi/icon_date.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_debuglog.png b/app/src/main/res/drawable-xhdpi/icon_debuglog.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_debuglogreport.png b/app/src/main/res/drawable-xhdpi/icon_debuglogreport.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_delete_32.png b/app/src/main/res/drawable-xhdpi/icon_delete_32.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_dianjian.png b/app/src/main/res/drawable-xhdpi/icon_dianjian.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_dinner.png b/app/src/main/res/drawable-xhdpi/icon_dinner.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_dinner_new.png b/app/src/main/res/drawable-xhdpi/icon_dinner_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_dj.png b/app/src/main/res/drawable-xhdpi/icon_dj.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_dj_new.png b/app/src/main/res/drawable-xhdpi/icon_dj_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_download.png b/app/src/main/res/drawable-xhdpi/icon_download.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_dzdt.png b/app/src/main/res/drawable-xhdpi/icon_dzdt.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_face_re.png b/app/src/main/res/drawable-xhdpi/icon_face_re.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_gcjd.png b/app/src/main/res/drawable-xhdpi/icon_gcjd.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_gcjd_new.png b/app/src/main/res/drawable-xhdpi/icon_gcjd_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_ggzx.png b/app/src/main/res/drawable-xhdpi/icon_ggzx.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_gkyth.png b/app/src/main/res/drawable-xhdpi/icon_gkyth.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_gzdb.png b/app/src/main/res/drawable-xhdpi/icon_gzdb.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_gzgz.png b/app/src/main/res/drawable-xhdpi/icon_gzgz.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_hb.png b/app/src/main/res/drawable-xhdpi/icon_hb.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_high_risk.png b/app/src/main/res/drawable-xhdpi/icon_high_risk.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_huaxue.png b/app/src/main/res/drawable-xhdpi/icon_huaxue.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_huayian.png b/app/src/main/res/drawable-xhdpi/icon_huayian.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_jzcs_new.png b/app/src/main/res/drawable-xhdpi/icon_jzcs_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_kjgl.png b/app/src/main/res/drawable-xhdpi/icon_kjgl.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_kks.png b/app/src/main/res/drawable-xhdpi/icon_kks.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_kks_search.png b/app/src/main/res/drawable-xhdpi/icon_kks_search.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_ks.png b/app/src/main/res/drawable-xhdpi/icon_ks.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_last.png b/app/src/main/res/drawable-xhdpi/icon_last.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_liangpiao.png b/app/src/main/res/drawable-xhdpi/icon_liangpiao.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_login_out.png b/app/src/main/res/drawable-xhdpi/icon_login_out.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_lpqt.png b/app/src/main/res/drawable-xhdpi/icon_lpqt.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_lsgk.png b/app/src/main/res/drawable-xhdpi/icon_lsgk.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_meet.png b/app/src/main/res/drawable-xhdpi/icon_meet.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_meet_date.png b/app/src/main/res/drawable-xhdpi/icon_meet_date.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_meetting.png b/app/src/main/res/drawable-xhdpi/icon_meetting.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_mentions.png b/app/src/main/res/drawable-xhdpi/icon_mentions.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_myphone.png b/app/src/main/res/drawable-xhdpi/icon_myphone.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_mzdh.png b/app/src/main/res/drawable-xhdpi/icon_mzdh.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_next.png b/app/src/main/res/drawable-xhdpi/icon_next.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_office.png b/app/src/main/res/drawable-xhdpi/icon_office.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_order.png b/app/src/main/res/drawable-xhdpi/icon_order.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_pause.png b/app/src/main/res/drawable-xhdpi/icon_pause.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_phone.png b/app/src/main/res/drawable-xhdpi/icon_phone.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_phone1.png b/app/src/main/res/drawable-xhdpi/icon_phone1.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_play.png b/app/src/main/res/drawable-xhdpi/icon_play.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_pwd.png b/app/src/main/res/drawable-xhdpi/icon_pwd.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_px.png b/app/src/main/res/drawable-xhdpi/icon_px.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_qdmeet.png b/app/src/main/res/drawable-xhdpi/icon_qdmeet.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_qj_new.png b/app/src/main/res/drawable-xhdpi/icon_qj_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_query.png b/app/src/main/res/drawable-xhdpi/icon_query.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_reception.png b/app/src/main/res/drawable-xhdpi/icon_reception.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_rinhuan_take.png b/app/src/main/res/drawable-xhdpi/icon_rinhuan_take.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_runlog_home.png b/app/src/main/res/drawable-xhdpi/icon_runlog_home.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_sbbb.png b/app/src/main/res/drawable-xhdpi/icon_sbbb.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_sbzttx.png b/app/src/main/res/drawable-xhdpi/icon_sbzttx.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_sis.png b/app/src/main/res/drawable-xhdpi/icon_sis.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_sis_new.png b/app/src/main/res/drawable-xhdpi/icon_sis_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_sis_new_first.png b/app/src/main/res/drawable-xhdpi/icon_sis_new_first.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_started.png b/app/src/main/res/drawable-xhdpi/icon_started.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_suggest.png b/app/src/main/res/drawable-xhdpi/icon_suggest.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_take_out.png b/app/src/main/res/drawable-xhdpi/icon_take_out.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_task.png b/app/src/main/res/drawable-xhdpi/icon_task.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_task_count.png b/app/src/main/res/drawable-xhdpi/icon_task_count.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_task_other.png b/app/src/main/res/drawable-xhdpi/icon_task_other.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_travel.png b/app/src/main/res/drawable-xhdpi/icon_travel.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_update_pwd.png b/app/src/main/res/drawable-xhdpi/icon_update_pwd.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_use_car.png b/app/src/main/res/drawable-xhdpi/icon_use_car.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_use_seal.png b/app/src/main/res/drawable-xhdpi/icon_use_seal.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_user.png b/app/src/main/res/drawable-xhdpi/icon_user.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_vehicle.png b/app/src/main/res/drawable-xhdpi/icon_vehicle.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_vehicle_new.png b/app/src/main/res/drawable-xhdpi/icon_vehicle_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_visit.png b/app/src/main/res/drawable-xhdpi/icon_visit.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_wdhy.png b/app/src/main/res/drawable-xhdpi/icon_wdhy.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_xmjd.png b/app/src/main/res/drawable-xhdpi/icon_xmjd.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_yjya.png b/app/src/main/res/drawable-xhdpi/icon_yjya.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_yjya_new.png b/app/src/main/res/drawable-xhdpi/icon_yjya_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_zhizhanglog.png b/app/src/main/res/drawable-xhdpi/icon_zhizhanglog.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_zhizhanglogreport.png b/app/src/main/res/drawable-xhdpi/icon_zhizhanglogreport.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_zhuzhi.png b/app/src/main/res/drawable-xhdpi/icon_zhuzhi.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_zyfx.png b/app/src/main/res/drawable-xhdpi/icon_zyfx.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/icon_zzlogreport.png b/app/src/main/res/drawable-xhdpi/icon_zzlogreport.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/login_logo.png b/app/src/main/res/drawable-xhdpi/login_logo.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/packup.png b/app/src/main/res/drawable-xhdpi/packup.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/page_bg_mine.png b/app/src/main/res/drawable-xhdpi/page_bg_mine.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/scan_light.png b/app/src/main/res/drawable-xhdpi/scan_light.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/tab_home.png b/app/src/main/res/drawable-xhdpi/tab_home.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/tab_home_hover.png b/app/src/main/res/drawable-xhdpi/tab_home_hover.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/tab_home_hover_new.png b/app/src/main/res/drawable-xhdpi/tab_home_hover_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/tab_home_new.png b/app/src/main/res/drawable-xhdpi/tab_home_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/tab_me.png b/app/src/main/res/drawable-xhdpi/tab_me.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/tab_me_hover.png b/app/src/main/res/drawable-xhdpi/tab_me_hover.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/tab_me_hover_new.png b/app/src/main/res/drawable-xhdpi/tab_me_hover_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/tab_me_new.png b/app/src/main/res/drawable-xhdpi/tab_me_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/top_image.jpg b/app/src/main/res/drawable-xhdpi/top_image.jpg old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/will_to_do.png b/app/src/main/res/drawable-xhdpi/will_to_do.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/xjgz.png b/app/src/main/res/drawable-xhdpi/xjgz.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/head_photo_new.png b/app/src/main/res/drawable-xxhdpi/head_photo_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_bi.png b/app/src/main/res/drawable-xxhdpi/icon_bi.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_bi_new.png b/app/src/main/res/drawable-xxhdpi/icon_bi_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_dianjian.png b/app/src/main/res/drawable-xxhdpi/icon_dianjian.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_dinner_new.png b/app/src/main/res/drawable-xxhdpi/icon_dinner_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_dj_new.png b/app/src/main/res/drawable-xxhdpi/icon_dj_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_face_re.png b/app/src/main/res/drawable-xxhdpi/icon_face_re.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_gcjd_new.png b/app/src/main/res/drawable-xxhdpi/icon_gcjd_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_gkyth.png b/app/src/main/res/drawable-xxhdpi/icon_gkyth.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_high_risk.png b/app/src/main/res/drawable-xxhdpi/icon_high_risk.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_jzcs_new.png b/app/src/main/res/drawable-xxhdpi/icon_jzcs_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_kks.png b/app/src/main/res/drawable-xxhdpi/icon_kks.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_kks_search.png b/app/src/main/res/drawable-xxhdpi/icon_kks_search.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_liangpiao.png b/app/src/main/res/drawable-xxhdpi/icon_liangpiao.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_login_out.png b/app/src/main/res/drawable-xxhdpi/icon_login_out.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_lpqt.png b/app/src/main/res/drawable-xxhdpi/icon_lpqt.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_meetting.png b/app/src/main/res/drawable-xxhdpi/icon_meetting.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_qj_new.png b/app/src/main/res/drawable-xxhdpi/icon_qj_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_rinhuan_take.png b/app/src/main/res/drawable-xxhdpi/icon_rinhuan_take.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_runlog_home.png b/app/src/main/res/drawable-xxhdpi/icon_runlog_home.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_sis_new.png b/app/src/main/res/drawable-xxhdpi/icon_sis_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_sis_new_first.png b/app/src/main/res/drawable-xxhdpi/icon_sis_new_first.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_use_car.png b/app/src/main/res/drawable-xxhdpi/icon_use_car.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_use_seal.png b/app/src/main/res/drawable-xxhdpi/icon_use_seal.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_vehicle_new.png b/app/src/main/res/drawable-xxhdpi/icon_vehicle_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_yjya.png b/app/src/main/res/drawable-xxhdpi/icon_yjya.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_yjya_new.png b/app/src/main/res/drawable-xxhdpi/icon_yjya_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/icon_zyfx.png b/app/src/main/res/drawable-xxhdpi/icon_zyfx.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/tab_home_hover_new.png b/app/src/main/res/drawable-xxhdpi/tab_home_hover_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/tab_home_new.png b/app/src/main/res/drawable-xxhdpi/tab_home_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/tab_me_hover_new.png b/app/src/main/res/drawable-xxhdpi/tab_me_hover_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/tab_me_new.png b/app/src/main/res/drawable-xxhdpi/tab_me_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/will_to_do.png b/app/src/main/res/drawable-xxhdpi/will_to_do.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/xjgz.png b/app/src/main/res/drawable-xxhdpi/xjgz.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/head_photo_new.png b/app/src/main/res/drawable-xxxhdpi/head_photo_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_bi.png b/app/src/main/res/drawable-xxxhdpi/icon_bi.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_bi_new.png b/app/src/main/res/drawable-xxxhdpi/icon_bi_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_dianjian.png b/app/src/main/res/drawable-xxxhdpi/icon_dianjian.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_dinner_new.png b/app/src/main/res/drawable-xxxhdpi/icon_dinner_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_dj_new.png b/app/src/main/res/drawable-xxxhdpi/icon_dj_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_face_re.png b/app/src/main/res/drawable-xxxhdpi/icon_face_re.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_gcjd_new.png b/app/src/main/res/drawable-xxxhdpi/icon_gcjd_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_gkyth.png b/app/src/main/res/drawable-xxxhdpi/icon_gkyth.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_high_risk.png b/app/src/main/res/drawable-xxxhdpi/icon_high_risk.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_jzcs_new.png b/app/src/main/res/drawable-xxxhdpi/icon_jzcs_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_kks.png b/app/src/main/res/drawable-xxxhdpi/icon_kks.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_kks_search.png b/app/src/main/res/drawable-xxxhdpi/icon_kks_search.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_liangpiao.png b/app/src/main/res/drawable-xxxhdpi/icon_liangpiao.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_login_out.png b/app/src/main/res/drawable-xxxhdpi/icon_login_out.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_lpqt.png b/app/src/main/res/drawable-xxxhdpi/icon_lpqt.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_meetting.png b/app/src/main/res/drawable-xxxhdpi/icon_meetting.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_qj_new.png b/app/src/main/res/drawable-xxxhdpi/icon_qj_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_rinhuan_take.png b/app/src/main/res/drawable-xxxhdpi/icon_rinhuan_take.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_runlog_home.png b/app/src/main/res/drawable-xxxhdpi/icon_runlog_home.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_sis_new.png b/app/src/main/res/drawable-xxxhdpi/icon_sis_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_sis_new_first.png b/app/src/main/res/drawable-xxxhdpi/icon_sis_new_first.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_use_car.png b/app/src/main/res/drawable-xxxhdpi/icon_use_car.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_use_seal.png b/app/src/main/res/drawable-xxxhdpi/icon_use_seal.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_vehicle_new.png b/app/src/main/res/drawable-xxxhdpi/icon_vehicle_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_yjya.png b/app/src/main/res/drawable-xxxhdpi/icon_yjya.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_yjya_new.png b/app/src/main/res/drawable-xxxhdpi/icon_yjya_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_zyfx.png b/app/src/main/res/drawable-xxxhdpi/icon_zyfx.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/tab_home_hover_new.png b/app/src/main/res/drawable-xxxhdpi/tab_home_hover_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/tab_home_new.png b/app/src/main/res/drawable-xxxhdpi/tab_home_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/tab_me_hover_new.png b/app/src/main/res/drawable-xxxhdpi/tab_me_hover_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/tab_me_new.png b/app/src/main/res/drawable-xxxhdpi/tab_me_new.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/will_to_do.png b/app/src/main/res/drawable-xxxhdpi/will_to_do.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxxhdpi/xjgz.png b/app/src/main/res/drawable-xxxhdpi/xjgz.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/auth_button_login.xml b/app/src/main/res/drawable/auth_button_login.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/auth_tab_header_text.xml b/app/src/main/res/drawable/auth_tab_header_text.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/bg_dj_edittext.xml b/app/src/main/res/drawable/bg_dj_edittext.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/bg_edittext.xml b/app/src/main/res/drawable/bg_edittext.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/border_line_gray.xml b/app/src/main/res/drawable/border_line_gray.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/border_line_while.xml b/app/src/main/res/drawable/border_line_while.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/btn_date_selector.xml b/app/src/main/res/drawable/btn_date_selector.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/btn_gray.xml b/app/src/main/res/drawable/btn_gray.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/btn_login_shape.xml b/app/src/main/res/drawable/btn_login_shape.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/btn_normal.xml b/app/src/main/res/drawable/btn_normal.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/btn_normal_mj.xml b/app/src/main/res/drawable/btn_normal_mj.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/btn_normal_mj_tg.xml b/app/src/main/res/drawable/btn_normal_mj_tg.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/btn_pressed.xml b/app/src/main/res/drawable/btn_pressed.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/btn_selector.xml b/app/src/main/res/drawable/btn_selector.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/btn_selector_mj_status.xml b/app/src/main/res/drawable/btn_selector_mj_status.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/btn_selector_mj_status_tg.xml b/app/src/main/res/drawable/btn_selector_mj_status_tg.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/check_fail.png b/app/src/main/res/drawable/check_fail.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/countdown_color_next_selector.xml b/app/src/main/res/drawable/countdown_color_next_selector.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/countdown_color_selector.xml b/app/src/main/res/drawable/countdown_color_selector.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/countdown_next_selector.xml b/app/src/main/res/drawable/countdown_next_selector.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/countdown_selector.xml b/app/src/main/res/drawable/countdown_selector.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/db.png b/app/src/main/res/drawable/db.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/edit_bg.xml b/app/src/main/res/drawable/edit_bg.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/fresh_button.png b/app/src/main/res/drawable/fresh_button.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/home.xml b/app/src/main/res/drawable/home.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/home_wait_to_do.xml b/app/src/main/res/drawable/home_wait_to_do.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/ic_add_image.png b/app/src/main/res/drawable/ic_add_image.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/login_bg.png b/app/src/main/res/drawable/login_bg.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/login_edit.xml b/app/src/main/res/drawable/login_edit.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/login_edit1.xml b/app/src/main/res/drawable/login_edit1.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/me.xml b/app/src/main/res/drawable/me.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/my_photo.png b/app/src/main/res/drawable/my_photo.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/pressed_bg_blue88.xml b/app/src/main/res/drawable/pressed_bg_blue88.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/presslogout.xml b/app/src/main/res/drawable/presslogout.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/presslr.xml b/app/src/main/res/drawable/presslr.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/progress_bar_color.xml b/app/src/main/res/drawable/progress_bar_color.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/ps_demo_permission_desc_bg.xml b/app/src/main/res/drawable/ps_demo_permission_desc_bg.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/radius_mjsq.xml b/app/src/main/res/drawable/radius_mjsq.xml new file mode 100644 index 0000000..0dc0211 --- /dev/null +++ b/app/src/main/res/drawable/radius_mjsq.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/randcode_back.png b/app/src/main/res/drawable/randcode_back.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/red_dot.xml b/app/src/main/res/drawable/red_dot.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/scan_bg.xml b/app/src/main/res/drawable/scan_bg.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/selector_list_item.xml b/app/src/main/res/drawable/selector_list_item.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/shape.xml b/app/src/main/res/drawable/shape.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/shape_bottom_corner.xml b/app/src/main/res/drawable/shape_bottom_corner.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/shape_check_fail.xml b/app/src/main/res/drawable/shape_check_fail.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/shape_check_fl.xml b/app/src/main/res/drawable/shape_check_fl.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/shape_circle_select.xml b/app/src/main/res/drawable/shape_circle_select.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/shape_corner.xml b/app/src/main/res/drawable/shape_corner.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/text_red_circ.xml b/app/src/main/res/drawable/text_red_circ.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/thumb.xml b/app/src/main/res/drawable/thumb.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/thumb_blue.xml b/app/src/main/res/drawable/thumb_blue.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/thumb_gray.xml b/app/src/main/res/drawable/thumb_gray.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/track.xml b/app/src/main/res/drawable/track.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/track_blue.xml b/app/src/main/res/drawable/track_blue.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/track_gray.xml b/app/src/main/res/drawable/track_gray.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_ajh_and_sbjd.xml b/app/src/main/res/layout/activity_ajh_and_sbjd.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_auth_success.xml b/app/src/main/res/layout/activity_auth_success.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_bi_show.xml b/app/src/main/res/layout/activity_bi_show.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_cjsj.xml b/app/src/main/res/layout/activity_cjsj.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_current_day_dj.xml b/app/src/main/res/layout/activity_current_day_dj.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_dj_statistics.xml b/app/src/main/res/layout/activity_dj_statistics.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_dj_zh_tj.xml b/app/src/main/res/layout/activity_dj_zh_tj.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_every_date_risk_controller_list.xml b/app/src/main/res/layout/activity_every_date_risk_controller_list.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_face_recognition.xml b/app/src/main/res/layout/activity_face_recognition.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_face_recognition_app.xml b/app/src/main/res/layout/activity_face_recognition_app.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_fan_wei.xml b/app/src/main/res/layout/activity_fan_wei.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_hight_risk.xml b/app/src/main/res/layout/activity_hight_risk.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_history_dj.xml b/app/src/main/res/layout/activity_history_dj.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_ji_zhu.xml b/app/src/main/res/layout/activity_ji_zhu.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_kks_search.xml b/app/src/main/res/layout/activity_kks_search.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_kks_search_gong_dan.xml b/app/src/main/res/layout/activity_kks_search_gong_dan.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_main2.xml b/app/src/main/res/layout/activity_main2.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_mainxj.xml b/app/src/main/res/layout/activity_mainxj.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_mj_apply.xml b/app/src/main/res/layout/activity_mj_apply.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_mj_apply_manage.xml b/app/src/main/res/layout/activity_mj_apply_manage.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_mj_apply_submit.xml b/app/src/main/res/layout/activity_mj_apply_submit.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_nfcinfo.xml b/app/src/main/res/layout/activity_nfcinfo.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_primary_auth.xml b/app/src/main/res/layout/activity_primary_auth.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_qr_code.xml b/app/src/main/res/layout/activity_qr_code.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_qr_code_new.xml b/app/src/main/res/layout/activity_qr_code_new.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_qxgd_list.xml b/app/src/main/res/layout/activity_qxgd_list.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_record_event.xml b/app/src/main/res/layout/activity_record_event.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_run_log.xml b/app/src/main/res/layout/activity_run_log.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_run_log_base.xml b/app/src/main/res/layout/activity_run_log_base.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_run_log_list.xml b/app/src/main/res/layout/activity_run_log_list.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_sbxdjgl.xml b/app/src/main/res/layout/activity_sbxdjgl.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_sbxjcjsb.xml b/app/src/main/res/layout/activity_sbxjcjsb.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_sdjgz.xml b/app/src/main/res/layout/activity_sdjgz.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_sdlb.xml b/app/src/main/res/layout/activity_sdlb.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_sis.xml b/app/src/main/res/layout/activity_sis.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_sis_base.xml b/app/src/main/res/layout/activity_sis_base.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_son.xml b/app/src/main/res/layout/activity_son.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_sqd.xml b/app/src/main/res/layout/activity_sqd.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_sqxgdlr3.xml b/app/src/main/res/layout/activity_sqxgdlr3.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_sxcdj.xml b/app/src/main/res/layout/activity_sxcdj.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_use_car.xml b/app/src/main/res/layout/activity_use_car.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_use_seal.xml b/app/src/main/res/layout/activity_use_seal.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_vpn_login.xml b/app/src/main/res/layout/activity_vpn_login.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_wait_for_to_do.xml b/app/src/main/res/layout/activity_wait_for_to_do.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_wait_for_to_do_base.xml b/app/src/main/res/layout/activity_wait_for_to_do_base.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_wjmm_get_verification_code.xml b/app/src/main/res/layout/activity_wjmm_get_verification_code.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_xj_check_and_upload.xml b/app/src/main/res/layout/activity_xj_check_and_upload.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_xj_mj_apply.xml b/app/src/main/res/layout/activity_xj_mj_apply.xml new file mode 100644 index 0000000..84567de --- /dev/null +++ b/app/src/main/res/layout/activity_xj_mj_apply.xml @@ -0,0 +1,235 @@ + + + + + + + + + + + + + +