" +
+ private static final String HTML_TITLE = "\n";
- private static final String HTML_FOOTER = "" +
+ private static final String HTML_FOOTER = "\n";
@@ -68,7 +66,7 @@ public class HtmlContext {
public static String DEFAULT_HTML() {
- return HTML_STRING("" +
+ return HTML_STRING("");
}
- /**
- * 生成表格的内容
- * @param sb html
- * @param s 内容
- * @return html
- */
- public static StringBuilder tableCell(StringBuilder sb, String... s){
- for (String c: s) {
- sb.append(String.format("%s ",c));
- }
- sb.append("\n");
- return sb;
- }
-
- /**
- * 生成表格标题
- * @param sb html
- * @param s 标题
- * @return html
- */
- public static StringBuilder tableCellHeader(StringBuilder sb, String... s){
- for (String c: s) {
- sb.append(String.format("%s ",c));
- }
- sb.append("\n");
- return sb;
- }
- @SuppressLint("DefaultLocale")
- public static StringBuilder tableKeyRow(StringBuilder sb , Boolean darkMode, String key, int value){
- sb.append(String.format("%s %d %s %s "
- ,alignCenter?"align=center":""
- ,darkMode ? "class=\"bbb\"":""));
- return sb;
- }
- public static StringBuilder tableRowEnd(StringBuilder sb){
- sb.append(" ");
- return sb;
- }
-
- public static StringBuilder tableBegin(StringBuilder sb){
- return tableBegin(sb,false,1,true);
- }
- public static StringBuilder tableBegin(StringBuilder sb,boolean hasBorder,boolean fullWidth){
- return tableBegin(sb,hasBorder,1,fullWidth);
- }
- @SuppressLint("DefaultLocale")
- public static StringBuilder tableBegin(StringBuilder sb, boolean hasBorder, int cellpadding,boolean fullWidth){
- sb.append(String.format(""
- ,hasBorder ? "border=\"1\"" :""
- ,cellpadding
- ,fullWidth ? "width=\"100%\"":""));
- return sb;
- }
-
- public static StringBuilder tableEnd(StringBuilder sb){
- sb.append("
");
- return sb;
- }
- public static String ListTableContext(Cursor cursor,boolean fullWidth){
- return ListTableContext(cursor,false,0,fullWidth);
- }
- public static String ListTableContext(Cursor cursor,boolean hasBorder,int cellpadding ,boolean fullWidth) {
+ public static String ListTableContext(Cursor cursor) {
StringBuilder result = new StringBuilder();
- HtmlContext.tableBegin(result,hasBorder,cellpadding,fullWidth).append("\n");
+ result.append("");
//写字段名
- HtmlContext.tableRowBegin(result);
+ result.append("");
for (int i = 0; i < cursor.getColumnCount(); i++) {
- HtmlContext.tableCellHeader(result,cursor.getColumnName(i));
+ result.append("");
+ result.append(cursor.getColumnName(i));
+ result.append(" ");
}
- HtmlContext.tableRowEnd(result).append("\n");
+ result.append(" \n");
int order=0;
while (cursor.moveToNext()) {
- HtmlContext.tableRowBegin(result,false,order % 2 !=0);
- for (int i = 0; i < cursor.getColumnCount(); i++) {
- HtmlContext.tableCell(result,(cursor.getString(i)!=null) ? cursor.getString(i) :"");
+ if (order%2==0) {
+ result.append("");
+ }else {
+ result.append(" ");
}
- HtmlContext.tableRowEnd(result).append("\n");
+ for (int i = 0; i < cursor.getColumnCount(); i++) {
+ result.append("");
+ if (cursor.getString(i)!=null) {
+ result.append(cursor.getString(i));
+ }
+ result.append(" ");
+ }
+ result.append(" \n");
order++;
}
- HtmlContext.tableEnd(result).append("\n");
+ result.append("
");
cursor.close();
return result.toString();
}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/html/LogHttpServer.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/html/LogHttpServer.java
old mode 100644
new mode 100755
index b443d6e..ea80ce8
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/html/LogHttpServer.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/html/LogHttpServer.java
@@ -35,7 +35,6 @@ import java.util.Objects;
import fi.iki.elonen.NanoHTTPD;
-@SuppressWarnings("ConstantConditions")
public class LogHttpServer extends NanoHTTPD {
private final MainViewModel mainViewModel;
public static int DEFAULT_PORT = 7050;
@@ -73,12 +72,10 @@ public class LogHttpServer extends NanoHTTPD {
return getMessages(session);
}else if (uri.equalsIgnoreCase("QSOSWLMSG")) {//查SWL QSO通联消息表
return getSWLQsoMessages(session);
- }else if (uri.equalsIgnoreCase("QSOLogs")) {//查QSO日志
- return getQsoLogs(session);
} else if (uri.equalsIgnoreCase("CALLSIGNGRID")) {//查呼号与网格的对应关系
msg = HTML_STRING(showCallGridList());
} else if (uri.equalsIgnoreCase("GETCALLSIGNQTH")) {
- msg = HTML_STRING(getCallsignQTH(session));
+ msg = HTML_STRING(getCallsignQTH());
} else if (uri.equalsIgnoreCase("ALLTABLE")) {//查所有的表
msg = HTML_STRING(getAllTableName());
} else if (uri.equalsIgnoreCase("FOLLOWCALLSIGNS")) {//查关注的呼号
@@ -154,8 +151,9 @@ public class LogHttpServer extends NanoHTTPD {
//判断是不是POST日志文件
if (session.getMethod().equals(Method.POST)
|| session.getMethod().equals(Method.PUT)) {
- Map files = new HashMap<>();
- //Map header = session.getHeaders();
+ //Log.e(TAG, "serve uri: --------->" + session.getUri());
+ Map files = new HashMap();
+ Map header = session.getHeaders();
try {
session.parseBody(files);
String param = files.get("file1");//这个是post或put文件的key
@@ -186,6 +184,8 @@ public class LogHttpServer extends NanoHTTPD {
temp.append("
");
}
return temp.toString();
+// return String.format(GeneralVariables.getStringFromResource(R.string.html_import_count) + " pars = session.getParms();
-
- if (pars.get("callsign") != null) {
- callsign = Objects.requireNonNull(pars.get("callsign"));
- }
- if (pars.get("grid") != null) {
- grid = Objects.requireNonNull(pars.get("grid"));
- }
- String whereCallsign = String.format("%%%s%%", callsign.toUpperCase());
- String whereGrid = String.format("%%%s%%", grid.toUpperCase());
- Cursor cursor = mainViewModel.databaseOpr.getDb()
- .rawQuery("select callsign ,grid,updateTime from CallsignQTH where (callsign like ?) and (grid like ?)"
- , new String[]{whereCallsign,whereGrid});
+ private String getCallsignQTH() {
+ Cursor cursor = mainViewModel.databaseOpr.getDb().rawQuery("select callsign ,grid,updateTime from CallsignQTH", null);
StringBuilder result = new StringBuilder();
- HtmlContext.tableBegin(result,true,2,false).append("\n");
+ result.append("");
- result.append(String.format("");
- HtmlContext.tableRowEnd(result).append("\n");
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_callsign)));
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_qsl_grid)));
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_distance)));
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_update_time)));
+ result.append(" \n");
@SuppressLint("SimpleDateFormat") SimpleDateFormat formatTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
int order = 0;
while (cursor.moveToNext()) {
- HtmlContext.tableRowBegin(result,true,order % 2 != 0);
+ if (order % 2 == 0) {
+ result.append("");
+ } else {
+ result.append(" ");
+ }
+
+ result.append("");
+ result.append(String.format("%s %s \n"
+ , cursor.getString(cursor.getColumnIndex("callsign"))
+ , cursor.getString(cursor.getColumnIndex("grid"))));
+ result.append(String.format("%s ",
+ MaidenheadGrid.getDistStr(GeneralVariables.getMyMaidenhead4Grid()
+ , cursor.getString(cursor.getColumnIndex("grid")))));
+
Date date = new Date(cursor.getLong(cursor.getColumnIndex("updateTime")));
- HtmlContext.tableCell(result
- ,cursor.getString(cursor.getColumnIndex("callsign"))
- ,cursor.getString(cursor.getColumnIndex("grid"))
- ,MaidenheadGrid.getDistStr(GeneralVariables.getMyMaidenhead4Grid()
- , cursor.getString(cursor.getColumnIndex("grid")))
- ,formatTime.format(date)
- ).append("\n");
- HtmlContext.tableRowEnd(result).append("\n");
+ result.append(String.format("%s ",
+ formatTime.format(date)));
+
+ result.append(" \n");
order++;
}
- HtmlContext.tableEnd(result).append("
");
//写字段名
- HtmlContext.tableRowBegin(result).append("\n");
+ result.append("");
for (int i = 0; i < cursor.getColumnCount(); i++) {
- HtmlContext.tableCellHeader(result
- ,GeneralVariables.getStringFromResource(R.string.html_callsign)
- ,GeneralVariables.getStringFromResource(R.string.html_operation)).append("\n");
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_callsign)));
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_operation)));
}
- HtmlContext.tableRowEnd(result).append("\n");
+ result.append(" \n");
int order = 0;
while (cursor.moveToNext()) {
- HtmlContext.tableRowBegin(result,true,order % 2 !=0).append("\n");
- for (int i = 0; i < cursor.getColumnCount(); i++) {
- HtmlContext.tableCell(result
- ,cursor.getString(i)
- ,String.format("%s "
- ,cursor.getString(i).replace("/", "_")
- , GeneralVariables.getStringFromResource(R.string.html_delete))
- ).append("\n");
+ if (order % 2 == 0) {
+ result.append("");
+ } else {
+ result.append(" ");
}
- HtmlContext.tableRowEnd(result).append("\n");
+ for (int i = 0; i < cursor.getColumnCount(); i++) {
+ result.append("");
+ result.append(String.format("%s %s \n");
order++;
}
- HtmlContext.tableEnd(result).append("\n");
- cursor.close();
+ result.append("
");
return result.toString();
}
@@ -373,49 +357,84 @@ public class LogHttpServer extends NanoHTTPD {
Cursor cursor = mainViewModel.databaseOpr.getDb().rawQuery(
"select * from QslCallsigns order by ID desc", null);
StringBuilder result = new StringBuilder();
- HtmlContext.tableBegin(result,false,0,true).append("\n");
+ result.append("\n");
//写字段名
- HtmlContext.tableRowBegin(result).append("\n");
- HtmlContext.tableCellHeader(result
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_start_time)
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_end_time)
- ,GeneralVariables.getStringFromResource(R.string.html_callsign)
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_mode)
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_grid)
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_band)
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_freq)
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_manual_confirmation)
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_lotw_confirmation)
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_data_source)
- ,GeneralVariables.getStringFromResource(R.string.html_operation)).append("\n");
- HtmlContext.tableRowEnd(result).append("\n");
+ result.append("");
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_qsl_start_time)));
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_qsl_end_time)));
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_callsign)));
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_qsl_mode)));
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_qsl_grid)));
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_qsl_band)));
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_qsl_freq)));
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_qsl_manual_confirmation)));
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_qsl_lotw_confirmation)));
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_qsl_data_source)));
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_operation)));
+ result.append(" \n");
int order = 0;
while (cursor.moveToNext()) {
- HtmlContext.tableRowBegin(result,true,order % 2 != 0);
- HtmlContext.tableCell(result
- ,cursor.getString(cursor.getColumnIndex("startTime"))
- ,cursor.getString(cursor.getColumnIndex("finishTime"))
- ,cursor.getString(cursor.getColumnIndex("callsign"))
- ,cursor.getString(cursor.getColumnIndex("mode"))
- ,cursor.getString(cursor.getColumnIndex("grid"))
- ,cursor.getString(cursor.getColumnIndex("band"))
- ,cursor.getString(cursor.getColumnIndex("band_i"))+"Hz"
- ,(cursor.getInt(cursor.getColumnIndex("isQSL")) == 1)
- ? "√ " : "× "
- ,(cursor.getInt(cursor.getColumnIndex("isLotW_QSL")) == 1)
- ? "√ " : "× "
- ,(cursor.getInt(cursor.getColumnIndex("isLotW_import")) == 1)
- ? GeneralVariables.getStringFromResource(R.string.html_qsl_import_data_from_external)
- : GeneralVariables.getStringFromResource(R.string.html_qsl_native_data)
- ,String.format("%s "
- , cursor.getString(cursor.getColumnIndex("ID"))
- , GeneralVariables.getStringFromResource(R.string.html_delete))).append("\n");
- HtmlContext.tableRowEnd(result).append("\n");
+ if (order % 2 == 0) {
+ result.append("");
+ } else {
+ result.append(" ");
+ }
+ result.append("");
+ result.append(cursor.getString(cursor.getColumnIndex("startTime")));
+ result.append(" ");
+
+ result.append("");
+ result.append(cursor.getString(cursor.getColumnIndex("finishTime")));
+ result.append(" ");
+
+ result.append("");
+ result.append(cursor.getString(cursor.getColumnIndex("callsign")));
+ result.append(" \n");
+
+ result.append("");
+ result.append(cursor.getString(cursor.getColumnIndex("mode")));
+ result.append(" ");
+ result.append("");
+ result.append(cursor.getString(cursor.getColumnIndex("grid")));
+ result.append(" ");
+ result.append("");
+ result.append(cursor.getString(cursor.getColumnIndex("band")));
+ result.append(" ");
+ result.append("");
+ result.append(cursor.getString(cursor.getColumnIndex("band_i")));
+ result.append("Hz ");
+ result.append("");
+ if (cursor.getInt(cursor.getColumnIndex("isQSL")) == 1) {
+ result.append("√ ");
+ } else {
+ result.append("× ");
+ }
+ result.append(" ");
+ result.append("");
+ if (cursor.getInt(cursor.getColumnIndex("isLotW_QSL")) == 1) {
+ result.append("√ ");
+ } else {
+ result.append("× ");
+ }
+ result.append(" ");
+
+
+ result.append("");
+ if (cursor.getInt(cursor.getColumnIndex("isLotW_import")) == 1) {
+ result.append(GeneralVariables.getStringFromResource(R.string.html_qsl_import_data_from_external));
+ } else {
+ result.append(GeneralVariables.getStringFromResource(R.string.html_qsl_native_data));
+ }
+ result.append(" ");
+
+ result.append(String.format("%s \n");
order++;
}
- HtmlContext.tableEnd(result).append("\n");
- cursor.close();
+ result.append("
");
return result.toString();
}
@@ -439,14 +458,14 @@ public class LogHttpServer extends NanoHTTPD {
"");
result.append(String.format(GeneralVariables.getStringFromResource(R.string.html_callsign_grid_total)
, GeneralVariables.callsignAndGrids.size()));
- HtmlContext.tableBegin(result,true,1,false);
- HtmlContext.tableRowBegin(result);
+ //result.append("\n");
+ result.append("\n");
+ result.append("");
result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_callsign)));
result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_qsl_grid)));
- HtmlContext.tableRowEnd(result).append("\n");
-
+ result.append(" \n");
result.append(GeneralVariables.getCallsignAndGridToHTML());
- HtmlContext.tableEnd(result).append("
\n");
+ //result.append("\n");
+ result.append("");
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_variable)));
+ result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_value)));
+ result.append(" \n");
- HtmlContext.tableBegin(result,true,5,false).append("\n");
-
- HtmlContext.tableRowBegin(result);
- HtmlContext.tableCellHeader(result
- ,GeneralVariables.getStringFromResource(R.string.html_variable)
- ,GeneralVariables.getStringFromResource(R.string.html_value)).append("\n");
-
- HtmlContext.tableKeyRow(result,false,"UTC"
- ,UtcTimer.getTimeStr(mainViewModel.timerSec.getValue()));
-
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.html_my_callsign)
- ,GeneralVariables.myCallsign);
-
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.html_my_grid)
- ,GeneralVariables.getMyMaidenheadGrid());
-
- HtmlContext.tableKeyRow(result,true//消息最大缓存条数
- ,GeneralVariables.getStringFromResource(R.string.html_max_message_cache)
- ,String.format("%d", GeneralVariables.MESSAGE_COUNT));
-
- HtmlContext.tableKeyRow(result,false//音量大小
- ,GeneralVariables.getStringFromResource(R.string.signal_strength)
- ,String.format("%.0f%%\n", GeneralVariables.volumePercent * 100f));
+ result.append("");
+ result.append("");
+ result.append("UTC");
+ result.append(" \n");
+ result.append("");
+ result.append(String.format("%s \n", UtcTimer.getTimeStr(mainViewModel.timerSec.getValue())));
+ result.append(" \n");
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.html_audio_bits)
- ,GeneralVariables.audioOutput32Bit ?
- GeneralVariables.getStringFromResource(R.string.audio32_bit)
- : GeneralVariables.getStringFromResource(R.string.audio16_bit));
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_my_callsign));
+ result.append(" \n");
+ result.append("");
+ result.append(String.format("%s \n", GeneralVariables.myCallsign));
+ result.append(" \n");
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.html_audio_rate)
- ,String.format("%dHz", GeneralVariables.audioSampleRate));
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.html_decodes_in_this_cycle)
- ,String.format("%d", mainViewModel.currentDecodeCount));
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_my_grid));
+ result.append(" \n");
+ result.append("");
+ result.append(String.format("%s \n", GeneralVariables.getMyMaidenheadGrid()));
+ result.append(" \n");
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.html_total_number_of_decodes)
- ,String.format("%d", mainViewModel.ft8Messages.size()));
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.html_in_recording_state)
- ,Boolean.TRUE.equals(mainViewModel.mutableIsRecording.getValue())
- ? GeneralVariables.getStringFromResource(R.string.html_recording)
- : GeneralVariables.getStringFromResource(R.string.html_no_recording));
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_max_message_cache));
+ result.append(" \n");
+ result.append("");
+ result.append(String.format("%d \n", GeneralVariables.MESSAGE_COUNT));//消息最大缓存条数
+ result.append(" \n");
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.html_time_consuming_for_this_decoding)
- ,String.format(GeneralVariables.getStringFromResource(R.string.html_milliseconds)
- , mainViewModel.ft8SignalListener.decodeTimeSec.getValue()));
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.signal_strength));
+ result.append(" \n");
+ result.append("");
+ result.append(String.format("%.0f%% \n", GeneralVariables.volumePercent * 100f));//音量大小
+ result.append(" \n");
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.html_average_delay_time_of_this_cycle)
- ,String.format(GeneralVariables.getStringFromResource(R.string.html_seconds)
- , mainViewModel.mutableTimerOffset.getValue()));
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.html_sound_frequency)
- ,String.format("%.0fHz", GeneralVariables.getBaseFrequency()));
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_decodes_in_this_cycle));
+ result.append(" \n");
+ result.append("");
+ result.append(String.format("%d \n", mainViewModel.currentDecodeCount));
+ result.append(" \n");
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.html_transmission_delay_time)
- ,String.format(GeneralVariables.getStringFromResource(R.string.html_milliseconds)
- , GeneralVariables.transmitDelay));
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_total_number_of_decodes));
+ result.append(" \n");
+ result.append("");
+ result.append(String.format("%d \n", mainViewModel.ft8Messages.size()));
+ result.append(" \n");
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.html_launch_supervision)
- ,String.format(GeneralVariables.getStringFromResource(R.string.html_milliseconds)
- , GeneralVariables.launchSupervision));
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_in_recording_state));
+ result.append(" \n");
+ result.append("");
+ result.append(String.format("%s \n",
+ Boolean.TRUE.equals(mainViewModel.mutableIsRecording.getValue())
+ ? GeneralVariables.getStringFromResource(R.string.html_recording)
+ : GeneralVariables.getStringFromResource(R.string.html_no_recording)));
+ result.append(" \n");
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.html_automatic_program_run_time)
- ,String.format(GeneralVariables.getStringFromResource(R.string.html_milliseconds)
- , GeneralVariables.launchSupervisionCount()));
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_time_consuming_for_this_decoding));
+ result.append(" \n");
+ result.append("");
+ result.append(String.format(GeneralVariables.getStringFromResource(R.string.html_milliseconds)
+ , mainViewModel.ft8SignalListener.decodeTimeSec.getValue()));
+ result.append(" \n \n");
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.html_no_reply_limit)
- ,GeneralVariables.noReplyLimit);
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_average_delay_time_of_this_cycle));
+ result.append(" \n");
+ result.append("");
+ result.append(String.format(GeneralVariables.getStringFromResource(R.string.html_seconds)
+ , mainViewModel.mutableTimerOffset.getValue()));
+ result.append(" \n \n");
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.html_no_reply_count)
- ,GeneralVariables.noReplyCount);
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_sound_frequency));
+ result.append(" \n");
+ result.append("");
+ result.append(String.format("%.0fHz", GeneralVariables.getBaseFrequency()));
+ result.append(" \n \n");
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.follow_cq)
- ,String.valueOf(GeneralVariables.autoFollowCQ));
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_transmission_delay_time));
+ result.append(" \n");
+ result.append("");
+ result.append(String.format(GeneralVariables.getStringFromResource(R.string.html_milliseconds)
+ , GeneralVariables.transmitDelay));
+ result.append(" \n \n");
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.auto_call_follow)
- ,String.valueOf(GeneralVariables.autoCallFollow));
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_launch_supervision));
+ result.append(" \n");
+ result.append("");
+ result.append(String.format(GeneralVariables.getStringFromResource(R.string.html_milliseconds)
+ , GeneralVariables.launchSupervision));
+ result.append(" \n \n");
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.html_target_callsign)
- ,(mainViewModel.ft8TransmitSignal.mutableToCallsign.getValue() != null)
- ? mainViewModel.ft8TransmitSignal.mutableToCallsign.getValue().callsign :"");
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.html_sequential)
- ,mainViewModel.ft8TransmitSignal.sequential);
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_automatic_program_run_time));
+ result.append(" \n");
+ result.append("");
+ result.append(String.format(GeneralVariables.getStringFromResource(R.string.html_milliseconds)
+ , GeneralVariables.launchSupervisionCount()));
+ result.append(" \n \n");
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.synFrequency)
- ,String.valueOf(GeneralVariables.synFrequency));
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_no_reply_limit));
+ result.append(" \n");
+ result.append("");
+ result.append(GeneralVariables.noReplyLimit);
+ result.append(" \n \n");
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.tran_delay)
- ,GeneralVariables.transmitDelay);
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_no_reply_count));
+ result.append(" \n");
+ result.append("");
+ result.append(GeneralVariables.noReplyCount);
+ result.append(" \n \n");
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.ptt_delay)
- ,GeneralVariables.pttDelay);
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.rig_name)
- ,RigNameList.getInstance(
- GeneralVariables.getMainContext()).getRigNameByIndex(GeneralVariables.modelNo).modelName);
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.follow_cq));
+ result.append(" \n");
+ result.append("");
+ result.append(GeneralVariables.autoFollowCQ);
+ result.append(" \n \n");
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.html_mark_message)
- ,String.format("%s", mainViewModel.markMessage
- ? GeneralVariables.getStringFromResource(R.string.html_marking_message)
- : GeneralVariables.getStringFromResource(R.string.html_do_not_mark_message)));
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.auto_call_follow));
+ result.append(" \n");
+ result.append("");
+ result.append(GeneralVariables.autoCallFollow);
+ result.append(" \n \n");
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.html_operation_mode)
- ,ControlMode.getControlModeStr(GeneralVariables.controlMode));
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.html_civ_address)
- ,String.format("0x%2X", GeneralVariables.civAddress));
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_target_callsign));
+ result.append(" \n");
+ result.append("");
+ if (mainViewModel.ft8TransmitSignal.mutableToCallsign.getValue() != null) {
+ result.append(mainViewModel.ft8TransmitSignal.mutableToCallsign.getValue().callsign);
+ } else {
+ result.append("-");
+ }
+ result.append(" \n \n");
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.html_baud_rate)
- ,GeneralVariables.baudRate);
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_sequential));
+ result.append(" \n");
+ result.append("");
+ result.append(mainViewModel.ft8TransmitSignal.sequential);
+ result.append(" \n \n");
+
+
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.synFrequency));
+ result.append(" \n");
+ result.append("");
+ result.append(GeneralVariables.synFrequency);
+ result.append(" \n \n");
+
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.tran_delay));
+ result.append(" \n");
+ result.append("");
+ result.append(GeneralVariables.transmitDelay);
+ result.append(" \n \n");
+
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.ptt_delay));
+ result.append(" \n");
+ result.append("");
+ result.append(GeneralVariables.pttDelay);
+ result.append(" \n \n");
+
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.rig_name));
+ result.append(" \n");
+ result.append("");
+ result.append(RigNameList.getInstance(
+ GeneralVariables.getMainContext()).getRigNameByIndex(GeneralVariables.modelNo).modelName);
+ result.append(" \n \n");
+
+
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_mark_message));
+ result.append(" \n");
+ result.append("");
+ result.append(String.format("%s", mainViewModel.markMessage
+ ? GeneralVariables.getStringFromResource(R.string.html_marking_message)
+ : GeneralVariables.getStringFromResource(R.string.html_do_not_mark_message)));
+ result.append(" \n \n");
+
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_operation_mode));
+ result.append(" \n");
+ result.append(String.format("%s "
+ , ControlMode.getControlModeStr(GeneralVariables.controlMode)));
+ result.append(" \n");
+
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_civ_address));
+ result.append(" \n");
+ result.append(String.format("0x%2X ", GeneralVariables.civAddress));
+ result.append(" \n");
+
+ result.append(">");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_baud_rate));
+ result.append(" \n");
+ result.append(String.format("%d ", GeneralVariables.baudRate));
+ result.append(" \n");
result.append("");
result.append("");
result.append(GeneralVariables.getStringFromResource(R.string.html_available_serial_ports));
result.append(" \n");
+
result.append("");
if (mainViewModel.mutableSerialPorts != null) {
if (mainViewModel.mutableSerialPorts.getValue().size() == 0) {
@@ -617,57 +749,123 @@ public class LogHttpServer extends NanoHTTPD {
}
}
for (CableSerialPort.SerialPort serialPort : Objects.requireNonNull(mainViewModel.mutableSerialPorts.getValue())) {
- result.append(serialPort.information()).append(" ");
+ result.append(" \n");
+
+ result.append(">");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_instruction_set));
+ result.append(" \n");
+
+ result.append("");
+ if (mainViewModel.baseRig != null) {
+ result.append(mainViewModel.baseRig.getName());
+ } else {
+ result.append("-");
+ }
+ result.append(" ");
+ result.append(" \n");
+
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_connect_mode));
+ result.append(" \n");
+ if (GeneralVariables.controlMode == ControlMode.VOX) {
+ result.append("- ");
+ } else {
+ result.append(String.format("%s "
+ , ConnectMode.getModeStr(GeneralVariables.connectMode)));
+ }
+ result.append(" \n");
+
+
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_baud_rate));
+ result.append(" \n");
+ result.append(String.format("%d ", GeneralVariables.baudRate));
+ result.append(" \n");
+
+
+ result.append(">");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_carrier_frequency_band));
+ result.append(" \n");
+ result.append("");
+ result.append(GeneralVariables.getBandString());
+ result.append(" ");
+ result.append(" \n");
+
+
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_radio_frequency));
+ result.append(" \n");
+ result.append("");
+ if (mainViewModel.baseRig != null) {
+ result.append(BaseRigOperation.getFrequencyStr(mainViewModel.baseRig.getFreq()));
+ } else {
+ result.append("-");
}
result.append(" ");
result.append(" \n");
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.html_instruction_set)
- ,(mainViewModel.baseRig != null) ? mainViewModel.baseRig.getName() : "-");
+ result.append(">");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_flex_max_rf_power));
+ result.append(" \n");
+ result.append("");
+ result.append(String.format("%d W", GeneralVariables.flexMaxRfPower));
+ result.append(" ");
+ result.append(" \n");
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.html_connect_mode)
- ,(GeneralVariables.controlMode == ControlMode.VOX) ? "-"
- :ConnectMode.getModeStr(GeneralVariables.connectMode));
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.html_baud_rate)
- ,GeneralVariables.baudRate);
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.html_atu_tune_power));
+ result.append(" \n");
+ result.append("");
+ result.append(String.format("%d W", GeneralVariables.flexMaxTunePower));
+ result.append(" ");
+ result.append(" \n");
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.html_carrier_frequency_band)
- ,GeneralVariables.getBandString());
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.html_radio_frequency)
- ,(mainViewModel.baseRig != null)
- ? BaseRigOperation.getFrequencyStr(mainViewModel.baseRig.getFreq()) : "-");
+ result.append(">");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.be_excluded_callsigns));
+ result.append(" \n");
+ result.append("");
+ result.append(GeneralVariables.getExcludeCallsigns());
+ result.append(" ");
+ result.append(" \n");
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.html_flex_max_rf_power)
- ,String.format("%d W", GeneralVariables.flexMaxRfPower));
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.html_atu_tune_power)
- ,String.format("%d W", GeneralVariables.flexMaxTunePower));
+ result.append("");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.config_save_swl));
+ result.append(" \n");
+ result.append("");
+ result.append(GeneralVariables.saveSWLMessage);
+ result.append(" ");
+ result.append(" \n");
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.be_excluded_callsigns)
- ,GeneralVariables.getExcludeCallsigns());
- HtmlContext.tableKeyRow(result,true
- ,GeneralVariables.getStringFromResource(R.string.config_save_swl)
- ,String.valueOf(GeneralVariables.saveSWLMessage));
+ result.append(">");
+ result.append("");
+ result.append(GeneralVariables.getStringFromResource(R.string.config_save_swl_qso));
+ result.append(" \n");
+ result.append("");
+ result.append(GeneralVariables.saveSWL_QSO);
+ result.append(" ");
+ result.append(" \n");
- HtmlContext.tableKeyRow(result,false
- ,GeneralVariables.getStringFromResource(R.string.config_save_swl_qso)
- ,String.valueOf(GeneralVariables.saveSWL_QSO));
+ result.append("
\n");
result.append(String.format("%s \n");
+ result.append(" ");
}
}
- result.append("
\n");
result.append(String.format("%s \n");
+ result.append(" ");
}
}
- result.append("
\n");
- HtmlContext.tableBegin(result,false,0,true).append("\n");
+ result.append("\n");
result.append(String.format("%s ");
result.append(GeneralVariables.qslRecordList.toHTML());
- result.append("
\n");
+ // result.append("
\n");
return result.toString();
}
@@ -723,26 +920,40 @@ public class LogHttpServer extends NanoHTTPD {
"}\n" +
"setTimeout('myrefresh()',5000); //指定5秒刷新一次，5000处可自定义设置，1000为1秒\n" +
"");
- HtmlContext.tableBegin(result,true,3,false).append("\n");
- HtmlContext.tableRowBegin(result);
- //表头
- HtmlContext.tableCellHeader(result,GeneralVariables.getStringFromResource(R.string.html_callsign)
- ,GeneralVariables.getStringFromResource(R.string.html_hash_value));
-
- HtmlContext.tableRowEnd(result).append("\n");
-
+ //result.append("\n");
+ result.append("\n");
+ result.append("");
+ result.append(String.format("%s "
+ , GeneralVariables.getStringFromResource(R.string.html_callsign)));
+ result.append(String.format("%s "
+ , GeneralVariables.getStringFromResource(R.string.html_hash_value)));
+ result.append(" \n");
int order = 0;
for (Map.Entry entry : Ft8Message.hashList.entrySet()) {
- HtmlContext.tableRowBegin(result,false,(order / 3) % 2 != 0);
-
- HtmlContext.tableCell(result,entry.getValue());
- HtmlContext.tableCell(result,String.format(" 0x%x ", entry.getKey()));
- HtmlContext.tableRowEnd(result).append("\n");
-
+ if ((order / 3) % 2 == 0) {
+ result.append("");
+ } else {
+ result.append(" ");
+ }
+ result.append(String.format(" %s ", entry.getValue()));
+ result.append(String.format(" 0x%x ", entry.getKey()));
+ result.append(" \n");
order++;
}
- HtmlContext.tableEnd(result).append("\n");
+// for (HashStruct hash : Ft8Message.hashList) {
+// if ((order / 3) % 2 == 0) {
+// result.append("");
+// } else {
+// result.append(" ");
+// }
+// result.append(String.format("%s ", hash.callsign));
+// result.append(String.format("0x%x ", hash.hashCode));
+// result.append(" \n");
+// order++;
+// }
+
+ result.append("
");
return result.toString();
}
@@ -788,7 +999,7 @@ public class LogHttpServer extends NanoHTTPD {
String whereStr = String.format("%%%s%%", callsign);
cursor = mainViewModel.databaseOpr.getDb().rawQuery(
"select * from SWLMessages where ((CALL_TO LIKE ?)OR(CALL_FROM LIKE ?)) " +
- dateSql +
+ dateSql.toString() +
" order by ID "
, new String[]{whereStr, whereStr});
@@ -821,7 +1032,7 @@ public class LogHttpServer extends NanoHTTPD {
response = newFixedLengthResponse(NanoHTTPD.Response.Status.OK, "text/plain", result.toString());
response.addHeader("Content-Disposition"
- , String.format("attachment;filename=%s", fileName));
+ , String.format("attachment;filename=%s",fileName.toString()));
return response;
}
@@ -872,10 +1083,6 @@ public class LogHttpServer extends NanoHTTPD {
return exportSWLMessage(exportFile, callsign, startDate, endDate);
}
- HtmlContext.tableBegin(result,false,0,true).append("\n");
- HtmlContext.tableRowBegin(result).append("");
-
-
result.append(String.format("%s " +
" , %s ");
- HtmlContext.tableRowEnd(result);
- HtmlContext.tableEnd(result).append("\n");
cursor = mainViewModel.databaseOpr.getDb().rawQuery(
String.format(
"select * from SWLMessages where ((CALL_TO LIKE ?)OR(CALL_FROM LIKE ?)) " +
- dateSql +
+ dateSql.toString() +
" order by ID LIMIT(%d),%d "
, (pageIndex - 1) * pageSize, pageSize), new String[]{whereStr, whereStr});
- //result.append("\n");
- HtmlContext.tableBegin(result,false,true).append("\n");
- HtmlContext.tableRowBegin(result).append("\n");
- HtmlContext.tableCellHeader(result,"No.");
- HtmlContext.tableCellHeader(result,GeneralVariables.getStringFromResource(R.string.html_protocol));
- HtmlContext.tableCellHeader(result,"i3.n3","UTC","dB","Δt");
- HtmlContext.tableCellHeader(result,GeneralVariables.getStringFromResource(R.string.html_qsl_freq));
- HtmlContext.tableCellHeader(result,GeneralVariables.getStringFromResource(R.string.message));
- HtmlContext.tableCellHeader(result,GeneralVariables.getStringFromResource(R.string.html_carrier_frequency_band)).append("\n");
- HtmlContext.tableRowEnd(result).append("\n");
-
-
+ result.append("\n");
+ result.append("");
+ result.append("No. ");
+ result.append("Protocol ");
+ result.append("i3.n3 ");
+ result.append("UTC ");
+ result.append("dB ");
+ result.append("Dt ");
+ result.append(String.format("%s "
+ , GeneralVariables.getStringFromResource(R.string.html_qsl_freq)));
+ result.append(String.format("%s "
+ , GeneralVariables.getStringFromResource(R.string.message)));
+ result.append(String.format("%s "
+ , GeneralVariables.getStringFromResource(R.string.html_carrier_frequency_band)));
+ result.append(" \n");
int order = 0;
while (cursor.moveToNext()) {
- HtmlContext.tableRowBegin(result,true,order % 2 != 0);
+ if (order % 2 == 0) {
+ result.append("");
+ } else {
+ result.append(" ");
+ }
+ //int id = cursor.getInt(cursor.getColumnIndex("ID"));
int i3 = cursor.getInt(cursor.getColumnIndex("I3"));
int n3 = cursor.getInt(cursor.getColumnIndex("N3"));
String utcTime = cursor.getString(cursor.getColumnIndex("UTC"));
@@ -973,30 +1184,35 @@ public class LogHttpServer extends NanoHTTPD {
String extra = cursor.getString(cursor.getColumnIndex("EXTRAL"));
long band = cursor.getLong(cursor.getColumnIndex("BAND"));
- HtmlContext.tableCell(result,String.format("%d",order + 1 + pageSize * (pageIndex - 1)));
- HtmlContext.tableCell(result,protocol,Ft8Message.getCommandInfoByI3N3(i3, n3));
- HtmlContext.tableCell(result,utcTime);
- HtmlContext.tableCell(result,String.format("%d",dB));
- HtmlContext.tableCell(result, String.format("%.1f",dt));
- HtmlContext.tableCell(result,String.format("%dHz", freq));
- HtmlContext.tableCell(result,String.format("" +
- "%s " +
- "%s %s%d " +
+ "%s " +//protocol
+ "%s " +
+ "%s %d %.1f %dHz %s " +
+ "%s "
+ , order + 1 + pageSize * (pageIndex - 1)
+ , protocol
+ , Ft8Message.getCommandInfoByI3N3(i3, n3)
+ , utcTime
+ , dB, dt, freq, String.format("" +
+ "%s " +
+ "%s %s"
+ , pageSize, callTo.replace("<", "")
+ .replace(">", "")
+ , callTo.replace("<", "<")
+ .replace(">", ">")
+ , pageSize, callFrom.replace("<", "")
+ .replace(">", "")
+ , callFrom.replace("<", "<")
+ .replace(">", ">"), extra)
+ , BaseRigOperation.getFrequencyStr(band)));
+ //result.append(UtcTimer.getDatetimeStr(utcTime));
+ result.append(" \n");
order++;
}
cursor.close();
- HtmlContext.tableEnd(result).append("
");
-
result.append(String.format("%s "
, callsign, startDate, endDate,GeneralVariables.getStringFromResource(R.string.html_export_adi)));
@@ -1134,7 +1336,7 @@ public class LogHttpServer extends NanoHTTPD {
//计算总的记录数
cursor = mainViewModel.databaseOpr.getDb().rawQuery(
"select count(*) as rc from SWLQSOTable " +
- "where (([call] LIKE ?)OR(station_callsign LIKE ?))" + dateSql
+ "where (([call] LIKE ?)OR(station_callsign LIKE ?))" + dateSql.toString()
, new String[]{whereStr, whereStr});
cursor.moveToFirst();
int pageCount = Math.round(((float) cursor.getInt(cursor.getColumnIndex("rc")) / pageSize) + 0.5f);
@@ -1145,20 +1347,19 @@ public class LogHttpServer extends NanoHTTPD {
result.append(String.format("\n"
-
, 1, pageSize, callsign, startDate, endDate
, pageIndex - 1 == 0 ? 1 : pageIndex - 1, pageSize, callsign, startDate, endDate
, pageIndex
, pageIndex == pageCount ? pageCount : pageIndex + 1, pageSize, callsign, startDate, endDate
, pageCount, pageSize, callsign, startDate, endDate));
- result.append(" ");
- HtmlContext.tableRowEnd(result);
- HtmlContext.tableEnd(result).append("\n");
+
cursor = mainViewModel.databaseOpr.getDb().rawQuery(
String.format(
"select * from SWLQSOTable where (([call] LIKE ?)OR(station_callsign LIKE ?)) " +
- dateSql +
- " order by qso_date desc,time_on desc LIMIT(%d),%d "
+ dateSql.toString() +
+ " order by ID LIMIT(%d),%d "
, (pageIndex - 1) * pageSize, pageSize), new String[]{whereStr, whereStr});
- HtmlContext.tableBegin(result,false,true).append("\n");
-
- HtmlContext.tableRowBegin(result);
- HtmlContext.tableCellHeader(result,"No."
- ,GeneralVariables.getStringFromResource(R.string.html_callsign)//"call"
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_grid)//"gridsquare"
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_mode)//"mode"
- ,GeneralVariables.getStringFromResource(R.string.html_rst_sent)//"rst_sent"
- ,GeneralVariables.getStringFromResource(R.string.html_rst_rcvd)//"rst_rcvd"
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_start_day)//"qso date"
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_start_time)//"time_on"
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_end_date)//qso date off
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_end_time)//"time_off"
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_band)//"band"
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_freq)//"freq"
- ,GeneralVariables.getStringFromResource(R.string.html_callsign)//"station_callsign"
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_grid)//"my_gridsquare"
- ,GeneralVariables.getStringFromResource(R.string.html_comment))//"comment")
- .append("\n");
- HtmlContext.tableRowEnd(result).append("\n");
+ result.append("\n");
+ result.append("");
+ result.append("No. ");
+ result.append("call ");
+ result.append("gridsquare ");
+ result.append("mode ");
+ result.append("rst_sent ");
+ result.append("rst_rcvd ");
+ result.append("qso_date ");
+ result.append("time_on ");
+ result.append("qso_date_off ");
+ result.append("time_off ");
+ result.append("band ");
+ result.append("freq ");
+ result.append("station_callsign ");
+ result.append("my_gridsquare ");
+ result.append("comment ");
+ result.append(" \n");
int order = 0;
while (cursor.moveToNext()) {
- HtmlContext.tableRowBegin(result,true,order % 2 != 0).append("\n");
+ if (order % 2 == 0) {
+ result.append("");
+ } else {
+ result.append(" ");
+ }
+ //int id = cursor.getInt(cursor.getColumnIndex("ID"));
String call = cursor.getString(cursor.getColumnIndex("call"));
String gridsquare = cursor.getString(cursor.getColumnIndex("gridsquare"));
String mode = cursor.getString(cursor.getColumnIndex("mode"));
@@ -1225,350 +1426,59 @@ public class LogHttpServer extends NanoHTTPD {
String comment = cursor.getString(cursor.getColumnIndex("comment"));
- //生成数据表的一行
- HtmlContext.tableCell(result,String.format("%d",order + 1 + pageSize * (pageIndex - 1)));
- HtmlContext.tableCell(result,String.format("%s "
- ,pageSize ,call.replace("<", "")
- .replace(">", "")
- , call.replace("<", "<")
- .replace(">", ">")));
- HtmlContext.tableCell(result,gridsquare==null?"":gridsquare);
- HtmlContext.tableCell(result,mode,rst_sent,rst_rcvd,qso_date,time_on,qso_date_off,time_off);
- HtmlContext.tableCell(result,band,freq);
- HtmlContext.tableCell(result,String.format("%s "
- ,pageSize
- ,station_callsign.replace("<", "")
- .replace(">", "")
- , station_callsign.replace("<", "<")
- .replace(">", ">")));
- HtmlContext.tableCell(result,my_gridsquare==null?"":my_gridsquare
- ,comment).append("\n");
+ //UtcTimer.getDatetimeStr(utcTime)
+ result.append(String.format("%d " +
+ "%s %s " +//gridsquare
+ "%s " +//mode
+ "%s " +//rst_sent
+ "%s " +//rst_rcvd
+ "%s " +//qso_date
+ "%s " +//time_on
+ "%s " +//qso_date_off
+ "%s " +//time_off
+ "%s " +//band
+ "%s " +//freq
+ "%s %s " +//my_gridsquare
+ "%s " //comment
- HtmlContext.tableRowEnd(result).append("\n");
- order++;
- }
- cursor.close();
- HtmlContext.tableEnd(result).append(" pars = session.getParms();
- int pageIndex = 1;
- if (pars.get("page") != null) {
- pageIndex = Integer.parseInt(Objects.requireNonNull(pars.get("page")));
- }
- if (pars.get("pageSize") != null) {
- pageSize = Integer.parseInt(Objects.requireNonNull(pars.get("pageSize")));
- }
- if (pars.get("callsign") != null) {
- callsign = Objects.requireNonNull(pars.get("callsign"));
- }
- if (pars.get("start_date") != null) {
- startDate = Objects.requireNonNull(pars.get("start_date"));
- }
- if (pars.get("end_date") != null) {
- endDate = Objects.requireNonNull(pars.get("end_date"));
- }
- String whereStr = String.format("%%%s%%", callsign);
-
- if (pars.get("exportFile") != null) {
- exportFile = Objects.requireNonNull(pars.get("exportFile"));
- }
- if (pars.get("QSL") != null) {
- qIsQSL = Objects.requireNonNull(pars.get("QSL"));
- }
- if (pars.get("Imported") != null) {
- qIsImported = Objects.requireNonNull(pars.get("Imported"));
- }
-
- result.append("
\n" +
- " "+
- "\n" +
- " "
-
-
- , String.format(GeneralVariables.getStringFromResource(R.string.html_message_page_count), pageCount)
- , GeneralVariables.getStringFromResource(R.string.html_message_page_size)
- , pageSize
- , GeneralVariables.getStringFromResource(R.string.html_message_query)
-
- , GeneralVariables.getStringFromResource(R.string.html_callsign)
- , callsign
- , GeneralVariables.getStringFromResource(R.string.html_start_date_swl_message)
- , startDate
- , GeneralVariables.getStringFromResource(R.string.html_end_date_swl_message)
- , endDate
-
- , qIsQSL.equals("") ? "checked=\"true\"":""
- , qIsQSL.equals("0") ? "checked=\"true\"":""
- , qIsQSL.equals("1") ? "checked=\"true\"":""
-
-
- , qIsImported.equals("") ? "checked=\"true\"":""
- , qIsImported.equals("0") ? "checked=\"true\"":""
- , qIsImported.equals("1") ? "checked=\"true\"":""
- ));
-
-
- //定位页，第一页、上一页、下一页，最后一页
- result.append(String.format("|< " +
- " << " +
- ">> \n" +
- " >| \n"
-
- , 1, pageSize, callsign, startDate, endDate,qIsQSL,qIsImported
- , pageIndex - 1 == 0 ? 1 : pageIndex - 1, pageSize, callsign, startDate, endDate,qIsQSL,qIsImported
- , pageIndex
- , pageIndex == pageCount ? pageCount : pageIndex + 1, pageSize, callsign, startDate, endDate,qIsQSL,qIsImported
- , pageCount, pageSize, callsign, startDate, endDate,qIsQSL,qIsImported));
- result.append(" ");
- HtmlContext.tableRowEnd(result);
- HtmlContext.tableEnd(result);
- result.append("");
- //"
\n"
-
-
- cursor = mainViewModel.databaseOpr.getDb().rawQuery(
- String.format(
- "select * from QSLTable where (([call] LIKE ?)OR(station_callsign LIKE ?)) " +
- dateSql +
- " order by qso_date desc,time_on desc LIMIT(%d),%d "
- , (pageIndex - 1) * pageSize, pageSize), new String[]{whereStr, whereStr});
-
- HtmlContext.tableBegin(result,false,true).append("\n");
-
- //表头
- HtmlContext.tableRowBegin(result).append("\n");
- HtmlContext.tableCellHeader(result,"No.","QSL"
- ,GeneralVariables.getStringFromResource(R.string.html_qso_source)
- ,GeneralVariables.getStringFromResource(R.string.html_callsign)
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_grid)
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_mode)
- ,GeneralVariables.getStringFromResource(R.string.html_rst_sent)
- ,GeneralVariables.getStringFromResource(R.string.html_rst_rcvd)
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_start_day)//"qso date"
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_start_time)//"time_on"
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_end_date)//qso date off
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_end_time)//"time_off"
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_band)
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_freq)
- ,GeneralVariables.getStringFromResource(R.string.html_callsign)//"station_callsign"
- ,GeneralVariables.getStringFromResource(R.string.html_qsl_grid)//"my_gridsquare"
- ,GeneralVariables.getStringFromResource(R.string.html_comment))//"comment")
- .append("\n");
- HtmlContext.tableRowEnd(result).append("\n");
-
- //表内容
- int order = 0;
- while (cursor.moveToNext()) {
- HtmlContext.tableRowBegin(result,true,order % 2 != 0).append("\n");
-
- String call = cursor.getString(cursor.getColumnIndex("call"));
- boolean isQSL = cursor.getInt(cursor.getColumnIndex("isQSL"))==1;
- boolean isLotW_Import = cursor.getInt(cursor.getColumnIndex("isLotW_import"))==1;
- boolean isLotW_QSL = cursor.getInt(cursor.getColumnIndex("isLotW_QSL"))==1;
- String gridsquare = cursor.getString(cursor.getColumnIndex("gridsquare"));
- String mode = cursor.getString(cursor.getColumnIndex("mode"));
- String rst_sent = cursor.getString(cursor.getColumnIndex("rst_sent"));
- String rst_rcvd = cursor.getString(cursor.getColumnIndex("rst_rcvd"));
- String qso_date = cursor.getString(cursor.getColumnIndex("qso_date"));
- String time_on = cursor.getString(cursor.getColumnIndex("time_on"));
- String qso_date_off = cursor.getString(cursor.getColumnIndex("qso_date_off"));
- String time_off = cursor.getString(cursor.getColumnIndex("time_off"));
- String band = cursor.getString(cursor.getColumnIndex("band"));
- String freq = cursor.getString(cursor.getColumnIndex("freq"));
- String station_callsign = cursor.getString(cursor.getColumnIndex("station_callsign"));
- String my_gridsquare = cursor.getString(cursor.getColumnIndex("my_gridsquare"));
- String comment = cursor.getString(cursor.getColumnIndex("comment"));
-
-
- HtmlContext.tableCell(result,String.format("%d",order + 1 + pageSize * (pageIndex - 1)));
- HtmlContext.tableCell(result,(isQSL ||isLotW_QSL) ? "√ " :"✗ ");
- HtmlContext.tableCell(result,isLotW_Import ?
- String.format("%s "
- ,GeneralVariables.getStringFromResource(R.string.html_qso_external))
- : String.format("%s "
- ,GeneralVariables.getStringFromResource(R.string.html_qso_raw)));//是否是导入的
- HtmlContext.tableCell(result,String.format("%s "
,pageSize
,call.replace("<", "")
.replace(">", "")
, call.replace("<", "<")
- .replace(">", ">")));
- HtmlContext.tableCell(result,gridsquare==null?"":gridsquare,mode,rst_sent,rst_rcvd
- ,qso_date,time_on,qso_date_off,time_off ,band,freq);
- HtmlContext.tableCell(result,String.format("%s "
+ .replace(">", ">")
+
+ ,gridsquare==null?"":gridsquare
+ ,mode,rst_sent,rst_rcvd
+ ,qso_date,time_on,qso_date_off,time_off
+ ,band,freq
+
,pageSize
,station_callsign.replace("<", "")
- .replace(">", "")
- ,station_callsign.replace("<", "<")
- .replace(">", ">")));
- HtmlContext.tableCell(result,my_gridsquare==null?"":my_gridsquare
- ,comment).append("\n");
-
- HtmlContext.tableRowEnd(result).append("\n");
+ .replace(">", "")
+ , station_callsign.replace("<", "<")
+ .replace(">", ">")
+ ,my_gridsquare==null?"":my_gridsquare
+ ,comment ));
+ //result.append(UtcTimer.getDatetimeStr(utcTime));
+ result.append("\n");
order++;
}
cursor.close();
- HtmlContext.tableEnd(result).append("
\n");
+ result.append("");
+ result.append("UTC ");
+ result.append("dB ");
+ result.append("Dt ");
+ result.append(String.format("%s "
+ , GeneralVariables.getStringFromResource(R.string.html_qsl_freq)));
+ result.append(String.format("%s "
+ , GeneralVariables.getStringFromResource(R.string.message)));
+ result.append(String.format("%s "
+ , GeneralVariables.getStringFromResource(R.string.html_carrier_frequency_band)));
+ result.append(" \n");
int order = 0;
if (mainViewModel.currentMessages != null) {
for (Ft8Message message : mainViewModel.currentMessages) {
- HtmlContext.tableRowBegin(result,true,order % 2 !=0)
- .append("\n").append(message.toHtml());
- HtmlContext.tableRowEnd(result).append("\n");
+ if (order % 2 == 0) {
+ result.append("");
+ } else {
+ result.append(" ");
+ }
+ result.append(message.toHtml());
+ result.append(" ");
order++;
}
}
- HtmlContext.tableEnd(result).append("
%s %s"
+ result.append("\n");
+ result.append(String.format("" +
+ "%s%s %s
");
return result.toString();
}
@@ -1659,23 +1571,21 @@ public class LogHttpServer extends NanoHTTPD {
private String showQSLTable() {
StringBuilder result = new StringBuilder();
- HtmlContext.tableBegin(result,false,1,true).append("\n");
- HtmlContext.tableRowBegin(result).append("\n");
-
- HtmlContext.tableCellHeader(result
- , GeneralVariables.getStringFromResource(R.string.html_time)
- , GeneralVariables.getStringFromResource(R.string.html_total)
- , GeneralVariables.getStringFromResource(R.string.html_operation)
- , GeneralVariables.getStringFromResource(R.string.html_operation)
- , GeneralVariables.getStringFromResource(R.string.html_operation)
- ).append("\n");
-
- HtmlContext.tableRowEnd(result).append("\n");
+ result.append("\n");
+ result.append(String.format("%s "
+ , GeneralVariables.getStringFromResource(R.string.html_time)));
+ result.append(String.format("%s "
+ , GeneralVariables.getStringFromResource(R.string.html_total)));
+ result.append(String.format("%s "
+ , GeneralVariables.getStringFromResource(R.string.html_operation)));
+ result.append(String.format("%s "
+ , GeneralVariables.getStringFromResource(R.string.html_operation)));
+ result.append(String.format("%s %s %s ", cursor.getString(cursor.getColumnIndex("b"))));
@@ -1688,52 +1598,53 @@ public class LogHttpServer extends NanoHTTPD {
"WHERE SUBSTR(qso_date,1,8)=?", new String[]{UtcTimer.getYYYYMMDD(UtcTimer.getSystemTime())});
cursor.moveToFirst();
- HtmlContext.tableRowBegin(result,true,true).append("\n");
- HtmlContext.tableCell(result,String.format("%s "
+ result.append("");
+
+ result.append(String.format("%s %s "
+ result.append(String.format("%s "
+ , cursor.getString(cursor.getColumnIndex("b"))));
+ result.append(String.format("%s %s "
+ result.append(String.format("%s %s "
- , UtcTimer.getYYYYMMDD(UtcTimer.getSystemTime())
- , GeneralVariables.getStringFromResource(R.string.html_delete))).append("\n");
-
- HtmlContext.tableRowEnd(result).append("\n");
+ result.append(String.format("%s "
+ , UtcTimer.getYYYYMMDD(UtcTimer.getSystemTime())
+ , GeneralVariables.getStringFromResource(R.string.html_delete)));
cursor.close();
int order = 1;
- cursor = mainViewModel.databaseOpr.getDb()
- .rawQuery("select SUBSTR(qso_date,1,6) as a,count(*) as b from QSLTable\n" +
+ cursor = mainViewModel.databaseOpr.getDb().rawQuery("select SUBSTR(qso_date,1,6) as a,count(*) as b from QSLTable\n" +
"group by SUBSTR(qso_date,1,6)", null);
while (cursor.moveToNext()) {
- HtmlContext.tableRowBegin(result,true,order % 2 == 0);
-
- HtmlContext.tableCell(result,String.format("%s "
- ,cursor.getString(cursor.getColumnIndex("a"))
- ,cursor.getString(cursor.getColumnIndex("a"))));
-
- HtmlContext.tableCell(result,cursor.getString(cursor.getColumnIndex("b")));
- HtmlContext.tableCell(result,String.format("%s "
+ if (order % 2 == 0) {
+ result.append("");
+ } else {
+ result.append(" ");
+ }
+ result.append(String.format("%s %s "
+ , cursor.getString(cursor.getColumnIndex("b"))));
+ result.append(String.format("%s %s "
+ result.append(String.format("%s %s "
- ,cursor.getString(cursor.getColumnIndex("a"))
- , GeneralVariables.getStringFromResource(R.string.html_delete))).append("\n");
- HtmlContext.tableRowEnd(result).append("\n");
+ result.append(String.format("%s "
+ , cursor.getString(cursor.getColumnIndex("a"))
+ , GeneralVariables.getStringFromResource(R.string.html_delete)));
order++;
}
- HtmlContext.tableEnd(result).append("\n");
- cursor.close();
+ result.append("
");
+ //cursor.close();
return result.toString();
}
@@ -1755,7 +1666,7 @@ public class LogHttpServer extends NanoHTTPD {
/**
* 下载全部日志
*
- * @return String
+ * @return
*/
private String downAllQSl() {
Cursor cursor = mainViewModel.databaseOpr.getDb().rawQuery("select * from QSLTable", null);
@@ -1769,6 +1680,7 @@ public class LogHttpServer extends NanoHTTPD {
*/
@SuppressLint({"Range", "DefaultLocale"})
private String downQSLTable(Cursor cursor,boolean isSWL) {
+ //Cursor cursor = mainViewModel.databaseOpr.getDb().rawQuery("select * from QSLTable", null);
StringBuilder logStr = new StringBuilder();
logStr.append("FT8CN ADIF Export\n");
@@ -1871,6 +1783,7 @@ public class LogHttpServer extends NanoHTTPD {
, comment));
}
+ //Log.e(TAG, "getQSLTable: " + logStr.toString());
cursor.close();
return logStr.toString();
}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IComPacketTypes.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IComPacketTypes.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IComWifiRig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IComWifiRig.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IcomAudioUdp.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IcomAudioUdp.java
old mode 100644
new mode 100755
index 3d40669..cbd022b
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IcomAudioUdp.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IcomAudioUdp.java
@@ -51,6 +51,44 @@ public class IcomAudioUdp extends IcomUdpBase {
}
doTXAudioRunnable.audioData=temp;
doTXThreadPool.execute(doTXAudioRunnable);
+// new Thread(new Runnable() {
+// @Override
+// public void run() {
+// final int partialLen = IComPacketTypes.TX_BUFFER_SIZE * 2;//数据包的长度
+// //要转换一下到BYTE,小端模式
+//
+// //byte[] data = new byte[audioData.length * 2 + partialLen * 4];//多出一点空声音放在前后各20ms*2共80ms
+// //先播放，是给出空的声音，for i 循环，做了一个判断，是给前面的空声音，for j循环，做得判断，是让后面发送空声音
+// byte[] audioPacket = new byte[partialLen];
+// for (int i = 0; i < (audioData.length / IComPacketTypes.TX_BUFFER_SIZE) + 8; i++) {//多出6个周期，前面3个，后面3个多
+// if (!isPttOn) break;
+// long now = System.currentTimeMillis() - 1;//获取当前时间
+//
+// sendTrackedPacket(IComPacketTypes.AudioPacket.getTxAudioPacket(audioPacket
+// , (short) 0, localId, remoteId, innerSeq));
+// innerSeq++;
+//
+// Arrays.fill(audioPacket,(byte)0x00);
+// if (i>=3) {//让前两个空数据发送出去
+// for (int j = 0; j < IComPacketTypes.TX_BUFFER_SIZE; j++) {
+// if ((i-3) * IComPacketTypes.TX_BUFFER_SIZE + j < audioData.length) {
+// System.arraycopy(IComPacketTypes.shortToBigEndian((short)
+// (audioData[(i-3) * IComPacketTypes.TX_BUFFER_SIZE + j]
+// * GeneralVariables.volumePercent))
+// , 0, audioPacket, j * 2, 2);
+// }
+// }
+// }
+// while (isPttOn) {
+// if (System.currentTimeMillis() - now >= 21) {//20毫秒一个周期
+// break;
+// }
+// }
+// }
+// Log.e(TAG, "run: 音频发送完毕！！" );
+// Thread.currentThread().interrupt();
+// }
+// }).start();
}
private static class DoTXAudioRunnable implements Runnable{
IcomAudioUdp icomAudioUdp;
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IcomCivUdp.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IcomCivUdp.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IcomControlUdp.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IcomControlUdp.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IcomSeqBuffer.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IcomSeqBuffer.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IcomUdpBase.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IcomUdpBase.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IcomUdpClient.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IcomUdpClient.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/HashTable.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/HashTable.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/LogCallsignAdapter.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/LogCallsignAdapter.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/LogFileImport.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/LogFileImport.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/LogQSLAdapter.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/LogQSLAdapter.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/OnQueryQSLCallsign.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/OnQueryQSLCallsign.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/OnQueryQSLRecordCallsign.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/OnQueryQSLRecordCallsign.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/QSLCallsignRecord.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/QSLCallsignRecord.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/QSLRecord.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/QSLRecord.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/QSLRecordStr.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/QSLRecordStr.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/SWLQsoList.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/SWLQsoList.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/maidenhead/MaidenheadGrid.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/maidenhead/MaidenheadGrid.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/BaseRig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/BaseRig.java
old mode 100644
new mode 100755
index def2611..a6d5cf6
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/BaseRig.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/BaseRig.java
@@ -2,7 +2,6 @@ package com.bg7yoz.ft8cn.rigs;
import androidx.lifecycle.MutableLiveData;
-import com.bg7yoz.ft8cn.Ft8Message;
import com.bg7yoz.ft8cn.connector.BaseRigConnector;
/**
@@ -46,10 +45,7 @@ public abstract class BaseRig {
}
}
-// public void sendWaveData(float[] data) {
-// //留给ICOM电台使用
-// }
- public void sendWaveData(Ft8Message message) {
+ public void sendWaveData(float[] data) {
//留给ICOM电台使用
}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/BaseRigOperation.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/BaseRigOperation.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/CRC16.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/CRC16.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/ElecraftCommand.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/ElecraftCommand.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/ElecraftRig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/ElecraftRig.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/ElecraftRigConstant.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/ElecraftRigConstant.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Flex6000Command.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Flex6000Command.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Flex6000Rig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Flex6000Rig.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Flex6000RigConstant.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Flex6000RigConstant.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/FlexNetworkRig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/FlexNetworkRig.java
old mode 100644
new mode 100755
index a0cb8ed..e680ab6
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/FlexNetworkRig.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/FlexNetworkRig.java
@@ -3,7 +3,6 @@ package com.bg7yoz.ft8cn.rigs;
import android.annotation.SuppressLint;
import android.util.Log;
-import com.bg7yoz.ft8cn.Ft8Message;
import com.bg7yoz.ft8cn.connector.FlexConnector;
import com.bg7yoz.ft8cn.flex.FlexCommand;
import com.bg7yoz.ft8cn.flex.FlexRadio;
@@ -80,12 +79,12 @@ public class FlexNetworkRig extends BaseRig{
}
@Override
- public void sendWaveData(Ft8Message message) {
-// Log.e(TAG, "sendWaveData: "+data.length );
-// if (getConnector()!=null){
-// getConnector().sendWaveData(data);
-// }
-
+ public void sendWaveData(float[] data) {
+ Log.e(TAG, "sendWaveData: "+data.length );
+ if (getConnector()!=null){
+ getConnector().sendWaveData(data);
+ }
+ //super.sendWaveData(data);
}
@Override
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/GuoHeQ900Rig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/GuoHeQ900Rig.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/GuoHeRigConstant.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/GuoHeRigConstant.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/IcomCommand.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/IcomCommand.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/IcomRig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/IcomRig.java
old mode 100644
new mode 100755
index 129aea2..7853d5e
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/IcomRig.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/IcomRig.java
@@ -2,12 +2,10 @@ package com.bg7yoz.ft8cn.rigs;
import android.util.Log;
-import com.bg7yoz.ft8cn.Ft8Message;
import com.bg7yoz.ft8cn.GeneralVariables;
import com.bg7yoz.ft8cn.R;
import com.bg7yoz.ft8cn.connector.ConnectMode;
import com.bg7yoz.ft8cn.database.ControlMode;
-import com.bg7yoz.ft8cn.ft8transmit.GenerateFT8;
import com.bg7yoz.ft8cn.icom.IComPacketTypes;
import com.bg7yoz.ft8cn.ui.ToastMessage;
@@ -130,14 +128,8 @@ public class IcomRig extends BaseRig {
}
@Override
- public void sendWaveData(Ft8Message message) {//发送音频数据到电台，用于网络方式
+ public void sendWaveData(float[] data) {//发送音频数据到电台，用于网络方式
if (getConnector() != null) {
- float[] data = GenerateFT8.generateFt8(message, GeneralVariables.getBaseFrequency()
- ,12000);//此处icom电台发射音频的采样率是12000，todo 此处可改为动态设置24000，48000
- if (data==null){
- setPTT(false);
- return;
- }
getConnector().sendWaveData(data);
}
}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/IcomRigConstant.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/IcomRigConstant.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/InstructionSet.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/InstructionSet.java
old mode 100644
new mode 100755
index b012935..6e9f8b1
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/InstructionSet.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/InstructionSet.java
@@ -15,5 +15,4 @@ public class InstructionSet {
public static final int FLEX_CABLE=11;//FLEX6000;
public static final int FLEX_NETWORK=12;//FLEX网络模式连接;
public static final int XIEGU_6100=13;//协谷X6100;
- public static final int KENWOOD_TS2000=14;//建武TS2000,发射指令是TX0;
}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/KenwoodKT90Rig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/KenwoodKT90Rig.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/KenwoodTK90RigConstant.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/KenwoodTK90RigConstant.java
old mode 100644
new mode 100755
index 624488b..02bf3b7
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/KenwoodTK90RigConstant.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/KenwoodTK90RigConstant.java
@@ -28,7 +28,6 @@ public class KenwoodTK90RigConstant {
private static final String TS590_VFO_A="FR0;";//KENWOOD TS590,设置VFO -A
- private static final String TS2000_PTT_ON="TX0;";//KENWOOD TS2000,PTT
private static final String TS590_PTT_ON="TX1;";//KENWOOD TS590,PTT
private static final String FLEX_6000_PTT_ON="TX01;";//FLEX_6000,PTT
private static final String TS590_PTT_OFF="RX;";//KENWOOD TS590,PTT
@@ -76,13 +75,6 @@ public class KenwoodTK90RigConstant {
return TS590_PTT_OFF.getBytes();
}
- } public static byte[] setTS2000PTTState(boolean on) {
- if (on) {
- return TS2000_PTT_ON.getBytes();
- } else {
- return TS590_PTT_OFF.getBytes();
- }
-
}
public static byte[] setFLEX6000PTTState(boolean on) {
if (on) {
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/KenwoodTS2000Rig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/KenwoodTS2000Rig.java
deleted file mode 100644
index 848884c..0000000
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/KenwoodTS2000Rig.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package com.bg7yoz.ft8cn.rigs;
-
-import static com.bg7yoz.ft8cn.GeneralVariables.QUERY_FREQ_TIMEOUT;
-import static com.bg7yoz.ft8cn.GeneralVariables.START_QUERY_FREQ_DELAY;
-
-import android.os.Handler;
-import android.util.Log;
-
-import com.bg7yoz.ft8cn.GeneralVariables;
-import com.bg7yoz.ft8cn.R;
-import com.bg7yoz.ft8cn.database.ControlMode;
-import com.bg7yoz.ft8cn.ui.ToastMessage;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-/**
- * KENWOOD TS2000,与YAESU3代指令接近，与TS590基本相同，唯一不同的是，PTT打开指令是TX0;而TS590是用的TX1;
- * 命令结构使用Yaesu3Command,指令在KenwoodTK90RigConstant中。
- */
-public class KenwoodTS2000Rig extends BaseRig {
- private static final String TAG = "KenwoodTS590Rig";
- private final StringBuilder buffer = new StringBuilder();
-
- private Timer readFreqTimer = new Timer();
- private int swr=0;
- private int alc=0;
- private boolean alcMaxAlert = false;
- private boolean swrAlert = false;
-
- private TimerTask readTask() {
- return new TimerTask() {
- @Override
- public void run() {
- try {
- if (!isConnected()) {
- readFreqTimer.cancel();
- readFreqTimer.purge();
- readFreqTimer = null;
- return;
- }
- if (isPttOn()){
- readMeters();//读METER
- }else {
- readFreqFromRig();//读频率
- }
-
- } catch (Exception e) {
- Log.e(TAG, "readFreq error:" + e.getMessage());
- }
- }
- };
- }
-
- /**
- * 读取Meter RM;
- */
- private void readMeters(){
- if (getConnector() != null) {
- clearBufferData();//清空一下缓存
- getConnector().sendData(KenwoodTK90RigConstant.setRead590Meters());
- }
- }
-
- /**
- * 清空缓存数据
- */
- private void clearBufferData() {
- buffer.setLength(0);
- }
-
- @Override
- public void setPTT(boolean on) {
- super.setPTT(on);
- if (getConnector() != null) {
- switch (getControlMode()) {
- case ControlMode.CAT://以CIV指令
- getConnector().setPttOn(KenwoodTK90RigConstant.setTS2000PTTState(on));
- break;
- case ControlMode.RTS:
- case ControlMode.DTR:
- getConnector().setPttOn(on);
- break;
- }
- }
- }
-
- @Override
- public boolean isConnected() {
- if (getConnector() == null) {
- return false;
- }
- return getConnector().isConnected();
- }
-
- @Override
- public void setUsbModeToRig() {
- if (getConnector() != null) {
- getConnector().sendData(KenwoodTK90RigConstant.setTS590OperationUSBMode());
- }
- }
-
- @Override
- public void setFreqToRig() {
- if (getConnector() != null) {
- getConnector().sendData(KenwoodTK90RigConstant.setTS590OperationFreq(getFreq()));
- }
- }
-
- @Override
- public void onReceiveData(byte[] data) {
- String s = new String(data);
-
- if (!s.contains("\r"))
- {
- buffer.append(s);
- if (buffer.length()>1000) clearBufferData();
- //return;//说明数据还没接收完。
- }else {
- if (s.indexOf("\r")>0){//说明接到结束的数据了，并且不是第一个字符是;
- buffer.append(s.substring(0,s.indexOf("\r")));
- }
- //开始分析数据
- Yaesu3Command yaesu3Command = Yaesu3Command.getCommand(buffer.toString());
- clearBufferData();//清一下缓存
- //要把剩下的数据放到缓存里
- buffer.append(s.substring(s.indexOf("\r")+1));
-
- if (yaesu3Command == null) {
- return;
- }
- String cmd=yaesu3Command.getCommandID();
- if (cmd.equalsIgnoreCase("FA")) {//频率
- long tempFreq=Yaesu3Command.getFrequency(yaesu3Command);
- if (tempFreq!=0) {//如果tempFreq==0，说明频率不正常
- setFreq(Yaesu3Command.getFrequency(yaesu3Command));
- }
- }else if (cmd.equalsIgnoreCase("RM")){//meter
- if (Yaesu3Command.is590MeterSWR(yaesu3Command)) {
- swr = Yaesu3Command.get590ALCOrSWR(yaesu3Command);
- }
- if (Yaesu3Command.is590MeterALC(yaesu3Command)) {
- alc = Yaesu3Command.get590ALCOrSWR(yaesu3Command);
- }
- showAlert();
- }
-
- }
-
- }
- private void showAlert() {
- if (swr >= KenwoodTK90RigConstant.ts_590_swr_alert_max) {
- if (!swrAlert) {
- swrAlert = true;
- ToastMessage.show(GeneralVariables.getStringFromResource(R.string.swr_high_alert));
- }
- } else {
- swrAlert = false;
- }
- if (alc > KenwoodTK90RigConstant.ts_590_alc_alert_max) {//网络模式下不警告ALC
- if (!alcMaxAlert) {
- alcMaxAlert = true;
- ToastMessage.show(GeneralVariables.getStringFromResource(R.string.alc_high_alert));
- }
- } else {
- alcMaxAlert = false;
- }
-
- }
- @Override
- public void readFreqFromRig() {
- if (getConnector() != null) {
- clearBufferData();//清空一下缓存
- getConnector().sendData(KenwoodTK90RigConstant.setTS590ReadOperationFreq());
- }
- }
-
- @Override
- public String getName() {
- return "KENWOOD TS-2000";
- }
-
- public KenwoodTS2000Rig() {
- new Handler().postDelayed(new Runnable() {
- @Override
- public void run() {
- if (getConnector()!=null){
- getConnector().sendData(KenwoodTK90RigConstant.setTS590VFOMode());
- }
- }
- },START_QUERY_FREQ_DELAY-500);
- readFreqTimer.schedule(readTask(), START_QUERY_FREQ_DELAY,QUERY_FREQ_TIMEOUT);
- }
-}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/KenwoodTS590Rig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/KenwoodTS590Rig.java
old mode 100644
new mode 100755
index fb59880..6905c42
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/KenwoodTS590Rig.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/KenwoodTS590Rig.java
@@ -176,7 +176,7 @@ public class KenwoodTS590Rig extends BaseRig {
@Override
public String getName() {
- return "KENWOOD TS-480/590";
+ return "KENWOOD TS-480/590/2000";
}
public KenwoodTS590Rig() {
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/OnConnectReceiveData.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/OnConnectReceiveData.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/OnRigStateChanged.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/OnRigStateChanged.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/XieGu6100Rig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/XieGu6100Rig.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/XieGuRig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/XieGuRig.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Yaesu2Command.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Yaesu2Command.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Yaesu2Rig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Yaesu2Rig.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Yaesu2RigConstant.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Yaesu2RigConstant.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Yaesu38Rig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Yaesu38Rig.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Yaesu38_450Rig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Yaesu38_450Rig.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Yaesu39Rig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Yaesu39Rig.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Yaesu3Command.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Yaesu3Command.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Yaesu3RigConstant.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/Yaesu3RigConstant.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/YaesuDX10Rig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/YaesuDX10Rig.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/CdcAcmSerialDriver.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/CdcAcmSerialDriver.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/Ch34xSerialDriver.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/Ch34xSerialDriver.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/CommonUsbSerialPort.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/CommonUsbSerialPort.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/Cp21xxSerialDriver.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/Cp21xxSerialDriver.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/FtdiSerialDriver.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/FtdiSerialDriver.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/ProbeTable.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/ProbeTable.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/ProlificSerialDriver.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/ProlificSerialDriver.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/SerialTimeoutException.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/SerialTimeoutException.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/UsbId.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/UsbId.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/UsbSerialDriver.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/UsbSerialDriver.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/UsbSerialPort.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/UsbSerialPort.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/UsbSerialProber.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/UsbSerialProber.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/util/MonotonicClock.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/util/MonotonicClock.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/util/SerialInputOutputManager.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/util/SerialInputOutputManager.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/spectrum/SpectrumListener.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/spectrum/SpectrumListener.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/timer/OnUtcTimer.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/timer/OnUtcTimer.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/timer/UtcTimer.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/timer/UtcTimer.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/BandsSpinnerAdapter.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/BandsSpinnerAdapter.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/BauRateSpinnerAdapter.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/BauRateSpinnerAdapter.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/CallingListAdapter.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/CallingListAdapter.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/CallingListFragment.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/CallingListFragment.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/ClearCacheDataDialog.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/ClearCacheDataDialog.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/ColumnarView.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/ColumnarView.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/ConfigFragment.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/ConfigFragment.java
old mode 100644
new mode 100755
index 53362c9..0e7d215
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/ConfigFragment.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/ConfigFragment.java
@@ -17,10 +17,6 @@ import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.CompoundButton;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Observer;
-
import com.bg7yoz.ft8cn.FAQActivity;
import com.bg7yoz.ft8cn.Ft8Message;
import com.bg7yoz.ft8cn.GeneralVariables;
@@ -38,6 +34,10 @@ import com.bg7yoz.ft8cn.timer.UtcTimer;
import java.io.IOException;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
+
/**
* A simple {@link Fragment} subclass.
* create an instance of this fragment.
@@ -280,12 +280,6 @@ public class ConfigFragment extends Fragment {
//设置电台名称，参数列表
setRigNameSpinner();
- //设置音频输出的位数
- setAudioOutputBitsMode();
-
- //设置音频输出采样率
- setAudioOutputRateMode();
-
//设置控制模式 VOX CAT
setControlMode();
@@ -768,60 +762,6 @@ public class ConfigFragment extends Fragment {
}
- /**
- * 设置音频输出的位数
- */
- private void setAudioOutputBitsMode() {
- //binding.controlModeRadioGroup.setOnCheckedChangeListener(null);
- binding.audioBitsRadioGroup.clearCheck();
- binding.audio32BitsRadioButton.setChecked(GeneralVariables.audioOutput32Bit);
- binding.audio16BitsRadioButton.setChecked(!GeneralVariables.audioOutput32Bit);
-
-
-
- View.OnClickListener listener = new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- int buttonId = binding.audioBitsRadioGroup.getCheckedRadioButtonId();
- GeneralVariables.audioOutput32Bit= buttonId ==binding.audio32BitsRadioButton.getId();
- writeConfig("audioBits", GeneralVariables.audioOutput32Bit? "1" : "0");
- }
- };
-
- binding.audio32BitsRadioButton.setOnClickListener(listener);
- binding.audio16BitsRadioButton.setOnClickListener(listener);
-
- }
-
- /**
- * 输出音频的采样率设置
- */
- private void setAudioOutputRateMode() {
- binding.audioRateRadioGroup.clearCheck();
- binding.audio12kRadioButton.setChecked(GeneralVariables.audioSampleRate==12000);
- binding.audio24kRadioButton.setChecked(GeneralVariables.audioSampleRate==24000);
- binding.audio48kRadioButton.setChecked(GeneralVariables.audioSampleRate==48000);
-
-
-
- View.OnClickListener listener = new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- if (binding.audio12kRadioButton.isChecked()) GeneralVariables.audioSampleRate=12000;
- if (binding.audio24kRadioButton.isChecked()) GeneralVariables.audioSampleRate=24000;
- if (binding.audio48kRadioButton.isChecked()) GeneralVariables.audioSampleRate=48000;
- writeConfig("audioRate", String.valueOf(GeneralVariables.audioSampleRate));
- }
- };
-
- binding.audio12kRadioButton.setOnClickListener(listener);
- binding.audio24kRadioButton.setOnClickListener(listener);
- binding.audio48kRadioButton.setOnClickListener(listener);
-
- }
-
-
-
/**
* 设置控制模式VOX CAT
*/
@@ -957,54 +897,66 @@ public class ConfigFragment extends Fragment {
binding.callsignHelpImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.callsign_help)
- , true).show();
+ if (GeneralVariables.isChina) {
+ new HelpDialog(requireContext(), requireActivity(), "callsign.txt", true).show();
+ } else {
+ new HelpDialog(requireContext(), requireActivity(), "callsign_en.txt", true).show();
+ }
}
});
//梅登海德网格的帮助
binding.maidenGridImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.maidenhead_help)
- , true).show();
+ if (GeneralVariables.isChina) {
+ new HelpDialog(requireContext(), requireActivity(), "maidenhead.txt", true).show();
+ } else {
+ new HelpDialog(requireContext(), requireActivity(), "maidenhead_en.txt", true).show();
+ }
}
});
//发射频率的帮助
binding.frequencyImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.frequency_help)
- , true).show();
+ if (GeneralVariables.isChina) {
+ new HelpDialog(requireContext(), requireActivity(), "frequency.txt", true).show();
+ } else {
+ new HelpDialog(requireContext(), requireActivity(), "frequency_en.txt", true).show();
+ }
}
});
//延迟发射帮助
binding.transDelayImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.transDelay_help)
- , true).show();
+ if (GeneralVariables.isChina) {
+ new HelpDialog(requireContext(), requireActivity(), "transDelay.txt", true).show();
+ } else {
+ new HelpDialog(requireContext(), requireActivity(), "transDelay_en.txt", true).show();
+ }
}
});
//时间偏移帮助
binding.timeOffsetImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.timeoffset_help)
- , true).show();
+ if (GeneralVariables.isChina) {
+ new HelpDialog(requireContext(), requireActivity(), "timeoffset.txt", true).show();
+ } else {
+ new HelpDialog(requireContext(), requireActivity(), "timeoffset_en.txt", true).show();
+ }
}
});
//PTT延时帮助
binding.pttDelayImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.pttdelay_help)
- , true).show();
+ if (GeneralVariables.isChina) {
+ new HelpDialog(requireContext(), requireActivity(), "pttdelay.txt", true).show();
+ } else {
+ new HelpDialog(requireContext(), requireActivity(), "pttdelay_en.txt", true).show();
+ }
}
});
//设置ABOUT
@@ -1018,100 +970,110 @@ public class ConfigFragment extends Fragment {
binding.operationHelpImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.operationBand_help)
- , true).show();
+ if (GeneralVariables.isChina) {
+ new HelpDialog(requireContext(), requireActivity(), "operationBand.txt", true).show();
+ } else {
+ new HelpDialog(requireContext(), requireActivity(), "operationBand_en.txt", true).show();
+ }
}
});
//设置操作模式
binding.controlModeHelpImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.controlMode_help)
- , true).show();
+ if (GeneralVariables.isChina) {
+ new HelpDialog(requireContext(), requireActivity(), "controlMode.txt", true).show();
+ } else {
+ new HelpDialog(requireContext(), requireActivity(), "controlMode_en.txt", true).show();
+ }
}
});
//设置CI-V地址和波特率帮助
binding.baudRateHelpImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.civ_help)
- , true).show();
+ if (GeneralVariables.isChina) {
+ new HelpDialog(requireContext(), requireActivity(), "civ_help.txt", true).show();
+ } else {
+ new HelpDialog(requireContext(), requireActivity(), "civ_help_en.txt", true).show();
+ }
}
});
//电台型号列表
binding.rigNameHelpImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.rig_model_help)
- , true).show();
+ if (GeneralVariables.isChina) {
+ new HelpDialog(requireContext(), requireActivity(), "rig_model_help.txt", true).show();
+ } else {
+ new HelpDialog(requireContext(), requireActivity(), "rig_model_help_en.txt", true).show();
+ }
}
});
//发射监管
binding.launchSupervisionImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.launch_supervision_help)
- , true).show();
+ if (GeneralVariables.isChina) {
+ new HelpDialog(requireContext(), requireActivity(), "launch_supervision_help.txt", true).show();
+ } else {
+ new HelpDialog(requireContext(), requireActivity(), "launch_supervision_en.txt", true).show();
+ }
}
});
//无回应次数
binding.noResponseCountButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.no_response_help)
- , true).show();
+ if (GeneralVariables.isChina) {
+ new HelpDialog(requireContext(), requireActivity(), "no_response_help.txt", true).show();
+ } else {
+ new HelpDialog(requireContext(), requireActivity(), "no_response_help_en.txt", true).show();
+ }
}
});
//自动呼叫
binding.autoFollowCountButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.auto_follow_help)
- , true).show();
+ if (GeneralVariables.isChina) {
+ new HelpDialog(requireContext(), requireActivity(), "auto_follow_help.txt", true).show();
+ } else {
+ new HelpDialog(requireContext(), requireActivity(), "auto_follow_help_en.txt", true).show();
+ }
}
});
//连接模式
binding.connectModeHelpImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.connectMode_help)
- , true).show();
+ if (GeneralVariables.isChina) {
+ new HelpDialog(requireContext(), requireActivity(), "connectMode.txt", true).show();
+ } else {
+ new HelpDialog(requireContext(), requireActivity(), "connectMode_en.txt", true).show();
+ }
}
});
//排除选项
binding.excludedHelpButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.excludeCallsign_help)
- , true).show();
+ if (GeneralVariables.isChina) {
+ new HelpDialog(requireContext(), requireActivity(), "excludeCallsign.txt", true).show();
+ } else {
+ new HelpDialog(requireContext(), requireActivity(), "excludeCallsign_en.txt", true).show();
+ }
}
});
binding.swlHelpButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.swlMode_help)
- , true).show();
- }
- });
-
- //音频输出帮助
- binding.audioOutputImageButton.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.audio_output_help)
- , true).show();
+ if (GeneralVariables.isChina) {
+ new HelpDialog(requireContext(), requireActivity(), "swlMode.txt", true).show();
+ } else {
+ new HelpDialog(requireContext(), requireActivity(), "swlMode_en.txt", true).show();
+ }
}
});
@@ -1119,9 +1081,11 @@ public class ConfigFragment extends Fragment {
binding.clearCacheHelpButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , GeneralVariables.getStringFromResource(R.string.clear_cache_data_help)
- , true).show();
+ if (GeneralVariables.isChina) {
+ new HelpDialog(requireContext(), requireActivity(), "clear_cache_data.txt", true).show();
+ } else {
+ new HelpDialog(requireContext(), requireActivity(), "clear_cache_data_en.txt", true).show();
+ }
}
});
binding.clearFollowButton.setOnClickListener(new View.OnClickListener() {
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/FilterDialog.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/FilterDialog.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/FlexMeterRulerView.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/FlexMeterRulerView.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/FlexRadioInfoFragment.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/FlexRadioInfoFragment.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/FreqDialog.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/FreqDialog.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/FunctionOrderSpinnerAdapter.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/FunctionOrderSpinnerAdapter.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/HelpDialog.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/HelpDialog.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/LaunchSupervisionSpinnerAdapter.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/LaunchSupervisionSpinnerAdapter.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/LogFragment.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/LogFragment.java
old mode 100644
new mode 100755
index 030ed84..e27c71e
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/LogFragment.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/LogFragment.java
@@ -1,7 +1,6 @@
package com.bg7yoz.ft8cn.ui;
/**
* 通联纪录的主界面。
- *
* @author BGY70Z
* @date 2023-03-20
*/
@@ -66,7 +65,7 @@ public class LogFragment extends Fragment {
private LogCallsignAdapter logCallsignAdapter;
private LogQSLAdapter logQSLAdapter;
- private boolean loading = false;//防止滑动触发多次查询
+ private boolean loading=false;//防止滑动触发多次查询
private int lastItemPosition;
@@ -114,12 +113,12 @@ public class LogFragment extends Fragment {
});
binding.inputMycallEdit.setText(mainViewModel.queryKey);
- queryByCallsign(mainViewModel.queryKey, 0);
+ queryByCallsign(mainViewModel.queryKey,0);
mainViewModel.mutableQueryFilter.observe(getViewLifecycleOwner(), new Observer() {
@Override
public void onChanged(Integer integer) {
- queryByCallsign(mainViewModel.queryKey, 0);
+ queryByCallsign(mainViewModel.queryKey,0);
}
});
@@ -138,7 +137,7 @@ public class LogFragment extends Fragment {
@Override
public void afterTextChanged(Editable editable) {
mainViewModel.queryKey = editable.toString();
- queryByCallsign(mainViewModel.queryKey, 0);
+ queryByCallsign(mainViewModel.queryKey,0);
}
});
@@ -167,7 +166,7 @@ public class LogFragment extends Fragment {
public void onClick(View view) {
mainViewModel.logListShowCallsign = !mainViewModel.logListShowCallsign;
setShowStyle();
- queryByCallsign(binding.inputMycallEdit.getText().toString(), 0);//偏移量0，就是重新查询
+ queryByCallsign(binding.inputMycallEdit.getText().toString(),0);//偏移量0，就是重新查询
}
});
@@ -177,7 +176,7 @@ public class LogFragment extends Fragment {
public void onClick(View view) {
Intent intent = new Intent(requireContext(), GridTrackerMainActivity.class);
intent.putExtra("qslAll", mainViewModel.queryKey);
- intent.putExtra("queryFilter", mainViewModel.queryFilter);
+ intent.putExtra("queryFilter",mainViewModel.queryFilter);
startActivity(intent);
}
});
@@ -210,8 +209,6 @@ public class LogFragment extends Fragment {
break;
case 3:
Intent intent = new Intent(requireContext(), GridTrackerMainActivity.class);
- //ArrayList records=new ArrayList<>();
- //records.add(logQSLAdapter.getRecord(position));
intent.putExtra("qslList", logQSLAdapter.getRecord(position));
startActivity(intent);
break;
@@ -225,7 +222,6 @@ public class LogFragment extends Fragment {
return super.onContextItemSelected(item);
}
-
private boolean itemIsOnScreen(View view) {
if (view != null) {
int width = view.getWidth();
@@ -236,20 +232,15 @@ public class LogFragment extends Fragment {
return false;
}
- private void loadQueryData(RecyclerView recyclerView) {
-// if ((!loading)&&(recyclerView.computeVerticalScrollRange()
-// - recyclerView.computeVerticalScrollExtent()
-// - recyclerView.computeVerticalScrollOffset() < 100)) {
- if ((!loading)) {
- //ToastMessage.show("查询");
- if (mainViewModel.logListShowCallsign) {
- queryByCallsign(mainViewModel.queryKey, logCallsignAdapter.getItemCount());
- } else {
- queryByCallsign(mainViewModel.queryKey, logQSLAdapter.getItemCount());
+ private void loadQueryData(RecyclerView recyclerView){
+ if ((!loading)) {
+ if (mainViewModel.logListShowCallsign){
+ queryByCallsign(mainViewModel.queryKey, logCallsignAdapter.getItemCount());
+ }else {
+ queryByCallsign(mainViewModel.queryKey, logQSLAdapter.getItemCount());
}
}
}
-
/**
* 设置列表滑动动作
*/
@@ -261,13 +252,13 @@ public class LogFragment extends Fragment {
super.onScrollStateChanged(recyclerView, newState);
int itemCount;
- if (mainViewModel.logListShowCallsign) {
- itemCount = logCallsignAdapter.getItemCount();
- } else {
- itemCount = logQSLAdapter.getItemCount();
+ if (mainViewModel.logListShowCallsign){
+ itemCount=logCallsignAdapter.getItemCount();
+ }else {
+ itemCount=logQSLAdapter.getItemCount();
}
if (newState == SCROLL_STATE_IDLE &&
- lastItemPosition == itemCount) {
+ lastItemPosition == itemCount){
loadQueryData(recyclerView);
}
@@ -277,28 +268,14 @@ public class LogFragment extends Fragment {
public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
super.onScrolled(recyclerView, dx, dy);
RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
- if (layoutManager instanceof LinearLayoutManager) {
+ if (layoutManager instanceof LinearLayoutManager){
LinearLayoutManager manager = (LinearLayoutManager) layoutManager;
int firstVisibleItem = manager.findFirstVisibleItemPosition();
int l = manager.findLastCompletelyVisibleItemPosition();
- lastItemPosition = firstVisibleItem + (l - firstVisibleItem) + 1;
+ lastItemPosition = firstVisibleItem+(l-firstVisibleItem)+1;
}
-// if (dy>0){//列表向上移动
-// loadQueryData(recyclerView);
-// }
- //当列表上滑，接近底部时，开始查询
-// if ((!loading)&&(dy>0)&&(recyclerView.computeVerticalScrollRange()
-// - recyclerView.computeVerticalScrollExtent()
-// - recyclerView.computeVerticalScrollOffset() < 100)) {
-// ToastMessage.show("查询");
-// if (mainViewModel.logListShowCallsign){
-// queryByCallsign(mainViewModel.queryKey, logCallsignAdapter.getItemCount());
-// }else {
-// queryByCallsign(mainViewModel.queryKey, logQSLAdapter.getItemCount());
-// }
-// }
}
});
@@ -448,15 +425,15 @@ public class LogFragment extends Fragment {
*
* @param callsign 呼号
*/
- private void queryByCallsign(String callsign, int offset) {
- loading = true;//开始读数据
+ private void queryByCallsign(String callsign,int offset) {
+ loading=true;//开始读数据
//分两种查询
if (mainViewModel.logListShowCallsign) {
- if (offset == 0) {//说明是新增记录
+ if (offset==0) {//说明是新增记录
logCallsignAdapter.clearRecords();//清空记录
}
- mainViewModel.databaseOpr.getQSLCallsignsByCallsign(false, offset, callsign, mainViewModel.queryFilter
+ mainViewModel.databaseOpr.getQSLCallsignsByCallsign(false,offset,callsign, mainViewModel.queryFilter
, new OnQueryQSLCallsign() {
@Override
public void afterQuery(ArrayList records) {
@@ -464,16 +441,16 @@ public class LogFragment extends Fragment {
@Override
public void run() {
logCallsignAdapter.setQSLCallsignList(records);
- loading = false;
+ loading=false;
}
});
}
});
} else {
- if (offset == 0) {//说明是新增记录
+ if (offset==0){//说明是新增记录
logQSLAdapter.clearRecords();
}
- mainViewModel.databaseOpr.getQSLRecordByCallsign(false, offset, callsign, mainViewModel.queryFilter
+ mainViewModel.databaseOpr.getQSLRecordByCallsign(false,offset,callsign, mainViewModel.queryFilter
, new OnQueryQSLRecordCallsign() {
@Override
public void afterQuery(ArrayList records) {
@@ -481,7 +458,7 @@ public class LogFragment extends Fragment {
@Override
public void run() {
logQSLAdapter.setQSLList(records);
- loading = false;
+ loading=false;
}
});
}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/LoginIcomRadioDialog.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/LoginIcomRadioDialog.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/MyCallingFragment.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/MyCallingFragment.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/NoReplyLimitSpinnerAdapter.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/NoReplyLimitSpinnerAdapter.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/PttDelaySpinnerAdapter.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/PttDelaySpinnerAdapter.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/QRZ_Fragment.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/QRZ_Fragment.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/RigNameSpinnerAdapter.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/RigNameSpinnerAdapter.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/RulerFrequencyView.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/RulerFrequencyView.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/SelectBluetoothDialog.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/SelectBluetoothDialog.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/SelectFlexRadioDialog.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/SelectFlexRadioDialog.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/SetVolumeDialog.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/SetVolumeDialog.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/SpectrumFragment.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/SpectrumFragment.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/SpectrumView.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/SpectrumView.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/ToastMessage.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/ToastMessage.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/UtcOffsetSpinnerAdapter.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/UtcOffsetSpinnerAdapter.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/VolumeProgress.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/VolumeProgress.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/WaterfallView.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/WaterfallView.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/HamRecorder.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/HamRecorder.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/MicRecorder.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/MicRecorder.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/OnAudioRecorded.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/OnAudioRecorded.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/OnGetVoiceDataDone.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/OnGetVoiceDataDone.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/OnHamRecord.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/OnHamRecord.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/OnVoiceMonitorChanged.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/OnVoiceMonitorChanged.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/WaveAccess.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/WaveAccess.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/WaveConstants.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/WaveConstants.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/WaveFileReader.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/WaveFileReader.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/WaveFileWriter.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/WaveFileWriter.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/WriteWavHeader.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/WriteWavHeader.java
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/anim/click_button.xml b/ft8CN/app/src/main/res/anim/click_button.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/anim/view_blink.xml b/ft8CN/app/src/main/res/anim/view_blink.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/color/imagebutton_click_selector.xml b/ft8CN/app/src/main/res/color/imagebutton_click_selector.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/color/switch_color_style.xml b/ft8CN/app/src/main/res/color/switch_color_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/baseline_location_on_24.xml b/ft8CN/app/src/main/res/drawable-night/baseline_location_on_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/clear_calling_list_image_48 2.xml b/ft8CN/app/src/main/res/drawable-night/clear_calling_list_image_48 2.xml
new file mode 100755
index 0000000..46b3d83
--- /dev/null
+++ b/ft8CN/app/src/main/res/drawable-night/clear_calling_list_image_48 2.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/ft8CN/app/src/main/res/drawable-night/clear_calling_list_image_48.xml b/ft8CN/app/src/main/res/drawable-night/clear_calling_list_image_48.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/config_ic_baseline_keyboard_arrow_down_24 2.xml b/ft8CN/app/src/main/res/drawable-night/config_ic_baseline_keyboard_arrow_down_24 2.xml
new file mode 100755
index 0000000..32ebe76
--- /dev/null
+++ b/ft8CN/app/src/main/res/drawable-night/config_ic_baseline_keyboard_arrow_down_24 2.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/ft8CN/app/src/main/res/drawable-night/config_ic_baseline_keyboard_arrow_down_24.xml b/ft8CN/app/src/main/res/drawable-night/config_ic_baseline_keyboard_arrow_down_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/config_ic_baseline_keyboard_arrow_up_24 2.xml b/ft8CN/app/src/main/res/drawable-night/config_ic_baseline_keyboard_arrow_up_24 2.xml
new file mode 100755
index 0000000..a893e20
--- /dev/null
+++ b/ft8CN/app/src/main/res/drawable-night/config_ic_baseline_keyboard_arrow_up_24 2.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/ft8CN/app/src/main/res/drawable-night/config_ic_baseline_keyboard_arrow_up_24.xml b/ft8CN/app/src/main/res/drawable-night/config_ic_baseline_keyboard_arrow_up_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/cqzone.png b/ft8CN/app/src/main/res/drawable-night/cqzone.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/cqzone_b 2.png b/ft8CN/app/src/main/res/drawable-night/cqzone_b 2.png
new file mode 100755
index 0000000..b4a4dfe
Binary files /dev/null and b/ft8CN/app/src/main/res/drawable-night/cqzone_b 2.png differ
diff --git a/ft8CN/app/src/main/res/drawable-night/cqzone_b.png b/ft8CN/app/src/main/res/drawable-night/cqzone_b.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/dxcc 2.png b/ft8CN/app/src/main/res/drawable-night/dxcc 2.png
new file mode 100755
index 0000000..6aa14e8
Binary files /dev/null and b/ft8CN/app/src/main/res/drawable-night/dxcc 2.png differ
diff --git a/ft8CN/app/src/main/res/drawable-night/dxcc.png b/ft8CN/app/src/main/res/drawable-night/dxcc.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/dxcc_b 2.png b/ft8CN/app/src/main/res/drawable-night/dxcc_b 2.png
new file mode 100755
index 0000000..f436b64
Binary files /dev/null and b/ft8CN/app/src/main/res/drawable-night/dxcc_b 2.png differ
diff --git a/ft8CN/app/src/main/res/drawable-night/dxcc_b.png b/ft8CN/app/src/main/res/drawable-night/dxcc_b.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/guohe_logo 2.png b/ft8CN/app/src/main/res/drawable-night/guohe_logo 2.png
new file mode 100755
index 0000000..a80382f
Binary files /dev/null and b/ft8CN/app/src/main/res/drawable-night/guohe_logo 2.png differ
diff --git a/ft8CN/app/src/main/res/drawable-night/guohe_logo.png b/ft8CN/app/src/main/res/drawable-night/guohe_logo.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_assignment_24 2.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_assignment_24 2.xml
new file mode 100755
index 0000000..84527a7
--- /dev/null
+++ b/ft8CN/app/src/main/res/drawable-night/ic_baseline_assignment_24 2.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_assignment_24.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_assignment_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_assignment_ind_24 2.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_assignment_ind_24 2.xml
new file mode 100755
index 0000000..f753515
--- /dev/null
+++ b/ft8CN/app/src/main/res/drawable-night/ic_baseline_assignment_ind_24 2.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_assignment_ind_24.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_assignment_ind_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_cancel_schedule_send_off 2.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_cancel_schedule_send_off 2.xml
new file mode 100755
index 0000000..f926e9a
--- /dev/null
+++ b/ft8CN/app/src/main/res/drawable-night/ic_baseline_cancel_schedule_send_off 2.xml
@@ -0,0 +1,6 @@
+
+
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_cancel_schedule_send_off.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_cancel_schedule_send_off.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_check_48 2.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_check_48 2.xml
new file mode 100755
index 0000000..76faa78
--- /dev/null
+++ b/ft8CN/app/src/main/res/drawable-night/ic_baseline_check_48 2.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_check_48.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_check_48.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_close_32 2.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_close_32 2.xml
new file mode 100755
index 0000000..a880088
--- /dev/null
+++ b/ft8CN/app/src/main/res/drawable-night/ic_baseline_close_32 2.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_close_32.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_close_32.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_headset_mic_24 2.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_headset_mic_24 2.xml
new file mode 100755
index 0000000..a99f4b1
--- /dev/null
+++ b/ft8CN/app/src/main/res/drawable-night/ic_baseline_headset_mic_24 2.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_headset_mic_24.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_headset_mic_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_info_32.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_info_32.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_insert_chart_outlined_24.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_insert_chart_outlined_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_link_24 2.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_link_24 2.xml
new file mode 100755
index 0000000..57f63f7
--- /dev/null
+++ b/ft8CN/app/src/main/res/drawable-night/ic_baseline_link_24 2.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_link_24.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_link_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_list_alt_24 2.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_list_alt_24 2.xml
new file mode 100755
index 0000000..a8087d4
--- /dev/null
+++ b/ft8CN/app/src/main/res/drawable-night/ic_baseline_list_alt_24 2.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_list_alt_24.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_list_alt_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_mic_off_48.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_mic_off_48.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_not_listed_location_32 2.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_not_listed_location_32 2.xml
new file mode 100755
index 0000000..0241208
--- /dev/null
+++ b/ft8CN/app/src/main/res/drawable-night/ic_baseline_not_listed_location_32 2.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_not_listed_location_32.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_not_listed_location_32.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_pause_circle_outline_24.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_pause_circle_outline_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_save_alt_24 2.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_save_alt_24 2.xml
new file mode 100755
index 0000000..a534888
--- /dev/null
+++ b/ft8CN/app/src/main/res/drawable-night/ic_baseline_save_alt_24 2.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_save_alt_24.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_save_alt_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_send_white_48 2.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_send_white_48 2.xml
new file mode 100755
index 0000000..461a25c
--- /dev/null
+++ b/ft8CN/app/src/main/res/drawable-night/ic_baseline_send_white_48 2.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_send_white_48.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_send_white_48.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/ic_baseline_settings_bluetooth_24.xml b/ft8CN/app/src/main/res/drawable-night/ic_baseline_settings_bluetooth_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/itu 2.png b/ft8CN/app/src/main/res/drawable-night/itu 2.png
new file mode 100755
index 0000000..d76a030
Binary files /dev/null and b/ft8CN/app/src/main/res/drawable-night/itu 2.png differ
diff --git a/ft8CN/app/src/main/res/drawable-night/itu.png b/ft8CN/app/src/main/res/drawable-night/itu.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/itu_b 2.png b/ft8CN/app/src/main/res/drawable-night/itu_b 2.png
new file mode 100755
index 0000000..1bce90b
Binary files /dev/null and b/ft8CN/app/src/main/res/drawable-night/itu_b 2.png differ
diff --git a/ft8CN/app/src/main/res/drawable-night/itu_b.png b/ft8CN/app/src/main/res/drawable-night/itu_b.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable-night/spinner_style 2.xml b/ft8CN/app/src/main/res/drawable-night/spinner_style 2.xml
new file mode 100755
index 0000000..f3e99f0
--- /dev/null
+++ b/ft8CN/app/src/main/res/drawable-night/spinner_style 2.xml
@@ -0,0 +1,28 @@
+
+
+
\ No newline at end of file
diff --git a/ft8CN/app/src/main/res/drawable-night/spinner_style.xml b/ft8CN/app/src/main/res/drawable-night/spinner_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/baseline_location_on_24.xml b/ft8CN/app/src/main/res/drawable/baseline_location_on_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/calling_list_cell_0_style.xml b/ft8CN/app/src/main/res/drawable/calling_list_cell_0_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/calling_list_cell_1_style.xml b/ft8CN/app/src/main/res/drawable/calling_list_cell_1_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/calling_list_cell_2_style.xml b/ft8CN/app/src/main/res/drawable/calling_list_cell_2_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/calling_list_cell_3_style.xml b/ft8CN/app/src/main/res/drawable/calling_list_cell_3_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/calling_list_cell_style.xml b/ft8CN/app/src/main/res/drawable/calling_list_cell_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/clear_calling_list_image_48.xml b/ft8CN/app/src/main/res/drawable/clear_calling_list_image_48.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/config_ic_baseline_keyboard_arrow_down_24.xml b/ft8CN/app/src/main/res/drawable/config_ic_baseline_keyboard_arrow_down_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/config_ic_baseline_keyboard_arrow_up_24.xml b/ft8CN/app/src/main/res/drawable/config_ic_baseline_keyboard_arrow_up_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/count_detail_item_0_style.xml b/ft8CN/app/src/main/res/drawable/count_detail_item_0_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/count_detail_item_1_style.xml b/ft8CN/app/src/main/res/drawable/count_detail_item_1_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/cq.png b/ft8CN/app/src/main/res/drawable/cq.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/cqzone.png b/ft8CN/app/src/main/res/drawable/cqzone.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/cqzone_b.png b/ft8CN/app/src/main/res/drawable/cqzone_b.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/debug_message_style.xml b/ft8CN/app/src/main/res/drawable/debug_message_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/dxcc.png b/ft8CN/app/src/main/res/drawable/dxcc.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/dxcc_b.png b/ft8CN/app/src/main/res/drawable/dxcc_b.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/editor_layout_background_style.xml b/ft8CN/app/src/main/res/drawable/editor_layout_background_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/editor_layout_style.xml b/ft8CN/app/src/main/res/drawable/editor_layout_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/editor_style.xml b/ft8CN/app/src/main/res/drawable/editor_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/error_editor_style.xml b/ft8CN/app/src/main/res/drawable/error_editor_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/flex_config_style.xml b/ft8CN/app/src/main/res/drawable/flex_config_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/flex_icon.png b/ft8CN/app/src/main/res/drawable/flex_icon.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/flex_meter_ruler_style.xml b/ft8CN/app/src/main/res/drawable/flex_meter_ruler_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/flex_meter_style.xml b/ft8CN/app/src/main/res/drawable/flex_meter_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/flexradio.png b/ft8CN/app/src/main/res/drawable/flexradio.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/float_button_style.xml b/ft8CN/app/src/main/res/drawable/float_button_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ft8cn_icon.png b/ft8CN/app/src/main/res/drawable/ft8cn_icon.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/guohe_logo.png b/ft8CN/app/src/main/res/drawable/guohe_logo.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/help_dialog_style.xml b/ft8CN/app/src/main/res/drawable/help_dialog_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_assignment_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_assignment_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_assignment_ind_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_assignment_ind_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_campaign_transmitting_red_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_campaign_transmitting_red_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_cancel_schedule_send_off.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_cancel_schedule_send_off.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_check_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_check_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_check_48.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_check_48.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_chevron_left_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_chevron_left_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_chevron_right_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_chevron_right_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_close_32.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_close_32.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_cq_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_cq_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_cq_qso_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_cq_qso_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_freq_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_freq_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_fullscreen_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_fullscreen_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_fullscreen_exit_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_fullscreen_exit_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_grid_tracker_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_grid_tracker_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_headset_mic_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_headset_mic_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_help_outline_32.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_help_outline_32.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_history_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_history_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_info_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_info_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_info_32.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_info_32.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_info_white_32.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_info_white_32.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_insert_chart_outlined_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_insert_chart_outlined_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_keyboard_arrow_down_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_keyboard_arrow_down_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_keyboard_arrow_up_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_keyboard_arrow_up_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_library_add_check_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_library_add_check_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_link_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_link_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_list_alt_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_list_alt_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_mic_48.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_mic_48.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_mic_off_48.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_mic_off_48.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_mic_red_48.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_mic_red_48.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_nav_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_nav_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_not_listed_location_32.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_not_listed_location_32.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_pause_circle_outline_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_pause_circle_outline_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_pause_disable_circle_outline_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_pause_disable_circle_outline_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_save_alt_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_save_alt_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_send_48.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_send_48.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_send_red_48.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_send_red_48.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_send_white_48.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_send_white_48.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_settings_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_settings_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_signal_cellular_4_bar_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_signal_cellular_4_bar_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_tracker_close_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_tracker_close_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_tracker_settings_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_tracker_settings_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_visibility_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_visibility_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_volume_up_24.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_volume_up_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_baseline_wifi_tethering_16.xml b/ft8CN/app/src/main/res/drawable/ic_baseline_wifi_tethering_16.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_launcher_background.xml b/ft8CN/app/src/main/res/drawable/ic_launcher_background.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_launcher_foreground.xml b/ft8CN/app/src/main/res/drawable/ic_launcher_foreground.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/ic_nav_spectrum_24.xml b/ft8CN/app/src/main/res/drawable/ic_nav_spectrum_24.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/icon_background_style.xml b/ft8CN/app/src/main/res/drawable/icon_background_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/imagebutton_selected_style.xml b/ft8CN/app/src/main/res/drawable/imagebutton_selected_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/imagebutton_style.xml b/ft8CN/app/src/main/res/drawable/imagebutton_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/imagebutton_transparent_style.xml b/ft8CN/app/src/main/res/drawable/imagebutton_transparent_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/itu.png b/ft8CN/app/src/main/res/drawable/itu.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/itu_b.png b/ft8CN/app/src/main/res/drawable/itu_b.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/log_callsign_editor_style.xml b/ft8CN/app/src/main/res/drawable/log_callsign_editor_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/log_item_delete_icon.xml b/ft8CN/app/src/main/res/drawable/log_item_delete_icon.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/logo_background_style.xml b/ft8CN/app/src/main/res/drawable/logo_background_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/nav_calling_list_image.xml b/ft8CN/app/src/main/res/drawable/nav_calling_list_image.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/nav_my_calling_image.xml b/ft8CN/app/src/main/res/drawable/nav_my_calling_image.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/newyear.png b/ft8CN/app/src/main/res/drawable/newyear.png
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/run_decode_image_48.xml b/ft8CN/app/src/main/res/drawable/run_decode_image_48.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/select_bluetooth_dialog_style.xml b/ft8CN/app/src/main/res/drawable/select_bluetooth_dialog_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/select_serial_port_item_style.xml b/ft8CN/app/src/main/res/drawable/select_serial_port_item_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/select_serial_port_layout_style.xml b/ft8CN/app/src/main/res/drawable/select_serial_port_layout_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/speaker.xml b/ft8CN/app/src/main/res/drawable/speaker.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/spectrum_text_back_ground.xml b/ft8CN/app/src/main/res/drawable/spectrum_text_back_ground.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/spinner_style.xml b/ft8CN/app/src/main/res/drawable/spinner_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/tracker_calling_list_background.xml b/ft8CN/app/src/main/res/drawable/tracker_calling_list_background.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/tracker_config_bar_style.xml b/ft8CN/app/src/main/res/drawable/tracker_config_bar_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/tracker_grid_info_win_style.xml b/ft8CN/app/src/main/res/drawable/tracker_grid_info_win_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/tracker_new_cq_info_win_style.xml b/ft8CN/app/src/main/res/drawable/tracker_new_cq_info_win_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/tracker_qsl_sample_style.xml b/ft8CN/app/src/main/res/drawable/tracker_qsl_sample_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/tracker_qso_sample_style.xml b/ft8CN/app/src/main/res/drawable/tracker_qso_sample_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/tracker_qsx_sample_style.xml b/ft8CN/app/src/main/res/drawable/tracker_qsx_sample_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/tracker_sample_cq_bar_style.xml b/ft8CN/app/src/main/res/drawable/tracker_sample_cq_bar_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/tracker_tips_radio_style.xml b/ft8CN/app/src/main/res/drawable/tracker_tips_radio_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/drawable/welcom_layout_style.xml b/ft8CN/app/src/main/res/drawable/welcom_layout_style.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout-land/fragment_calling_list.xml b/ft8CN/app/src/main/res/layout-land/fragment_calling_list.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout-land/fragment_flex_radio_info.xml b/ft8CN/app/src/main/res/layout-land/fragment_flex_radio_info.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout-land/fragment_my_calling.xml b/ft8CN/app/src/main/res/layout-land/fragment_my_calling.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout-land/log_callsign_holder_item.xml b/ft8CN/app/src/main/res/layout-land/log_callsign_holder_item.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout-land/log_qsl_holder_item.xml b/ft8CN/app/src/main/res/layout-land/log_qsl_holder_item.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout-land/main_activity.xml b/ft8CN/app/src/main/res/layout-land/main_activity.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout/activity_faqactivity.xml b/ft8CN/app/src/main/res/layout/activity_faqactivity.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout/activity_grid_tracker_main.xml b/ft8CN/app/src/main/res/layout/activity_grid_tracker_main.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout/bau_rate_spinner_item.xml b/ft8CN/app/src/main/res/layout/bau_rate_spinner_item.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout/bluetooth_device_list_item.xml b/ft8CN/app/src/main/res/layout/bluetooth_device_list_item.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout/call_list_holder_item.xml b/ft8CN/app/src/main/res/layout/call_list_holder_item.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout/clear_cache_dialog_layout.xml b/ft8CN/app/src/main/res/layout/clear_cache_dialog_layout.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout/count_detail_item.xml b/ft8CN/app/src/main/res/layout/count_detail_item.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout/count_info_bar_item.xml b/ft8CN/app/src/main/res/layout/count_info_bar_item.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout/count_info_none_item.xml b/ft8CN/app/src/main/res/layout/count_info_none_item.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout/count_info_pie_item.xml b/ft8CN/app/src/main/res/layout/count_info_pie_item.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout/filter_dialog_layout.xml b/ft8CN/app/src/main/res/layout/filter_dialog_layout.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout/flex_device_list_item.xml b/ft8CN/app/src/main/res/layout/flex_device_list_item.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout/fragment_calling_list.xml b/ft8CN/app/src/main/res/layout/fragment_calling_list.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/layout/fragment_config.xml b/ft8CN/app/src/main/res/layout/fragment_config.xml
old mode 100644
new mode 100755
index c91a6bc..4c9d64c
--- a/ft8CN/app/src/main/res/layout/fragment_config.xml
+++ b/ft8CN/app/src/main/res/layout/fragment_config.xml
@@ -345,168 +345,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ app:layout_constraintTop_toBottomOf="@+id/swlOprLayout">
Χρόνος έναρξης : %s
Χρόνος τερματισμού : %s
Rst που ελήφθη : %s
- Rst που ελήφθη
Rst που στάλθηξε : %s
- Rst που στάλθηξε
Μπάντα : %s
Συχν : %s
Mode : %s
@@ -214,9 +212,7 @@
Λειτουργία
Διαγραφή
Χρόνος έναρξης QSO
- Ημερομηνία έναρξης QSO
Χρόνος τερματισμού QSO
- Ημερομηνία λήξης QSO
Mode
Grid
Μπάντα
@@ -431,46 +427,6 @@
Export to ADIF file
Total number of QSO decoded
QSOs decoded
- Audio output
- 16-bit int
- 32-bit float
- The number of bits in audio output
- 12kHz
- 24kHz
- 48kHz
- Sample rate
- The sample rate of the audio output
- Bit depth
- callsign_en.txt
- maidenhead_en.txt
- frequency_en.txt
- transDelay_en.txt
- timeoffset_en.txt
- pttdelay_en.txt
- operationBand_en.txt
- controlMode_en.txt
- civ_help_en.txt
- rig_model_help_en.txt
- launch_supervision_en.txt
- no_response_help_en.txt
- auto_follow_help_en.txt
- connectMode_en.txt
- excludeCallsign_en.txt
- swlMode_en.txt
- audio_output_help_en.txt
- clear_cache_data_en.txt
- Query the logs
- All
- Data sources
- Unconfirmed
- Confirmed
- Local logs
- External logs
- External
- Local log
- Πρωτόκολλο
- Comment
-
diff --git a/ft8CN/app/src/main/res/values-es/strings.xml b/ft8CN/app/src/main/res/values-es/strings.xml
old mode 100644
new mode 100755
index f6dd19f..80aac66
--- a/ft8CN/app/src/main/res/values-es/strings.xml
+++ b/ft8CN/app/src/main/res/values-es/strings.xml
@@ -173,9 +173,7 @@
Hora de inicio : %s
Hora de finalización: %s
Rst recibido : %s
- Rst recibido
Rst enviado: %s
- Rst enviado
Banda : %s
Freq : %s
Modo : %s
@@ -214,9 +212,7 @@
Operación
Borrar
QSO hora de inicio
- Fecha de inicio del qso
QSO hora de finalización
- Fecha de finalización del qso
Modo
Grid
Banda
@@ -431,45 +427,6 @@
Export to ADIF file
Total number of QSO decoded
QSOs decoded
- Audio output
- 16-bit int
- 32-bit float
- The number of bits in audio output
- 12kHz
- 24kHz
- 48kHz
- Sample rate
- The sample rate of the audio output
- Bit depth
- callsign_en.txt
- maidenhead_en.txt
- frequency_en.txt
- transDelay_en.txt
- timeoffset_en.txt
- pttdelay_en.txt
- operationBand_en.txt
- controlMode_en.txt
- civ_help_en.txt
- rig_model_help_en.txt
- launch_supervision_en.txt
- no_response_help_en.txt
- auto_follow_help_en.txt
- connectMode_en.txt
- excludeCallsign_en.txt
- swlMode_en.txt
- audio_output_help_en.txt
- clear_cache_data_en.txt
- Query the logs
- All
- Data sources
- Unconfirmed
- Confirmed
- Local logs
- External logs
- External
- Local log
- Acuerdo
- Comment
diff --git a/ft8CN/app/src/main/res/values-ja/strings.xml b/ft8CN/app/src/main/res/values-ja/strings.xml
old mode 100644
new mode 100755
index d995ed8..e88d0f3
--- a/ft8CN/app/src/main/res/values-ja/strings.xml
+++ b/ft8CN/app/src/main/res/values-ja/strings.xml
@@ -323,10 +323,8 @@
終了時間:%s
自局RST:%s
- 自局RST
相手局RST:%s
- 相手局RST
バンド:%s
@@ -393,10 +391,8 @@
削除
交信開始時間
- 交信開始日
交信終了時間
- 交信終了日
モード
@@ -717,45 +713,6 @@
ADIFにエクスポート
デコードされたQSO総件数
デコードされたQSO
- 音声出力
- 16-bit int
- 32-bit float
- 音声出力中のビット数
- 12kHz
- 24kHz
- 48kHz
- サンプルレート
- 音声出力のサンプルレート
- ビット深度
- callsign_en.txt
- maidenhead_en.txt
- frequency_en.txt
- transDelay_en.txt
- timeoffset_en.txt
- pttdelay_en.txt
- operationBand_en.txt
- controlMode_en.txt
- civ_help_en.txt
- rig_model_help_en.txt
- launch_supervision_en.txt
- no_response_help_en.txt
- auto_follow_help_en.txt
- connectMode_en.txt
- excludeCallsign_en.txt
- swlMode_en.txt
- audio_output_help_en.txt
- clear_cache_data_en.txt
- ログを検索
- 全部
- データソース
- 未確認
- 確認済
- ローカルログ
- 外部ログ
- 外部
- ローカル
- プロトコル
- コメント
\ No newline at end of file
diff --git a/ft8CN/app/src/main/res/values-night/colors.xml b/ft8CN/app/src/main/res/values-night/colors.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/values-night/strings.xml b/ft8CN/app/src/main/res/values-night/strings.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/values-night/themes.xml b/ft8CN/app/src/main/res/values-night/themes.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/values-zh-rCN/strings.xml b/ft8CN/app/src/main/res/values-zh-rCN/strings.xml
old mode 100644
new mode 100755
index 7eb8b08..fd650ae
--- a/ft8CN/app/src/main/res/values-zh-rCN/strings.xml
+++ b/ft8CN/app/src/main/res/values-zh-rCN/strings.xml
@@ -172,9 +172,7 @@
起始时间:%s
结束时间:%s
接收报告:%s
- 接收报告
发送报告:%s
- 发送报告
波长:%s
频率:%s
模式:%s
@@ -211,7 +209,6 @@
操作
删除
通联开始时间
- 通联开始日期
通联结束时间
模式
网格
@@ -428,45 +425,6 @@
导出到ADIF文件
守听到的QSO数
SWL记录
- 音频输出
- 16位整型
- 32位浮点
- 音频输出位数
- 12kHz
- 24kHz
- 48kHz
- 采样频率
- 音频输出采样率
- 位深
- callsign.txt
- maidenhead.txt
- frequency.txt
- transDelay.txt
- timeoffset.txt
- pttdelay.txt
- operationBand.txt
- controlMode.txt
- civ_help.txt
- rig_model_help.txt
- launch_supervision_help.txt
- no_response_help.txt
- auto_follow_help.txt
- connectMode.txt
- excludeCallsign.txt
- swlMode.txt
- audio_output_help.txt
- clear_cache_data.txt
- 查询日志
- 全部
- 数据来源
- 未确认
- 已确认
- 本地日志
- 外部日志
- 外部日志
- 本地日志
- 协议
- 备注
\ No newline at end of file
diff --git a/ft8CN/app/src/main/res/values-zh-rHK/strings.xml b/ft8CN/app/src/main/res/values-zh-rHK/strings.xml
old mode 100644
new mode 100755
index f4ef2f2..d8cebe0
--- a/ft8CN/app/src/main/res/values-zh-rHK/strings.xml
+++ b/ft8CN/app/src/main/res/values-zh-rHK/strings.xml
@@ -172,9 +172,7 @@
起始時間:%s
結束時間:%s
接收報告:%s
- 接收報告
發送報告:%s
- 發送報告
頻段:%s
頻率:%s
模式:%s
@@ -211,9 +209,7 @@
操作
刪除
通聯開始時間
- 通聯開始日期
通聯結束時間
- 通聯結束日期
模式
網格
頻段
@@ -429,45 +425,6 @@
導出到ADIF文件
收聽到的QSO數
SWL記錄
- 音頻輸出
- 16位整型
- 32位浮點
- 音頻輸出位數
- 12kHz
- 24kHz
- 48kHz
- 采樣頻率
- 音頻輸出采樣率
- 位深
- callsign.txt
- maidenhead.txt
- frequency.txt
- transDelay.txt
- timeoffset.txt
- pttdelay.txt
- operationBand.txt
- controlMode.txt
- civ_help.txt
- rig_model_help.txt
- launch_supervision_help.txt
- no_response_help.txt
- auto_follow_help.txt
- connectMode.txt
- excludeCallsign.txt
- swlMode.txt
- audio_output_help.txt
- clear_cache_data.txt
- 查詢日誌
- 全部
- 數據來源
- 未確認
- 已確認
- 本地日誌
- 外部日誌
- 外部日誌
- 本地日誌
- 協定
- 備註
\ No newline at end of file
diff --git a/ft8CN/app/src/main/res/values-zh-rMO/strings.xml b/ft8CN/app/src/main/res/values-zh-rMO/strings.xml
old mode 100644
new mode 100755
index 40584ad..7f8e931
--- a/ft8CN/app/src/main/res/values-zh-rMO/strings.xml
+++ b/ft8CN/app/src/main/res/values-zh-rMO/strings.xml
@@ -172,9 +172,7 @@
起始時間:%s
結束時間:%s
接收報告:%s
- 接收報告
發送報告:%s
- 發送報告
頻段:%s
頻率:%s
模式:%s
@@ -211,9 +209,7 @@
操作
刪除
通聯開始時間
- 通聯開始日期
通聯結束時間
- 通聯結束日期
模式
網格
頻段
@@ -429,45 +425,5 @@
導出到ADIF文件
收聽到的QSO數
SWL記錄
- 音頻輸出
- 16位整型
- 32位浮點
- 音頻輸出位數
- 12kHz
- 24kHz
- 48kHz
- 采樣頻率
- 音頻輸出采樣率
- 位深
- callsign.txt
- maidenhead.txt
- frequency.txt
- transDelay.txt
- timeoffset.txt
- pttdelay.txt
- operationBand.txt
- controlMode.txt
- civ_help.txt
- rig_model_help.txt
- launch_supervision_help.txt
- no_response_help.txt
- auto_follow_help.txt
- connectMode.txt
- excludeCallsign.txt
- swlMode.txt
- audio_output_help.txt
- clear_cache_data.txt
- 查詢日誌
- 全部
- 數據來源
- 未確認
- 已確認
- 本地日誌
- 外部日誌
- 外部日誌
- 本地日誌
- 協定
- 備註
-
\ No newline at end of file
diff --git a/ft8CN/app/src/main/res/values-zh-rTW/strings.xml b/ft8CN/app/src/main/res/values-zh-rTW/strings.xml
old mode 100644
new mode 100755
index 1ec04ed..114d409
--- a/ft8CN/app/src/main/res/values-zh-rTW/strings.xml
+++ b/ft8CN/app/src/main/res/values-zh-rTW/strings.xml
@@ -172,9 +172,7 @@
起始時間:%s
結束時間:%s
接收報告:%s
- 接收報告
發送報告:%s
- 發送報告
頻段:%s
頻率:%s
模式:%s
@@ -211,9 +209,7 @@
操作
刪除
通聯開始時間
- 通聯開始日期
通聯結束時間
- 通聯結束日期
模式
網格
頻段
@@ -429,45 +425,6 @@
導出到ADIF文件
收聽到的QSO數
SWL記錄
- 音頻輸出
- 16位整型
- 32位浮點
- 音頻輸出位數
- 12kHz
- 24kHz
- 48kHz
- 采樣頻率
- 音頻輸出采樣率
- 位深
- callsign.txt
- maidenhead.txt
- frequency.txt
- transDelay.txt
- timeoffset.txt
- pttdelay.txt
- operationBand.txt
- controlMode.txt
- civ_help.txt
- rig_model_help.txt
- launch_supervision_help.txt
- no_response_help.txt
- auto_follow_help.txt
- connectMode.txt
- excludeCallsign.txt
- swlMode.txt
- audio_output_help.txt
- clear_cache_data.txt
- 查詢日誌
- 全部
- 數據來源
- 未確認
- 已確認
- 本地日誌
- 外部日誌
- 外部日誌
- 本地日誌
- 協定
- 備註
\ No newline at end of file
diff --git a/ft8CN/app/src/main/res/values/colors.xml b/ft8CN/app/src/main/res/values/colors.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/values/float_button_ids.xml b/ft8CN/app/src/main/res/values/float_button_ids.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/values/strings.xml b/ft8CN/app/src/main/res/values/strings.xml
old mode 100644
new mode 100755
index 18aacca..dfa5a02
--- a/ft8CN/app/src/main/res/values/strings.xml
+++ b/ft8CN/app/src/main/res/values/strings.xml
@@ -173,9 +173,7 @@
Start time : %s
End time : %s
Rst received : %s
- Rst received
Rst send : %s
- Rst send
Band : %s
Freq : %s
Mode : %s
@@ -214,9 +212,7 @@
Operation
Delete
QSO start time
- QSO start date
QSO end time
- QSO end date
Mode
Grid
Band
@@ -433,45 +429,6 @@
Export to ADIF file
Total number of QSO decoded
QSOs decoded
- Audio output
- 16-bit int
- 32-bit float
- Audio - bit depth
- 12kHz
- 24kHz
- 48kHz
- Sample rate
- Audio - sample rate
- Bit depth
- callsign_en.txt
- maidenhead_en.txt
- frequency_en.txt
- transDelay_en.txt
- timeoffset_en.txt
- pttdelay_en.txt
- operationBand_en.txt
- controlMode_en.txt
- civ_help_en.txt
- rig_model_help_en.txt
- launch_supervision_en.txt
- no_response_help_en.txt
- auto_follow_help_en.txt
- connectMode_en.txt
- excludeCallsign_en.txt
- swlMode_en.txt
- audio_output_help_en.txt
- clear_cache_data_en.txt
- Query the logs
- All
- Data sources
- Unconfirmed
- Confirmed
- Local logs
- External logs
- External
- Local log
- Protocol
- Comment
\ No newline at end of file
diff --git a/ft8CN/app/src/main/res/values/styles.xml b/ft8CN/app/src/main/res/values/styles.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/values/themes.xml b/ft8CN/app/src/main/res/values/themes.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/main/res/xml/device_filter.xml b/ft8CN/app/src/main/res/xml/device_filter.xml
old mode 100644
new mode 100755
diff --git a/ft8CN/app/src/test/java/com/bg7yoz/ft8cn/ExampleUnitTest.java b/ft8CN/app/src/test/java/com/bg7yoz/ft8cn/ExampleUnitTest.java
new file mode 100755
index 0000000..1ec875a
--- /dev/null
+++ b/ft8CN/app/src/test/java/com/bg7yoz/ft8cn/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.bg7yoz.ft8cn;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see Testing documentation
+ */
+public class ExampleUnitTest {
+ @Test
+ public void addition_isCorrect() {
+ assertEquals(4, 2 + 2);
+ }
+}
\ No newline at end of file
diff --git a/ft8CN/build.gradle b/ft8CN/build.gradle
old mode 100644
new mode 100755
index 5908a23..a13cd5e
--- a/ft8CN/build.gradle
+++ b/ft8CN/build.gradle
@@ -1,13 +1,10 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
- id 'com.android.application' version '7.1.2' apply false
- id 'com.android.library' version '7.1.2' apply false
+ id 'com.android.application' version '7.4.1' apply false
+ id 'com.android.library' version '7.4.1' apply false
}
ext {
- var3 = 'G:\\coding\\ft8CN\\ft8CN.jks'
- var = var3
- var1 = '/Users/mymac/Desktop/coding/ft8CN/ft8CN.jks'
- var2 = var
+
}
task clean(type: Delete) {
delete rootProject.buildDir
diff --git a/ft8CN/ft8cn_icon.png b/ft8CN/ft8cn_icon.png
old mode 100644
new mode 100755
diff --git a/ft8CN/gradle.properties b/ft8CN/gradle.properties
old mode 100644
new mode 100755
diff --git a/ft8CN/gradle/wrapper/gradle-wrapper.jar b/ft8CN/gradle/wrapper/gradle-wrapper.jar
old mode 100644
new mode 100755
diff --git a/ft8CN/gradle/wrapper/gradle-wrapper.properties b/ft8CN/gradle/wrapper/gradle-wrapper.properties
old mode 100644
new mode 100755
index 0b0cadd..515d43a
--- a/ft8CN/gradle/wrapper/gradle-wrapper.properties
+++ b/ft8CN/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue May 02 09:27:34 CST 2023
+#Mon Mar 20 22:46:09 CST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionPath=wrapper/dists
diff --git a/ft8CN/gradlew b/ft8CN/gradlew
old mode 100644
new mode 100755
diff --git a/ft8CN/gradlew.bat b/ft8CN/gradlew.bat
old mode 100644
new mode 100755
diff --git a/ft8CN/settings.gradle b/ft8CN/settings.gradle
old mode 100644
new mode 100755