xymp
/
TermApp
3
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

Labels Milestones

main #3

Open
matthew wants to merge 835 commits from main into rtmpsuck
pull from: main
merge into: xymp:rtmpsuck
Conversation 0 Commits 835 Files Changed 189
matthew commented 4 months ago
Owner

同步代码

同步代码
matthew added 139 commits 4 months ago
345f9cc09d Update version to 1.3.5 
Based Core Version to 1.4.2
650765e87d 短信 
运维时间表不返回修复
设置CMD_ID不应答修复
设置主站IP端口返回的网络方式和加密方式不一致修复
水印查询和修改修复
设置心跳及连接协议修复
2b0f921157 Update version to 1.3.6 
Based Core Version to 1.4.3
5000fdecef Update version to 1.3.7 
Based Core Version to 1.4.4
772690d57e Update version to 1.3.8 
Based Core Version to 1.4.5
c08b8a03b1 Update version to 1.3.9 
Based Core Version to 1.4.6
f2db516071 补拍的时间处理保护 
补拍应该不会存在拍照计划时间为0的情况，这儿这样处理，是为了外部特殊处理，故意把拍照计划时间置为0
b597e1f4eb Update version to 1.3.11 
Based Core Version to 1.4.7
87e8853737 Update version to 1.3.12 
Based Core Version to 1.4.7
af9ace5183 Update version to 1.3.13 
Based Core Version to 1.4.8
db208237d6 Update version to 1.3.14 
Based Core Version to 1.4.9
4f1b8c3b49 Update version to 1.3.15 
Based Core Version to 1.4.10
3c3cb9b130 增加网络信息的设置 
重启MPApp使用临时方案，通过MpMaster来完成，解决自身不能重启的问题
672159ddc5 Update version to 1.3.16 
Based Core Version to 1.4.12
9b59489969 Update version to 1.3.17 
Based Core Version to 1.4.13
09cd545777 Update version to 1.3.18 
Based Core Version to 1.4.13
2fe94152e5 Update version to 1.3.19 
Based Core Version to 1.4.14
e1c99fa228 Update version to 1.3.20 
Based Core Version to 1.4.14
1e71375144 Update version to 1.3.21 
Based Core Version to 1.4.15
a81dfe5bcf Update version to 1.3.22 
Based Core Version to 1.4.16
4686003763 Update version to 1.3.23 
Based Core Version to 1.4.17
79aa0134a5 Update version to 1.3.24 
Based Core Version to 1.4.17
cb36acfbd6 Update version to 1.3.25 
Based Core Version to 1.4.18
b91432cc4d Update version to 1.3.26 
Based Core Version to 1.4.20
76e63a8808 Update version to 1.3.27 
Based Core Version to 1.4.20
e39f42c28a Update version to 1.3.28 
Based Core Version to 1.4.20
dabff33bbc Update version to 1.3.29 
Based Core Version to 1.4.20
c64cc8ef44 Update version to 1.3.30 
Based Core Version to 1.4.21
e0d1cbb60a Update version to 1.3.31 
Based Core Version to 1.4.22
3234185c8b Update version to 1.3.32 
Based Core Version to 1.4.22
cff24f65ae Update version to 1.3.33 
Based Core Version to 1.4.23
6fdfe988a7 Update version to 1.3.34 
Based Core Version to 1.4.23
d69c7d257a Update version to 1.3.35 
Based Core Version to 1.4.24
1801ceb965 Update version to 1.3.36 
Based Core Version to 1.4.25
8a3da517b4 Update version to 1.3.37 
Based Core Version to 1.4.26
2898295236 Update version to 1.3.38 
Based Core Version to 1.4.27
2d6db87e11 Update version to 1.3.39 
Based Core Version to 1.4.27
226932ae02 Update version to 1.3.40 
Based Core Version to 1.4.28
matthew added 1 commit 4 months ago
matthew added 1 commit 4 months ago
matthew added 1 commit 4 months ago
matthew added 2 commits 4 months ago
matthew added 1 commit 4 months ago
3db0d0387b Update version to 1.3.41 
Based Core Version to 1.4.28
matthew added 1 commit 4 months ago
e66667eb11 Update version to 1.3.42 
Based Core Version to 1.4.29
matthew added 1 commit 4 months ago
matthew added 2 commits 4 months ago
matthew added 1 commit 4 months ago
853e556d8a Update version to 1.3.43 
Based Core Version to 1.4.29
gj.liu added 2 commits 4 months ago
matthew added 1 commit 4 months ago
matthew added 2 commits 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
a38f473ce8 Update version to 1.3.44 
Based Core Version to 1.4.29
gj.liu added 1 commit 3 months ago
gj.liu added 1 commit 3 months ago
matthew added 3 commits 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
e5c25f084e Update version to 1.3.45 
Based Core Version to 1.4.29
matthew added 1 commit 3 months ago
xi.chen added 1 commit 3 months ago
matthew added 3 commits 3 months ago
matthew added 1 commit 3 months ago
65e56000cb Update version to 1.3.46 
Based Core Version to 1.4.29
matthew added 2 commits 3 months ago
f2023d130d Update version to 1.3.47 
Based Core Version to 1.4.29
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
05d265d559 Update version to 1.3.48 
Based Core Version to 1.4.29
matthew added 1 commit 3 months ago
2baecd5289 Update version to 1.3.49 
Based Core Version to 1.4.30
matthew added 1 commit 3 months ago
3ec9d6e711 Update version to 1.3.50 
Based Core Version to 1.4.31
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
06843dff13 Update version to 1.3.51 
Based Core Version to 1.4.31
matthew added 1 commit 3 months ago
b8dad4ed13 Update version to 1.3.52 
Based Core Version to 1.4.32
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
fa6d7929ff Update version to 1.3.53 
Based Core Version to 1.4.32
matthew added 2 commits 3 months ago
03a2888369 Update version to 1.3.54 
Based Core Version to 1.4.32
matthew added 2 commits 3 months ago
matthew added 1 commit 3 months ago
3d6a3b6559 Update version to 1.3.55 
Based Core Version to 1.4.32
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
f3bd23680d Update version to 1.3.56 
Based Core Version to 1.4.32
matthew added 1 commit 3 months ago
b1d1e3f65c 运维展示优化 
cmdid未设置时，显示序列号
matthew added 2 commits 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
6db86856e7 Update version to 1.3.57 
Based Core Version to 1.4.32
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
295aadfc16 Update version to 1.3.58 
Based Core Version to 1.4.33
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
a17f6a4278 Update version to 1.3.59 
Based Core Version to 1.4.34
matthew added 2 commits 3 months ago
f8bbdc58cf Update version to 1.3.60 
Based Core Version to 1.4.34
matthew added 3 commits 3 months ago
matthew added 1 commit 3 months ago
matthew added 3 commits 3 months ago
matthew added 1 commit 3 months ago
1f6276860e Update version to 1.3.61 
Based Core Version to 1.4.34
matthew added 2 commits 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
0d7d3a69b6 Update version to 1.3.62 
Based Core Version to 1.4.34
matthew added 1 commit 3 months ago
xi.chen added 1 commit 3 months ago
xi.chen added 1 commit 3 months ago
matthew added 1 commit 3 months ago
964fa2a91b Update version to 1.3.63 
Based Core Version to 1.4.34
gj.liu added 2 commits 3 months ago
huyizhong added 3 commits 3 months ago
7376d4cb0f 优化控制云台反a应速度，添加精准云台位置控制 
优化控制云台反a应速度，添加精准云台位置控制
xi.chen added 1 commit 3 months ago
xi.chen added 1 commit 3 months ago
huyizhong added 2 commits 3 months ago
xi.chen added 1 commit 3 months ago
cdd0fcc361 Update version to 1.3.64 
Based Core Version to 1.4.35
matthew added 2 commits 3 months ago
matthew added 2 commits 3 months ago
b996c663a9 Update version to 1.3.65 
Based Core Version to 1.4.36
b6e58239d3 Update version to 1.3.66 
Based Core Version to 1.4.37
matthew added 1 commit 3 months ago
matthew added 2 commits 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
xi.chen added 2 commits 3 months ago
matthew added 2 commits 3 months ago
matthew added 2 commits 3 months ago
matthew added 2 commits 3 months ago
matthew added 1 commit 3 months ago
d9f6c6e8ac Update version to 1.3.70 
Based Core Version to 1.4.38
xi.chen added 2 commits 3 months ago
Colin added 1 commit 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
xi.chen added 1 commit 3 months ago
xi.chen added 1 commit 3 months ago
matthew added 2 commits 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
Colin added 1 commit 3 months ago
xi.chen added 2 commits 3 months ago
xi.chen added 1 commit 3 months ago
216a053086 Update version to 1.3.71 
Based Core Version to 1.4.39
matthew added 2 commits 3 months ago
xi.chen added 1 commit 3 months ago
a14c76c4ed Update version to 1.3.72 
Based Core Version to 1.4.39
huyizhong added 2 commits 3 months ago
huyizhong added 1 commit 3 months ago
matthew added 2 commits 3 months ago
xi.chen added 1 commit 3 months ago
0d92c10c60 Update version to 1.3.73 
Based Core Version to 1.4.40
gj.liu added 6 commits 3 months ago
xi.chen added 2 commits 3 months ago
485301e714 Update version to 1.3.74 
Based Core Version to 1.4.41
matthew added 2 commits 3 months ago
xi.chen added 2 commits 3 months ago
c308feff90 Update version to 1.3.75 
Based Core Version to 1.4.42
xi.chen added 1 commit 3 months ago
0957cc3a12 Update version to 1.3.76 
Based Core Version to 1.4.43
matthew added 2 commits 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
b579a0062d Update version to 1.3.77 
Based Core Version to 1.4.45
xi.chen added 1 commit 3 months ago
4e80dced8b Update version to 1.3.78 
Based Core Version to 1.4.46
xi.chen added 1 commit 3 months ago
b23224415e Update version to 1.3.79 
Based Core Version to 1.4.47
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
xi.chen added 1 commit 3 months ago
eba500f734 Update version to 1.3.80 
Based Core Version to 1.4.48
xi.chen added 1 commit 3 months ago
99784847e3 Update version to 1.3.81 
Based Core Version to 1.4.49
matthew added 2 commits 3 months ago
454c5d6cc6 Update version to 1.3.80 
Based Core Version to 1.4.47
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
620af9bb26 Update version to 1.3.82 
Based Core Version to 1.4.49
matthew added 1 commit 3 months ago
matthew added 2 commits 3 months ago
e05bcedb6e Update version to 1.3.84 
Based Core Version to 1.4.49
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
fb42203056 Update version to 1.3.85 
Based Core Version to 1.4.49
xi.chen added 1 commit 3 months ago
xi.chen added 1 commit 3 months ago
xi.chen added 1 commit 3 months ago
fe97b3c5bc Update version to 1.3.86 
Based Core Version to 1.4.50
gj.liu added 3 commits 3 months ago
matthew added 2 commits 3 months ago
matthew added 2 commits 3 months ago
2c0b32fe64 Update version to 1.3.87 
Based Core Version to 1.4.50
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
b08adad0a4 Update version to 1.3.88 
Based Core Version to 1.4.50
matthew added 2 commits 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
matthew added 4 commits 3 months ago
matthew force-pushed main from 22c8fe1d28 to c8966009b8 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
3dbb79e94c Update version to 1.3.89 
Based Core Version to 1.4.51
matthew added 2 commits 3 months ago
21fd57061c Update version to 1.3.90 
Based Core Version to 1.4.51
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
huyizhong added 2 commits 3 months ago
matthew added 2 commits 3 months ago
xi.chen added 1 commit 3 months ago
matthew added 2 commits 3 months ago
matthew added 2 commits 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
c8610406ef 重新实现关电控制 
现在通过线程的方式来实现延迟关电，性能不是很好
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
c17dc6a83e Update version to 1.3.91 
Based Core Version to 1.4.53
matthew added 1 commit 3 months ago
0aabc2af52 Update version to 1.3.92 
Based Core Version to 1.4.54
matthew added 1 commit 3 months ago
matthew added 2 commits 3 months ago
0c33cc68c4 Update version to 1.3.93 
Based Core Version to 1.4.54
matthew added 1 commit 3 months ago
3fdf189af5 Update version to 1.3.94 
Based Core Version to 1.4.54
matthew added 2 commits 3 months ago
ab91aa6cef Update version to 1.3.95 
Based Core Version to 1.4.54
matthew added 2 commits 3 months ago
a506598b42 Update version to 1.3.96 
Based Core Version to 1.4.54
xi.chen added 1 commit 3 months ago
xi.chen added 1 commit 3 months ago
matthew added 3 commits 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
b1071b52c5 Update version to 1.3.97 
Based Core Version to 1.4.54
gj.liu added 3 commits 3 months ago
9017c2bd7d 运维新增支持adb shell命令 
修复sim卡2 在连接不上运维主站时  无法切换到sim卡1的情况
xi.chen added 1 commit 3 months ago
xi.chen added 1 commit 3 months ago
bd81fd52d0 Update version to 1.3.98 
Based Core Version to 1.4.55
matthew added 2 commits 3 months ago
180b2efe0b 938禁用AI识别 
移除部分日志
matthew added 1 commit 3 months ago
7b0c32e7b9 Update version to 1.3.99 
Based Core Version to 1.4.56
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
5f4af242be Update version to 1.3.100 
Based Core Version to 1.4.57
matthew added 1 commit 3 months ago
matthew added 1 commit 3 months ago
d7a9212d90 Update version to 1.3.101 
Based Core Version to 1.4.57
matthew added 2 commits 3 months ago
c5d9e19aff Update version to 1.3.102 
Based Core Version to 1.4.57
matthew added 1 commit 3 months ago
gj.liu added 5 commits 3 months ago
gj.liu added 1 commit 3 months ago
gj.liu added 1 commit 3 months ago
matthew added 2 commits 3 months ago
gj.liu added 2 commits 3 months ago
matthew added 3 commits 3 months ago
matthew added 1 commit 3 months ago
0b5e19541e Update version to 1.3.103 
Based Core Version to 1.4.58
matthew added 1 commit 3 months ago
4b09ea6428 Update version to 1.3.104 
Based Core Version to 1.4.59
matthew added 12 commits 3 months ago
8381d6a0b9 增加云台控制时间精准控制 
增加云台控制时间精准控制
3575377767 Update version to 1.3.105 
Based Core Version to 1.4.60
4e10f77ce3 Update version to 1.3.106 
Based Core Version to 1.4.61
matthew added 1 commit 3 months ago
991fc0a449 Update version to 1.3.107 
Based Core Version to 1.4.62
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
5a26bd6353 Update version to 1.3.108 
Based Core Version to 1.4.63

支持通过光敏自动切换日夜镜头
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
06842bca13 Update version to 1.3.109 
Based Core Version to 1.4.64
xi.chen added 1 commit 2 months ago
huyizhong added 1 commit 2 months ago
matthew added 2 commits 2 months ago
matthew added 1 commit 2 months ago
huyizhong added 2 commits 2 months ago
matthew added 2 commits 2 months ago
ebe52ca252 Update version to 1.3.110 
Based Core Version to 1.4.65
matthew added 2 commits 2 months ago
79dc4e8ec7 Update version to 1.3.111 
Based Core Version to 1.4.65
huyizhong added 2 commits 2 months ago
matthew added 1 commit 2 months ago
40e9533d31 Update version to 1.3.112 
Based Core Version to 1.4.66
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
a74db09f67 Update version to 1.3.113 
Based Core Version to 1.4.67
huyizhong added 2 commits 2 months ago
2c53f2fc0a 增加云台200号预置点临时一次性自检处理 
1、单独调用，直接置云台为自检状态；
2、拍照带200号预置点，等待调预置点时间使用设置的自检时间。
xi.chen added 1 commit 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
996cb9109f Update version to 1.3.114 
Based Core Version to 1.4.68
matthew added 7 commits 2 months ago
5049677133 Update version to 1.3.115 
Based Core Version to 1.4.68
e3aa7d04eb 移除ISP的设置 
参考系统相机
matthew added 1 commit 2 months ago
ec5799f167 Update version to 1.3.116 
Based Core Version to 1.4.69
huyizhong added 1 commit 2 months ago
huyizhong added 1 commit 2 months ago
matthew added 1 commit 2 months ago
94ca4f77a4 Update version to 1.3.117 
Based Core Version to 1.4.69
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
2336758523 Update version to 1.3.118 
Based Core Version to 1.4.69
matthew added 1 commit 2 months ago
8a7d571e0e Update version to 1.3.119 
Based Core Version to 1.4.70
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
1ba1b9d56a Update version to 1.3.120 
Based Core Version to 1.4.70
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
d1d34ebcfc Update version to 1.3.121 
Based Core Version to 1.4.70
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
6587298604 Update version to 1.3.122 
Based Core Version to 1.4.70
matthew added 1 commit 2 months ago
252e2575f5 调整回预览+静态抓拍模式 
针对iso为200-300之间的粉色问题，做了补丁，强制走预览模式，临时绕过这个问题
matthew added 3 commits 2 months ago
8e9597eaf4 Update version to 1.3.123 
Based Core Version to 1.4.70
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
621cf4f3ba Update version to 1.3.124 
Based Core Version to 1.4.70
matthew added 1 commit 2 months ago
matthew added 2 commits 2 months ago
matthew added 2 commits 2 months ago
matthew added 1 commit 2 months ago
1782269938 Update version to 1.3.125 
Based Core Version to 1.4.71
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
6925da78b1 Update version to 1.3.126 
Based Core Version to 1.4.71
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
matthew added 2 commits 2 months ago
04abdbeb61 Update version to 1.3.127 
Based Core Version to 1.4.71
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
0fc7ff436e 统一GPIO 
N938：
#define CMD_SET_3V3_PWR_EN                      360  // 改为132

云台：
#define CMD_SET_485_ENABLE                      512 // 改成131
#define CMD_SET_3V3_PWR_EN                      516 // 改成 132

固件从20250419的版本开始
matthew added 1 commit 2 months ago
7e57c3cc08 Update version to 1.3.128 
Based Core Version to 1.4.71
gj.liu added 1 commit 2 months ago
matthew added 1 commit 2 months ago
e0a23a6c3b Update version to 1.3.129 
Based Core Version to 1.4.72
gj.liu added 2 commits 2 months ago
gj.liu added 1 commit 2 months ago
gj.liu added 2 commits 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
matthew added 5 commits 2 months ago
744057c407 Update version to 1.3.132 
Based Core Version to 1.4.72
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
b8cc50ad51 Update version to 1.3.133 
Based Core Version to 1.4.72
matthew force-pushed main from b8cc50ad51 to f2f29482a0 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
868fbebb6b Update version to 1.3.133 
Based Core Version to 1.4.72
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
39b94cee90 Update version to 1.3.134 
Based Core Version to 1.4.72
xi.chen added 1 commit 2 months ago
matthew added 4 commits 2 months ago
matthew added 1 commit 2 months ago
b5a188a5b4 Update version to 1.3.135 
Based Core Version to 1.4.74
matthew added 1 commit 2 months ago
matthew added 2 commits 2 months ago
359b52c869 Update version to 1.3.136 
Based Core Version to 1.4.74
matthew force-pushed main from 359b52c869 to 4c42820cea 2 months ago
matthew added 2 commits 2 months ago
d4c5986943 Update version to 1.3.136 
Based Core Version to 1.4.74
matthew added 1 commit 2 months ago
xi.chen added 2 commits 2 months ago
xi.chen added 1 commit 2 months ago
xi.chen added 1 commit 2 months ago
matthew added 2 commits 2 months ago
f445f5f6c8 Update version to 1.3.137 
Based Core Version to 1.4.74
matthew added 1 commit 2 months ago
matthew added 2 commits 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
7ea3b47abb Update version to 1.3.138 
Based Core Version to 1.4.76
matthew added 1 commit 2 months ago
matthew added 2 commits 2 months ago
b216ad7546 Update version to 1.3.139 
Based Core Version to 1.4.76
gj.liu added 3 commits 2 months ago
matthew added 4 commits 2 months ago
870cffab5c Update version to 1.3.140 
Based Core Version to 1.4.76
matthew added 3 commits 2 months ago
6e379548e6 优化航煜拍照实现 
如果照片太大出错，则降低图像质量后重试
matthew added 1 commit 2 months ago
a04db636c6 Update version to 1.3.141 
Based Core Version to 1.4.76
matthew added 5 commits 2 months ago
fde6514d16 Update version to 1.3.142 
Based Core Version to 1.4.77
matthew added 1 commit 2 months ago
be7b992bdd Update version to 1.3.143 
Based Core Version to 1.4.78
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
huyizhong added 1 commit 2 months ago
matthew added 2 commits 2 months ago
44a5a32741 Update version to 1.3.144 
Based Core Version to 1.4.79
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
62de685e4e Update version to 1.3.145 
Based Core Version to 1.4.80
gj.liu added 2 commits 2 months ago
matthew added 4 commits 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
f8784c5b26 Update version to 1.3.146 
Based Core Version to 1.4.80
matthew force-pushed main from f8784c5b26 to ee492d0e60 2 months ago
matthew added 1 commit 2 months ago
47ff714ae5 Update version to 1.3.147 
Based Core Version to 1.4.80
matthew added 1 commit 2 months ago
matthew added 1 commit 2 months ago
7ae8505809 Update version to 1.3.148 
Based Core Version to 1.4.80
gj.liu added 2 commits 2 months ago
matthew added 2 commits 2 months ago
xi.chen added 4 commits 2 months ago
f8784c5b26 Update version to 1.3.146 
Based Core Version to 1.4.80
gj.liu added 1 commit 2 months ago
gj.liu added 1 commit 2 months ago
matthew added 4 commits 2 months ago
82e8212027 移除绑定网络的代码 
通过路由来控制
matthew added 1 commit 2 months ago
025c9fb07f Update version to 1.3.149 
Based Core Version to 1.4.80
matthew added 2 commits 2 months ago
c0e0b3874f Update version to 1.3.150 
Based Core Version to 1.4.81
gj.liu added 1 commit 2 months ago
matthew added 17 commits 1 month ago
20c5eebd20 Update version to 1.3.151 
Based Core Version to 1.4.81
667ebb60c8 Update version to 1.3.152 
Based Core Version to 1.4.82
matthew added 3 commits 1 month ago
matthew added 1 commit 1 month ago
4e5b1b7b2a Update version to 1.3.153 
Based Core Version to 1.4.82
matthew added 1 commit 1 month ago
matthew added 1 commit 1 month ago
matthew added 3 commits 1 month ago
matthew added 1 commit 1 month ago
matthew added 2 commits 1 month ago
matthew added 1 commit 1 month ago
matthew added 2 commits 1 month ago
db2ff686c6 Update version to 1.3.154 
Based Core Version to 1.4.83
matthew added 2 commits 1 month ago
5d57a099cd Update version to 1.3.155 
Based Core Version to 1.4.83
gj.liu added 1 commit 1 month ago
gj.liu added 1 commit 1 month ago
gj.liu added 1 commit 1 month ago
matthew added 6 commits 1 month ago
2811c694b7 增加函数 
获取进程id
matthew added 1 commit 1 month ago
matthew added 1 commit 1 month ago
matthew added 1 commit 1 month ago
gj.liu added 1 commit 1 month ago
matthew force-pushed main from b41dc44246 to 362a23f58d 1 month ago
matthew added 1 commit 1 month ago
matthew added 1 commit 1 month ago
b1b2b0d550 Update version to 1.3.156 
Based Core Version to 1.4.85
matthew added 9 commits 1 month ago
b533cd645f Update version to 1.3.157 
Based Core Version to 1.4.85
matthew added 1 commit 1 month ago
matthew added 1 commit 1 month ago
matthew added 1 commit 1 month ago
matthew added 2 commits 1 month ago
d75ad0949e Update version to 1.3.158 
Based Core Version to 1.4.86
xi.chen added 1 commit 1 month ago
matthew added 7 commits 1 month ago
752b5fe318 Update version to 1.3.159 
Based Core Version to 1.4.86
f0b82e235e Update version to 1.3.160 
Based Core Version to 1.4.87
matthew added 2 commits 1 month ago
gj.liu added 2 commits 1 month ago
gj.liu added 1 commit 1 month ago
7558b79c5e 删除之前测试的日志 
删除MpMaster中的读取电压的代码
matthew added 25 commits 1 month ago
115a22dd47 Update version to 1.3.161 
Based Core Version to 1.4.87
69bc6dced9 Update version to 1.3.162 
Based Core Version to 1.4.88
a7f4866ac8 Update version to 1.3.163 
Based Core Version to 1.4.89
0b08c08d81 Update version to 1.3.164 
Based Core Version to 1.4.89
026bd1a022 Update version to 1.3.165 
Based Core Version to 1.4.89
02fc11fc22 修正错误的判断条件 
Based Core Version to 1.4.89
c1a06203e3 Update version to 1.3.166 
Based Core Version to 1.4.89
67479e0acc Update version to 1.3.167 
Based Core Version to 1.4.89
be9f65d3a3 Update version to 1.3.168 
Based Core Version to 1.4.89
gj.liu added 1 commit 1 month ago
matthew added 3 commits 1 month ago
matthew added 3 commits 1 month ago
2b416c3f0d Update version to 1.3.169 
Based Core Version to 1.4.90
matthew added 2 commits 1 month ago
matthew added 2 commits 1 month ago
f8e627abc5 Update version to 1.3.170 
Based Core Version to 1.4.90
matthew added 1 commit 1 month ago
matthew added 1 commit 1 month ago
matthew added 2 commits 1 month ago
matthew added 1 commit 1 month ago
1f07b07004 Update version to 1.3.171 
Based Core Version to 1.4.90
matthew added 1 commit 1 month ago
matthew added 1 commit 1 month ago
matthew added 1 commit 1 month ago
matthew added 1 commit 1 month ago
6b8e477ed1 Update version to 1.3.172 
Based Core Version to 1.4.90
gj.liu added 1 commit 1 month ago
matthew added 4 commits 1 month ago
gj.liu added 1 commit 1 month ago
matthew added 2 commits 1 month ago
matthew added 1 commit 1 month ago
6239916828 Update version to 1.3.173 
Based Core Version to 1.4.91
gj.liu added 2 commits 1 month ago
matthew added 3 commits 1 month ago
matthew added 2 commits 1 month ago
matthew added 4 commits 1 month ago
189ebe3f41 Update version to 1.3.174 
Based Core Version to 1.4.91
a58544eab1 Update version to 1.3.175 
Based Core Version to 1.4.92
matthew added 2 commits 4 weeks ago
4eb14e755c 增加一种保活机制 
心跳时设置一个系统服务延迟启动运维app的闹钟，并在下一次心跳时重置闹钟时间。
matthew added 1 commit 4 weeks ago
matthew force-pushed main from 162eb6239d to 4eb14e755c 4 weeks ago
matthew added 1 commit 4 weeks ago
matthew added 2 commits 4 weeks ago
matthew force-pushed main from ada605f184 to d27321974f 4 weeks ago
matthew added 2 commits 4 weeks ago
matthew added 1 commit 4 weeks ago
matthew added 1 commit 4 weeks ago
matthew added 2 commits 4 weeks ago
matthew added 2 commits 4 weeks ago
matthew added 3 commits 4 weeks ago
matthew added 1 commit 4 weeks ago
matthew added 2 commits 4 weeks ago
5de3b6e73e Update version to 1.3.176 
Based Core Version to 1.4.92
xi.chen added 2 commits 4 weeks ago
matthew added 1 commit 4 weeks ago
xi.chen added 1 commit 4 weeks ago
xi.chen added 1 commit 4 weeks ago
xi.chen added 1 commit 4 weeks ago
xi.chen added 1 commit 4 weeks ago
xi.chen added 1 commit 4 weeks ago
xi.chen added 1 commit 4 weeks ago
xi.chen added 1 commit 4 weeks ago
matthew added 2 commits 4 weeks ago
15873ca510 Update version to 1.3.177 
Based Core Version to 1.4.92
xi.chen added 2 commits 4 weeks ago
matthew added 1 commit 4 weeks ago
a39614c581 调整规约 
65290名称改成河南全景 65285增加为河南统一
matthew added 1 commit 4 weeks ago
matthew added 1 commit 4 weeks ago
matthew added 1 commit 4 weeks ago
matthew added 1 commit 4 weeks ago
gj.liu added 1 commit 4 weeks ago
matthew added 2 commits 4 weeks ago
matthew added 1 commit 4 weeks ago
eca28cd6f7 Update version to 1.3.178 
Based Core Version to 1.4.93
xi.chen added 2 commits 4 weeks ago
matthew added 3 commits 4 weeks ago
matthew added 1 commit 4 weeks ago
matthew added 1 commit 4 weeks ago
f3e5cda1da Update version to 1.3.179 
Based Core Version to 1.4.93
matthew added 1 commit 4 weeks ago
matthew added 1 commit 4 weeks ago
matthew added 1 commit 3 weeks ago
matthew added 1 commit 3 weeks ago
matthew added 1 commit 3 weeks ago
matthew added 1 commit 3 weeks ago
436058fefa Update version to 1.3.180 
Based Core Version to 1.4.94
matthew added 1 commit 3 weeks ago
matthew added 1 commit 3 weeks ago
86b7e63849 Update version to 1.3.181 
Based Core Version to 1.4.94
matthew added 1 commit 3 weeks ago
matthew added 1 commit 3 weeks ago
matthew added 4 commits 3 weeks ago
ce2b36422c Update version to 1.3.182 
Based Core Version to 1.4.94
6e1655813d Update version to 1.3.183 
Based Core Version to 1.4.94
matthew added 1 commit 3 weeks ago
284f61a86e Update version to 1.3.184 
Based Core Version to 1.4.95
matthew added 1 commit 3 weeks ago
7e3ff1b741 Update version to 1.3.185 
Based Core Version to 1.4.95
matthew added 1 commit 3 weeks ago
b425713f63 Update version to 1.3.186 
Based Core Version to 1.4.96
matthew added 1 commit 3 weeks ago
matthew added 1 commit 3 weeks ago
matthew added 2 commits 3 weeks ago
matthew added 1 commit 3 weeks ago
matthew added 1 commit 3 weeks ago
matthew added 1 commit 3 weeks ago
matthew added 1 commit 3 weeks ago
94edf1324f Update version to 1.3.187 
Based Core Version to 1.4.97
matthew added 1 commit 3 weeks ago
b96fe6bbfd Update version to 1.3.188 
Based Core Version to 1.4.98
matthew added 1 commit 2 weeks ago
matthew added 1 commit 2 weeks ago
matthew added 1 commit 2 weeks ago
9ff07b8c12 Update version to 1.3.189 
Based Core Version to 1.4.99
matthew added 1 commit 2 weeks ago
matthew added 1 commit 2 weeks ago
matthew added 1 commit 2 weeks ago
934e76519c Update version to 1.3.190 
Based Core Version to 1.4.99
matthew force-pushed main from 934e76519c to 058e4b2f46 2 weeks ago
matthew added 1 commit 2 weeks ago
118ffdc638 Update version to 1.3.190 
Based Core Version to 1.4.100
matthew added 1 commit 2 weeks ago
matthew added 1 commit 2 weeks ago
matthew added 1 commit 1 week ago
matthew added 1 commit 1 week ago
d50b21d0d6 Update version to 1.3.191 
Based Core Version to 1.4.101
matthew added 2 commits 1 week ago
aa04fca845 Update version to 1.3.192 
Based Core Version to 1.4.101
xi.chen added 1 commit 1 week ago
xi.chen added 1 commit 1 week ago
matthew added 4 commits 7 days ago
662d3307b0 Update version to 1.3.193 
Based Core Version to 1.4.103
matthew added 1 commit 7 days ago
matthew added 1 commit 7 days ago
0b1aa8a13a Update version to 1.3.194 
Based Core Version to 1.4.104
matthew added 1 commit 6 days ago
913747e6c3 Update version to 1.3.195 
Based Core Version to 1.4.105
matthew added 3 commits 5 days ago
matthew added 2 commits 5 days ago
matthew added 2 commits 5 days ago
matthew added 3 commits 5 days ago
matthew added 2 commits 5 days ago
f9b79e67fd Update version to 1.3.196 
Based Core Version to 1.4.106
matthew added 1 commit 1 day ago
This pull request has changes conflicting with the target branch.
  • app/src/main/java/com/xypower/mpapp/MainActivity.java
  • app/src/main/res/layout-land/activity_main.xml
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b main rtmpsuck
git pull origin main

Step 2:

Merge the changes and update on Gitea.
git checkout rtmpsuck
git merge --no-ff main
git push origin rtmpsuck
Sign in to join this conversation.
Reviewers
Request review
No reviewers
Labels
Apply labels
Clear labels
No items
No Label
Milestone
Set milestone
Clear milestone
No items
No Milestone
Projects
Set Project
Clear projects
No project
Assignees
Assign users
Clear assignees
No Assignees
5 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: xymp/TermApp#3
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'main'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes