diff --git a/app/src/main/java/com/idormy/sms/forwarder/activity/MainActivity.kt b/app/src/main/java/com/idormy/sms/forwarder/activity/MainActivity.kt index e0672d4b..3ab5ec32 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/activity/MainActivity.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/activity/MainActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.LayoutInflater import android.view.MenuItem import android.view.View -import android.widget.TextView import androidx.appcompat.app.ActionBarDrawerToggle import androidx.appcompat.widget.Toolbar import androidx.recyclerview.widget.RecyclerView @@ -135,12 +134,6 @@ class MainActivity : BaseActivity(), val adapter = FragmentAdapter(supportFragmentManager, fragments) binding!!.includeMain.viewPager.offscreenPageLimit = mTitles.size - 1 binding!!.includeMain.viewPager.adapter = adapter - - if (!SettingUtils.enableHelpTip) { - val headerView = binding!!.navView.getHeaderView(0) - val tvSlogan = headerView.findViewById(R.id.tv_slogan) - tvSlogan.visibility = View.GONE - } } private fun initData() { diff --git a/app/src/main/java/com/idormy/sms/forwarder/adapter/TaskPagingAdapter.kt b/app/src/main/java/com/idormy/sms/forwarder/adapter/TaskPagingAdapter.kt index bb7e2f01..45006f34 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/adapter/TaskPagingAdapter.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/adapter/TaskPagingAdapter.kt @@ -73,7 +73,13 @@ class TaskPagingAdapter(private val itemClickListener: OnItemClickListener) : Pa itemClickListener.onItemClicked(view, item) } - holder.binding.sbEnable.isChecked = item.status == 1 + if (item.status == 0) { + holder.binding.ivArrow.setImageResource(R.drawable.auto_task_icon_left_arrow_grey) + holder.binding.sbEnable.isChecked = false + } else { + holder.binding.ivArrow.setImageResource(R.drawable.auto_task_icon_left_arrow) + holder.binding.sbEnable.isChecked = true + } holder.binding.sbEnable.setOnClickListener { view: View? -> itemClickListener.onItemClicked(view, item) } @@ -86,8 +92,10 @@ class TaskPagingAdapter(private val itemClickListener: OnItemClickListener) : Pa holder.binding.layoutImage.visibility = View.VISIBLE holder.binding.layoutIcons.visibility = View.GONE if (item.status == 0) { + holder.binding.ivArrow.setImageResource(R.drawable.auto_task_icon_left_arrow_grey) holder.binding.ivImage.setImageResource(item.greyImageId) } else { + holder.binding.ivArrow.setImageResource(R.drawable.auto_task_icon_left_arrow) holder.binding.ivImage.setImageResource(item.imageId) } holder.binding.ivStatus.setImageResource(item.statusImageId) diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/AboutFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/AboutFragment.kt index b533bd67..0678e2d3 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/AboutFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/AboutFragment.kt @@ -111,7 +111,7 @@ class AboutFragment : BaseFragment(), SuperTextView.OnSup binding!!.menuWechatMiniprogram.setOnSuperTextViewClickListener(this) binding!!.menuDonation.setOnSuperTextViewClickListener(this) - binding!!.menuWecomGroup.setOnSuperTextViewClickListener(this) + binding!!.menuTelegramGroup.setOnSuperTextViewClickListener(this) binding!!.menuDingtalkGroup.setOnSuperTextViewClickListener(this) binding!!.menuQqChannel.setOnSuperTextViewClickListener(this) binding!!.menuUserProtocol.setOnSuperTextViewClickListener(this) @@ -133,8 +133,8 @@ class AboutFragment : BaseFragment(), SuperTextView.OnSup previewPicture(this, getString(R.string.url_wechat_miniprogram), null) } - R.id.menu_wecom_group -> { - previewPicture(this, getString(R.string.url_wework_group), null) + R.id.menu_telegram_group -> { + previewPicture(this, getString(R.string.url_telegram_group), null) } R.id.menu_dingtalk_group -> { diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/SettingsFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/SettingsFragment.kt index b948668a..4821eb01 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/SettingsFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/SettingsFragment.kt @@ -154,9 +154,6 @@ class SettingsFragment : BaseFragment(), View.OnClickL //自定义模板 editSmsTemplate(binding!!.etSmsTemplate) - //帮助提示 - switchHelpTip(binding!!.sbHelpTip) - //纯客户端模式 switchDirectlyToClient(binding!!.sbDirectlyToClient) @@ -853,14 +850,6 @@ class SettingsFragment : BaseFragment(), View.OnClickL }) } - //页面帮助提示 - private fun switchHelpTip(@SuppressLint("UseSwitchCompatOrMaterialCode") switchHelpTip: SwitchButton) { - switchHelpTip.isChecked = SettingUtils.enableHelpTip - switchHelpTip.setOnCheckedChangeListener { _: CompoundButton?, isChecked: Boolean -> - SettingUtils.enableHelpTip = isChecked - } - } - //纯客户端模式 private fun switchDirectlyToClient(@SuppressLint("UseSwitchCompatOrMaterialCode") switchDirectlyToClient: SwitchButton) { switchDirectlyToClient.isChecked = SettingUtils.enablePureClientMode diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/TasksEditFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/TasksEditFragment.kt index 3d195205..a854ac6a 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/TasksEditFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/TasksEditFragment.kt @@ -368,7 +368,7 @@ class TasksEditFragment : BaseFragment(), View.OnClic return } - //必须开启定位服务，才能使用进入地点 或 离开地址 类型条件 + //必须开启定位服务，才能使用进入地点 或 离开地点 类型条件 if ((typeCondition == TASK_CONDITION_TO_ADDRESS || typeCondition == TASK_CONDITION_LEAVE_ADDRESS) && !App.LocationClient.isStarted()) { MaterialDialog.Builder(requireContext()) .iconRes(R.drawable.auto_task_icon_location) @@ -385,7 +385,7 @@ class TasksEditFragment : BaseFragment(), View.OnClic return } - //进入地点 或 离开地址 类型条件互斥 + //进入地点 或 离开地点 类型条件互斥 if ((typeCondition == TASK_CONDITION_TO_ADDRESS || typeCondition == TASK_CONDITION_LEAVE_ADDRESS) && (item.type == TASK_CONDITION_TO_ADDRESS || item.type == TASK_CONDITION_LEAVE_ADDRESS)) { XToastUtils.error(getString(R.string.only_one_location_condition)) return diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/Constants.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/Constants.kt index 6a8a57e3..bd634807 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/Constants.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/Constants.kt @@ -82,7 +82,6 @@ const val SP_EXTRA_SIM2 = "extra_sim2" const val SP_ENABLE_SMS_TEMPLATE = "enable_sms_template" const val SP_SMS_TEMPLATE = "sms_template" -const val SP_ENABLE_HELP_TIP = "enable_help_tip" const val SP_PURE_CLIENT_MODE = "enable_pure_client_mode" const val SP_PURE_TASK_MODE = "enable_pure_task_mode" const val SP_LOCATION = "enable_location" diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtils.kt index 68e0c2e4..cee9722c 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtils.kt @@ -120,9 +120,6 @@ class SettingUtils private constructor() { //自定义模板 var smsTemplate: String by SharedPreference(SP_SMS_TEMPLATE, "") - //是否显示页面帮助 - var enableHelpTip: Boolean by SharedPreference(SP_ENABLE_HELP_TIP, false) - //是否纯客户端模式 var enablePureClientMode: Boolean by SharedPreference(SP_PURE_CLIENT_MODE, false) diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/task/ConditionUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/task/ConditionUtils.kt index 3d083e0b..6d8b4327 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/task/ConditionUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/task/ConditionUtils.kt @@ -67,6 +67,8 @@ class ConditionUtils private constructor() { Log.d(TAG, "TASK-$taskId：cron condition is not satisfied") return false } + + Log.d(TAG, "TASK-$taskId：cron condition is satisfied") } TASK_CONDITION_TO_ADDRESS, TASK_CONDITION_LEAVE_ADDRESS -> { @@ -75,23 +77,30 @@ class ConditionUtils private constructor() { Log.d(TAG, "TASK-$taskId：locationSetting is null") continue } + val locationOld = TaskUtils.locationInfoOld val locationNew = TaskUtils.locationInfoNew if (locationSetting.calcType == "distance") { val distanceOld = calculateDistance(locationOld.latitude, locationOld.longitude, locationSetting.latitude, locationSetting.longitude) val distanceNew = calculateDistance(locationNew.latitude, locationNew.longitude, locationSetting.latitude, locationSetting.longitude) if (locationSetting.type == "to" && distanceOld > locationSetting.distance && distanceNew <= locationSetting.distance) { + Log.d(TAG, "TASK-$taskId：TO_ADDRESS distanceOld = $distanceOld, distanceNew = $distanceNew, locationSetting = $locationSetting") continue } else if (locationSetting.type == "leave" && distanceOld <= locationSetting.distance && distanceNew > locationSetting.distance) { + Log.d(TAG, "TASK-$taskId：LEAVE_ADDRESS distanceOld = $distanceOld, distanceNew = $distanceNew, locationSetting = $locationSetting") continue } } else if (locationSetting.calcType == "address") { if (locationSetting.type == "to" && !locationOld.address.contains(locationSetting.address) && locationNew.address.contains(locationSetting.address)) { + Log.d(TAG, "TASK-$taskId：TO_ADDRESS locationOld = $locationOld, locationNew = $locationNew, locationSetting = $locationSetting") continue } else if (locationSetting.type == "leave" && locationOld.address.contains(locationSetting.address) && !locationNew.address.contains(locationSetting.address)) { + Log.d(TAG, "TASK-$taskId：LEAVE_ADDRESS locationOld = $locationOld, locationNew = $locationNew, locationSetting = $locationSetting") continue } } + + Log.d(TAG, "TASK-$taskId：location is not match, locationOld = $locationOld, locationNew = $locationNew, locationSetting = $locationSetting") return false } @@ -118,6 +127,8 @@ class ConditionUtils private constructor() { Log.d(TAG, "TASK-$taskId：wifiSsid is not match, networkSetting = $networkSetting") return false } + + Log.d(TAG, "TASK-$taskId：networkState is match, networkSetting = $networkSetting") } TASK_CONDITION_SIM -> { @@ -126,10 +137,13 @@ class ConditionUtils private constructor() { Log.d(TAG, "TASK-$taskId：simSetting is null") continue } + if (TaskUtils.simState != simSetting.simState) { Log.d(TAG, "TASK-$taskId：simState is not match, simSetting = $simSetting") return false } + + Log.d(TAG, "TASK-$taskId：simState is match, simSetting = $simSetting") } TASK_CONDITION_BATTERY -> { @@ -140,12 +154,15 @@ class ConditionUtils private constructor() { Log.d(TAG, "TASK-$taskId：batterySetting is null") continue } + when (batteryStatus) { BatteryManager.BATTERY_STATUS_CHARGING, BatteryManager.BATTERY_STATUS_FULL -> { //充电中 if (batterySetting.status != BatteryManager.BATTERY_STATUS_CHARGING) return false if (batterySetting.keepReminding && batteryLevel >= batterySetting.levelMax) { + Log.d(TAG, "TASK-$taskId：1 batteryLevel = $batteryLevel, batterySetting = $batterySetting") continue } else if (!batterySetting.keepReminding && batteryLevel == batterySetting.levelMax) { + Log.d(TAG, "TASK-$taskId：2 batteryLevel = $batteryLevel, batterySetting = $batterySetting") continue } } @@ -153,12 +170,17 @@ class ConditionUtils private constructor() { BatteryManager.BATTERY_STATUS_DISCHARGING, BatteryManager.BATTERY_STATUS_NOT_CHARGING -> { //放电中 if (batterySetting.status != BatteryManager.BATTERY_STATUS_DISCHARGING) return false if (batterySetting.keepReminding && batteryLevel <= batterySetting.levelMin) { + Log.d(TAG, "TASK-$taskId：3 batteryLevel = $batteryLevel, batterySetting = $batterySetting") continue } else if (!batterySetting.keepReminding && batteryLevel == batterySetting.levelMin) { + Log.d(TAG, "TASK-$taskId：4 batteryLevel = $batteryLevel, batterySetting = $batterySetting") continue } } } + + Log.d(TAG, "TASK-$taskId：batteryStatus is not match! batteryLevel = $batteryLevel, batterySetting = $batterySetting") + return false } TASK_CONDITION_CHARGE -> { @@ -167,11 +189,15 @@ class ConditionUtils private constructor() { Log.d(TAG, "TASK-$taskId：chargeSetting is null") continue } + val batteryStatus = TaskUtils.batteryStatus val batteryPlugged = TaskUtils.batteryPlugged if (batteryStatus != chargeSetting.status || batteryPlugged != chargeSetting.plugged) { + Log.d(TAG, "TASK-$taskId：batteryStatus or batteryPlugged is not match, chargeSetting = $chargeSetting") return false } + + Log.d(TAG, "TASK-$taskId：batteryStatus and batteryPlugged is match, chargeSetting = $chargeSetting") } TASK_CONDITION_LOCK_SCREEN -> { @@ -181,8 +207,11 @@ class ConditionUtils private constructor() { continue } if (TaskUtils.lockScreenAction != lockScreenSetting.action) { + Log.d(TAG, "TASK-$taskId：lockScreenAction is not match, lockScreenSetting = $lockScreenSetting") return false } + + Log.d(TAG, "TASK-$taskId：lockScreenAction is match, lockScreenSetting = $lockScreenSetting") } } } diff --git a/app/src/main/res/drawable/auto_task_address_item_normal.xml b/app/src/main/res/drawable/auto_task_address_item_normal.xml deleted file mode 100644 index d46ae48c..00000000 --- a/app/src/main/res/drawable/auto_task_address_item_normal.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_address_item_selected.xml b/app/src/main/res/drawable/auto_task_address_item_selected.xml deleted file mode 100644 index 04038bc3..00000000 --- a/app/src/main/res/drawable/auto_task_address_item_selected.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_default_bg.xml b/app/src/main/res/drawable/auto_task_default_bg.xml deleted file mode 100644 index fc4b2a00..00000000 --- a/app/src/main/res/drawable/auto_task_default_bg.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_edit_address_icon.xml b/app/src/main/res/drawable/auto_task_edit_address_icon.xml deleted file mode 100644 index 83c6a910..00000000 --- a/app/src/main/res/drawable/auto_task_edit_address_icon.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_add.xml b/app/src/main/res/drawable/auto_task_icon_add.xml deleted file mode 100644 index f5278c26..00000000 --- a/app/src/main/res/drawable/auto_task_icon_add.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_icon_delete.xml b/app/src/main/res/drawable/auto_task_icon_delete.xml deleted file mode 100644 index 1c882d45..00000000 --- a/app/src/main/res/drawable/auto_task_icon_delete.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_item_background.xml b/app/src/main/res/drawable/auto_task_item_background.xml deleted file mode 100644 index 6cc6183d..00000000 --- a/app/src/main/res/drawable/auto_task_item_background.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_item_background_bottom.xml b/app/src/main/res/drawable/auto_task_item_background_bottom.xml deleted file mode 100644 index 8d6d4a88..00000000 --- a/app/src/main/res/drawable/auto_task_item_background_bottom.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_item_background_center.xml b/app/src/main/res/drawable/auto_task_item_background_center.xml deleted file mode 100644 index ff6dc5af..00000000 --- a/app/src/main/res/drawable/auto_task_item_background_center.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_item_background_top.xml b/app/src/main/res/drawable/auto_task_item_background_top.xml deleted file mode 100644 index 5db0cc26..00000000 --- a/app/src/main/res/drawable/auto_task_item_background_top.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/auto_task_left_small_arrow.xml b/app/src/main/res/drawable/auto_task_left_small_arrow.xml deleted file mode 100644 index 25eec650..00000000 --- a/app/src/main/res/drawable/auto_task_left_small_arrow.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml index 9eb39c35..1f873346 100644 --- a/app/src/main/res/drawable/ic_add.xml +++ b/app/src/main/res/drawable/ic_add.xml @@ -6,5 +6,5 @@ android:viewportHeight="24"> + android:pathData="M10.875,19.535C10.875,20.137 11.363,20.625 11.965,20.625H12.035C12.637,20.625 13.125,20.137 13.125,19.535V13.125H19.535C20.137,13.125 20.625,12.637 20.625,12.035V11.965C20.625,11.363 20.137,10.875 19.535,10.875H13.125V4.465C13.125,3.863 12.637,3.375 12.035,3.375H11.965C11.363,3.375 10.875,3.863 10.875,4.465V10.875H4.465C3.863,10.875 3.375,11.363 3.375,11.965V12.035C3.375,12.637 3.863,13.125 4.465,13.125H10.875V19.535Z" /> diff --git a/app/src/main/res/layout/adapter_tasks_card_view_list_item.xml b/app/src/main/res/layout/adapter_tasks_card_view_list_item.xml index e91e3da6..e234d03b 100644 --- a/app/src/main/res/layout/adapter_tasks_card_view_list_item.xml +++ b/app/src/main/res/layout/adapter_tasks_card_view_list_item.xml @@ -30,6 +30,7 @@ android:orientation="horizontal" /> + + + + app:sLeftTextString="@string/about_item_add_telegram_group" /> - - + tools:ignore="RtlSymmetry"> @@ -1094,6 +1095,7 @@ android:gravity="center_vertical" android:paddingStart="10dp" android:paddingTop="10dp" + android:paddingEnd="10dp" tools:ignore="RtlSymmetry"> - - - - - - - - - - - - - + android:layout_height="wrap_content" + android:visibility="gone"> - - \ No newline at end of file diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 40052aec..6f16549b 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -36,14 +36,14 @@ Gitee Reward List DingTalk Group - Wework Group + Telegram Group QQ Channel https://github.com/pppscn/SmsForwarder https://gitee.com/pp/SmsForwarder https://gitee.com/pp/SmsForwarder/wikis/pages https://gitee.com/pp/SmsForwarder.wiki/raw/master/%E6%89%93%E8%B5%8F%E5%90%8D%E5%8D%95.md https://gitee.com/pp/SmsForwarder/raw/main/pic/dingtalk.png - https://gitee.com/pp/SmsForwarder/raw/main/pic/qywechat.png + https://gitee.com/pp/SmsForwarder/raw/main/pic/qywechat.png https://qun.qq.com/qqweb/qunpro/share?_wv=3&_wwv=128&appChannel=share&inviteCode=1W5aewP&appChannel=share&businessType=9&from=246610&biz=ka https://gitee.com/pp/SmsForwarder/raw/main/pic/wechat_miniprogram.jpg diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7f14d6e1..c375275a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -36,14 +36,14 @@ Gitee 打赏名单 钉钉客户群 - 企业微信群 + Telegram群组 QQ频道 https://github.com/pppscn/SmsForwarder https://gitee.com/pp/SmsForwarder https://gitee.com/pp/SmsForwarder/wikis/pages https://gitee.com/pp/SmsForwarder.wiki/raw/master/%E6%89%93%E8%B5%8F%E5%90%8D%E5%8D%95.md https://gitee.com/pp/SmsForwarder/raw/main/pic/dingtalk.png - https://gitee.com/pp/SmsForwarder/raw/main/pic/qywechat.png + https://gitee.com/pp/SmsForwarder/raw/main/pic/tg.png https://qun.qq.com/qqweb/qunpro/share?_wv=3&_wwv=128&appChannel=share&inviteCode=1W5aewP&appChannel=share&businessType=9&from=246610&biz=ka https://gitee.com/pp/SmsForwarder/raw/main/pic/wechat_miniprogram.jpg @@ -1249,7 +1249,7 @@ 离开GPS地址包含[%s]关键字区域 已添加过该类型条件 已添加过该类型动作 - 进入地点 与 离开地址 类型条件互斥 + 进入地点 与 离开地点 类型条件互斥 当前地址：%s 定位失败，请稍后重试 , 当前距离中心%s米