|
|
@ -130,18 +130,19 @@ class RulesEditFragment : BaseFragment<FragmentRulesEditBinding?>(), View.OnClic
|
|
|
|
initAppSpinner()
|
|
|
|
initAppSpinner()
|
|
|
|
//监听已安装App信息列表加载完成事件
|
|
|
|
//监听已安装App信息列表加载完成事件
|
|
|
|
LiveEventBus.get(EVENT_LOAD_APP_LIST, String::class.java).observeStickyForever(appListObserver)
|
|
|
|
LiveEventBus.get(EVENT_LOAD_APP_LIST, String::class.java).observeStickyForever(appListObserver)
|
|
|
|
binding!!.layoutUid.visibility = View.VISIBLE
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
"call" -> {
|
|
|
|
"call" -> {
|
|
|
|
titleBar?.setTitle(R.string.call_rule)
|
|
|
|
titleBar?.setTitle(R.string.call_rule)
|
|
|
|
binding!!.rbContent.visibility = View.GONE
|
|
|
|
binding!!.rbContent.visibility = View.GONE
|
|
|
|
binding!!.rbPackageName.visibility = View.GONE
|
|
|
|
binding!!.rbPackageName.visibility = View.GONE
|
|
|
|
|
|
|
|
binding!!.rbUid.visibility = View.GONE
|
|
|
|
binding!!.rbInformContent.visibility = View.GONE
|
|
|
|
binding!!.rbInformContent.visibility = View.GONE
|
|
|
|
//binding!!.rbMultiMatch.visibility = View.GONE
|
|
|
|
//binding!!.rbMultiMatch.visibility = View.GONE
|
|
|
|
binding!!.tvMuRuleTips.setText(R.string.mu_rule_call_tips)
|
|
|
|
binding!!.tvMuRuleTips.setText(R.string.mu_rule_call_tips)
|
|
|
|
binding!!.btInsertContent.visibility = View.GONE
|
|
|
|
binding!!.btInsertContent.visibility = View.GONE
|
|
|
|
binding!!.btInsertSenderApp.visibility = View.GONE
|
|
|
|
binding!!.btInsertSenderApp.visibility = View.GONE
|
|
|
|
|
|
|
|
binding!!.btInsertUid.visibility = View.GONE
|
|
|
|
binding!!.btInsertTitleApp.visibility = View.GONE
|
|
|
|
binding!!.btInsertTitleApp.visibility = View.GONE
|
|
|
|
binding!!.btInsertContentApp.visibility = View.GONE
|
|
|
|
binding!!.btInsertContentApp.visibility = View.GONE
|
|
|
|
|
|
|
|
|
|
|
@ -158,18 +159,18 @@ class RulesEditFragment : BaseFragment<FragmentRulesEditBinding?>(), View.OnClic
|
|
|
|
binding!!.spCallType.selectedIndex = callTypeIndex
|
|
|
|
binding!!.spCallType.selectedIndex = callTypeIndex
|
|
|
|
}
|
|
|
|
}
|
|
|
|
binding!!.spCallType.selectedIndex = callTypeIndex
|
|
|
|
binding!!.spCallType.selectedIndex = callTypeIndex
|
|
|
|
binding!!.layoutUid.visibility = View.GONE
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
else -> {
|
|
|
|
else -> {
|
|
|
|
titleBar?.setTitle(R.string.sms_rule)
|
|
|
|
titleBar?.setTitle(R.string.sms_rule)
|
|
|
|
binding!!.rbCallType.visibility = View.GONE
|
|
|
|
binding!!.rbCallType.visibility = View.GONE
|
|
|
|
binding!!.rbPackageName.visibility = View.GONE
|
|
|
|
binding!!.rbPackageName.visibility = View.GONE
|
|
|
|
|
|
|
|
binding!!.rbUid.visibility = View.GONE
|
|
|
|
binding!!.rbInformContent.visibility = View.GONE
|
|
|
|
binding!!.rbInformContent.visibility = View.GONE
|
|
|
|
binding!!.btInsertSenderApp.visibility = View.GONE
|
|
|
|
binding!!.btInsertSenderApp.visibility = View.GONE
|
|
|
|
|
|
|
|
binding!!.btInsertUid.visibility = View.GONE
|
|
|
|
binding!!.btInsertTitleApp.visibility = View.GONE
|
|
|
|
binding!!.btInsertTitleApp.visibility = View.GONE
|
|
|
|
binding!!.btInsertContentApp.visibility = View.GONE
|
|
|
|
binding!!.btInsertContentApp.visibility = View.GONE
|
|
|
|
binding!!.layoutUid.visibility = View.GONE
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -189,6 +190,7 @@ class RulesEditFragment : BaseFragment<FragmentRulesEditBinding?>(), View.OnClic
|
|
|
|
binding!!.btInsertSender.setOnClickListener(this)
|
|
|
|
binding!!.btInsertSender.setOnClickListener(this)
|
|
|
|
binding!!.btInsertContent.setOnClickListener(this)
|
|
|
|
binding!!.btInsertContent.setOnClickListener(this)
|
|
|
|
binding!!.btInsertSenderApp.setOnClickListener(this)
|
|
|
|
binding!!.btInsertSenderApp.setOnClickListener(this)
|
|
|
|
|
|
|
|
binding!!.btInsertUid.setOnClickListener(this)
|
|
|
|
binding!!.btInsertTitleApp.setOnClickListener(this)
|
|
|
|
binding!!.btInsertTitleApp.setOnClickListener(this)
|
|
|
|
binding!!.btInsertContentApp.setOnClickListener(this)
|
|
|
|
binding!!.btInsertContentApp.setOnClickListener(this)
|
|
|
|
binding!!.btInsertExtra.setOnClickListener(this)
|
|
|
|
binding!!.btInsertExtra.setOnClickListener(this)
|
|
|
@ -320,6 +322,11 @@ class RulesEditFragment : BaseFragment<FragmentRulesEditBinding?>(), View.OnClic
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
R.id.bt_insert_uid -> {
|
|
|
|
|
|
|
|
CommonUtils.insertOrReplaceText2Cursor(etSmsTemplate, getString(R.string.tag_uid))
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
R.id.bt_insert_title_app -> {
|
|
|
|
R.id.bt_insert_title_app -> {
|
|
|
|
CommonUtils.insertOrReplaceText2Cursor(etSmsTemplate, getString(R.string.tag_title))
|
|
|
|
CommonUtils.insertOrReplaceText2Cursor(etSmsTemplate, getString(R.string.tag_title))
|
|
|
|
return
|
|
|
|
return
|
|
|
@ -595,7 +602,6 @@ class RulesEditFragment : BaseFragment<FragmentRulesEditBinding?>(), View.OnClic
|
|
|
|
binding!!.sbStatus.isChecked = rule.statusChecked
|
|
|
|
binding!!.sbStatus.isChecked = rule.statusChecked
|
|
|
|
silentPeriodStart = rule.silentPeriodStart
|
|
|
|
silentPeriodStart = rule.silentPeriodStart
|
|
|
|
silentPeriodEnd = rule.silentPeriodEnd
|
|
|
|
silentPeriodEnd = rule.silentPeriodEnd
|
|
|
|
binding!!.etUid.setText(rule.uid.toString())
|
|
|
|
|
|
|
|
//初始化发送通道下拉框
|
|
|
|
//初始化发送通道下拉框
|
|
|
|
initSenderSpinner()
|
|
|
|
initSenderSpinner()
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -612,6 +618,7 @@ class RulesEditFragment : BaseFragment<FragmentRulesEditBinding?>(), View.OnClic
|
|
|
|
R.id.rb_phone -> FILED_PHONE_NUM
|
|
|
|
R.id.rb_phone -> FILED_PHONE_NUM
|
|
|
|
R.id.rb_call_type -> FILED_CALL_TYPE
|
|
|
|
R.id.rb_call_type -> FILED_CALL_TYPE
|
|
|
|
R.id.rb_package_name -> FILED_PACKAGE_NAME
|
|
|
|
R.id.rb_package_name -> FILED_PACKAGE_NAME
|
|
|
|
|
|
|
|
R.id.rb_uid -> FILED_UID
|
|
|
|
R.id.rb_inform_content -> FILED_INFORM_CONTENT
|
|
|
|
R.id.rb_inform_content -> FILED_INFORM_CONTENT
|
|
|
|
R.id.rb_multi_match -> FILED_MULTI_MATCH
|
|
|
|
R.id.rb_multi_match -> FILED_MULTI_MATCH
|
|
|
|
else -> FILED_TRANSPOND_ALL
|
|
|
|
else -> FILED_TRANSPOND_ALL
|
|
|
@ -662,11 +669,6 @@ class RulesEditFragment : BaseFragment<FragmentRulesEditBinding?>(), View.OnClic
|
|
|
|
//if (status == STATUS_OFF) {
|
|
|
|
//if (status == STATUS_OFF) {
|
|
|
|
// throw Exception(getString(R.string.invalid_rule_status))
|
|
|
|
// throw Exception(getString(R.string.invalid_rule_status))
|
|
|
|
//}
|
|
|
|
//}
|
|
|
|
val uidText = binding!!.etUid.text
|
|
|
|
|
|
|
|
var uid = 0
|
|
|
|
|
|
|
|
if(uidText!=null&& uidText.isNotEmpty()){
|
|
|
|
|
|
|
|
uid = uidText.toString().toInt()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return Rule(
|
|
|
|
return Rule(
|
|
|
|
ruleId,
|
|
|
|
ruleId,
|
|
|
|
ruleType,
|
|
|
|
ruleType,
|
|
|
@ -682,8 +684,7 @@ class RulesEditFragment : BaseFragment<FragmentRulesEditBinding?>(), View.OnClic
|
|
|
|
senderListSelected,
|
|
|
|
senderListSelected,
|
|
|
|
senderLogic,
|
|
|
|
senderLogic,
|
|
|
|
silentPeriodStart,
|
|
|
|
silentPeriodStart,
|
|
|
|
silentPeriodEnd,
|
|
|
|
silentPeriodEnd
|
|
|
|
uid
|
|
|
|
|
|
|
|
)
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|