优化:界面微调(增加输入框提示等)
This commit is contained in:
parent
ef5b62fbea
commit
510d7d5c91
|
@ -461,6 +461,8 @@ public class MainActivity extends AppCompatActivity implements RefreshListView.I
|
|||
ToastUtils.show(R.string.delete_log_toast);
|
||||
dialog.dismiss();
|
||||
});
|
||||
//取消
|
||||
builder.setPositiveButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
|
||||
//重发消息回调,重发失败也会触发
|
||||
Handler handler = new Handler(Looper.myLooper(), msg -> {
|
||||
|
@ -470,7 +472,7 @@ public class MainActivity extends AppCompatActivity implements RefreshListView.I
|
|||
});
|
||||
//对于发送失败的消息添加重发按钮
|
||||
if (logVo.getForwardStatus() != 2) {
|
||||
builder.setPositiveButton(R.string.resend, (dialog, which) -> {
|
||||
builder.setNeutralButton(R.string.resend, (dialog, which) -> {
|
||||
ToastUtils.show(R.string.resend_toast);
|
||||
SendUtil.resendMsgByLog(MainActivity.this, handler, logVo);
|
||||
dialog.dismiss();
|
||||
|
|
|
@ -257,6 +257,7 @@ public class RuleActivity extends AppCompatActivity {
|
|||
|
||||
Button buttonRuleOk = view1.findViewById(R.id.buttonRuleOk);
|
||||
Button buttonRuleDel = view1.findViewById(R.id.buttonRuleDel);
|
||||
buttonRuleDel.setText(ruleModel != null ? "删除" : "取消");
|
||||
Button buttonRuleTest = view1.findViewById(R.id.buttonRuleTest);
|
||||
alertDialog71
|
||||
.setTitle(getDialogTitle(currentType))
|
||||
|
@ -541,7 +542,7 @@ public class RuleActivity extends AppCompatActivity {
|
|||
builder.setTitle(R.string.select_sender);
|
||||
//添加列表
|
||||
builder.setItems(senderNames, (dialogInterface, which) -> {
|
||||
ToastUtils.delayedShow(senderNames[which], 3000);
|
||||
//ToastUtils.delayedShow(senderNames[which], 3000);
|
||||
showTv.setText(senderNames[which]);
|
||||
showTv.setTag(senderModels.get(which).getId());
|
||||
});
|
||||
|
|
|
@ -442,6 +442,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||
|
||||
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||
buttonDel.setText(senderModel != null ? "删除" : "取消");
|
||||
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||
alertDialog71
|
||||
.setTitle(R.string.setdingdingtitle)
|
||||
|
@ -575,6 +576,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||
|
||||
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||
buttonDel.setText(senderModel != null ? "删除" : "取消");
|
||||
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||
alertDialog71
|
||||
.setTitle(R.string.setemailtitle)
|
||||
|
@ -779,6 +781,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||
|
||||
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||
buttonDel.setText(senderModel != null ? "删除" : "取消");
|
||||
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||
alertDialog71
|
||||
.setTitle(R.string.setbarktitle)
|
||||
|
@ -990,6 +993,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||
|
||||
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||
buttonDel.setText(senderModel != null ? "删除" : "取消");
|
||||
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||
alertDialog71
|
||||
.setTitle(R.string.setwebnotifytitle)
|
||||
|
@ -1097,6 +1101,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||
|
||||
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||
buttonDel.setText(senderModel != null ? "删除" : "取消");
|
||||
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||
alertDialog71
|
||||
.setTitle(R.string.setqywxgrouprobottitle)
|
||||
|
@ -1215,6 +1220,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||
|
||||
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||
buttonDel.setText(senderModel != null ? "删除" : "取消");
|
||||
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||
alertDialog71
|
||||
.setTitle(R.string.setqywxapptitle)
|
||||
|
@ -1332,6 +1338,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||
|
||||
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||
buttonDel.setText(senderModel != null ? "删除" : "取消");
|
||||
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||
alertDialog71
|
||||
.setTitle(R.string.setserverchantitle)
|
||||
|
@ -1484,6 +1491,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||
|
||||
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||
buttonDel.setText(senderModel != null ? "删除" : "取消");
|
||||
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||
alertDialog71
|
||||
.setTitle(R.string.settelegramtitle)
|
||||
|
@ -1656,6 +1664,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||
|
||||
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||
buttonDel.setText(senderModel != null ? "删除" : "取消");
|
||||
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||
alertDialog71
|
||||
.setTitle(R.string.setsmstitle)
|
||||
|
@ -1759,7 +1768,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||
switchFeishuEnable.setChecked(senderModel.getStatusChecked());
|
||||
}
|
||||
|
||||
final EditText editTextFeishuWebhook = view1.findViewById(R.id.editTextFeishuWebhook);
|
||||
final ClearEditText editTextFeishuWebhook = view1.findViewById(R.id.editTextFeishuWebhook);
|
||||
final ClearEditText editTextFeishuSecret = view1.findViewById(R.id.editTextFeishuSecret);
|
||||
final RadioGroup radioGroupFeishuMsgType = view1.findViewById(R.id.radioGroupFeishuMsgType);
|
||||
final EditText editTextFeishuTitle = view1.findViewById(R.id.editTextFeishuTitle);
|
||||
|
@ -1786,6 +1795,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||
|
||||
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||
buttonDel.setText(senderModel != null ? "删除" : "取消");
|
||||
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||
alertDialog71
|
||||
.setTitle(R.string.setfeishutitle)
|
||||
|
@ -1801,7 +1811,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||
return;
|
||||
}
|
||||
|
||||
String webHook = editTextFeishuWebhook.getText().toString().trim();
|
||||
String webHook = editTextFeishuWebhook.getText().trim();
|
||||
String secret = editTextFeishuSecret.getText().trim();
|
||||
String msgType = radioGroupFeishuMsgType.getCheckedRadioButtonId() == R.id.radioFeishuMsgTypeText ? "text" : "interactive";
|
||||
String titleTemplate = editTextFeishuTitle.getText().toString().trim();
|
||||
|
@ -1844,7 +1854,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||
});
|
||||
|
||||
buttonTest.setOnClickListener(view -> {
|
||||
String webHook = editTextFeishuWebhook.getText().toString().trim();
|
||||
String webHook = editTextFeishuWebhook.getText().trim();
|
||||
String secret = editTextFeishuSecret.getText().trim();
|
||||
String msgType = radioGroupFeishuMsgType.getCheckedRadioButtonId() == R.id.radioFeishuMsgTypeText ? "text" : "interactive";
|
||||
String titleTemplate = editTextFeishuTitle.getText().toString().trim();
|
||||
|
@ -1934,6 +1944,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||
|
||||
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||
buttonDel.setText(senderModel != null ? "删除" : "取消");
|
||||
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||
alertDialog71
|
||||
.setTitle(R.string.setpushplustitle)
|
||||
|
@ -2087,6 +2098,7 @@ public class SenderActivity extends AppCompatActivity {
|
|||
|
||||
Button buttonOk = view1.findViewById(R.id.buttonOk);
|
||||
Button buttonDel = view1.findViewById(R.id.buttonDel);
|
||||
buttonDel.setText(senderModel != null ? "删除" : "取消");
|
||||
Button buttonTest = view1.findViewById(R.id.buttonTest);
|
||||
alertDialog71
|
||||
.setTitle(R.string.setgotifytitle)
|
||||
|
|
|
@ -239,7 +239,7 @@ public class SettingUtil {
|
|||
}
|
||||
|
||||
public static String getSmsHubApiUrl() {
|
||||
return sp_setting.getString(Define.SP_MSG_KEY_STRING_SMSHUB_API_URL, "http://xxx.com/send_api");
|
||||
return sp_setting.getString(Define.SP_MSG_KEY_STRING_SMSHUB_API_URL, "");
|
||||
}
|
||||
|
||||
public static void switchCallType1(Boolean switchCallType) {
|
||||
|
|
|
@ -3,7 +3,6 @@ package com.idormy.sms.forwarder.view;
|
|||
import android.animation.ObjectAnimator;
|
||||
import android.content.Context;
|
||||
import android.content.res.TypedArray;
|
||||
import android.graphics.Color;
|
||||
import android.text.Editable;
|
||||
import android.text.InputFilter;
|
||||
import android.text.InputType;
|
||||
|
@ -40,8 +39,8 @@ public class ClearEditText extends RelativeLayout {
|
|||
private int cleanPadding = 0;//清除按钮padding边距
|
||||
private String hintStr;
|
||||
private String textStr;
|
||||
private int mTextColorHint = Color.BLACK;
|
||||
private int mTextColor = Color.BLACK;
|
||||
private int mTextColorHint = -1; //Color.LTGRAY
|
||||
private int mTextColor = -1;//Color.BLACK
|
||||
private int mTextSize = -1;
|
||||
private int mMaxLength = 2000;
|
||||
private int mMaxLines = 1;
|
||||
|
@ -97,9 +96,9 @@ public class ClearEditText extends RelativeLayout {
|
|||
ivEditEye = view.findViewById(R.id.iv_edit_eye);
|
||||
|
||||
myEdie.setHint(hintStr);
|
||||
myEdie.setHintTextColor(mTextColorHint);
|
||||
if (mTextColorHint != -1) myEdie.setHintTextColor(mTextColorHint);
|
||||
myEdie.setText(textStr);
|
||||
myEdie.setTextColor(mTextColor);
|
||||
if (mTextColor != -1) myEdie.setTextColor(mTextColor);
|
||||
myEdie.setMaxLines(mMaxLines);
|
||||
myEdie.setFilters(new InputFilter[]{new InputFilter.LengthFilter(mMaxLength)});
|
||||
if (mTextSize != -1) {
|
||||
|
|
|
@ -335,6 +335,7 @@
|
|||
android:id="@+id/editText_text_sms_hub_url"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:hint="http://xxx.com/send_api"
|
||||
app:showEye="true" />
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
@ -65,6 +65,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:hint=""
|
||||
android:text="@string/set_bark_server_tips"
|
||||
android:textSize="10sp"
|
||||
tools:ignore="SmallSp" />
|
||||
|
@ -83,36 +84,24 @@
|
|||
android:layout_marginStart="10dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:orientation="vertical">
|
||||
android:orientation="horizontal">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/set_bark_icon"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="@string/set_bark_icon_tips"
|
||||
android:textSize="10sp"
|
||||
tools:ignore="SmallSp" />
|
||||
</LinearLayout>
|
||||
android:text="@string/set_bark_icon"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/editTextBarkIcon"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_weight="1"
|
||||
android:autofillHints=""
|
||||
android:ems="14"
|
||||
android:hint="@string/set_bark_icon_tips"
|
||||
android:inputType="text"
|
||||
android:text=""
|
||||
android:textSize="14sp"
|
||||
tools:ignore="LabelFor" />
|
||||
</LinearLayout>
|
||||
|
||||
|
@ -122,36 +111,24 @@
|
|||
android:layout_marginStart="10dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:orientation="vertical">
|
||||
android:orientation="horizontal">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bark_sound"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="@string/bark_sound_tips"
|
||||
android:textSize="10sp"
|
||||
tools:ignore="SmallSp" />
|
||||
</LinearLayout>
|
||||
android:text="@string/bark_sound"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/editTextBarkSound"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_weight="1"
|
||||
android:autofillHints=""
|
||||
android:ems="14"
|
||||
android:hint="@string/bark_sound_tips"
|
||||
android:inputType="text"
|
||||
android:text=""
|
||||
android:textSize="14sp"
|
||||
tools:ignore="LabelFor" />
|
||||
</LinearLayout>
|
||||
|
||||
|
@ -161,36 +138,24 @@
|
|||
android:layout_marginStart="10dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:orientation="vertical">
|
||||
android:orientation="horizontal">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bark_badge"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="@string/bark_badge_tips"
|
||||
android:textSize="10sp"
|
||||
tools:ignore="SmallSp" />
|
||||
</LinearLayout>
|
||||
android:text="@string/bark_badge"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/editTextBarkBadge"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_weight="1"
|
||||
android:autofillHints=""
|
||||
android:ems="14"
|
||||
android:hint="@string/bark_badge_tips"
|
||||
android:inputType="text"
|
||||
android:text=""
|
||||
android:textSize="14sp"
|
||||
tools:ignore="LabelFor" />
|
||||
</LinearLayout>
|
||||
|
||||
|
@ -200,37 +165,25 @@
|
|||
android:layout_marginStart="10dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:orientation="vertical">
|
||||
android:orientation="horizontal">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bark_url"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="@string/bark_url_tips"
|
||||
android:textSize="10sp"
|
||||
tools:ignore="SmallSp" />
|
||||
</LinearLayout>
|
||||
android:text="@string/bark_url"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/editTextBarkUrl"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_weight="1"
|
||||
android:autofillHints=""
|
||||
android:ems="14"
|
||||
android:inputType="textUri"
|
||||
android:text=""
|
||||
tools:ignore="LabelFor" />
|
||||
android:hint="@string/bark_url_tips"
|
||||
android:inputType="text"
|
||||
android:textSize="14sp"
|
||||
tools:ignore="LabelFor,TextFields" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/dingding_token"
|
||||
android:textStyle="bold" />
|
||||
|
@ -65,8 +65,9 @@
|
|||
|
||||
<com.idormy.sms.forwarder.view.ClearEditText
|
||||
android:id="@+id/editTextDingdingToken"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:hint="机器人设置→webhook→access_token"
|
||||
app:showEye="true" />
|
||||
</LinearLayout>
|
||||
|
||||
|
@ -88,6 +89,7 @@
|
|||
android:id="@+id/editTextDingdingSecret"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:hint="机器人设置→安全设置→加签"
|
||||
app:showEye="true" />
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
@ -109,7 +109,6 @@
|
|||
android:layout_marginStart="3dp"
|
||||
app:hint="填写登录密码 或 授权码"
|
||||
app:showEye="true"
|
||||
app:textColorHint="#9E9E9E"
|
||||
app:textSize="13sp" />
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
@ -56,15 +56,12 @@
|
|||
android:text="@string/feishu_webhook"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<EditText
|
||||
<com.idormy.sms.forwarder.view.ClearEditText
|
||||
android:id="@+id/editTextFeishuWebhook"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:autofillHints=""
|
||||
android:ems="14"
|
||||
android:inputType="text"
|
||||
android:text=""
|
||||
tools:ignore="LabelFor" />
|
||||
app:hint="群机器人→Webhook 地址"
|
||||
app:showEye="true" />
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
|
@ -77,16 +74,16 @@
|
|||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/feishu_secret"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<com.idormy.sms.forwarder.view.ClearEditText
|
||||
android:id="@+id/editTextFeishuSecret"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
app:hint="群机器人→安全设置→签名校验"
|
||||
app:showEye="true" />
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
@ -73,7 +73,7 @@
|
|||
android:id="@+id/editTextPushPlusToken"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
app:hint="请认准 pushplus 官网地址"
|
||||
app:showEye="true" />
|
||||
</LinearLayout>
|
||||
|
||||
|
@ -97,6 +97,7 @@
|
|||
android:layout_marginStart="3dp"
|
||||
android:autofillHints=""
|
||||
android:ems="14"
|
||||
android:hint="@string/optional"
|
||||
android:inputType="text"
|
||||
android:text=""
|
||||
tools:ignore="LabelFor" />
|
||||
|
@ -172,6 +173,7 @@
|
|||
android:layout_marginStart="3dp"
|
||||
android:autofillHints=""
|
||||
android:ems="14"
|
||||
android:hint="@string/optional"
|
||||
android:inputType="text"
|
||||
android:text=""
|
||||
tools:ignore="LabelFor" />
|
||||
|
@ -197,6 +199,7 @@
|
|||
android:layout_marginStart="3dp"
|
||||
android:autofillHints=""
|
||||
android:ems="14"
|
||||
android:hint="@string/optional"
|
||||
android:inputType="textUri"
|
||||
android:text=""
|
||||
tools:ignore="LabelFor" />
|
||||
|
@ -222,6 +225,7 @@
|
|||
android:layout_marginStart="3dp"
|
||||
android:autofillHints=""
|
||||
android:ems="14"
|
||||
android:hint="@string/optional"
|
||||
android:inputType="number"
|
||||
android:text=""
|
||||
tools:ignore="LabelFor" />
|
||||
|
|
|
@ -50,14 +50,14 @@
|
|||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/ServerChanSendKey"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<com.idormy.sms.forwarder.view.ClearEditText
|
||||
android:id="@+id/editTextServerChanSendKey"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
app:showEye="true" />
|
||||
|
|
|
@ -50,16 +50,15 @@
|
|||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/TelegramApiToken"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<com.idormy.sms.forwarder.view.ClearEditText
|
||||
android:id="@+id/editTextTelegramApiToken"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
app:showEye="true" />
|
||||
</LinearLayout>
|
||||
|
||||
|
@ -121,6 +120,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:autofillHints=""
|
||||
android:hint="@string/TelegramChatIdTips"
|
||||
android:ems="14"
|
||||
android:inputType="text"
|
||||
android:text=""
|
||||
|
|
|
@ -126,9 +126,9 @@
|
|||
<string name="invalid_phone_num">Phone number cannot be blank</string>
|
||||
<string name="set_bark_name">GroupName/Status</string>
|
||||
<string name="set_bark_server">Bark-Server</string>
|
||||
<string name="set_bark_server_tips"> e.g. https://day.app/XXXXXXXX/</string>
|
||||
<string name="set_bark_icon">Bark-Icon (optional)</string>
|
||||
<string name="set_bark_icon_tips">e.g. http://day.app/assets/images/avatar.jpg</string>
|
||||
<string name="set_bark_server_tips"> e.g. https://api.day.app/XXXXXXXX/</string>
|
||||
<string name="set_bark_icon">Bark-Icon</string>
|
||||
<string name="set_bark_icon_tips">Optional, fill in the Url, the image should not be too big</string>
|
||||
<string name="set_name">Name/Staus</string>
|
||||
<string name="dingding_token">Token(Not contain links)</string>
|
||||
<string name="dingding_token_tips">e.g. the XXX part of https://oapi.dingtalk.com/robot/send?access_token=XXX</string>
|
||||
|
@ -397,12 +397,12 @@
|
|||
<string name="tips_get_info_failed">Failed to get one-click clone information from sender</string>
|
||||
<string name="linkman">Linkman:</string>
|
||||
<string name="via_number">Via Number:</string>
|
||||
<string name="bark_sound">Sound (optional)</string>
|
||||
<string name="bark_sound_tips">e.g. minuet.caf</string>
|
||||
<string name="bark_badge">Badge (optional)</string>
|
||||
<string name="bark_badge_tips">e.g. 888</string>
|
||||
<string name="bark_url">Url (optional)</string>
|
||||
<string name="bark_url_tips">e.g. https://github.com/pppscn/SmsForwarder</string>
|
||||
<string name="bark_sound">Sound</string>
|
||||
<string name="bark_sound_tips">optional, e.g. minuet.caf</string>
|
||||
<string name="bark_badge">Badge</string>
|
||||
<string name="bark_badge_tips">optional, e.g. 888</string>
|
||||
<string name="bark_url">Url</string>
|
||||
<string name="bark_url_tips">optional, e.g. https://github.com/pppscn/SmsForwarder</string>
|
||||
<string name="bark_level">Level</string>
|
||||
<string name="bark_level_active">active</string>
|
||||
<string name="bark_level_timeSensitive">timeSensitive</string>
|
||||
|
@ -445,4 +445,6 @@
|
|||
<string name="hint_from_add_full">format: AAA@BBB.CCC</string>
|
||||
<string name="other_mail_type">Other</string>
|
||||
<string name="tips_other_mail_type">For other email addresses, please fill in the complete email address and manually fill in the SMTP server information</string>
|
||||
<string name="optional">Optional</string>
|
||||
<string name="TelegramChatIdTips">Follow the steps in the wiki to obtain it</string>
|
||||
</resources>
|
||||
|
|
|
@ -126,13 +126,13 @@
|
|||
<string name="invalid_phone_num">接收手机号不能为空</string>
|
||||
<string name="set_bark_name">分组名称/状态</string>
|
||||
<string name="set_bark_server">Bark-Server</string>
|
||||
<string name="set_bark_server_tips">例:https://day.app/XXXXXXXX/</string>
|
||||
<string name="set_bark_icon">消息图标(可选)</string>
|
||||
<string name="set_bark_icon_tips">例:http://day.app/assets/images/avatar.jpg</string>
|
||||
<string name="set_bark_server_tips">例:https://api.day.app/XXXXXXXX/</string>
|
||||
<string name="set_bark_icon">消息图标</string>
|
||||
<string name="set_bark_icon_tips">可选,填写Url,图片不要太大</string>
|
||||
<string name="set_name">名称/状态</string>
|
||||
<string name="dingding_token">Token(不含链接)</string>
|
||||
<string name="dingding_token_tips">例:https://oapi.dingtalk.com/robot/send?access_token=XXX 中的 XXX</string>
|
||||
<string name="dingding_secret">加签 Secret (没有可不填)</string>
|
||||
<string name="dingding_secret">加签 Secret</string>
|
||||
<string name="dingding_at">转发时@某人</string>
|
||||
<string name="dingding_at_tips">Tips:多个手机号用逗号分开,例如:18888888888,19999999999</string>
|
||||
<string name="email_host">服务器地址</string>
|
||||
|
@ -160,7 +160,7 @@
|
|||
<string name="QYWXGroupRobotWebHook">WebHook地址</string>
|
||||
<string name="QYWXGroupRobotWebHookTips">示例:https://qyapi.weixin.qq.com/cgixx?key=xxx</string>
|
||||
<string name="ServerChanSendKey">Server酱·Turbo版的SendKey</string>
|
||||
<string name="TelegramApiToken">Tg机器人的 ApiToken 或 自定义地址(http开头)</string>
|
||||
<string name="TelegramApiToken">ApiToken 或 自定义代理地址(http开头)</string>
|
||||
<string name="TelegramChatId">被通知人(或群组)的ChatId</string>
|
||||
<string name="Method" formatted="false">请求方式</string>
|
||||
<string name="WebNotifyWebServer">WebServer</string>
|
||||
|
@ -396,12 +396,12 @@
|
|||
<string name="tips_get_info_failed">从发送端获取一键克隆信息失败</string>
|
||||
<string name="linkman">联 系 人:</string>
|
||||
<string name="via_number">来源号码:</string>
|
||||
<string name="bark_sound">消息声音(可选)</string>
|
||||
<string name="bark_sound_tips">例:minuet.caf</string>
|
||||
<string name="bark_badge">消息角标(可选)</string>
|
||||
<string name="bark_badge_tips">例:888</string>
|
||||
<string name="bark_url">消息链接(可选)</string>
|
||||
<string name="bark_url_tips">例:https://github.com/pppscn/SmsForwarder</string>
|
||||
<string name="bark_sound">消息声音</string>
|
||||
<string name="bark_sound_tips">可选,例:minuet.caf</string>
|
||||
<string name="bark_badge">消息角标</string>
|
||||
<string name="bark_badge_tips">可选,例:888</string>
|
||||
<string name="bark_url">消息链接</string>
|
||||
<string name="bark_url_tips">可选,例:https://github.com/pppscn/SmsForwarder</string>
|
||||
<string name="bark_level">通知级别</string>
|
||||
<string name="bark_level_active">立即亮屏</string>
|
||||
<string name="bark_level_timeSensitive">时效性</string>
|
||||
|
@ -444,4 +444,6 @@
|
|||
<string name="hint_from_add_full">填写格式: AAA@BBB.CCC</string>
|
||||
<string name="other_mail_type">其他邮箱</string>
|
||||
<string name="tips_other_mail_type">其他邮箱,请填写完整的邮箱地址并手动填写SMTP服务器信息</string>
|
||||
<string name="optional">可选</string>
|
||||
<string name="TelegramChatIdTips">请按照wiki中的步骤获取</string>
|
||||
</resources>
|
||||
|
|
|
@ -10,7 +10,7 @@ buildscript {
|
|||
maven { url 'https://repo1.maven.org/maven2/' }
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:7.1.1'
|
||||
classpath 'com.android.tools.build:gradle:7.1.2'
|
||||
classpath 'com.chenenyu:img-optimizer:1.2.0'
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue