list) {
@@ -582,4 +577,11 @@ public class GeneralVariables {
return false;
}
+ /**
+ * 输出音频的数据类型，网络模式不可用
+ */
+ public enum AudioOutputBitMode{
+ Float32,
+ Int16
+ }
}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/MainActivity.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/MainActivity.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/MainViewModel.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/MainViewModel.java
old mode 100755
new mode 100644
index b4bdd6b..ebdc682
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/MainViewModel.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/MainViewModel.java
@@ -5,19 +5,16 @@ package com.bg7yoz.ft8cn;
* 1.解码的总条数。decoded_counter和mutable_Decoded_Counter。
* 2.解码消息的列表。消息以Ft8Message展示，列表用ArrayList泛型实现。ft8Messages，mutableFt8MessageList。
* 3.解码和录音都需要时间同步，也就是以UTC时间的每15秒为一个周期。同步事件的触发由UtcTimer类来实现。
- * 录音方法runRecode，解码暂时用testFt8实现，后续应改为类方式。--------TODO------------
* 4.当前的UTC时间。timerSec，更新频率（心跳频率）由UtcTimer确定，暂定100毫秒。
- *
* 5.通过类方法getInstance获取当前的MainViewModel的实例，确保有唯一的实例。
* 6.用HamAudioRecorder类实现录音，目前只实现录音成文件，然后读取文件的数据给解码模块，后面要改成直接给数组的方式----TO DO---
- *
* 7.解码采用JNI接口调用原生C语言。调用接口名时ft8cn，由cpp文件夹下的CMakeLists.txt维护。各函数的调用接口在decode_ft8.cpp中。
- *
* -----2022.5.9-----
* 如果系统没有发射信号，触发器会在每一个周期触发录音动作，因录音开始和结束要浪费一些时间，如果不干预上一个录音的动作，将出现
* 连续的周期内录音动作重叠，造成第二个录音动作失败。所以，第二个周期的录音开始前，要停止前一个周期的录音，造成的结果就是每一次录音
* 的开始时间要晚于周期开始300毫秒（模拟器的结果），实际录音的长度一般在14.77秒左右
*
+ *
* @author BG7YOZ
* @date 2022.5.6
*/
@@ -71,6 +68,7 @@ import com.bg7yoz.ft8cn.rigs.GuoHeQ900Rig;
import com.bg7yoz.ft8cn.rigs.IcomRig;
import com.bg7yoz.ft8cn.rigs.InstructionSet;
import com.bg7yoz.ft8cn.rigs.KenwoodKT90Rig;
+import com.bg7yoz.ft8cn.rigs.KenwoodTS2000Rig;
import com.bg7yoz.ft8cn.rigs.KenwoodTS590Rig;
import com.bg7yoz.ft8cn.rigs.OnRigStateChanged;
import com.bg7yoz.ft8cn.rigs.XieGu6100Rig;
@@ -97,7 +95,7 @@ import java.util.concurrent.Executors;
public class MainViewModel extends ViewModel {
String TAG = "ft8cn MainViewModel";
- public boolean configIsLoaded=false;
+ public boolean configIsLoaded = false;
private static MainViewModel viewModel = null;//当前存在的实例。
//public static Application application;
@@ -123,12 +121,12 @@ public class MainViewModel extends ViewModel {
public MutableLiveData mutableIsDecoding = new MutableLiveData<>();//会触发频谱图中的标记动作
public ArrayList currentMessages = null;//本周期解码的消息（用于画到频谱上）
- public MutableLiveData mutableIsFlexRadio=new MutableLiveData<>();//是不是flex电台
+ public MutableLiveData mutableIsFlexRadio = new MutableLiveData<>();//是不是flex电台
private final ExecutorService getQTHThreadPool = Executors.newCachedThreadPool();
private final ExecutorService sendWaveDataThreadPool = Executors.newCachedThreadPool();
- private final GetQTHRunnable getQTHRunnable=new GetQTHRunnable(this);
- private final SendWaveDataRunnable sendWaveDataRunnable=new SendWaveDataRunnable();
+ private final GetQTHRunnable getQTHRunnable = new GetQTHRunnable(this);
+ private final SendWaveDataRunnable sendWaveDataRunnable = new SendWaveDataRunnable();
public HamRecorder hamRecorder;//用于录音的对象
@@ -140,7 +138,7 @@ public class MainViewModel extends ViewModel {
//控制电台的方式
public OperationBand operationBand = null;
- private SWLQsoList swlQsoList=new SWLQsoList();//用于记录SWL的QSO对象，对SWL QSO做判断，防止重复。
+ private SWLQsoList swlQsoList = new SWLQsoList();//用于记录SWL的QSO对象，对SWL QSO做判断，防止重复。
public MutableLiveData> mutableSerialPorts = new MutableLiveData<>();
@@ -189,7 +187,7 @@ public class MainViewModel extends ViewModel {
//发射信号用的消息列表
//public ArrayList transmitMessages = new ArrayList<>();
//public MutableLiveData> mutableTransmitMessages = new MutableLiveData<>();
- public MutableLiveData mutableTransmitMessagesCount=new MutableLiveData<>();
+ public MutableLiveData mutableTransmitMessagesCount = new MutableLiveData<>();
public boolean deNoise = false;//在频谱中抑制噪声
@@ -199,7 +197,7 @@ public class MainViewModel extends ViewModel {
public String queryKey = "";//查询的关键字
public int queryFilter = 0;//过滤，0全部，1，确认，2，未确认
public MutableLiveData mutableQueryFilter = new MutableLiveData<>();
- public ArrayList callsignRecords=new ArrayList<>();
+ public ArrayList callsignRecords = new ArrayList<>();
//public ArrayList qslRecords=new ArrayList<>();
//********************************************
//关注呼号的列表
@@ -279,7 +277,9 @@ public class MainViewModel extends ViewModel {
}
@Override
- public void afterDecode(long utc, float time_sec, int sequential, ArrayList messages) {
+ public void afterDecode(long utc, float time_sec, int sequential
+ , ArrayList messages, boolean isDeep) {
+ if (messages.size() == 0) return;//没有解码出消息，不触发动作
synchronized (ft8Messages) {
ft8Messages.addAll(messages);//添加消息到列表
@@ -293,20 +293,37 @@ public class MainViewModel extends ViewModel {
findIncludedCallsigns(messages);//查找符合条件的消息，放到呼叫列表中
//检查发射程序。从消息列表中解析发射的程序
- ft8TransmitSignal.parseMessageToFunction(messages);
+ //超出周期2秒钟，就不应该解析了
+ if (!ft8TransmitSignal.isTransmitting()
+ && (ft8SignalListener.timeSec
+ + GeneralVariables.pttDelay
+ + GeneralVariables.transmitDelay <= 2000)) {//考虑网络模式，发射时长是13秒
+ ft8TransmitSignal.parseMessageToFunction(messages);//解析消息，并处理
+ }
+
+ currentMessages = messages;
+
+ if (isDeep) {
+ currentDecodeCount += messages.size();
+ } else {
+ currentDecodeCount = messages.size();
+ }
mutableIsDecoding.postValue(false);//解码的状态，会触发频谱图中的标记动作
- currentMessages = messages;//保存本次解码的消息
- getQTHRunnable.messages=messages;
+ getQTHRunnable.messages = messages;
getQTHThreadPool.execute(getQTHRunnable);//用线程池的方式查询归属地
+ //此变量也是告诉消息列表变化的
+ mutable_Decoded_Counter.postValue(
+ currentDecodeCount);//告知界面消息的总数量
+
if (GeneralVariables.saveSWLMessage) {
databaseOpr.writeMessage(messages);//把SWL消息写到数据库
}
//检查QSO of SWL,并保存到SWLQSOTable中的通联列表qsoList中
- if (GeneralVariables.saveSWL_QSO){
+ if (GeneralVariables.saveSWL_QSO) {
swlQsoList.findSwlQso(messages, ft8Messages, new SWLQsoList.OnFoundSwlQso() {
@Override
public void doFound(QSLRecord record) {
@@ -366,12 +383,12 @@ public class MainViewModel extends ViewModel {
}
@Override
- public void onAfterGenerate(float[] data) {
+ public void onTransmitByWifi(Ft8Message msg) {
if (GeneralVariables.connectMode == ConnectMode.NETWORK) {
if (baseRig != null) {
if (baseRig.isConnected()) {
- sendWaveDataRunnable.baseRig=baseRig;
- sendWaveDataRunnable.data=data;
+ sendWaveDataRunnable.baseRig = baseRig;
+ sendWaveDataRunnable.message = msg;
//以线程池的方式执行网络数据包发送
sendWaveDataThreadPool.execute(sendWaveDataRunnable);
}
@@ -406,13 +423,14 @@ public class MainViewModel extends ViewModel {
}
}
- public void setTransmitIsFreeText(boolean isFreeText){
- if (ft8TransmitSignal!=null) {
+ public void setTransmitIsFreeText(boolean isFreeText) {
+ if (ft8TransmitSignal != null) {
ft8TransmitSignal.setTransmitFreeText(isFreeText);
}
}
- public boolean getTransitIsFreeText(){
- if (ft8TransmitSignal!=null){
+
+ public boolean getTransitIsFreeText() {
+ if (ft8TransmitSignal != null) {
return ft8TransmitSignal.isTransmitFreeText();
}
return false;
@@ -424,12 +442,12 @@ public class MainViewModel extends ViewModel {
*
* @param messages 消息
*/
- private void findIncludedCallsigns(ArrayList messages) {
+ private synchronized void findIncludedCallsigns(ArrayList messages) {
Log.d(TAG, "findIncludedCallsigns: 查找关注的呼号");
if (ft8TransmitSignal.isActivated() && ft8TransmitSignal.sequential != UtcTimer.getNowSequential()) {
return;
}
- int count=0;
+ int count = 0;
for (Ft8Message msg : messages) {
//与我的呼号有关，与关注的呼号有关
if (msg.getCallsignFrom().equals(GeneralVariables.myCallsign)
@@ -746,9 +764,12 @@ public class MainViewModel extends ViewModel {
case InstructionSet.XIEGU_6100:
baseRig = new XieGu6100Rig(GeneralVariables.civAddress);//协谷6100
break;
+ case InstructionSet.KENWOOD_TS2000:
+ baseRig = new KenwoodTS2000Rig();//建伍TS2000
+ break;
}
- mutableIsFlexRadio.postValue(GeneralVariables.instructionSet==InstructionSet.FLEX_NETWORK);
+ mutableIsFlexRadio.postValue(GeneralVariables.instructionSet == InstructionSet.FLEX_NETWORK);
}
@@ -863,8 +884,9 @@ public class MainViewModel extends ViewModel {
private static class GetQTHRunnable implements Runnable {
MainViewModel mainViewModel;
ArrayList messages;
+
public GetQTHRunnable(MainViewModel mainViewModel) {
- this.mainViewModel=mainViewModel;
+ this.mainViewModel = mainViewModel;
}
@@ -872,20 +894,19 @@ public class MainViewModel extends ViewModel {
public void run() {
CallsignDatabase.getMessagesLocation(
GeneralVariables.callsignDatabase.getDb(), messages);
-
- mainViewModel.currentDecodeCount = messages.size();
- //此变量也是告诉消息列表变化的
- mainViewModel.mutable_Decoded_Counter.postValue(
- mainViewModel.currentDecodeCount);//告知界面消息的总数量
+ mainViewModel.mutableFt8MessageList.postValue(mainViewModel.ft8Messages);
}
}
- private static class SendWaveDataRunnable implements Runnable{
+
+ private static class SendWaveDataRunnable implements Runnable {
BaseRig baseRig;
- float[] data;
+ //float[] data;
+ Ft8Message message;
+
@Override
public void run() {
- if (baseRig!=null&&data!=null){
- baseRig.sendWaveData(data);//实际生成的数据是12.64+0.04,0.04是生成的0数据
+ if (baseRig != null && message != null) {
+ baseRig.sendWaveData(message);//实际生成的数据是12.64+0.04,0.04是生成的0数据
}
}
}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/MessageHashMap.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/MessageHashMap.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/bluetooth/BluetoothConstants.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/bluetooth/BluetoothConstants.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/bluetooth/BluetoothSerialListener.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/bluetooth/BluetoothSerialListener.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/bluetooth/BluetoothSerialService.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/bluetooth/BluetoothSerialService.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/bluetooth/BluetoothSerialSocket.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/bluetooth/BluetoothSerialSocket.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/bluetooth/BluetoothStateBroadcastReceive.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/bluetooth/BluetoothStateBroadcastReceive.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/callsign/CallsignDatabase.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/callsign/CallsignDatabase.java
old mode 100755
new mode 100644
index 353b01f..dde5f67
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/callsign/CallsignDatabase.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/callsign/CallsignDatabase.java
@@ -105,9 +105,12 @@ public class CallsignDatabase extends SQLiteOpenHelper {
/**
* 更新消息中的位置及经纬度信息
*
- * @param messages 消息列表
+ * @param ft8Messages 消息列表
*/
- public static void getMessagesLocation(SQLiteDatabase db, ArrayList messages) {
+ public static synchronized void getMessagesLocation(SQLiteDatabase db, ArrayList ft8Messages ) {
+ if (ft8Messages==null) return;
+ ArrayList messages = new ArrayList<>(ft8Messages);//防止线程访问冲突
+
for (Ft8Message msg : messages) {
if (msg.i3==0&&msg.n3==0) continue;//如果是自由文本，就不查了
CallsignInfo fromCallsignInfo = getCallsignInfo(db,
@@ -142,7 +145,6 @@ public class CallsignDatabase extends SQLiteOpenHelper {
}
msg.toLatLng = new LatLng(toCallsignInfo.Latitude, toCallsignInfo.Longitude*-1);
}
-
}
}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/callsign/CallsignFileOperation.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/callsign/CallsignFileOperation.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/callsign/CallsignInfo.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/callsign/CallsignInfo.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/callsign/OnAfterQueryCallsignLocation.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/callsign/OnAfterQueryCallsignLocation.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/connector/BaseRigConnector.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/connector/BaseRigConnector.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/connector/BluetoothRigConnector.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/connector/BluetoothRigConnector.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/connector/CableConnector.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/connector/CableConnector.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/connector/CableSerialPort.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/connector/CableSerialPort.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/connector/ConnectMode.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/connector/ConnectMode.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/connector/FlexConnector.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/connector/FlexConnector.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/connector/IComWifiConnector.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/connector/IComWifiConnector.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/connector/OnConnectorStateChanged.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/connector/OnConnectorStateChanged.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/count/CountDbOpr.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/count/CountDbOpr.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/count/CountFragment.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/count/CountFragment.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/count/CountInfoAdapter.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/count/CountInfoAdapter.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/ControlMode.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/ControlMode.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/DatabaseOpr.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/DatabaseOpr.java
old mode 100755
new mode 100644
index fa524c1..0a9feb2
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/DatabaseOpr.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/DatabaseOpr.java
@@ -823,8 +823,6 @@ public class DatabaseOpr extends SQLiteOpenHelper {
return false;
}
- //record.getToCallsign()
-
String querySQL;
if (!checkQSLCallsign(record)) {//如果不存在记录，就添加
querySQL = "INSERT INTO QslCallsigns (callsign" +
@@ -1147,9 +1145,19 @@ public class DatabaseOpr extends SQLiteOpenHelper {
@Override
protected Void doInBackground(Void... voids) {
String querySQL;
- querySQL = "INSERT INTO SWLQSOTable(call, gridsquare, mode, rst_sent, rst_rcvd, qso_date, " +
- "time_on, qso_date_off, time_off, band, freq, station_callsign, my_gridsquare," +
- "comment)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+ //删除之前重复的记录
+ querySQL = "DELETE FROM SWLQSOTable where ([call]=?) and (station_callsign=?) and (qso_date=?) and(time_on=?) and (freq=?)";
+ databaseOpr.db.execSQL(querySQL, new String[]{
+ qslRecord.getToCallsign()
+ , qslRecord.getMyCallsign()
+ , qslRecord.getQso_date()
+ , qslRecord.getTime_on()
+ , BaseRigOperation.getFrequencyFloat(qslRecord.getBandFreq())
+ });
+ //添加记录
+ querySQL = "INSERT INTO SWLQSOTable([call], gridsquare, mode, rst_sent, rst_rcvd, qso_date, " +
+ "time_on, qso_date_off, time_off, band, freq, station_callsign, my_gridsquare,comment)\n" +
+ "VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
databaseOpr.db.execSQL(querySQL, new String[]{qslRecord.getToCallsign()
, qslRecord.getToMaidenGrid()
@@ -1449,7 +1457,8 @@ public class DatabaseOpr extends SQLiteOpenHelper {
}
String querySQL = "select * from QSLTable where ([call] like ?) \n" +
filterStr +
- " order by ID desc\n"+
+ " ORDER BY qso_date DESC, time_off DESC\n"+
+ //" order by ID desc\n"+
limitStr;
Cursor cursor = db.rawQuery(querySQL, new String[]{"%" + callsign + "%"});
ArrayList records = new ArrayList<>();
@@ -1774,8 +1783,7 @@ public class DatabaseOpr extends SQLiteOpenHelper {
GeneralVariables.baudRate = result.equals("") ? 19200 : Integer.parseInt(result);
}
if (name.equalsIgnoreCase("bandFreq")) {
- //--todo---把波段的索引数改成频率。用bandFreq值
- GeneralVariables.band = result.equals("") ? 14074000 : Long.valueOf(result);
+ GeneralVariables.band = result.equals("") ? 14074000 : Long.parseLong(result);
GeneralVariables.bandListIndex = OperationBand.getIndexByFreq(GeneralVariables.band);
}
if (name.equalsIgnoreCase("ctrMode")) {
@@ -1833,6 +1841,15 @@ public class DatabaseOpr extends SQLiteOpenHelper {
if (name.equalsIgnoreCase("saveSWLQSO")) {//保存解码信息
GeneralVariables.saveSWL_QSO = result.equals("1");
}
+ if (name.equalsIgnoreCase("audioBits")) {//输出音频是否32位浮点
+ GeneralVariables.audioOutput32Bit = result.equals("1");
+ }
+ if (name.equalsIgnoreCase("audioRate")) {//输出音频是否32位浮点
+ GeneralVariables.audioSampleRate =Integer.parseInt( result);
+ }
+ if (name.equalsIgnoreCase("deepMode")) {//是不是深度解码模式
+ GeneralVariables.deepDecodeMode =result.equals("1");
+ }
}
cursor.close();
@@ -1843,106 +1860,6 @@ public class DatabaseOpr extends SQLiteOpenHelper {
onAfterQueryConfig.doOnAfterQueryConfig(null, null);
}
- /*
- String result = "";
- GeneralVariables.setMyMaidenheadGrid(getConfigByKey("grid"));
-
- GeneralVariables.myCallsign = getConfigByKey("callsign");
-
- GeneralVariables.toModifier = getConfigByKey("toModifier");
-
- String callsign = GeneralVariables.myCallsign;
- if (callsign.length() > 0) {
- Ft8Message.hashList.addHash(FT8Package.getHash22(callsign), callsign);
- Ft8Message.hashList.addHash(FT8Package.getHash12(callsign), callsign);
- Ft8Message.hashList.addHash(FT8Package.getHash10(callsign), callsign);
- }
- result = getConfigByKey("freq");
- float freq = 1000;
- try {
- freq = Float.parseFloat(result);
- } catch (Exception e) {
- Log.e(TAG, "doInBackground: " + e.getMessage());
- }
- //GeneralVariables.setBaseFrequency(result.equals("") ? 1000 : Float.parseFloat(result));
- GeneralVariables.setBaseFrequency(freq);
-
- result = getConfigByKey("synFreq");
- GeneralVariables.synFrequency = !(result.equals("") || result.equals("0"));
-
- result = getConfigByKey("transDelay");
- if (result.matches("^\\d{1,4}$")) {//正则表达式，1-4位长度的数字
- GeneralVariables.transmitDelay = Integer.parseInt(result);
- } else {
- GeneralVariables.transmitDelay = FT8Common.FT8_TRANSMIT_DELAY;
- }
-
- result = getConfigByKey("civ");
- GeneralVariables.civAddress = result.equals("") ? 0xa4 : Integer.parseInt(result, 16);
-
- result = getConfigByKey("baudRate");
- GeneralVariables.baudRate = result.equals("") ? 19200 : Integer.parseInt(result);
-
- //--todo---把波段的索引数改成频率。用bandFreq值
- result = getConfigByKey("bandFreq");
-
- GeneralVariables.band = result.equals("") ? 14074000 : Long.valueOf(result);
- GeneralVariables.bandListIndex = OperationBand.getIndexByFreq(GeneralVariables.band);
-
-
- result = getConfigByKey("ctrMode");
- GeneralVariables.controlMode = result.equals("") ? ControlMode.VOX : Integer.parseInt(result);
-
- result = getConfigByKey("model");//电台型号
- GeneralVariables.modelNo = result.equals("") ? 0 : Integer.parseInt(result);
-
- result = getConfigByKey("instruction");//指令集
- GeneralVariables.instructionSet = result.equals("") ? 0 : Integer.parseInt(result);
-
-
- result = getConfigByKey("launchSupervision");//发射监管
- GeneralVariables.launchSupervision = result.equals("") ?
- GeneralVariables.DEFAULT_LAUNCH_SUPERVISION : Integer.parseInt(result);
-
- result = getConfigByKey("noReplyLimit");//发射监管
- GeneralVariables.noReplyLimit = result.equals("") ? 0 : Integer.parseInt(result);
-
- result = getConfigByKey("autoFollowCQ");//自动关注CQ
- GeneralVariables.autoFollowCQ = (result.equals("") || result.equals("1"));
-
- result = getConfigByKey("autoCallFollow");//自动关注CQ
- GeneralVariables.autoCallFollow = (result.equals("") || result.equals("1"));
-
- result = getConfigByKey("pttDelay");//ptt延时设置
- GeneralVariables.pttDelay = result.equals("") ? 100 : Integer.parseInt(result);
-
-
- //获取icom网络连接参数
- result = getConfigByKey("icomIp");//IcomIp地址
- GeneralVariables.icomIp = result.equals("") ? "255.255.255.255" : result;
- result = getConfigByKey("icomPort");//Icom端口
- GeneralVariables.icomUdpPort = result.equals("") ? 50001 : Integer.parseInt(result);
- result = getConfigByKey("icomUserName");//Icom用户名
- GeneralVariables.icomUserName = result.equals("") ? "ic705" : result;
- result = getConfigByKey("icomPassword");//Icom密码
- GeneralVariables.icomPassword = result;
-
- //输出音量大小
- result = getConfigByKey("volumeValue");
- GeneralVariables.volumePercent = result.equals("") ? 1.0f : Float.parseFloat(result) / 100f;
-
- //排除的呼号
- result = getConfigByKey("excludedCallsigns");
- GeneralVariables.addExcludedCallsigns(result);
-
- GetAllQSLCallsign.get(db);//获取通联过的呼号
-
- if (onAfterQueryConfig != null) {
- onAfterQueryConfig.doOnAfterQueryConfig(null, null);
- }
-
-
- */
return null;
}
}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/DxccObject.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/DxccObject.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/OnAfterQueryConfig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/OnAfterQueryConfig.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/OnAfterQueryFollowCallsigns.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/OnAfterQueryFollowCallsigns.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/OnAfterWriteConfig.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/OnAfterWriteConfig.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/OnGetCallsign.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/OnGetCallsign.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/OperationBand.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/OperationBand.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/RigNameList.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/database/RigNameList.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/FlexCommand.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/FlexCommand.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/FlexMeterInfos.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/FlexMeterInfos.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/FlexMeterList.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/FlexMeterList.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/FlexMeterType.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/FlexMeterType.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/FlexMeters.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/FlexMeters.java
deleted file mode 100755
index d5b7bee..0000000
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/FlexMeters.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.bg7yoz.ft8cn.flex;
-/**
- * flexRadio仪表处理
- * @author BG7YOZ
- */
-
-import android.util.Log;
-
-import java.util.HashMap;
-
-public class FlexMeters extends HashMap {
- private static final String TAG="FlexMeters";
- public FlexMeters(String content) {
- String[] temp =content.substring(content.indexOf("meter ")+"meter ".length()).split("#");
- for (int i = 0; i < temp.length; i++) {
- String[] val = temp[i].split("=");
- if (val.length == 2) {
- if (val[0].contains(".")) {
- int index = Integer.parseInt(val[0].substring(0, val[0].indexOf(".")));
- FlexMeter meter;
- if (this.containsKey(index)){
- meter=this.get(index);
- }else {
- meter=new FlexMeter();
- this.put(index,meter);
- }
-
- if (val[0].toLowerCase().contains(".src")) {
- meter.src = val[1];
- }
- if (val[0].toLowerCase().contains(".num")) {
- meter.num = val[1];
- }
- if (val[0].toLowerCase().contains(".nam")) {
- meter.nam = val[1];
- }
- if (val[0].toLowerCase().contains(".low")) {
- meter.low = val[1];
- }
- if (val[0].toLowerCase().contains(".hi")) {
- meter.hi = val[1];
- }
- if (val[0].toLowerCase().contains(".desc")) {
- meter.desc = val[1];
- }
- if (val[0].toLowerCase().contains(".unit")) {
- meter.unit = val[1];
- }
- if (val[0].toLowerCase().contains(".fps")) {
- meter.fps = val[1];
- }
- if (val[0].toLowerCase().contains(".peak")) {
- meter.peak = val[1];
- }
- }
- }
- }
- }
-
- public void getAllMeters(){
- for (int key:this.keySet()) {
- //s.append(String.format("%d->%s\n",key,get(key)));
- Log.e(TAG, "getAllMeters: "+String.format("ID:%d FIELDS:%s\n",key,get(key)) );
- }
- }
-
-
- public static class FlexMeter {
- public String src;
- public String num;
- public String nam;
- public String low;
- public String hi;
- public String desc;
- public String unit;
- public String fps;
- public String peak;
-
- @Override
- public String toString() {
- return "{" +
- "src='" + src + '\'' +
- ", num='" + num + '\'' +
- ", nam='" + nam + '\'' +
- ", low='" + low + '\'' +
- ", hi='" + hi + '\'' +
- ", desc='" + desc + '\'' +
- ", unit='" + unit + '\'' +
- ", fps='" + fps + '\'' +
- ", peak='" + peak + '\'' +
- '}';
- }
- }
-}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/FlexRadio.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/FlexRadio.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/FlexRadioFactory.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/FlexRadioFactory.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/FlexResponseStyle.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/FlexResponseStyle.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/RadioTcpClient.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/RadioTcpClient.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/RadioUdpClient.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/RadioUdpClient.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/VITA.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/flex/VITA.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/floatview/FloatView.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/floatview/FloatView.java
old mode 100755
new mode 100644
index 4e6e38c..618b442
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/floatview/FloatView.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/floatview/FloatView.java
@@ -215,7 +215,7 @@ public class FloatView extends ConstraintLayout {
WindowManager wm = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
width = wm.getDefaultDisplay().getWidth();
height = wm.getDefaultDisplay().getHeight();
- } else {//--TODO--这部分基本没有执行过
+ } else {//这部分基本没有执行过
width = parentViewWidth;
height = parentViewHeight;
}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/floatview/FloatViewButton.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/floatview/FloatViewButton.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8listener/A91List.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8listener/A91List.java
new file mode 100644
index 0000000..c516314
--- /dev/null
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8listener/A91List.java
@@ -0,0 +1,31 @@
+package com.bg7yoz.ft8cn.ft8listener;
+
+import com.bg7yoz.ft8cn.ft8transmit.GenerateFT8;
+
+import java.util.ArrayList;
+
+public class A91List {
+
+ public ArrayList list=new ArrayList<>();
+ public void clear(){
+ list.clear();
+ }
+ public void add(byte[] data,float freq,float sec){
+ A91 a91=new A91(data,sec,freq);
+ list.add(a91);
+ }
+ public int size(){
+ return list.size();
+ }
+ public static class A91{
+ public byte[] a91 ;//= new byte[GenerateFT8.FTX_LDPC_K_BYTES];
+ public float time_sec = 0;//时间偏移(秒)
+ public float freq_hz = 0;//频率
+
+ public A91(byte[] a91, float time_sec, float freq_hz) {
+ this.a91 = a91;
+ this.time_sec = time_sec;
+ this.freq_hz = freq_hz;
+ }
+ }
+}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8listener/FT8SignalListener.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8listener/FT8SignalListener.java
old mode 100755
new mode 100644
index 81bfffa..850d04d
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8listener/FT8SignalListener.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8listener/FT8SignalListener.java
@@ -14,9 +14,12 @@ import com.bg7yoz.ft8cn.FT8Common;
import com.bg7yoz.ft8cn.Ft8Message;
import com.bg7yoz.ft8cn.GeneralVariables;
import com.bg7yoz.ft8cn.database.DatabaseOpr;
+import com.bg7yoz.ft8cn.ft8transmit.GenerateFT8;
import com.bg7yoz.ft8cn.timer.OnUtcTimer;
import com.bg7yoz.ft8cn.timer.UtcTimer;
import com.bg7yoz.ft8cn.wave.OnGetVoiceDataDone;
+import com.bg7yoz.ft8cn.wave.WaveFileReader;
+import com.bg7yoz.ft8cn.wave.WaveFileWriter;
import java.util.ArrayList;
@@ -27,15 +30,15 @@ public class FT8SignalListener {
private final OnFt8Listen onFt8Listen;//当开始监听，解码结束后触发的事件
//private long band;
public MutableLiveData decodeTimeSec = new MutableLiveData<>();//解码的时长
+ public long timeSec=0;//解码的时长
+
private OnWaveDataListener onWaveDataListener;
+
private DatabaseOpr db;
- //用于保存解码数据的地址
-// private final long ft8Decoder=InitDecoder(0, FT8Common.SAMPLE_RATE
-// , 15*24000, true);;
+ private final A91List a91List = new A91List();//a91列表
- //private String myCallsign;
static {
System.loadLibrary("ft8cn");
@@ -50,7 +53,6 @@ public class FT8SignalListener {
this.onFt8Listen = onFt8Listen;
this.db = db;
-
//创建动作触发器，与UTC时间同步，以15秒一个周期，DoOnSecTimer是在周期起始时触发的事件。150是15秒
utcTimer = new UtcTimer(FT8Common.FT8_SLOT_TIME_M, false, new OnUtcTimer() {
@Override
@@ -108,6 +110,7 @@ public class FT8SignalListener {
}
public void decodeFt8(long utc, float[] voiceData) {
+
new Thread(new Runnable() {
@Override
public void run() {
@@ -115,70 +118,137 @@ public class FT8SignalListener {
if (onFt8Listen != null) {
onFt8Listen.beforeListen(utc);
}
- ArrayList ft8Messages = new ArrayList<>();
- Ft8Message ft8Message = new Ft8Message(FT8Common.FT8_MODE);
- ft8Message.utcTime = utc;
- ft8Message.band = GeneralVariables.band;
- //此处，改为reset,是因为在cpp部分，改为一个变量，不是以指针，申请新内存的方式处理了。
+
+ ///读入音频数据，并做预处理
//其实这种方式要注意一个问题，在一个周期之内，必须解码完毕，否则新的解码又要开始了
- long ft8Decoder = InitDecoder(ft8Message.utcTime, FT8Common.SAMPLE_RATE
+ long ft8Decoder = InitDecoder(utc, FT8Common.SAMPLE_RATE
, voiceData.length, true);
-
- //DecoderFt8Reset(ft8Decoder, ft8Message.utcTime, voiceData.length);
-
- DecoderMonitorPressFloat(voiceData, ft8Decoder);
+ DecoderMonitorPressFloat(voiceData, ft8Decoder);//读入音频数据
- int num_candidates = DecoderFt8FindSync(ft8Decoder);
- float dt = 0;
- int dtAverage = 0;
- for (int idx = 0; idx < num_candidates; ++idx) {
+ ArrayList allMsg = new ArrayList<>();
+ ArrayList msgs = runDecode(ft8Decoder, utc, false);
+ addMsgToList(allMsg, msgs);
+ timeSec = System.currentTimeMillis() - time;
+ decodeTimeSec.postValue(timeSec);//解码耗时
+ if (onFt8Listen != null) {
+ onFt8Listen.afterDecode(utc, averageOffset(allMsg), UtcTimer.sequential(utc), msgs, false);
+ }
- try {//做一下解码失败保护
- if (DecoderFt8Analysis(idx, ft8Decoder, ft8Message)) {
- if (ft8Message.isValid) {
- Ft8Message msg = new Ft8Message(ft8Message);//此处使用msg，是因为有的哈希呼号会把<...>替换掉
- if (checkMessageSame(ft8Messages, msg)) {
- continue;
- }
- dt += ft8Message.time_sec;
- dtAverage++;
- //ft8Messages.add(new Ft8Message(ft8Message));
- ft8Messages.add(msg);
- }
- }
- } catch (Exception e) {
- Log.e(TAG, "run: " + e.getMessage());
+
+ if (GeneralVariables.deepDecodeMode) {//进入深度解码模式
+ msgs = runDecode(ft8Decoder, utc, true);
+ addMsgToList(allMsg, msgs);
+ timeSec = System.currentTimeMillis() - time;
+ decodeTimeSec.postValue(timeSec);//解码耗时
+ if (onFt8Listen != null) {
+ onFt8Listen.afterDecode(utc, averageOffset(allMsg), UtcTimer.sequential(utc), msgs, true);
}
- }
- float time_sec = 0f;
- if (dtAverage != 0) {
- time_sec = dt / dtAverage;
- //utcTimer.setTime_sec(Math.round(time_sec * 1000));
- } else {//当检测不到时，不要偏移时间
- utcTimer.setTime_sec(Math.round(0));
- }
+ do {
+ if (timeSec > FT8Common.DEEP_DECODE_TIMEOUT) break;//此处做超时检测，超过一定时间(7秒)，就不做减码操作了
+ //减去解码的信号
+ ReBuildSignal.subtractSignal(ft8Decoder, a91List);
+
+ //再做一次解码
+ msgs = runDecode(ft8Decoder, utc, true);
+ addMsgToList(allMsg, msgs);
+ timeSec = System.currentTimeMillis() - time;
+ decodeTimeSec.postValue(timeSec);//解码耗时
+ if (onFt8Listen != null) {
+ onFt8Listen.afterDecode(utc, averageOffset(allMsg), UtcTimer.sequential(utc), msgs, true);
+ }
+
+ } while (msgs.size() > 0 );
+
+ }
//移到finalize() 方法中调用了
DeleteDecoder(ft8Decoder);
-
- if (onFt8Listen != null) {
- onFt8Listen.afterDecode(utc, time_sec, UtcTimer.sequential(utc), ft8Messages);
- }
-
- decodeTimeSec.postValue(System.currentTimeMillis() - time);//解码耗时
-
Log.d(TAG, String.format("解码耗时:%d毫秒", System.currentTimeMillis() - time));
+
}
}).start();
}
+ private ArrayList runDecode(long ft8Decoder, long utc, boolean isDeep) {
+ ArrayList ft8Messages = new ArrayList<>();
+ Ft8Message ft8Message = new Ft8Message(FT8Common.FT8_MODE);
+
+ ft8Message.utcTime = utc;
+ ft8Message.band = GeneralVariables.band;
+ a91List.clear();
+
+ setDecodeMode(ft8Decoder, isDeep);//设置迭代次数,isDeep==true，迭代次数增加
+
+ int num_candidates = DecoderFt8FindSync(ft8Decoder);//最多120个
+ //long startTime = System.currentTimeMillis();
+ for (int idx = 0; idx < num_candidates; ++idx) {
+ //todo 应当做一下超时计算
+ try {//做一下解码失败保护
+ if (DecoderFt8Analysis(idx, ft8Decoder, ft8Message)) {
+
+ if (ft8Message.isValid) {
+ Ft8Message msg = new Ft8Message(ft8Message);//此处使用msg，是因为有的哈希呼号会把<...>替换掉
+ byte[] a91 = DecoderGetA91(ft8Decoder);
+ a91List.add(a91, ft8Message.freq_hz, ft8Message.time_sec);
+
+ if (checkMessageSame(ft8Messages, msg)) {
+ continue;
+ }
+
+ msg.isWeakSignal = isDeep;//是不是弱信号
+ ft8Messages.add(msg);
+
+ }
+ }
+ } catch (Exception e) {
+ Log.e(TAG, "run: " + e.getMessage());
+ }
+
+ }
+
+
+ return ft8Messages;
+ }
+
+ /**
+ * 计算平均时间偏移值
+ *
+ * @param messages 消息列表
+ * @return 偏移值
+ */
+ private float averageOffset(ArrayList messages) {
+ if (messages.size() == 0) return 0f;
+ float dt = 0;
+ //int dtAverage = 0;
+ for (Ft8Message msg : messages) {
+ dt += msg.time_sec;
+ }
+ return dt / messages.size();
+ }
+
+ /**
+ * 把消息添加到列表中
+ *
+ * @param allMsg 消息列表
+ * @param newMsg 新的消息
+ */
+ private void addMsgToList(ArrayList allMsg, ArrayList newMsg) {
+ for (int i = newMsg.size() - 1; i >= 0; i--) {
+ if (checkMessageSame(allMsg, newMsg.get(i))) {
+ newMsg.remove(i);
+ } else {
+ allMsg.add(newMsg.get(i));
+ }
+ }
+ }
+
/**
* 检查消息列表里同样的内容是否存在
*
@@ -204,14 +274,15 @@ public class FT8SignalListener {
super.finalize();
}
- public OnWaveDataListener getOnWaveDataListener() {
- return onWaveDataListener;
- }
+
public void setOnWaveDataListener(OnWaveDataListener onWaveDataListener) {
this.onWaveDataListener = onWaveDataListener;
}
+
+
+
/**
* 解码的第一步，初始化解码器，获取解码器的地址。
*
@@ -261,5 +332,7 @@ public class FT8SignalListener {
public native void DecoderFt8Reset(long decoder, long utcTime, int num_samples);
+ public native byte[] DecoderGetA91(long decoder);//获取当前message的a91数据
+ public native void setDecodeMode(long decoder, boolean isDeep);//设置解码的模式，isDeep=true是多次迭代，=false是快速迭代
}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8listener/OnFt8Listen.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8listener/OnFt8Listen.java
old mode 100755
new mode 100644
index 919625f..04492d0
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8listener/OnFt8Listen.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8listener/OnFt8Listen.java
@@ -23,5 +23,5 @@ public interface OnFt8Listen {
* @param sequential 当前的时序
* @param messages 消息列表
*/
- void afterDecode(long utc,float time_sec,int sequential, ArrayList messages);
+ void afterDecode(long utc,float time_sec,int sequential, ArrayList messages,boolean isDeep);
}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8listener/ReBuildSignal.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8listener/ReBuildSignal.java
new file mode 100644
index 0000000..5e2a3a5
--- /dev/null
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8listener/ReBuildSignal.java
@@ -0,0 +1,28 @@
+package com.bg7yoz.ft8cn.ft8listener;
+
+import android.util.Log;
+
+import com.bg7yoz.ft8cn.FT8Common;
+import com.bg7yoz.ft8cn.Ft8Message;
+import com.bg7yoz.ft8cn.ft8transmit.GenerateFT8;
+import com.bg7yoz.ft8cn.wave.WaveFileWriter;
+
+import java.util.ArrayList;
+
+public class ReBuildSignal {
+ private static String TAG = "ReBuildSignal";
+ static {
+ System.loadLibrary("ft8cn");
+ }
+
+
+ public static void subtractSignal(long decoder,A91List a91List){
+ for (A91List.A91 a91 : a91List.list) {
+ doSubtractSignal(decoder,a91.a91,FT8Common.SAMPLE_RATE,a91.freq_hz,a91.time_sec);
+ }
+ }
+
+ private static native void doSubtractSignal(long decoder,byte[] payload,int sample_rate
+ ,float frequency,float time_sec);
+
+}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8signal/FT8Package.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8signal/FT8Package.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/FT8TransmitSignal.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/FT8TransmitSignal.java
old mode 100755
new mode 100644
index 8e3607c..14626ce
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/FT8TransmitSignal.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/FT8TransmitSignal.java
@@ -1,6 +1,7 @@
package com.bg7yoz.ft8cn.ft8transmit;
/**
* 与发射信号有关的类。包括分析通联过程的自动程序。
+ *
* @author BGY70Z
* @date 2023-03-20
*/
@@ -33,8 +34,8 @@ import java.util.concurrent.Executors;
public class FT8TransmitSignal {
private static final String TAG = "FT8TransmitSignal";
- private boolean transmitFreeText=false;
- private String freeText="FREE TEXT";
+ private boolean transmitFreeText = false;
+ private String freeText = "FREE TEXT";
private final DatabaseOpr databaseOpr;//配置信息，和相关数据的数据库
private TransmitCallsign toCallsign;//目标呼号
@@ -64,7 +65,7 @@ public class FT8TransmitSignal {
private int receivedReport = 0;//我接收到的报告
private int receiveTargetReport = -100;//发送给对方的信号报告
//********************************************
- private final OnTransmitSuccess onTransmitSuccess ;//一般是用于保存QSL数据
+ private final OnTransmitSuccess onTransmitSuccess;//一般是用于保存QSL数据
//防止播放中止，变量不能放在方法中
@@ -80,7 +81,7 @@ public class FT8TransmitSignal {
private final OnDoTransmitted onDoTransmitted;//一般是用于打开关闭PTT
private final ExecutorService doTransmitThreadPool = Executors.newCachedThreadPool();
- private final DoTransmitRunnable doTransmitRunnable=new DoTransmitRunnable(this);
+ private final DoTransmitRunnable doTransmitRunnable = new DoTransmitRunnable(this);
static {
System.loadLibrary("ft8cn");
@@ -107,7 +108,7 @@ public class FT8TransmitSignal {
GeneralVariables.mutableVolumePercent.observeForever(new Observer() {
@Override
public void onChanged(Float aFloat) {
- if (audioTrack!=null){
+ if (audioTrack != null) {
audioTrack.setVolume(aFloat);
}
}
@@ -187,7 +188,6 @@ public class FT8TransmitSignal {
// @SuppressLint("DefaultLocale")
// @Override
// public void run() {
-// //--todo----
// //此处可能要修改，维护一个列表。把每个呼号，网格，时间，波段，记录下来
// if (functionOrder == 1 || functionOrder == 2) {//当消息处于1或2时，说明开始了通联
// messageStartTime = UtcTimer.getSystemTime();
@@ -336,9 +336,9 @@ public class FT8TransmitSignal {
//发射模式6，CQ BG7YOZ OL50
case 6:
resetTargetReport();//把给对方的信号报告,接收到对方的信号报告记录复位成-100
- Ft8Message msg=new Ft8Message(1, 0, "CQ", GeneralVariables.myCallsign
+ Ft8Message msg = new Ft8Message(1, 0, "CQ", GeneralVariables.myCallsign
, GeneralVariables.getMyMaidenhead4Grid());
- msg.modifier=GeneralVariables.toModifier;
+ msg.modifier = GeneralVariables.toModifier;
return msg;
}
@@ -365,18 +365,42 @@ public class FT8TransmitSignal {
setCurrentFunctionOrder(functionOrder);//设置当前消息
}
+ /**
+ * 为了最大限度兼容，把32位浮点转换成16位整型，有些声卡不支持32位的浮点。
+ * @param buffer 32位浮点音频
+ * @return 16位整型
+ */
+ private short[] float2Short(float[] buffer) {
+ short[] temp = new short[buffer.length + 8];//多出8个为0的数据包，是为了兼容QP-7C的RP2040音频判断
+ for (int i = 0; i < buffer.length; i++) {
+ float x = buffer[i];
+ if (x > 1.0)
+ x = 1.0f;
+ else if (x < -1.0)
+ x = -1.0f;
+ temp[i] = (short) (x * 32767.0);
+ }
+ return temp;
+ }
- private void playFT8Signal(float[] buffer) {
+ //private void playFT8Signal(float[] buffer) {
+ private void playFT8Signal(Ft8Message msg) {
- //todo--实现网络发送模式
if (GeneralVariables.connectMode == ConnectMode.NETWORK) {//网络方式就不播放音频了
Log.d(TAG, "playFT8Signal: 进入网络发射程序，等待音频发送。");
+
+
+ if (onDoTransmitted != null) {//处理音频数据，可以给ICOM的网络模式发送
+ onDoTransmitted.onTransmitByWifi(msg);
+ }
+
+
long now = System.currentTimeMillis();
while (isTransmitting) {//等待音频数据包发送完毕再退出，以触发afterTransmitting
try {
Thread.sleep(1);
long current = System.currentTimeMillis() - now;
- if (current > 13500) {//实际发射的时长
+ if (current > 13000) {//实际发射的时长
isTransmitting = false;
break;
}
@@ -390,26 +414,45 @@ public class FT8TransmitSignal {
}
- Log.d(TAG, "playFT8Signal: 准备声卡播放....");
+ //进入声卡模式
+ float[] buffer;
+ buffer = GenerateFT8.generateFt8(msg, GeneralVariables.getBaseFrequency()
+ , GeneralVariables.audioSampleRate);
+ if (buffer == null) {
+ afterPlayAudio();
+ return;
+ }
+
+ Log.d(TAG, String.format("playFT8Signal: 准备声卡播放....位数：%s,采样率：%d"
+ , GeneralVariables.audioOutput32Bit ? "Float32" : "Int16"
+ , GeneralVariables.audioSampleRate));
attributes = new AudioAttributes.Builder()
.setUsage(AudioAttributes.USAGE_MEDIA)
.setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
.build();
- myFormat = new AudioFormat.Builder().setSampleRate(FT8Common.SAMPLE_RATE)
- //.setEncoding(AudioFormat.ENCODING_PCM_16BIT)
- .setEncoding(AudioFormat.ENCODING_PCM_FLOAT)
+ //myFormat = new AudioFormat.Builder().setSampleRate(FT8Common.SAMPLE_RATE)
+ myFormat = new AudioFormat.Builder().setSampleRate(GeneralVariables.audioSampleRate)
+ .setEncoding(GeneralVariables.audioOutput32Bit ? //浮点与整型
+ AudioFormat.ENCODING_PCM_FLOAT : AudioFormat.ENCODING_PCM_16BIT)
.setChannelMask(AudioFormat.CHANNEL_OUT_MONO).build();
int mySession = 0;
audioTrack = new AudioTrack(attributes, myFormat
- , 12000 * 15 * 4, AudioTrack.MODE_STATIC
+ , GeneralVariables.audioOutput32Bit ? GeneralVariables.audioSampleRate * 15 * 4
+ : GeneralVariables.audioSampleRate * 15 * 2//浮点与整型
+ , AudioTrack.MODE_STATIC
, mySession);
-
- //写入数据大小 array 就是预先将音频数据加载到array数组中
- int writeResult = audioTrack.write(buffer, 0, buffer.length
- , AudioTrack.WRITE_NON_BLOCKING);
-
+ //区分32浮点和整型
+ int writeResult;
+ if (GeneralVariables.audioOutput32Bit) {
+ writeResult = audioTrack.write(buffer, 0, buffer.length
+ , AudioTrack.WRITE_NON_BLOCKING);
+ } else {
+ short[] audio_data = float2Short(buffer);
+ writeResult = audioTrack.write(audio_data, 0, audio_data.length
+ , AudioTrack.WRITE_NON_BLOCKING);
+ }
if (buffer.length > writeResult) {
Log.e(TAG, String.format("播放缓冲区不足：%d--->%d", buffer.length, writeResult));
@@ -463,10 +506,7 @@ public class FT8TransmitSignal {
messageEndTime = UtcTimer.getSystemTime();//获取结束的时间
//如对方没有网格，就从历史呼号与网格对应表中查找
- toMaidenheadGrid =GeneralVariables.getGridByCallsign(toCallsign.callsign,databaseOpr);
-// if (toMaidenheadGrid.equals("")) {
-// toMaidenheadGrid = GeneralVariables.getGridByCallsign(toCallsign.callsign,databaseOpr);
-// }
+ toMaidenheadGrid = GeneralVariables.getGridByCallsign(toCallsign.callsign, databaseOpr);
if (messageStartTime == 0) {//如果起始时间没有，就取现在的
messageStartTime = UtcTimer.getSystemTime();
@@ -557,6 +597,29 @@ public class FT8TransmitSignal {
}
}
+ /**
+ * 检查消息中from中有目标呼号的数量。当有目标呼号呼叫我的消息，返回0，
+ * @param messages 消息列表
+ * @return 0：有目标呼叫我的，1：没有任何目标呼号发出的消息，>1：有目标呼号呼叫别人的消息
+ */
+ private int checkTargetCallMe(ArrayList messages){
+ int fromCount=1;
+ for (int i = messages.size() - 1; i >= 0; i--) {
+ Ft8Message ft8Message = messages.get(i);
+ if (ft8Message.getSequence() == sequential) continue;//同一个时序下的消息不做解析
+ if (toCallsign == null) {
+ continue;
+ }
+ if (ft8Message.getCallsignTo().equals(GeneralVariables.myCallsign)
+ && checkCallsignIsCallTo(ft8Message.getCallsignFrom(), toCallsign.callsign)) {
+ return 0;
+ }
+ if (checkCallsignIsCallTo(ft8Message.getCallsignFrom(), toCallsign.callsign)){
+ fromCount++;//计数器，from是目标呼号的情况
+ }
+ }
+ return fromCount;
+ }
/**
* 检测本消息列表中对方回复消息的序号，如果没有,返回-1
*
@@ -566,6 +629,7 @@ public class FT8TransmitSignal {
private int checkFunctionOrdFromMessages(ArrayList messages) {
for (int i = messages.size() - 1; i >= 0; i--) {
Ft8Message ft8Message = messages.get(i);
+ if (ft8Message.getSequence() == sequential) continue;//同一个时序下的消息不做解析
if (toCallsign == null) {
continue;
}
@@ -627,7 +691,7 @@ public class FT8TransmitSignal {
if (msg.band != GeneralVariables.band) {//如果消息不在相同的波段内，不呼叫
continue;
}
- if (GeneralVariables.checkIsExcludeCallsign(msg.callsignFrom)){//如果是在过滤范围内的呼叫，不理会
+ if (GeneralVariables.checkIsExcludeCallsign(msg.callsignFrom)) {//如果是在过滤范围内的呼叫，不理会
continue;
}
@@ -693,7 +757,7 @@ public class FT8TransmitSignal {
QSLRecord record = GeneralVariables.qslRecordList.getRecordByCallsign(toCall.callsign);
if (record == null) {
- toMaidenheadGrid=GeneralVariables.getGridByCallsign(toCallsign.callsign,databaseOpr);
+ toMaidenheadGrid = GeneralVariables.getGridByCallsign(toCallsign.callsign, databaseOpr);
record = GeneralVariables.qslRecordList.addQSLRecord(new QSLRecord(
messageStartTime,
messageEndTime,
@@ -739,20 +803,19 @@ public class FT8TransmitSignal {
/**
* 从关注列表解码的消息中，此处是变化发射程序的入口
*
- * @param messages 消息列表
+ * @param msgList 消息列表
*/
//@RequiresApi(api = Build.VERSION_CODES.N)
- public void parseMessageToFunction(ArrayList messages) {
+ public void parseMessageToFunction(ArrayList msgList) {
if (GeneralVariables.myCallsign.length() < 3) {
return;
}
- if (messages.size() > 0) {//如果当前消息的时序与发射的时序相同，不解析
- if (messages.get(0).getSequence() == sequential) {
- return;
- }
- } else {//没有消息解析，返回
+ if (msgList.size() == 0) return;//没有消息解析，返回
+
+ if (msgList.get(0).getSequence() == sequential) {
return;
}
+ ArrayList messages =new ArrayList<>(msgList);//防止线程冲突
int newOrder = checkFunctionOrdFromMessages(messages);//检查消息中对方回复的消息序号，-1为没有收到
@@ -760,16 +823,20 @@ public class FT8TransmitSignal {
GeneralVariables.noReplyCount = 0;
}
-
//更新一下通联的列表检查是不是在通联列表中，如果没有记录下来，就保存
updateQSlRecordList(newOrder, toCallsign);
- //判断通联成功：对方回73（5）||我是73（5），且对方没回（-1）||我是RR73(4),且已经达到无回应阈值，且有无回应限制
+
+ // 判断通联成功：对方回73（5）||我是73（5），且对方没回（-1）
+ // 或者我是RR73(4),且已经达到无回应阈值，且有无回应限制
+ // 或我是RR73(4),且对方开始呼叫别人了,解决RR73卡死的问题
if (newOrder == 5
- || (functionOrder == 5 && newOrder == -1)
+ || (functionOrder == 5 && newOrder == -1)// 判断通联成功：对方回73（5）||我是73（5），且对方没回（-1）
|| (functionOrder == 4 &&
(GeneralVariables.noReplyCount > GeneralVariables.noReplyLimit * 2)
- && (GeneralVariables.noReplyLimit > 0))) {
+ && (GeneralVariables.noReplyLimit > 0)) // 或者我是RR73(4),且已经达到无回应阈值，且有无回应限制
+ || (functionOrder ==4 && checkTargetCallMe(messages)>1)
+ ) { // 或我是RR73(4),且对方开始呼叫别人了
//doComplete();//做保存的动作
//进入到CQ状态
resetToCQ();
@@ -812,8 +879,10 @@ public class FT8TransmitSignal {
}
- //到此位置，说明没有回应，错误次数要加1
- GeneralVariables.noReplyCount++;
+ //到此位置，说明没有回应，错误次数要加1,弱信号检测不记无回应
+ if (!messages.get(0).isWeakSignal) {
+ GeneralVariables.noReplyCount++;
+ }
//如果超出无反应限定值，复位到CQ状态
if ((GeneralVariables.noReplyCount > GeneralVariables.noReplyLimit) && (GeneralVariables.noReplyLimit > 0)) {
//检查关注消息列表，如果没有新的CQ，就进入到CQ状态，如果有，就转入到呼叫新的目标。
@@ -911,7 +980,7 @@ public class FT8TransmitSignal {
if (GeneralVariables.myCallsign.length() < 3) {
return;
}
- //todo---要判断我的呼号类型，才能确定i3n3 !!!
+ //要判断我的呼号类型，才能确定i3n3 !!!
int i3 = GenerateFT8.checkI3ByCallsign(GeneralVariables.myCallsign);
setTransmit(new TransmitCallsign(i3, 0, "CQ", UtcTimer.getNowSequential())
, 6, "");
@@ -964,15 +1033,15 @@ public class FT8TransmitSignal {
public void setTransmitFreeText(boolean transmitFreeText) {
this.transmitFreeText = transmitFreeText;
- if (transmitFreeText){
+ if (transmitFreeText) {
ToastMessage.show(GeneralVariables.getStringFromResource(R.string.trans_free_text_mode));
- }else {
+ } else {
ToastMessage.show((GeneralVariables.getStringFromResource(R.string.trans_standard_messge_mode)));
}
}
- private static class DoTransmitRunnable implements Runnable{
+ private static class DoTransmitRunnable implements Runnable {
FT8TransmitSignal transmitSignal;
public DoTransmitRunnable(FT8TransmitSignal transmitSignal) {
@@ -992,25 +1061,19 @@ public class FT8TransmitSignal {
//用于显示将要发射的消息内容
Ft8Message msg;
- if (transmitSignal.transmitFreeText){
- msg=new Ft8Message("CQ",GeneralVariables.myCallsign,transmitSignal.freeText);
- msg.i3=0;
- msg.n3=0;
- }else {
+ if (transmitSignal.transmitFreeText) {
+ msg = new Ft8Message("CQ", GeneralVariables.myCallsign, transmitSignal.freeText);
+ msg.i3 = 0;
+ msg.n3 = 0;
+ } else {
msg = transmitSignal.getFunctionCommand(transmitSignal.functionOrder);
}
- msg.modifier=GeneralVariables.toModifier;
+ msg.modifier = GeneralVariables.toModifier;
if (transmitSignal.onDoTransmitted != null) {
//此处用于处理PTT等事件
transmitSignal.onDoTransmitted.onBeforeTransmit(msg, transmitSignal.functionOrder);
}
- //short[] buffer = new short[FT8Common.SAMPLE_RATE * FT8Common.FT8_SLOT_TIME];
- //79个符号，每个符号0.16秒，采样率12000，
-// short[] buffer = new short[(int) (0.5f +
-// GenerateFT8.num_tones * GenerateFT8.symbol_period
-// * GenerateFT8.sample_rate)]; // 数据信号中的采样数0.5+79*0.16*12000];
-
transmitSignal.isTransmitting = true;
transmitSignal.mutableIsTransmitting.postValue(true);
@@ -1020,11 +1083,11 @@ public class FT8TransmitSignal {
, GeneralVariables.getBaseFrequency()
, msg.getMessageText()));
//生成信号
- float[] buffer=GenerateFT8.generateFt8(msg, GeneralVariables.getBaseFrequency());
- if (buffer==null) {
- return;
- }
- ;
+// float[] buffer=GenerateFT8.generateFt8(msg, GeneralVariables.getBaseFrequency());
+// if (buffer==null) {
+// return;
+// }
+
//电台动作可能有要有个延迟时间，所以时间并不一定完全准确
try {//给电台一个100毫秒的响应时间
Thread.sleep(GeneralVariables.pttDelay);//给PTT指令后，电台一个响应时间，默认100毫秒
@@ -1032,11 +1095,12 @@ public class FT8TransmitSignal {
e.printStackTrace();
}
- if (transmitSignal.onDoTransmitted != null) {//处理音频数据，可以给ICOM的网络模式发送
- transmitSignal.onDoTransmitted.onAfterGenerate(buffer);
- }
+// if (transmitSignal.onDoTransmitted != null) {//处理音频数据，可以给ICOM的网络模式发送
+// transmitSignal.onDoTransmitted.onAfterGenerate(buffer);
+// }
//播放音频
- transmitSignal.playFT8Signal(buffer);
+ //transmitSignal.playFT8Signal(buffer);
+ transmitSignal.playFT8Signal(msg);
}
}
}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/FunctionOfTransmit.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/FunctionOfTransmit.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/GenerateFT8.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/GenerateFT8.java
old mode 100755
new mode 100644
index 5fc3a6e..675252b
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/GenerateFT8.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/GenerateFT8.java
@@ -16,7 +16,7 @@ import com.bg7yoz.ft8cn.ui.ToastMessage;
public class GenerateFT8 {
private static final String TAG = "GenerateFT8";
private static final int FTX_LDPC_K = 91;
- private static final int FTX_LDPC_K_BYTES = (FTX_LDPC_K + 7) / 8;
+ public static final int FTX_LDPC_K_BYTES = (FTX_LDPC_K + 7) / 8;
private static final int FT8_NN = 79;
private static final float FT8_SYMBOL_PERIOD = 0.160f;
private static final float FT8_SYMBOL_BT = 2.0f;
@@ -29,7 +29,7 @@ public class GenerateFT8 {
private static final float symbol_bt = FT8_SYMBOL_BT;//FT8_SYMBOL_BT=2.0f
private static final float slot_time = FT8_SLOT_TIME;//FT8_SLOT_TIME=15f
//public static int sample_rate = 48000;//采样率
- public static int sample_rate = 12000;//采样率
+ //public static int sample_rate = 12000;//采样率
static {
@@ -120,8 +120,19 @@ public class GenerateFT8 {
return !extraInfo.trim().matches("[A-Z][A-Z][0-9][0-9]");
}
+ public static float[] generateFt8(Ft8Message msg, float frequency,int sample_rate){
+ return generateFt8(msg,frequency,sample_rate,true);
+ }
- public static float[] generateFt8(Ft8Message msg, float frequency) {
+ /**
+ * 生成FT8信号
+ * @param msg 消息
+ * @param frequency 频率
+ * @param sample_rate 采样率
+ * @param hasModifier 是否有修饰符
+ * @return
+ */
+ public static float[] generateFt8(Ft8Message msg, float frequency,int sample_rate,boolean hasModifier) {
if (msg.callsignFrom.length()<3){
ToastMessage.show(GeneralVariables.getStringFromResource(R.string.callsign_error));
return null;
@@ -131,7 +142,11 @@ public class GenerateFT8 {
//把"<>"去掉
msg.callsignTo = msg.callsignTo.replace("<", "").replace(">", "");
msg.callsignFrom = msg.callsignFrom.replace("<", "").replace(">", "");
- msg.modifier=GeneralVariables.toModifier;//修饰符
+ if (hasModifier) {
+ msg.modifier = GeneralVariables.toModifier;//修饰符
+ }else {
+ msg.modifier="";
+ }
//msg.callsignTo="CQ AzCz";
//判定用非标准呼号i3=4的条件：
@@ -160,13 +175,49 @@ public class GenerateFT8 {
packFreeTextTo77(msg.getMessageText(), packed);
}
+ return generateFt8ByA91(packed,frequency,sample_rate);
+ /*
// 其次，将二进制消息编码为FSK音调序列,79个字节
byte[] tones = new byte[num_tones]; // 79音调（符号）数组
+ //此处是88个字节（91+7）/8，可以使用a91生成音频
ft8_encode(packed, tones);
// 第三，将FSK音调转换为音频信号b
+
+ int num_samples = (int) (0.5f + num_tones * symbol_period * sample_rate); // 数据信号中的采样数0.5+79*0.16*12000
+
+ //float[] signal = new float[Ft8num_samples];
+ float[] signal = new float[num_samples];
+
+ //Ft8num_sampleFT8声音的总采样数，不是字节数。15*12000
+ //for (int i = 0; i < Ft8num_samples; i++)//把数据全部静音。
+ for (int i = 0; i < num_samples; i++)//把数据全部静音。
+ {
+ signal[i] = 0;
+ }
+
+ // 用79个字节符号，生成FT8音频
+ synth_gfsk(tones, num_tones, frequency, symbol_bt, symbol_period, sample_rate, signal, 0);
+ for (int i = 0; i < num_samples; i++)//把数据全部静音。
+ {
+ if (signal[i]>1.0||signal[i]<-1.0){
+ Log.e(TAG, "generateFt8: "+signal[i] );
+ }
+ }
+ return signal;
+ */
+ }
+
+ public static float[] generateFt8ByA91(byte[] a91, float frequency,int sample_rate){
+ byte[] tones = new byte[num_tones]; // 79音调（符号）数组
+ //此处是12个字节（91+7）/8，可以使用a91生成音频
+ ft8_encode(a91, tones);
+
+ // 第三，将FSK音调转换为音频信号b
+
+
int num_samples = (int) (0.5f + num_tones * symbol_period * sample_rate); // 数据信号中的采样数0.5+79*0.16*12000
@@ -184,17 +235,18 @@ public class GenerateFT8 {
signal[i] = 0;
}
+ // 用79个字节符号，生成FT8音频
synth_gfsk(tones, num_tones, frequency, symbol_bt, symbol_period, sample_rate, signal, 0);
- for (int i = 0; i < num_samples; i++)//把数据全部静音。
- {
- if (signal[i]>1.0||signal[i]<-1.0){
- Log.e(TAG, "generateFt8: "+signal[i] );
- }
- }
+// for (int i = 0; i < num_samples; i++)//把数据全部静音。
+// {
+// if (signal[i]>1.0||signal[i]<-1.0){
+// Log.e(TAG, "generateFt8: "+signal[i] );
+// }
+// }
return signal;
-
}
+
private static native int packFreeTextTo77(String msg, byte[] c77);
private static native int pack77(String msg, byte[] c77);
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/OnDoTransmitted.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/OnDoTransmitted.java
old mode 100755
new mode 100644
index 9dca03a..c519e83
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/OnDoTransmitted.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/OnDoTransmitted.java
@@ -10,5 +10,5 @@ import com.bg7yoz.ft8cn.Ft8Message;
public interface OnDoTransmitted {
void onBeforeTransmit(Ft8Message message,int functionOder);
void onAfterTransmit(Ft8Message message, int functionOder);
- void onAfterGenerate(float[] data);
+ void onTransmitByWifi(Ft8Message message);
}
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/OnTransmitSuccess.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/OnTransmitSuccess.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/QSLRecord.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/QSLRecord.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/QslRecordList.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/QslRecordList.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/TransmitCallsign.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ft8transmit/TransmitCallsign.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/grid_tracker/GridInfoWindow.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/grid_tracker/GridInfoWindow.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/grid_tracker/GridMarkerInfoWindow.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/grid_tracker/GridMarkerInfoWindow.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/grid_tracker/GridOsmMapView.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/grid_tracker/GridOsmMapView.java
old mode 100755
new mode 100644
index 84f03b8..eff74c3
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/grid_tracker/GridOsmMapView.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/grid_tracker/GridOsmMapView.java
@@ -449,13 +449,11 @@ public class GridOsmMapView {
if (fromLatLng == null) {
//todo 把呼号转为国家的经纬度
return null;
- //fromLatLng = message.fromLatLng;
}
if (toLatLng == null) {
//todo 把呼号转为国家的经纬度
return null;
- //toLatLng = message.toLatLng;
}
final GridPolyLine line = new GridPolyLine(gridMapView, fromLatLng, toLatLng, recordStr);
return line;
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/grid_tracker/GridRecordInfoWindow.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/grid_tracker/GridRecordInfoWindow.java
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/grid_tracker/GridTrackerMainActivity.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/grid_tracker/GridTrackerMainActivity.java
old mode 100755
new mode 100644
index 3e195a3..baf5424
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/grid_tracker/GridTrackerMainActivity.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/grid_tracker/GridTrackerMainActivity.java
@@ -1,6 +1,7 @@
package com.bg7yoz.ft8cn.grid_tracker;
/**
* 网格追踪的主窗口。
+ *
* @author BGY70Z
* @date 2023-03-20
*/
@@ -78,7 +79,6 @@ public class GridTrackerMainActivity extends AppCompatActivity {
private MutableLiveData> qslRecordList = new MutableLiveData<>();
-
@SuppressLint("NotifyDataSetChanged")
protected void doAfterCreate() {
//设置消息列表
@@ -101,7 +101,7 @@ public class GridTrackerMainActivity extends AppCompatActivity {
}
//画日志界面查询出的全部消息
String queryKey = intentGet.getStringExtra("qslAll");
- int queryFilter=intentGet.getIntExtra("queryFilter",0);
+ int queryFilter = intentGet.getIntExtra("queryFilter", 0);
if (queryKey != null) {
ToastMessage.show(GeneralVariables.getStringFromResource(R.string.tracker_query_qso_info));
mainViewModel.databaseOpr.getQSLRecordByCallsign(true, 0, queryKey, queryFilter
@@ -187,30 +187,68 @@ public class GridTrackerMainActivity extends AppCompatActivity {
@SuppressLint({"DefaultLocale", "NotifyDataSetChanged"})
@Override
public void onChanged(Integer integer) {
- callingListAdapter.notifyDataSetChanged();
+// callingListAdapter.notifyDataSetChanged();
//当列表下部稍微多出一些，自动上移
+// if (callMessagesRecyclerView.computeVerticalScrollRange()
+// - callMessagesRecyclerView.computeVerticalScrollExtent()
+// - callMessagesRecyclerView.computeVerticalScrollOffset() < 500) {
+// callMessagesRecyclerView.scrollToPosition(callingListAdapter.getItemCount() - 1);
+// }
+// if (mainViewModel.currentMessages != null) {
+//
+// ToastMessage.show(String.format(GeneralVariables.getStringFromResource(
+// R.string.tracker_decoded_new)
+// , mainViewModel.currentDecodeCount)
+// + " " + String.format(
+// getString(R.string.decoding_takes_milliseconds)
+// , mainViewModel.ft8SignalListener.decodeTimeSec.getValue()));
+// //画电台之间的连线
+// //对CQ的电台打点
+// gridOsmMapView.clearLines();
+// gridOsmMapView.clearMarkers();
+// for (Ft8Message msg : mainViewModel.currentMessages) {
+// drawMessage(msg);//在地图上画每一个消息
+// }
+// gridOsmMapView.showInfoWindows();
+// }
+ }
+ });
+ mainViewModel.mutableIsDecoding.observe(this, new Observer() {
+ @Override
+ public void onChanged(Boolean aBoolean) {
+ if (aBoolean) {
+ gridOsmMapView.clearLines();
+ gridOsmMapView.clearMarkers();
+ }
+ }
+ });
+ mainViewModel.mutableFt8MessageList.observe(this, new Observer>() {
+ @SuppressLint("NotifyDataSetChanged")
+ @Override
+ public void onChanged(ArrayList messages) {
+ if (mainViewModel.currentMessages == null) return;
+ ArrayList tempMsg = new ArrayList<>(mainViewModel.currentMessages);
+ callingListAdapter.notifyDataSetChanged();
if (callMessagesRecyclerView.computeVerticalScrollRange()
- callMessagesRecyclerView.computeVerticalScrollExtent()
- callMessagesRecyclerView.computeVerticalScrollOffset() < 500) {
callMessagesRecyclerView.scrollToPosition(callingListAdapter.getItemCount() - 1);
}
- if (mainViewModel.currentMessages != null) {
- ToastMessage.show(String.format(GeneralVariables.getStringFromResource(
- R.string.tracker_decoded_new)
- , mainViewModel.currentDecodeCount)
- + " " + String.format(
- getString(R.string.decoding_takes_milliseconds)
- , mainViewModel.ft8SignalListener.decodeTimeSec.getValue()));
- //画电台之间的连线
- //对CQ的电台打点
- gridOsmMapView.clearLines();
- gridOsmMapView.clearMarkers();
- for (Ft8Message msg : mainViewModel.currentMessages) {
- drawMessage(msg);//在地图上画每一个消息
- }
- gridOsmMapView.showInfoWindows();
+ binding.gridMessageTextView.setText(String.format("%s %s"
+ , String.format(GeneralVariables.getStringFromResource(
+ R.string.tracker_decoded_new)
+ , mainViewModel.currentDecodeCount), String.format(
+ getString(R.string.decoding_takes_milliseconds)
+ , mainViewModel.ft8SignalListener.decodeTimeSec.getValue())));
+
+ //画电台之间的连线
+ //对CQ的电台打点
+ for (Ft8Message msg : tempMsg) {
+ drawMessage(msg);//在地图上画每一个消息
}
+ gridOsmMapView.showInfoWindows();
+ //}
}
});
diff --git a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/html/HtmlContext.java b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/html/HtmlContext.java
old mode 100755
new mode 100644
index a876798..9d4a309
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/html/HtmlContext.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/html/HtmlContext.java
@@ -5,6 +5,7 @@ package com.bg7yoz.ft8cn.html;
* @date 2023-03-20
*/
+import android.annotation.SuppressLint;
import android.database.Cursor;
import com.bg7yoz.ft8cn.BuildConfig;
@@ -29,9 +30,10 @@ public class HtmlContext {
" UL {\tCOLOR: #333333; FONT-FAMILY: tahoma,helvetica,sans-serif }\n" +
" P {\tCOLOR: #333333; FONT-FAMILY: tahoma,helvetica,sans-serif }\n" +
" BODY {\tCOLOR: #333333; FONT-FAMILY: tahoma,helvetica,sans-serif }\n" +
- " TD {\tCOLOR: #333333; FONT-FAMILY: tahoma,helvetica,sans-serif }\n" +
+ " FIELDSET {max-width: fit-content}\n" +
+ " TD {\tCOLOR: #333333; FONT-FAMILY: tahoma,helvetica,sans-serif; FONT-SIZE: 8pt}\n" +
" TR {\tBACKGROUND-COLOR: WHITE;COLOR: #333333; FONT-FAMILY: tahoma,helvetica,sans-serif }\n" +
- " TR.bbb {\tBACKGROUND-COLOR: #F6FBFF; COLOR: #333333; FONT-FAMILY: tahoma,helvetica,sans-serif }\n" +
+ " TR.bbb {\tBACKGROUND-COLOR: #DDF0FE; COLOR: #333333; FONT-FAMILY: tahoma,helvetica,sans-serif }\n" +
" TH {\tBACKGROUND-COLOR: C8C2FF;COLOR: #333333; FONT-FAMILY: tahoma,helvetica,sans-serif;FONT-SIZE: 8pt; }\n" +
" FONT.title {\tBACKGROUND-COLOR: white; COLOR: #363636; FONT-FAMILY:tahoma,helvetica,verdana,lucida console,utopia; FONT-SIZE: 10pt; FONT-WEIGHT: bold }\n" +
" FONT.sub {\tBACKGROUND-COLOR: white; COLOR: #000000; FONT-FAMILY:tahoma,helvetica,verdana,lucida console,utopia; FONT-SIZE: 10pt }\n" +
@@ -48,11 +50,11 @@ public class HtmlContext {
"\n" +
"\n" +
"\n";
- private static final String HTML_TITLE = "" +
+ private static final String HTML_TITLE = "\n";
- private static final String HTML_FOOTER = "" +
+ private static final String HTML_FOOTER = "\n";
@@ -66,7 +68,7 @@ public class HtmlContext {
public static String DEFAULT_HTML() {
- return HTML_STRING("" +
+ return HTML_STRING("");
}
- public static String ListTableContext(Cursor cursor) {
+ /**
+ * 生成表格的内容
+ * @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) {
StringBuilder result = new StringBuilder();
- result.append("");
+ HtmlContext.tableBegin(result,hasBorder,cellpadding,fullWidth).append("\n");
//写字段名
- result.append("");
+ HtmlContext.tableRowBegin(result);
for (int i = 0; i < cursor.getColumnCount(); i++) {
- result.append("");
- result.append(cursor.getColumnName(i));
- result.append(" ");
+ HtmlContext.tableCellHeader(result,cursor.getColumnName(i));
}
- result.append(" \n");
+ HtmlContext.tableRowEnd(result).append("\n");
int order=0;
while (cursor.moveToNext()) {
- if (order%2==0) {
- result.append("");
- }else {
- result.append(" ");
- }
+ HtmlContext.tableRowBegin(result,false,order % 2 !=0);
for (int i = 0; i < cursor.getColumnCount(); i++) {
- result.append("");
- if (cursor.getString(i)!=null) {
- result.append(cursor.getString(i));
- }
- result.append(" ");
+ HtmlContext.tableCell(result,(cursor.getString(i)!=null) ? cursor.getString(i) :"");
}
- result.append(" \n");
+ HtmlContext.tableRowEnd(result).append("\n");
order++;
}
- result.append("
");
+ HtmlContext.tableEnd(result).append("\n");
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 100755
new mode 100644
index ea80ce8..49f32a4
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/html/LogHttpServer.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/html/LogHttpServer.java
@@ -1,6 +1,7 @@
package com.bg7yoz.ft8cn.html;
/**
* Http服务的具体内容。数据库访问不需要异步方式。
+ *
* @author BGY70Z
* @date 2023-03-20
*/
@@ -35,6 +36,7 @@ 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;
@@ -70,12 +72,14 @@ public class LogHttpServer extends NanoHTTPD {
msg = HTML_STRING(getNewMessages());
} else if (uri.equalsIgnoreCase("MESSAGE")) {//查保存的SWL通联消息表
return getMessages(session);
- }else if (uri.equalsIgnoreCase("QSOSWLMSG")) {//查SWL QSO通联消息表
+ } 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());
+ msg = HTML_STRING(getCallsignQTH(session));
} else if (uri.equalsIgnoreCase("ALLTABLE")) {//查所有的表
msg = HTML_STRING(getAllTableName());
} else if (uri.equalsIgnoreCase("FOLLOWCALLSIGNS")) {//查关注的呼号
@@ -151,9 +155,8 @@ public class LogHttpServer extends NanoHTTPD {
//判断是不是POST日志文件
if (session.getMethod().equals(Method.POST)
|| session.getMethod().equals(Method.PUT)) {
- //Log.e(TAG, "serve uri: --------->" + session.getUri());
- Map files = new HashMap();
- Map header = session.getHeaders();
+ Map files = new HashMap<>();
+ //Map header = session.getHeaders();
try {
session.parseBody(files);
String param = files.get("file1");//这个是post或put文件的key
@@ -183,9 +186,8 @@ public class LogHttpServer extends NanoHTTPD {
temp.append("
");
}
+ mainViewModel.databaseOpr.getQslDxccToMap();//更新一下已经通联的分区
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});
StringBuilder result = new StringBuilder();
- result.append("");
+ HtmlContext.tableBegin(result, true, 2, false).append("\n");
+ result.append(String.format("");
+ HtmlContext.tableRowBegin(result).append("\n");
+ HtmlContext.tableCellHeader(result
+ , GeneralVariables.getStringFromResource(R.string.html_callsign)
+ , GeneralVariables.getStringFromResource(R.string.html_qsl_grid)
+ , GeneralVariables.getStringFromResource(R.string.html_distance)
+ , GeneralVariables.getStringFromResource(R.string.html_update_time)
+ ).append("\n");
+ 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()) {
- 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")))));
-
+ HtmlContext.tableRowBegin(result, true, order % 2 != 0);
Date date = new Date(cursor.getLong(cursor.getColumnIndex("updateTime")));
- result.append(String.format("%s ",
- formatTime.format(date)));
-
- result.append(" \n");
+ 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");
order++;
}
- result.append("
");
+ HtmlContext.tableBegin(result, true, 3, false).append("\n");
//写字段名
- result.append("");
+ HtmlContext.tableRowBegin(result).append("\n");
for (int i = 0; i < cursor.getColumnCount(); i++) {
- result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_callsign)));
- result.append(String.format("%s ", GeneralVariables.getStringFromResource(R.string.html_operation)));
+ HtmlContext.tableCellHeader(result
+ , GeneralVariables.getStringFromResource(R.string.html_callsign)
+ , GeneralVariables.getStringFromResource(R.string.html_operation)).append("\n");
}
- result.append(" \n");
+ HtmlContext.tableRowEnd(result).append("\n");
int order = 0;
while (cursor.moveToNext()) {
- if (order % 2 == 0) {
- result.append("");
- } else {
- result.append(" ");
- }
+ HtmlContext.tableRowBegin(result, true, order % 2 != 0).append("\n");
for (int i = 0; i < cursor.getColumnCount(); i++) {
- result.append("");
- result.append(String.format("%s %s %s "
+ , cursor.getString(i).replace("/", "_")
+ , GeneralVariables.getStringFromResource(R.string.html_delete))
+ ).append("\n");
}
- result.append(" \n");
+ HtmlContext.tableRowEnd(result).append("\n");
order++;
}
- result.append("
");
+ HtmlContext.tableEnd(result).append("\n");
+ cursor.close();
return result.toString();
}
@@ -357,84 +375,49 @@ public class LogHttpServer extends NanoHTTPD {
Cursor cursor = mainViewModel.databaseOpr.getDb().rawQuery(
"select * from QslCallsigns order by ID desc", null);
StringBuilder result = new StringBuilder();
- result.append("\n");
+ HtmlContext.tableBegin(result, false, 0, true).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");
+ 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");
int order = 0;
while (cursor.moveToNext()) {
- 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");
+ 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");
order++;
}
- result.append("
");
+ HtmlContext.tableEnd(result).append("\n");
+ cursor.close();
return result.toString();
}
@@ -458,14 +441,14 @@ public class LogHttpServer extends NanoHTTPD {
"");
result.append(String.format(GeneralVariables.getStringFromResource(R.string.html_callsign_grid_total)
, GeneralVariables.callsignAndGrids.size()));
- //result.append("\n");
- result.append("\n");
- result.append("");
+ HtmlContext.tableBegin(result, true, 1, false);
+ HtmlContext.tableRowBegin(result);
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(" \n");
+ HtmlContext.tableRowEnd(result).append("\n");
+
result.append(GeneralVariables.getCallsignAndGridToHTML());
- 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");
- 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.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(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, true
+ , GeneralVariables.getStringFromResource(R.string.html_audio_bits)
+ , GeneralVariables.audioOutput32Bit ?
+ GeneralVariables.getStringFromResource(R.string.audio32_bit)
+ : GeneralVariables.getStringFromResource(R.string.audio16_bit));
+
+ 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));
+
+ HtmlContext.tableKeyRow(result, false
+ , GeneralVariables.getStringFromResource(R.string.decode_mode_text)
+ , GeneralVariables.deepDecodeMode
+ ? GeneralVariables.getStringFromResource(R.string.deep_mode)
+ : GeneralVariables.getStringFromResource(R.string.fast_mode));
- 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, true
+ , GeneralVariables.getStringFromResource(R.string.html_total_number_of_decodes)
+ , String.format("%d", mainViewModel.ft8Messages.size()));
-
- 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");
-
- 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");
-
-
- 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");
-
- 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");
-
- 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())
+ HtmlContext.tableKeyRow(result, false
+ , 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(" \n");
+ : GeneralVariables.getStringFromResource(R.string.html_no_recording));
- 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, true
+ , 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.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, false
+ , GeneralVariables.getStringFromResource(R.string.html_average_delay_time_of_this_cycle)
+ , String.format(GeneralVariables.getStringFromResource(R.string.html_seconds)
+ , mainViewModel.mutableTimerOffset.getValue()));
- 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, true
+ , GeneralVariables.getStringFromResource(R.string.html_sound_frequency)
+ , String.format("%.0fHz", GeneralVariables.getBaseFrequency()));
- 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, false
+ , 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_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, true
+ , GeneralVariables.getStringFromResource(R.string.html_launch_supervision)
+ , String.format(GeneralVariables.getStringFromResource(R.string.html_milliseconds)
+ , GeneralVariables.launchSupervision));
+ HtmlContext.tableKeyRow(result, false
+ , 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_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, true
+ , GeneralVariables.getStringFromResource(R.string.html_no_reply_limit)
+ , GeneralVariables.noReplyLimit);
- 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, false
+ , GeneralVariables.getStringFromResource(R.string.html_no_reply_count)
+ , GeneralVariables.noReplyCount);
- 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, true
+ , GeneralVariables.getStringFromResource(R.string.follow_cq)
+ , String.valueOf(GeneralVariables.autoFollowCQ));
+ HtmlContext.tableKeyRow(result, false
+ , GeneralVariables.getStringFromResource(R.string.auto_call_follow)
+ , String.valueOf(GeneralVariables.autoCallFollow));
- 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, true
+ , GeneralVariables.getStringFromResource(R.string.html_target_callsign)
+ , (mainViewModel.ft8TransmitSignal.mutableToCallsign.getValue() != null)
+ ? mainViewModel.ft8TransmitSignal.mutableToCallsign.getValue().callsign : "");
- 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, false
+ , GeneralVariables.getStringFromResource(R.string.html_sequential)
+ , mainViewModel.ft8TransmitSignal.sequential);
+ HtmlContext.tableKeyRow(result, true
+ , GeneralVariables.getStringFromResource(R.string.synFrequency)
+ , String.valueOf(GeneralVariables.synFrequency));
- 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, false
+ , GeneralVariables.getStringFromResource(R.string.tran_delay)
+ , GeneralVariables.transmitDelay);
- 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");
+ HtmlContext.tableKeyRow(result, true
+ , GeneralVariables.getStringFromResource(R.string.ptt_delay)
+ , GeneralVariables.pttDelay);
+ HtmlContext.tableKeyRow(result, false
+ , GeneralVariables.getStringFromResource(R.string.rig_name)
+ , RigNameList.getInstance(
+ GeneralVariables.getMainContext()).getRigNameByIndex(GeneralVariables.modelNo).modelName);
- result.append("");
- result.append("");
- result.append(GeneralVariables.getStringFromResource(R.string.synFrequency));
- result.append(" \n");
- result.append("");
- result.append(GeneralVariables.synFrequency);
- result.append(" \n \n");
+ HtmlContext.tableKeyRow(result, true
+ , 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.tran_delay));
- result.append(" \n");
- result.append("");
- result.append(GeneralVariables.transmitDelay);
- result.append(" \n \n");
+ HtmlContext.tableKeyRow(result, false
+ , GeneralVariables.getStringFromResource(R.string.html_operation_mode)
+ , ControlMode.getControlModeStr(GeneralVariables.controlMode));
- 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");
+ HtmlContext.tableKeyRow(result, true
+ , GeneralVariables.getStringFromResource(R.string.html_civ_address)
+ , String.format("0x%2X", GeneralVariables.civAddress));
- 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");
+ HtmlContext.tableKeyRow(result, false
+ , GeneralVariables.getStringFromResource(R.string.html_baud_rate)
+ , GeneralVariables.baudRate);
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) {
@@ -749,123 +626,57 @@ public class LogHttpServer extends NanoHTTPD {
}
}
for (CableSerialPort.SerialPort serialPort : Objects.requireNonNull(mainViewModel.mutableSerialPorts.getValue())) {
- result.append(serialPort.information() + " ");
- 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(serialPort.information()).append(" ");
result.append(" \n");
- 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, true
+ , GeneralVariables.getStringFromResource(R.string.html_instruction_set)
+ , (mainViewModel.baseRig != null) ? mainViewModel.baseRig.getName() : "-");
+ HtmlContext.tableKeyRow(result, false
+ , GeneralVariables.getStringFromResource(R.string.html_connect_mode)
+ , (GeneralVariables.controlMode == ControlMode.VOX) ? "-"
+ : ConnectMode.getModeStr(GeneralVariables.connectMode));
- 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, true
+ , GeneralVariables.getStringFromResource(R.string.html_baud_rate)
+ , GeneralVariables.baudRate);
+ HtmlContext.tableKeyRow(result, false
+ , GeneralVariables.getStringFromResource(R.string.html_carrier_frequency_band)
+ , GeneralVariables.getBandString());
- 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, true
+ , GeneralVariables.getStringFromResource(R.string.html_radio_frequency)
+ , (mainViewModel.baseRig != null)
+ ? BaseRigOperation.getFrequencyStr(mainViewModel.baseRig.getFreq()) : "-");
+ HtmlContext.tableKeyRow(result, false
+ , GeneralVariables.getStringFromResource(R.string.html_flex_max_rf_power)
+ , String.format("%d W", GeneralVariables.flexMaxRfPower));
- 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, true
+ , GeneralVariables.getStringFromResource(R.string.html_atu_tune_power)
+ , String.format("%d W", GeneralVariables.flexMaxTunePower));
+ HtmlContext.tableKeyRow(result, false
+ , GeneralVariables.getStringFromResource(R.string.be_excluded_callsigns)
+ , GeneralVariables.getExcludeCallsigns());
- 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, true
+ , GeneralVariables.getStringFromResource(R.string.config_save_swl)
+ , String.valueOf(GeneralVariables.saveSWLMessage));
- result.append("
\n");
+ HtmlContext.tableBegin(result, false, 0, true).append("\n");
result.append(String.format("%s ");
+ result.append(" \n");
}
}
- result.append("
\n");
+ HtmlContext.tableBegin(result, false, 0, true).append("\n");
result.append(String.format("%s ");
+ result.append(" \n");
}
}
- result.append("
\n");
+ result.append("\n");
+ HtmlContext.tableEnd(result).append("\n");
- result.append("\n");
+ HtmlContext.tableBegin(result, false, 0, true).append("\n");
result.append(String.format("%s ");
result.append(GeneralVariables.qslRecordList.toHTML());
- result.append("
\n");
- // result.append("
\n");
+ result.append("\n");
+ HtmlContext.tableEnd(result).append("\n");
return result.toString();
}
@@ -920,40 +732,26 @@ public class LogHttpServer extends NanoHTTPD {
"}\n" +
"setTimeout('myrefresh()',5000); //指定5秒刷新一次，5000处可自定义设置，1000为1秒\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");
+ 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");
+
int order = 0;
for (Map.Entry entry : Ft8Message.hashList.entrySet()) {
- 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");
+ 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");
+
order++;
}
-// 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("
");
+ HtmlContext.tableEnd(result).append("\n");
return result.toString();
}
@@ -977,11 +775,11 @@ public class LogHttpServer extends NanoHTTPD {
.replace(".", "_")
.replace(">", "_"));
}
- if (start_date.length()>0){
- fileName.append(String.format("_%s",start_date));
+ if (start_date.length() > 0) {
+ fileName.append(String.format("_%s", start_date));
}
- if (end_date.length()>0){
- fileName.append(String.format("_%s",end_date));
+ if (end_date.length() > 0) {
+ fileName.append(String.format("_%s", end_date));
}
fileName.append(".").append(exportFile);
@@ -998,18 +796,18 @@ 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.toString() +
- " order by ID "
- , new String[]{whereStr, whereStr});
+ "select * from SWLMessages where ((CALL_TO LIKE ?)OR(CALL_FROM LIKE ?)) " +
+ dateSql +
+ " order by ID "
+ , new String[]{whereStr, whereStr});
- StringBuilder result=new StringBuilder();
+ StringBuilder result = new StringBuilder();
String formatStr;
- if (exportFile.equalsIgnoreCase("CSV")){
- formatStr="%s,%.3f,Rx,%s,%d,%.1f,%d,%s\n";
- }else {
- formatStr="%s %12.3f Rx %s %6d %4.1f %4d %s\n";
+ if (exportFile.equalsIgnoreCase("CSV")) {
+ formatStr = "%s,%.3f,Rx,%s,%d,%.1f,%d,%s\n";
+ } else {
+ formatStr = "%s %12.3f Rx %s %6d %4.1f %4d %s\n";
}
while (cursor.moveToNext()) {
@@ -1024,15 +822,14 @@ public class LogHttpServer extends NanoHTTPD {
long band = cursor.getLong(cursor.getColumnIndex("BAND"));
result.append(String.format(formatStr
- ,utcTime,(band/1000f/1000f),protocol,dB,dt,freq,String.format("%s %s %s",callTo,callFrom,extra)));
+ , utcTime, (band / 1000f / 1000f), protocol, dB, dt, freq, String.format("%s %s %s", callTo, callFrom, extra)));
}
cursor.close();
-
response = newFixedLengthResponse(NanoHTTPD.Response.Status.OK, "text/plain", result.toString());
response.addHeader("Content-Disposition"
- , String.format("attachment;filename=%s",fileName.toString()));
+ , String.format("attachment;filename=%s", fileName));
return response;
}
@@ -1083,10 +880,14 @@ 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.toString() +
+ dateSql +
" order by ID LIMIT(%d),%d "
, (pageIndex - 1) * pageSize, pageSize), new String[]{whereStr, whereStr});
- 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");
+ //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");
+
+
int order = 0;
while (cursor.moveToNext()) {
- if (order % 2 == 0) {
- result.append("");
- } else {
- result.append(" ");
- }
+ HtmlContext.tableRowBegin(result, true, order % 2 != 0);
- //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"));
@@ -1184,35 +980,30 @@ public class LogHttpServer extends NanoHTTPD {
String extra = cursor.getString(cursor.getColumnIndex("EXTRAL"));
long band = cursor.getLong(cursor.getColumnIndex("BAND"));
- //UtcTimer.getDatetimeStr(utcTime)
- result.append(String.format("%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)
+ 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 \n");
order++;
}
cursor.close();
- result.append("
");
+
result.append(String.format("%s "
- , callsign, startDate, endDate,GeneralVariables.getStringFromResource(R.string.html_export_adi)));
+ , callsign, startDate, endDate, GeneralVariables.getStringFromResource(R.string.html_export_adi)));
Cursor cursor;
StringBuilder dateSql = new StringBuilder();
@@ -1336,7 +1141,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.toString()
+ "where (([call] LIKE ?)OR(station_callsign LIKE ?))" + dateSql
, new String[]{whereStr, whereStr});
cursor.moveToFirst();
int pageCount = Math.round(((float) cursor.getInt(cursor.getColumnIndex("rc")) / pageSize) + 0.5f);
@@ -1347,19 +1152,20 @@ 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.toString() +
- " order by ID LIMIT(%d),%d "
+ dateSql +
+ " order by qso_date desc,time_on desc LIMIT(%d),%d "
, (pageIndex - 1) * pageSize, pageSize), new String[]{whereStr, whereStr});
- 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");
+ 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");
int order = 0;
while (cursor.moveToNext()) {
- if (order % 2 == 0) {
- result.append("");
- } else {
- result.append(" ");
- }
+ HtmlContext.tableRowBegin(result, true, order % 2 != 0).append("\n");
- //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"));
@@ -1426,58 +1232,350 @@ public class LogHttpServer extends NanoHTTPD {
String comment = cursor.getString(cursor.getColumnIndex("comment"));
- //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
-
- , order + 1 + pageSize * (pageIndex - 1)
-
- ,pageSize
- ,call.replace("<", "")
+ //生成数据表的一行
+ HtmlContext.tableCell(result, String.format("%d", order + 1 + pageSize * (pageIndex - 1)));
+ HtmlContext.tableCell(result, String.format("%s "
+ , pageSize, call.replace("<", "")
.replace(">", "")
, call.replace("<", "<")
- .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(">", ">")));
+ 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(">", ">")
+ .replace(">", ">")));
+ HtmlContext.tableCell(result, my_gridsquare == null ? "" : my_gridsquare
+ , comment).append("\n");
- ,my_gridsquare==null?"":my_gridsquare
- ,comment ));
- //result.append(UtcTimer.getDatetimeStr(utcTime));
- result.append(" \n");
+ HtmlContext.tableRowEnd(result).append("\n");
order++;
}
cursor.close();
- 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 "
+ , 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");
+
+ 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");
+ HtmlContext.tableBegin(result, false, true).append("\n");
+
+ HtmlContext.tableRowBegin(result);
+ HtmlContext.tableCellHeader(result, "UTC", "dB", "Δt"
+ , GeneralVariables.getStringFromResource(R.string.html_qsl_freq)
+ , GeneralVariables.getStringFromResource(R.string.message)
+ , GeneralVariables.getStringFromResource(R.string.html_carrier_frequency_band));
+ HtmlContext.tableRowEnd(result).append("\n");
+
int order = 0;
if (mainViewModel.currentMessages != null) {
for (Ft8Message message : mainViewModel.currentMessages) {
- if (order % 2 == 0) {
- result.append("");
- } else {
- result.append(" ");
- }
- result.append(message.toHtml());
- result.append(" ");
+ HtmlContext.tableRowBegin(result, true, order % 2 != 0)
+ .append("\n").append(message.toHtml());
+ HtmlContext.tableRowEnd(result).append("\n");
order++;
}
}
- result.append("
\n");
- result.append(String.format("" +
- "%s%s %s %s %s"
, GeneralVariables.getStringFromResource(R.string.html_please_select)
, GeneralVariables.getStringFromResource(R.string.html_adi_format)
, GeneralVariables.getStringFromResource(R.string.html_file_in_other_format)));
- result.append("
");
+ " ");
+ HtmlContext.tableRowEnd(result).append("\n");
+ HtmlContext.tableEnd(result).append("\n");
return result.toString();
}
@@ -1571,21 +1667,23 @@ public class LogHttpServer extends NanoHTTPD {
private String showQSLTable() {
StringBuilder result = new StringBuilder();
- 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"))));
@@ -1598,53 +1696,52 @@ public class LogHttpServer extends NanoHTTPD {
"WHERE SUBSTR(qso_date,1,8)=?", new String[]{UtcTimer.getYYYYMMDD(UtcTimer.getSystemTime())});
cursor.moveToFirst();
- result.append("");
-
- result.append(String.format("%s %s "
, UtcTimer.getYYYYMMDD(UtcTimer.getSystemTime())
, GeneralVariables.getStringFromResource(R.string.html_today_log)));
- result.append(String.format("%s "
- , cursor.getString(cursor.getColumnIndex("b"))));
- result.append(String.format("%s %s "
, UtcTimer.getYYYYMMDD(UtcTimer.getSystemTime())
, GeneralVariables.getStringFromResource(R.string.html_download_all)));
- result.append(String.format("%s %s "
, UtcTimer.getYYYYMMDD(UtcTimer.getSystemTime())
, GeneralVariables.getStringFromResource(R.string.html_download_unconfirmed)));
-
- result.append(String.format("%s "
+ HtmlContext.tableCell(result, String.format("%s "
, UtcTimer.getYYYYMMDD(UtcTimer.getSystemTime())
- , GeneralVariables.getStringFromResource(R.string.html_delete)));
+ , GeneralVariables.getStringFromResource(R.string.html_delete))).append("\n");
+
+ HtmlContext.tableRowEnd(result).append("\n");
+
cursor.close();
int order = 1;
- 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);
+ 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()) {
- if (order % 2 == 0) {
- result.append("");
- } else {
- result.append(" ");
- }
- result.append(String.format("%s %s "
, cursor.getString(cursor.getColumnIndex("a"))
, cursor.getString(cursor.getColumnIndex("a"))));
- result.append(String.format("%s "
- , cursor.getString(cursor.getColumnIndex("b"))));
- result.append(String.format("%s %s "
, cursor.getString(cursor.getColumnIndex("a"))
, GeneralVariables.getStringFromResource(R.string.html_download_all)));
- result.append(String.format("%s %s "
, cursor.getString(cursor.getColumnIndex("a"))
, GeneralVariables.getStringFromResource(R.string.html_download_unconfirmed)));
-
- result.append(String.format("%s "
+ HtmlContext.tableCell(result, String.format("%s "
, cursor.getString(cursor.getColumnIndex("a"))
- , GeneralVariables.getStringFromResource(R.string.html_delete)));
+ , GeneralVariables.getStringFromResource(R.string.html_delete))).append("\n");
+
+ HtmlContext.tableRowEnd(result).append("\n");
order++;
}
- result.append("
");
- //cursor.close();
+ HtmlContext.tableEnd(result).append("\n");
+ cursor.close();
return result.toString();
}
@@ -1660,17 +1757,17 @@ public class LogHttpServer extends NanoHTTPD {
, new String[]{String.valueOf(month.length()), month});
}
- return downQSLTable(cursor,false);
+ return downQSLTable(cursor, false);
}
/**
* 下载全部日志
*
- * @return
+ * @return String
*/
private String downAllQSl() {
Cursor cursor = mainViewModel.databaseOpr.getDb().rawQuery("select * from QSLTable", null);
- return downQSLTable(cursor,false);
+ return downQSLTable(cursor, false);
}
/**
@@ -1679,8 +1776,7 @@ public class LogHttpServer extends NanoHTTPD {
* @return 日志内容
*/
@SuppressLint({"Range", "DefaultLocale"})
- private String downQSLTable(Cursor cursor,boolean isSWL) {
- //Cursor cursor = mainViewModel.databaseOpr.getDb().rawQuery("select * from QSLTable", null);
+ private String downQSLTable(Cursor cursor, boolean isSWL) {
StringBuilder logStr = new StringBuilder();
logStr.append("FT8CN ADIF Export\n");
@@ -1699,76 +1795,76 @@ public class LogHttpServer extends NanoHTTPD {
} else {
logStr.append("N ");
}
- }else {
+ } else {
logStr.append("Y ");
}
- if (cursor.getString(cursor.getColumnIndex("gridsquare"))!=null) {
+ if (cursor.getString(cursor.getColumnIndex("gridsquare")) != null) {
logStr.append(String.format("%s "
, cursor.getString(cursor.getColumnIndex("gridsquare")).length()
, cursor.getString(cursor.getColumnIndex("gridsquare"))));
}
- if (cursor.getString(cursor.getColumnIndex("mode"))!=null) {
+ if (cursor.getString(cursor.getColumnIndex("mode")) != null) {
logStr.append(String.format("%s "
, cursor.getString(cursor.getColumnIndex("mode")).length()
, cursor.getString(cursor.getColumnIndex("mode"))));
}
- if (cursor.getString(cursor.getColumnIndex("rst_sent"))!=null) {
+ if (cursor.getString(cursor.getColumnIndex("rst_sent")) != null) {
logStr.append(String.format("%s "
, cursor.getString(cursor.getColumnIndex("rst_sent")).length()
, cursor.getString(cursor.getColumnIndex("rst_sent"))));
}
- if (cursor.getString(cursor.getColumnIndex("rst_rcvd"))!=null) {
+ if (cursor.getString(cursor.getColumnIndex("rst_rcvd")) != null) {
logStr.append(String.format("%s "
, cursor.getString(cursor.getColumnIndex("rst_rcvd")).length()
, cursor.getString(cursor.getColumnIndex("rst_rcvd"))));
}
- if (cursor.getString(cursor.getColumnIndex("qso_date"))!=null) {
+ if (cursor.getString(cursor.getColumnIndex("qso_date")) != null) {
logStr.append(String.format("%s "
, cursor.getString(cursor.getColumnIndex("qso_date")).length()
, cursor.getString(cursor.getColumnIndex("qso_date"))));
}
- if (cursor.getString(cursor.getColumnIndex("time_on"))!=null) {
+ if (cursor.getString(cursor.getColumnIndex("time_on")) != null) {
logStr.append(String.format("%s "
, cursor.getString(cursor.getColumnIndex("time_on")).length()
, cursor.getString(cursor.getColumnIndex("time_on"))));
}
- if (cursor.getString(cursor.getColumnIndex("qso_date_off"))!=null) {
+ if (cursor.getString(cursor.getColumnIndex("qso_date_off")) != null) {
logStr.append(String.format("%s "
, cursor.getString(cursor.getColumnIndex("qso_date_off")).length()
, cursor.getString(cursor.getColumnIndex("qso_date_off"))));
}
- if (cursor.getString(cursor.getColumnIndex("time_off"))!=null) {
+ if (cursor.getString(cursor.getColumnIndex("time_off")) != null) {
logStr.append(String.format("%s "
, cursor.getString(cursor.getColumnIndex("time_off")).length()
, cursor.getString(cursor.getColumnIndex("time_off"))));
}
- if (cursor.getString(cursor.getColumnIndex("band"))!=null) {
+ if (cursor.getString(cursor.getColumnIndex("band")) != null) {
logStr.append(String.format("%s "
, cursor.getString(cursor.getColumnIndex("band")).length()
, cursor.getString(cursor.getColumnIndex("band"))));
}
- if (cursor.getString(cursor.getColumnIndex("freq"))!=null) {
+ if (cursor.getString(cursor.getColumnIndex("freq")) != null) {
logStr.append(String.format("%s "
, cursor.getString(cursor.getColumnIndex("freq")).length()
, cursor.getString(cursor.getColumnIndex("freq"))));
}
- if (cursor.getString(cursor.getColumnIndex("station_callsign"))!=null) {
+ if (cursor.getString(cursor.getColumnIndex("station_callsign")) != null) {
logStr.append(String.format("%s "
, cursor.getString(cursor.getColumnIndex("station_callsign")).length()
, cursor.getString(cursor.getColumnIndex("station_callsign"))));
}
- if (cursor.getString(cursor.getColumnIndex("my_gridsquare"))!=null) {
+ if (cursor.getString(cursor.getColumnIndex("my_gridsquare")) != null) {
logStr.append(String.format("%s "
, cursor.getString(cursor.getColumnIndex("my_gridsquare")).length()
, cursor.getString(cursor.getColumnIndex("my_gridsquare"))));
@@ -1783,7 +1879,6 @@ 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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
index cbd022b..d0f1242
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IcomAudioUdp.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/icom/IcomAudioUdp.java
@@ -47,48 +47,10 @@ public class IcomAudioUdp extends IcomUdpBase {
x = 1.0f;
else if (x < -1.0)
x = -1.0f;
- temp[i] = (short) (0.5 + (x * 32767.0));
+ temp[i] = (short) (x * 32767.0);
}
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
index 7e39539..8e170f8
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/LogQSLAdapter.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/log/LogQSLAdapter.java
@@ -111,10 +111,15 @@ public class LogQSLAdapter extends RecyclerView.Adapter1000) 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 100755
new mode 100644
index 6905c42..fb59880
--- 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/2000";
+ return "KENWOOD TS-480/590";
}
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
index 338b384..1f7244e
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/YaesuDX10Rig.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/rigs/YaesuDX10Rig.java
@@ -17,7 +17,7 @@ import java.util.TimerTask;
* 3代的指令，不同电台还有不同，频率长度981，991是9位，其它的长度是8位
*/
public class YaesuDX10Rig extends BaseRig {
- private static final String TAG = "Yaesu3Rig";
+ private static final String TAG = "YaesuDX10Rig";
private final StringBuilder buffer = new StringBuilder();
private int swr = 0;
private int alc = 0;
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 100755
new mode 100644
index 8574a44..be22673
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/CdcAcmSerialDriver.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/CdcAcmSerialDriver.java
@@ -305,6 +305,8 @@ public class CdcAcmSerialDriver implements UsbSerialDriver {
new int[] {
UsbId.VAN_OOIJEN_TECH_TEENSYDUINO_SERIAL,
});
+
+
supportedDevices.put(UsbId.VENDOR_ATMEL,
new int[] {
UsbId.ATMEL_LUFA_CDC_DEMO_APP,
@@ -321,7 +323,8 @@ public class CdcAcmSerialDriver implements UsbSerialDriver {
new int[] {
UsbId.ST_CDC,
UsbId.ST_CDC2,
- UsbId.ST_CDC3
+ UsbId.ST_CDC3,
+ UsbId.CDC_WOLF_PID
});
supportedDevices.put(UsbId.VENDOR_RASPBERRY_PI,
new int[] {
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
index b9db984..73ab2a2
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/UsbId.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/serialport/UsbId.java
@@ -42,6 +42,8 @@ public final class UsbId {
public static final int VENDOR_VAN_OOIJEN_TECH = 0x16c0;
public static final int VAN_OOIJEN_TECH_TEENSYDUINO_SERIAL = 0x0483;
+ public static final int CDC_WOLF_PID= 0xF001;// ST CDC WOLF RIG
+
public static final int VENDOR_LEAFLABS = 0x1eaf;
public static final int LEAFLABS_MAPLE = 0x0004;
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
index b2c7223..ddfb0f9
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/CallingListAdapter.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/CallingListAdapter.java
@@ -9,6 +9,7 @@ package com.bg7yoz.ft8cn.ui;
import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.Paint;
+import android.opengl.Visibility;
import android.view.ContextMenu;
import android.view.LayoutInflater;
import android.view.View;
@@ -169,6 +170,7 @@ public class CallingListAdapter extends RecyclerView.Adapter>() {
+ @Override
+ public void onChanged(ArrayList messages) {
callingListAdapter.notifyDataSetChanged();
//当列表下部稍微多出一些，自动上移
if (callListRecyclerView.computeVerticalScrollRange()
@@ -115,7 +124,6 @@ public class CallingListFragment extends Fragment {
}
});
-
//观察UTC时间
mainViewModel.timerSec.observe(getViewLifecycleOwner(), new Observer() {
@Override
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
index 0e7d215..9e69fa1
--- 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,6 +17,10 @@ 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;
@@ -34,10 +38,6 @@ 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,6 +280,15 @@ public class ConfigFragment extends Fragment {
//设置电台名称，参数列表
setRigNameSpinner();
+ //设置解码模式
+ setDecodeMode();
+
+ //设置音频输出的位数
+ setAudioOutputBitsMode();
+
+ //设置音频输出采样率
+ setAudioOutputRateMode();
+
//设置控制模式 VOX CAT
setControlMode();
@@ -762,6 +771,80 @@ public class ConfigFragment extends Fragment {
}
+ private void setDecodeMode() {
+ binding.decodeModeRadioGroup.clearCheck();
+ binding.fastDecodeRadioButton.setChecked(!GeneralVariables.deepDecodeMode);
+ binding.deepDecodeRadioButton.setChecked(GeneralVariables.deepDecodeMode);
+
+ View.OnClickListener listener = new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ int buttonId = binding.decodeModeRadioGroup.getCheckedRadioButtonId();
+ GeneralVariables.deepDecodeMode= buttonId ==binding.deepDecodeRadioButton.getId();
+ writeConfig("deepMode", GeneralVariables.deepDecodeMode? "1" : "0");
+ }
+ };
+
+ binding.fastDecodeRadioButton.setOnClickListener(listener);
+ binding.deepDecodeRadioButton.setOnClickListener(listener);
+
+ }
+
+
+ /**
+ * 设置音频输出的位数
+ */
+ 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
*/
@@ -897,66 +980,54 @@ public class ConfigFragment extends Fragment {
binding.callsignHelpImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- if (GeneralVariables.isChina) {
- new HelpDialog(requireContext(), requireActivity(), "callsign.txt", true).show();
- } else {
- new HelpDialog(requireContext(), requireActivity(), "callsign_en.txt", true).show();
- }
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.callsign_help)
+ , true).show();
}
});
//梅登海德网格的帮助
binding.maidenGridImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- if (GeneralVariables.isChina) {
- new HelpDialog(requireContext(), requireActivity(), "maidenhead.txt", true).show();
- } else {
- new HelpDialog(requireContext(), requireActivity(), "maidenhead_en.txt", true).show();
- }
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.maidenhead_help)
+ , true).show();
}
});
//发射频率的帮助
binding.frequencyImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- if (GeneralVariables.isChina) {
- new HelpDialog(requireContext(), requireActivity(), "frequency.txt", true).show();
- } else {
- new HelpDialog(requireContext(), requireActivity(), "frequency_en.txt", true).show();
- }
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.frequency_help)
+ , true).show();
}
});
//延迟发射帮助
binding.transDelayImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- if (GeneralVariables.isChina) {
- new HelpDialog(requireContext(), requireActivity(), "transDelay.txt", true).show();
- } else {
- new HelpDialog(requireContext(), requireActivity(), "transDelay_en.txt", true).show();
- }
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.transDelay_help)
+ , true).show();
}
});
//时间偏移帮助
binding.timeOffsetImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- if (GeneralVariables.isChina) {
- new HelpDialog(requireContext(), requireActivity(), "timeoffset.txt", true).show();
- } else {
- new HelpDialog(requireContext(), requireActivity(), "timeoffset_en.txt", true).show();
- }
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.timeoffset_help)
+ , true).show();
}
});
//PTT延时帮助
binding.pttDelayImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- if (GeneralVariables.isChina) {
- new HelpDialog(requireContext(), requireActivity(), "pttdelay.txt", true).show();
- } else {
- new HelpDialog(requireContext(), requireActivity(), "pttdelay_en.txt", true).show();
- }
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.pttdelay_help)
+ , true).show();
}
});
//设置ABOUT
@@ -970,110 +1041,110 @@ public class ConfigFragment extends Fragment {
binding.operationHelpImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- if (GeneralVariables.isChina) {
- new HelpDialog(requireContext(), requireActivity(), "operationBand.txt", true).show();
- } else {
- new HelpDialog(requireContext(), requireActivity(), "operationBand_en.txt", true).show();
- }
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.operationBand_help)
+ , true).show();
}
});
//设置操作模式
binding.controlModeHelpImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- if (GeneralVariables.isChina) {
- new HelpDialog(requireContext(), requireActivity(), "controlMode.txt", true).show();
- } else {
- new HelpDialog(requireContext(), requireActivity(), "controlMode_en.txt", true).show();
- }
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.controlMode_help)
+ , true).show();
}
});
//设置CI-V地址和波特率帮助
binding.baudRateHelpImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- if (GeneralVariables.isChina) {
- new HelpDialog(requireContext(), requireActivity(), "civ_help.txt", true).show();
- } else {
- new HelpDialog(requireContext(), requireActivity(), "civ_help_en.txt", true).show();
- }
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.civ_help)
+ , true).show();
}
});
//电台型号列表
binding.rigNameHelpImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- 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();
- }
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.rig_model_help)
+ , true).show();
}
});
//发射监管
binding.launchSupervisionImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- if (GeneralVariables.isChina) {
- new HelpDialog(requireContext(), requireActivity(), "launch_supervision_help.txt", true).show();
- } else {
- new HelpDialog(requireContext(), requireActivity(), "launch_supervision_en.txt", true).show();
- }
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.launch_supervision_help)
+ , true).show();
}
});
//无回应次数
binding.noResponseCountButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- 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();
- }
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.no_response_help)
+ , true).show();
}
});
//自动呼叫
binding.autoFollowCountButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- 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();
- }
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.auto_follow_help)
+ , true).show();
}
});
//连接模式
binding.connectModeHelpImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- if (GeneralVariables.isChina) {
- new HelpDialog(requireContext(), requireActivity(), "connectMode.txt", true).show();
- } else {
- new HelpDialog(requireContext(), requireActivity(), "connectMode_en.txt", true).show();
- }
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.connectMode_help)
+ , true).show();
}
});
//排除选项
binding.excludedHelpButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- if (GeneralVariables.isChina) {
- new HelpDialog(requireContext(), requireActivity(), "excludeCallsign.txt", true).show();
- } else {
- new HelpDialog(requireContext(), requireActivity(), "excludeCallsign_en.txt", true).show();
- }
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.excludeCallsign_help)
+ , true).show();
}
});
binding.swlHelpButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- if (GeneralVariables.isChina) {
- new HelpDialog(requireContext(), requireActivity(), "swlMode.txt", true).show();
- } else {
- new HelpDialog(requireContext(), requireActivity(), "swlMode_en.txt", true).show();
- }
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.swlMode_help)
+ , true).show();
+ }
+ });
+
+ //解码模式
+ binding.decodeModeHelpButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ new HelpDialog(requireContext(),requireActivity()
+ ,GeneralVariables.getStringFromResource(R.string.deep_mode_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();
}
});
@@ -1081,11 +1152,9 @@ public class ConfigFragment extends Fragment {
binding.clearCacheHelpButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- 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();
- }
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.clear_cache_data_help)
+ , 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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
index e27c71e..ad1ab12
--- 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,6 +1,7 @@
package com.bg7yoz.ft8cn.ui;
/**
* 通联纪录的主界面。
+ *
* @author BGY70Z
* @date 2023-03-20
*/
@@ -65,7 +66,7 @@ public class LogFragment extends Fragment {
private LogCallsignAdapter logCallsignAdapter;
private LogQSLAdapter logQSLAdapter;
- private boolean loading=false;//防止滑动触发多次查询
+ private boolean loading = false;//防止滑动触发多次查询
private int lastItemPosition;
@@ -113,12 +114,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);
}
});
@@ -137,7 +138,7 @@ public class LogFragment extends Fragment {
@Override
public void afterTextChanged(Editable editable) {
mainViewModel.queryKey = editable.toString();
- queryByCallsign(mainViewModel.queryKey,0);
+ queryByCallsign(mainViewModel.queryKey, 0);
}
});
@@ -153,10 +154,16 @@ public class LogFragment extends Fragment {
binding.exportImageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- new HelpDialog(requireContext(), requireActivity()
- , String.format(GeneralVariables.getStringFromResource(R.string.export_info)
- , getLocalIp(), LogHttpServer.DEFAULT_PORT)
- , false).show();
+ if (getLocalIp()==null) {
+ new HelpDialog(requireContext(), requireActivity()
+ , GeneralVariables.getStringFromResource(R.string.export_null)
+ ,false).show();
+ }else {
+ new HelpDialog(requireContext(), requireActivity()
+ , String.format(GeneralVariables.getStringFromResource(R.string.export_info)
+ , getLocalIp(), LogHttpServer.DEFAULT_PORT)
+ , false).show();
+ }
}
});
@@ -166,7 +173,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，就是重新查询
}
});
@@ -176,7 +183,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);
}
});
@@ -209,6 +216,8 @@ 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;
@@ -222,6 +231,7 @@ public class LogFragment extends Fragment {
return super.onContextItemSelected(item);
}
+
private boolean itemIsOnScreen(View view) {
if (view != null) {
int width = view.getWidth();
@@ -232,15 +242,20 @@ public class LogFragment extends Fragment {
return false;
}
- private void loadQueryData(RecyclerView recyclerView){
- if ((!loading)) {
- if (mainViewModel.logListShowCallsign){
- queryByCallsign(mainViewModel.queryKey, logCallsignAdapter.getItemCount());
- }else {
- queryByCallsign(mainViewModel.queryKey, logQSLAdapter.getItemCount());
+ 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());
}
}
}
+
/**
* 设置列表滑动动作
*/
@@ -252,13 +267,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);
}
@@ -268,14 +283,28 @@ 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());
+// }
+// }
}
});
@@ -425,15 +454,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) {
@@ -441,16 +470,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) {
@@ -458,7 +487,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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
index 84ea2b3..6dbd23c
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/SpectrumView.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/SpectrumView.java
@@ -72,8 +72,6 @@ public class SpectrumView extends ConstraintLayout {
mainViewModel.currentMessages=null;
-
-
//原始频谱开关
controlDeNoiseSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
@@ -105,7 +103,7 @@ public class SpectrumView extends ConstraintLayout {
mainViewModel.mutableIsDecoding.observe(fragment.getViewLifecycleOwner(), new Observer() {
@Override
public void onChanged(Boolean aBoolean) {
- waterfallView.setDrawMessage(!aBoolean);//false说明解码完毕
+ waterfallView.setDrawMessage(!aBoolean);//aBoolean==false说明解码完毕
}
});
@@ -121,7 +119,6 @@ public class SpectrumView extends ConstraintLayout {
columnarView.setTouch_x(Math.round(motionEvent.getX()));
-
if (!mainViewModel.ft8TransmitSignal.isSynFrequency()
&& (waterfallView.getFreq_hz() > 0)
&& (motionEvent.getAction() == ACTION_UP)
@@ -132,7 +129,6 @@ public class SpectrumView extends ConstraintLayout {
mainViewModel.ft8TransmitSignal.setBaseFrequency(
(float) waterfallView.getFreq_hz());
-
rulerFrequencyView.setFreq(waterfallView.getFreq_hz());
fragment.requireActivity().runOnUiThread(new Runnable() {
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
index 93b243d..a0fc9ed
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/WaterfallView.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/ui/WaterfallView.java
@@ -1,6 +1,7 @@
package com.bg7yoz.ft8cn.ui;
/**
* 瀑布图自定义控件。
+ *
* @author BGY70Z
* @date 2023-03-20
*/
@@ -19,12 +20,17 @@ import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.View;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.bg7yoz.ft8cn.Ft8Message;
import com.bg7yoz.ft8cn.timer.UtcTimer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
+import java.util.ListIterator;
public class WaterfallView extends View {
private int blockHeight = 2;//色块高度
@@ -60,6 +66,8 @@ public class WaterfallView extends View {
public WaterfallView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
+ ArrayList messages= new ArrayList<>();
+
/**
* 把dp值转换为像素点
@@ -97,7 +105,7 @@ public class WaterfallView extends View {
fontPaint.setDither(true);
fontPaint.setTextAlign(Paint.Align.LEFT);
- // messagePaint = new Paint();
+ // messagePaint = new Paint();
messagePaint.setTextSize(dpToPixel(11));
messagePaint.setColor(0xff00ffff);
messagePaint.setAntiAlias(true);
@@ -176,7 +184,10 @@ public class WaterfallView extends View {
invalidate();
}
- public void setWaveData(int[] data, int sequential, List messages) {
+ public void setWaveData(int[] data, int sequential, List msgs) {
+ if (drawMessage&& msgs!=null){//把需要画的消息复制出来防止多线程访问冲突
+ messages=new ArrayList<>(msgs);
+ }
if (data == null) {
return;
@@ -232,19 +243,7 @@ public class WaterfallView extends View {
fontPaint.setTextAlign(Paint.Align.LEFT);
for (Ft8Message msg : messages) {
-// if (GeneralVariables.checkQSLCallsign(msg.getCallsignFrom())) {//如果在数据库中，划线
-// messagePaint.setStrikeThruText(true);
-// messagePaint.setUnderlineText(true);
-// //messagePaint.setFlags(messagePaint.getFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
-// } else {//如果不在数据库中，去掉划线
-// messagePaint.setStrikeThruText(false);
-// messagePaint.setUnderlineText(false);
-// //messagePaint.setFlags(messagePaint.getFlags() & (~Paint.STRIKE_THRU_TEXT_FLAG));
-// }
-
-
if (msg.inMyCall()) {//与我有关
- //messagePaint.setColor(0xffFF0202);
messagePaint.setColor(0xffffb2b2);
} else if (msg.checkIsCQ()) {//CQ
messagePaint.setColor(0xffeeee00);
@@ -252,18 +251,20 @@ public class WaterfallView extends View {
messagePaint.setColor(0xff00ffff);
}
Path path = new Path();
+
path.moveTo(msg.freq_hz * freq_width, pathStart);
path.lineTo(msg.freq_hz * freq_width, pathEnd);
- _canvas.drawTextOnPath(msg.getMessageText(), path
+ _canvas.drawTextOnPath(msg.getMessageText(true), path
, 0, 0, messagePaintBack);//消息背景
- _canvas.drawTextOnPath(msg.getMessageText(), path
+ _canvas.drawTextOnPath(msg.getMessageText(true), path
, 0, 0, messagePaint);//消息
}
}
+
}
public void setTouch_x(int touch_x) {
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
index ade3750..dcc46bd
--- a/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/WaveFileWriter.java
+++ b/ft8CN/app/src/main/java/com/bg7yoz/ft8cn/wave/WaveFileWriter.java
@@ -87,7 +87,7 @@ public class WaveFileWriter {
}
public void close() {
- // TODO document why this method is empty
+
}
private void writeString(String str, int len) {
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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/anim/click_button.xml b/ft8CN/app/src/main/res/anim/click_button.xml
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/anim/view_blink.xml b/ft8CN/app/src/main/res/anim/view_blink.xml
old mode 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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
deleted file mode 100755
index 46b3d83..0000000
--- a/ft8CN/app/src/main/res/drawable-night/clear_calling_list_image_48 2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
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 100755
new mode 100644
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
deleted file mode 100755
index 32ebe76..0000000
--- a/ft8CN/app/src/main/res/drawable-night/config_ic_baseline_keyboard_arrow_down_24 2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
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 100755
new mode 100644
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
deleted file mode 100755
index a893e20..0000000
--- a/ft8CN/app/src/main/res/drawable-night/config_ic_baseline_keyboard_arrow_up_24 2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable-night/cqzone.png b/ft8CN/app/src/main/res/drawable-night/cqzone.png
old mode 100755
new mode 100644
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
deleted file mode 100755
index b4a4dfe..0000000
Binary files a/ft8CN/app/src/main/res/drawable-night/cqzone_b 2.png and /dev/null 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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable-night/dxcc 2.png b/ft8CN/app/src/main/res/drawable-night/dxcc 2.png
deleted file mode 100755
index 6aa14e8..0000000
Binary files a/ft8CN/app/src/main/res/drawable-night/dxcc 2.png and /dev/null 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 100755
new mode 100644
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
deleted file mode 100755
index f436b64..0000000
Binary files a/ft8CN/app/src/main/res/drawable-night/dxcc_b 2.png and /dev/null 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 100755
new mode 100644
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
deleted file mode 100755
index a80382f..0000000
Binary files a/ft8CN/app/src/main/res/drawable-night/guohe_logo 2.png and /dev/null 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 100755
new mode 100644
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
deleted file mode 100755
index 84527a7..0000000
--- a/ft8CN/app/src/main/res/drawable-night/ic_baseline_assignment_24 2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
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 100755
new mode 100644
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
deleted file mode 100755
index f753515..0000000
--- a/ft8CN/app/src/main/res/drawable-night/ic_baseline_assignment_ind_24 2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
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 100755
new mode 100644
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
deleted file mode 100755
index f926e9a..0000000
--- a/ft8CN/app/src/main/res/drawable-night/ic_baseline_cancel_schedule_send_off 2.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
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 100755
new mode 100644
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
deleted file mode 100755
index 76faa78..0000000
--- a/ft8CN/app/src/main/res/drawable-night/ic_baseline_check_48 2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
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 100755
new mode 100644
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
deleted file mode 100755
index a880088..0000000
--- a/ft8CN/app/src/main/res/drawable-night/ic_baseline_close_32 2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
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 100755
new mode 100644
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
deleted file mode 100755
index a99f4b1..0000000
--- a/ft8CN/app/src/main/res/drawable-night/ic_baseline_headset_mic_24 2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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
deleted file mode 100755
index 57f63f7..0000000
--- a/ft8CN/app/src/main/res/drawable-night/ic_baseline_link_24 2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
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 100755
new mode 100644
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
deleted file mode 100755
index a8087d4..0000000
--- a/ft8CN/app/src/main/res/drawable-night/ic_baseline_list_alt_24 2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
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 100755
new mode 100644
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 100755
new mode 100644
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
deleted file mode 100755
index 0241208..0000000
--- a/ft8CN/app/src/main/res/drawable-night/ic_baseline_not_listed_location_32 2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
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 100755
new mode 100644
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 100755
new mode 100644
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
deleted file mode 100755
index a534888..0000000
--- a/ft8CN/app/src/main/res/drawable-night/ic_baseline_save_alt_24 2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
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 100755
new mode 100644
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
deleted file mode 100755
index 461a25c..0000000
--- a/ft8CN/app/src/main/res/drawable-night/ic_baseline_send_white_48 2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
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 100755
new mode 100644
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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable-night/itu 2.png b/ft8CN/app/src/main/res/drawable-night/itu 2.png
deleted file mode 100755
index d76a030..0000000
Binary files a/ft8CN/app/src/main/res/drawable-night/itu 2.png and /dev/null 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 100755
new mode 100644
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
deleted file mode 100755
index 1bce90b..0000000
Binary files a/ft8CN/app/src/main/res/drawable-night/itu_b 2.png and /dev/null 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 100755
new mode 100644
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
deleted file mode 100755
index f3e99f0..0000000
--- a/ft8CN/app/src/main/res/drawable-night/spinner_style 2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
\ 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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable/cq.png b/ft8CN/app/src/main/res/drawable/cq.png
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable/cqzone.png b/ft8CN/app/src/main/res/drawable/cqzone.png
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable/cqzone_b.png b/ft8CN/app/src/main/res/drawable/cqzone_b.png
old mode 100755
new mode 100644
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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable/dxcc.png b/ft8CN/app/src/main/res/drawable/dxcc.png
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable/dxcc_b.png b/ft8CN/app/src/main/res/drawable/dxcc_b.png
old mode 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable/editor_style.xml b/ft8CN/app/src/main/res/drawable/editor_style.xml
old mode 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable/flex_icon.png b/ft8CN/app/src/main/res/drawable/flex_icon.png
old mode 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable/flexradio.png b/ft8CN/app/src/main/res/drawable/flexradio.png
old mode 100755
new mode 100644
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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable/ft8cn_icon.png b/ft8CN/app/src/main/res/drawable/ft8cn_icon.png
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable/guohe_logo.png b/ft8CN/app/src/main/res/drawable/guohe_logo.png
old mode 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable/imagebutton_style.xml b/ft8CN/app/src/main/res/drawable/imagebutton_style.xml
old mode 100755
new mode 100644
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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable/is_weak_signal_24.xml b/ft8CN/app/src/main/res/drawable/is_weak_signal_24.xml
new file mode 100644
index 0000000..1872318
--- /dev/null
+++ b/ft8CN/app/src/main/res/drawable/is_weak_signal_24.xml
@@ -0,0 +1,6 @@
+
+
diff --git a/ft8CN/app/src/main/res/drawable/itu.png b/ft8CN/app/src/main/res/drawable/itu.png
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable/itu_b.png b/ft8CN/app/src/main/res/drawable/itu_b.png
old mode 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable/newyear.png b/ft8CN/app/src/main/res/drawable/newyear.png
old mode 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable/speaker.xml b/ft8CN/app/src/main/res/drawable/speaker.xml
old mode 100755
new mode 100644
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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/drawable/spinner_style.xml b/ft8CN/app/src/main/res/drawable/spinner_style.xml
old mode 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/layout/activity_faqactivity.xml b/ft8CN/app/src/main/res/layout/activity_faqactivity.xml
old mode 100755
new mode 100644
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 100755
new mode 100644
index d0d2789..1cf90e9
--- a/ft8CN/app/src/main/res/layout/activity_grid_tracker_main.xml
+++ b/ft8CN/app/src/main/res/layout/activity_grid_tracker_main.xml
@@ -69,6 +69,29 @@
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -880,6 +1044,77 @@
+
+
+
+
+
+
+
+
+
+ app:layout_constraintTop_toBottomOf="@+id/decodeModeLayout">
-
+ app:layout_constraintTop_toBottomOf="@+id/audioOutputLayout">
Κλήση
Αρχείο επαφών
Ρυθμίσεις
-
-
-
\'Εναρξη αποκωδικοποίησης
dB
Δt
@@ -173,7 +170,9 @@
Χρόνος έναρξης : %s
Χρόνος τερματισμού : %s
Rst που ελήφθη : %s
+ Rst που ελήφθη
Rst που στάλθηξε : %s
+ Rst που στάλθηξε
Μπάντα : %s
Συχν : %s
Mode : %s
@@ -212,7 +211,9 @@
Λειτουργία
Διαγραφή
Χρόνος έναρξης QSO
+ Ημερομηνία έναρξης QSO
Χρόνος τερματισμού QSO
+ Ημερομηνία λήξης QSO
Mode
Grid
Μπάντα
@@ -427,7 +428,51 @@
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
+ Λειτουργία αποκωδικοποίησης
+ Γρήγορη λειτουργία
+ Λειτουργία πολλαπλής αποκωδικοποίησης
+ Παρακαλώ χρησιμοποιήστε τον web browser των άλλων συσκευών για εξαγωγή στο παρασκήνιο στο ίδιο LAN που είναι αυτή η συσκευή.\nPlease connect to a valid Wi-Fi
+ decode_help_en.txt
+
\ No newline at end of file
diff --git a/ft8CN/app/src/main/res/values-es/strings.xml b/ft8CN/app/src/main/res/values-es/strings.xml
old mode 100755
new mode 100644
index 80aac66..9b6ec62
--- a/ft8CN/app/src/main/res/values-es/strings.xml
+++ b/ft8CN/app/src/main/res/values-es/strings.xml
@@ -5,9 +5,6 @@
Calling
QSO Logs
Ajustes
-
-
-
Empezar a decodificar
dB
Δt
@@ -173,7 +170,9 @@
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
@@ -212,7 +211,9 @@
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
@@ -427,7 +428,50 @@
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
+ Modo de decodificación
+ Modo rápido
+ Modo de decodificación múltiple
+ Utilice el navegador web de otros dispositivos para exportar desde el fondo en la misma LAN que este dispositivo.\nPlease connect to a valid Wi-Fi
+ decode_help_en.txt
\ No newline at end of file
diff --git a/ft8CN/app/src/main/res/values-ja/strings.xml b/ft8CN/app/src/main/res/values-ja/strings.xml
old mode 100755
new mode 100644
index e88d0f3..0600511
--- a/ft8CN/app/src/main/res/values-ja/strings.xml
+++ b/ft8CN/app/src/main/res/values-ja/strings.xml
@@ -13,12 +13,6 @@
設定
-
-
-
-
-
-
デコ—ドを開始
dB
@@ -288,7 +282,7 @@
- %.0fキロメートル
+ %.0f km
@@ -323,8 +317,10 @@
終了時間:%s
自局RST:%s
+ 自局RST
相手局RST:%s
+ 相手局RST
バンド:%s
@@ -391,8 +387,10 @@
削除
交信開始時間
+ 交信開始日
交信終了時間
+ 交信終了日
モード
@@ -713,6 +711,50 @@
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
+ ログを検索
+ 全部
+ データソース
+ 未確認
+ 確認済
+ ローカルログ
+ 外部ログ
+ 外部
+ ローカル
+ プロトコル
+ コメント
+ デコードモード
+ 高速
+ ディープ
+ このデバイスと同じLANに接続し、ほかのデバイスでウェブブラウザーを利用してエクスポートしてください。\nブラウザーのアドレスバーに次の内容を入力してください：\n有効なWiFiに接続してください。
+ decode_help_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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/values-night/strings.xml b/ft8CN/app/src/main/res/values-night/strings.xml
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/values-night/themes.xml b/ft8CN/app/src/main/res/values-night/themes.xml
old mode 100755
new mode 100644
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 100755
new mode 100644
index fd650ae..0c20174
--- a/ft8CN/app/src/main/res/values-zh-rCN/strings.xml
+++ b/ft8CN/app/src/main/res/values-zh-rCN/strings.xml
@@ -6,8 +6,6 @@
通联记录
设置
-
-
开始解码
dB
Δt
@@ -172,7 +170,9 @@
起始时间:%s
结束时间:%s
接收报告:%s
+ 接收报告
发送报告:%s
+ 发送报告
波长:%s
频率:%s
模式:%s
@@ -209,6 +209,7 @@
操作
删除
通联开始时间
+ 通联开始日期
通联结束时间
模式
网格
@@ -425,6 +426,50 @@
导出到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
+ 查询日志
+ 全部
+ 数据来源
+ 未确认
+ 已确认
+ 本地日志
+ 外部日志
+ 外部日志
+ 本地日志
+ 协议
+ 备注
+ 解码模式
+ 快速解码
+ 多次解码
+ 请在与本机相同的局域网下，用其它设备的网页浏览器从后台导出。\n在浏览器的地址栏中输入如下内容：\n无法获取合适的IP地址，请连接到一个有效的Wifi。
+ decode_help.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 100755
new mode 100644
index d8cebe0..d4a9220
--- a/ft8CN/app/src/main/res/values-zh-rHK/strings.xml
+++ b/ft8CN/app/src/main/res/values-zh-rHK/strings.xml
@@ -6,8 +6,6 @@
通聯記錄
設置
-
-
開始解碼
dB
Δt
@@ -172,7 +170,9 @@
起始時間:%s
結束時間:%s
接收報告:%s
+ 接收報告
發送報告:%s
+ 發送報告
頻段:%s
頻率:%s
模式:%s
@@ -209,7 +209,9 @@
操作
刪除
通聯開始時間
+ 通聯開始日期
通聯結束時間
+ 通聯結束日期
模式
網格
頻段
@@ -425,6 +427,50 @@
導出到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
+ 查詢日誌
+ 全部
+ 數據來源
+ 未確認
+ 已確認
+ 本地日誌
+ 外部日誌
+ 外部日誌
+ 本地日誌
+ 協定
+ 備註
+ 解碼模式
+ 快速解碼
+ 多次解碼
+ 請在與本機相同的局域網下，用其它設備的網頁瀏覽器從後台導出。\n在瀏覽器的地址欄中輸入如下內容：\n無法獲取合適的IP地址，請連接到一個有效的Wifi。
+ decode_help.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 100755
new mode 100644
index 7f8e931..1d36dab
--- a/ft8CN/app/src/main/res/values-zh-rMO/strings.xml
+++ b/ft8CN/app/src/main/res/values-zh-rMO/strings.xml
@@ -6,8 +6,6 @@
通聯記錄
設置
-
-
開始解碼
dB
Δt
@@ -172,7 +170,9 @@
起始時間:%s
結束時間:%s
接收報告:%s
+ 接收報告
發送報告:%s
+ 發送報告
頻段:%s
頻率:%s
模式:%s
@@ -209,7 +209,9 @@
操作
刪除
通聯開始時間
+ 通聯開始日期
通聯結束時間
+ 通聯結束日期
模式
網格
頻段
@@ -425,5 +427,50 @@
導出到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
+ 查詢日誌
+ 全部
+ 數據來源
+ 未確認
+ 已確認
+ 本地日誌
+ 外部日誌
+ 外部日誌
+ 本地日誌
+ 協定
+ 備註
+ 解碼模式
+ 快速解碼
+ 多次解碼
+ 請在與本機相同的局域網下，用其它設備的網頁瀏覽器從後台導出。\n在瀏覽器的地址欄中輸入如下內容：\n無法獲取合適的IP地址，請連接到一個有效的Wifi。
+ decode_help.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 100755
new mode 100644
index 114d409..b052a6b
--- a/ft8CN/app/src/main/res/values-zh-rTW/strings.xml
+++ b/ft8CN/app/src/main/res/values-zh-rTW/strings.xml
@@ -6,8 +6,6 @@
通聯記錄
設置
-
-
開始解碼
dB
Δt
@@ -172,7 +170,9 @@
起始時間:%s
結束時間:%s
接收報告:%s
+ 接收報告
發送報告:%s
+ 發送報告
頻段:%s
頻率:%s
模式:%s
@@ -209,7 +209,9 @@
操作
刪除
通聯開始時間
+ 通聯開始日期
通聯結束時間
+ 通聯結束日期
模式
網格
頻段
@@ -425,6 +427,50 @@
導出到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
+ 查詢日誌
+ 全部
+ 數據來源
+ 未確認
+ 已確認
+ 本地日誌
+ 外部日誌
+ 外部日誌
+ 本地日誌
+ 協定
+ 備註
+ 解碼模式
+ 快速解碼
+ 多次解碼
+ 請在與本機相同的局域網下，用其它設備的網頁瀏覽器從後台導出。\n在瀏覽器的地址欄中輸入如下內容：\n無法獲取合適的IP地址，請連接到一個有效的Wifi。
+ decode_help.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 100755
new mode 100644
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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/values/strings.xml b/ft8CN/app/src/main/res/values/strings.xml
old mode 100755
new mode 100644
index dfa5a02..8671633
--- a/ft8CN/app/src/main/res/values/strings.xml
+++ b/ft8CN/app/src/main/res/values/strings.xml
@@ -173,7 +173,9 @@
Start time : %s
End time : %s
Rst received : %s
+ Rst received
Rst send : %s
+ Rst send
Band : %s
Freq : %s
Mode : %s
@@ -212,7 +214,9 @@
Operation
Delete
QSO start time
+ QSO start date
QSO end time
+ QSO end date
Mode
Grid
Band
@@ -357,7 +361,6 @@
Warning ! SWR is too high .
Signal output strength %.0f %%
Signal output strength
-
Distance
QTH of callsign
Update time
@@ -395,7 +398,6 @@
Band \t Total
CQ Modifier
Please input modifer
-
Start ATU
Maximum Tx power to %d W
ATU Tune power %d W
@@ -429,6 +431,50 @@
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
+ decode_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
+ Decode mode
+ Fast decode
+ Deep decode
+ Export from WebUI via web browser on another device under the same LAN \n Please connect to a valid Wi-Fi
\ 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 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/values/themes.xml b/ft8CN/app/src/main/res/values/themes.xml
old mode 100755
new mode 100644
diff --git a/ft8CN/app/src/main/res/xml/device_filter.xml b/ft8CN/app/src/main/res/xml/device_filter.xml
old mode 100755
new mode 100644
index 265ed83..dd21225
--- a/ft8CN/app/src/main/res/xml/device_filter.xml
+++ b/ft8CN/app/src/main/res/xml/device_filter.xml
@@ -39,4 +39,5 @@
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 100755
new mode 100644
index a13cd5e..5908a23
--- a/ft8CN/build.gradle
+++ b/ft8CN/build.gradle
@@ -1,10 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
- id 'com.android.application' version '7.4.1' apply false
- id 'com.android.library' version '7.4.1' apply false
+ id 'com.android.application' version '7.1.2' apply false
+ id 'com.android.library' version '7.1.2' 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 100755
new mode 100644
diff --git a/ft8CN/gradle.properties b/ft8CN/gradle.properties
old mode 100755
new mode 100644
diff --git a/ft8CN/gradle/wrapper/gradle-wrapper.jar b/ft8CN/gradle/wrapper/gradle-wrapper.jar
old mode 100755
new mode 100644
diff --git a/ft8CN/gradle/wrapper/gradle-wrapper.properties b/ft8CN/gradle/wrapper/gradle-wrapper.properties
old mode 100755
new mode 100644
index 515d43a..e0c50f2
--- a/ft8CN/gradle/wrapper/gradle-wrapper.properties
+++ b/ft8CN/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Mon Mar 20 22:46:09 CST 2023
+#Sat Jul 08 16:47:34 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 100755
new mode 100644
diff --git a/ft8CN/gradlew.bat b/ft8CN/gradlew.bat
old mode 100755
new mode 100644
diff --git a/ft8CN/settings.gradle b/ft8CN/settings.gradle
old mode 100755
new mode 100644