Commit a20ea341 authored by 储小杉's avatar 储小杉 🃏

删除log模块无用代码,升级log版本。

parent b9ea641f
...@@ -8,4 +8,5 @@ ...@@ -8,4 +8,5 @@
.externalNativeBuild .externalNativeBuild
/.idea /.idea
/.gradle /.gradle
\ No newline at end of file /fetch/build
\ No newline at end of file
package com.qimai.android.widget package com.qimai.android.widget
import android.app.DatePickerDialog
import android.app.TimePickerDialog
import android.os.Bundle import android.os.Bundle
import android.text.method.ScrollingMovementMethod
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.blankj.utilcode.util.KeyboardUtils
import com.blankj.utilcode.util.LogUtils
import com.blankj.utilcode.util.TimeUtils
import com.qimai.android.widget.databinding.ActivityLogBinding import com.qimai.android.widget.databinding.ActivityLogBinding
import com.qimai.log.LogUp import com.qimai.log.QLog
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
...@@ -27,58 +21,21 @@ class LogActivity : AppCompatActivity() { ...@@ -27,58 +21,21 @@ class LogActivity : AppCompatActivity() {
} }
private fun init() { private fun init() {
bind.tvContent.movementMethod = ScrollingMovementMethod.getInstance() bind.btnLog.setOnClickListener { initLog() }
bind.btnPickDate.setOnClickListener { bind.btnWrite.setOnClickListener {
showTime()
}
bind.btnSearch.setOnClickListener {
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
val timeStr = bind.etDate.text.toString() QLog.write("123456", QLog.D)
val timeSplit = timeStr.split(" -- ")
val startTime = timeSplit[0]
val endTime = timeSplit[1]
val list = LogUp.getLogListByPeriod(startTime, endTime)
val content = list.fold("") { total, next ->
"$total===================================\n" +
"记录时间:${
TimeUtils.millis2String(
next?.l ?: 0,
"yyyy-MM-dd HH:mm:ss"
)
}\n" +
"日志类型:${next?.f}\n" +
"线程名称:${next?.n}\n" +
"线程 id :${next?.i}\n" +
"日志内容:\n${next?.c}\n"
}
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
KeyboardUtils.hideSoftInput(bind.btnSearch) QLog.write("123456789", QLog.E)
bind.etDate.clearFocus()
bind.tvContent.text = content
} }
} }
} }
} }
private fun showTime() { /**
TimePickerDialog( * 初始化LogUp
this, { _, hourOfDay, minute -> */
LogUtils.d("---hourOfDay--->$hourOfDay") private fun initLog() {
LogUtils.d("---minute--->$minute") QLog.init(true)
}, 12, 50, true
).show()
}
private fun showDate() {
val nowYear: Int = TimeUtils.getNowString(TimeUtils.getSafeDateFormat("yyyy")).toInt()
val nowMoth: Int = TimeUtils.getNowString(TimeUtils.getSafeDateFormat("MM")).toInt() - 1
val nowDay: Int = TimeUtils.getNowString(TimeUtils.getSafeDateFormat("dd")).toInt()
DatePickerDialog(
this, { _, year, month, dayOfMonth ->
LogUtils.d("---year--->$year")
LogUtils.d("---month--->$month")
LogUtils.d("---dayOfMonth--->$dayOfMonth")
}, nowYear, nowMoth, nowDay
).show()
} }
} }
\ No newline at end of file
...@@ -9,8 +9,6 @@ import android.widget.TextView ...@@ -9,8 +9,6 @@ import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import com.qimai.android.widgetlib.popup.QmTipOverlayDrawable import com.qimai.android.widgetlib.popup.QmTipOverlayDrawable
import com.qimai.android.widgetlib.toast.HolderContext import com.qimai.android.widgetlib.toast.HolderContext
import com.qimai.log.LogUp
import com.qimai.log.ui.LogUpActivity
import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.activity_main.*
class MainActivity : AppCompatActivity() { class MainActivity : AppCompatActivity() {
...@@ -19,7 +17,6 @@ class MainActivity : AppCompatActivity() { ...@@ -19,7 +17,6 @@ class MainActivity : AppCompatActivity() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main) setContentView(R.layout.activity_main)
HolderContext.getInstance().register { this } HolderContext.getInstance().register { this }
LogUp.init(this, true)
findViewById<Button>(R.id.commonPop).setOnClickListener { findViewById<Button>(R.id.commonPop).setOnClickListener {
// ToastUtils.getInstance().showCenter("测试测试") // ToastUtils.getInstance().showCenter("测试测试")
...@@ -58,7 +55,7 @@ class MainActivity : AppCompatActivity() { ...@@ -58,7 +55,7 @@ class MainActivity : AppCompatActivity() {
startActivity(Intent(this, MainActivityPtinter::class.java)) startActivity(Intent(this, MainActivityPtinter::class.java))
} }
findViewById<Button>(R.id.btn_log).setOnClickListener { findViewById<Button>(R.id.btn_log).setOnClickListener {
startActivity(Intent(this, LogUpActivity::class.java)) startActivity(Intent(this, LogActivity::class.java))
} }
keyboard.btnText = "结账" keyboard.btnText = "结账"
keyboard.invalidate() keyboard.invalidate()
......
...@@ -8,13 +8,10 @@ import android.os.Environment ...@@ -8,13 +8,10 @@ import android.os.Environment
import android.util.Log import android.util.Log
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import com.blankj.utilcode.util.LogUtils
import com.blankj.utilcode.util.TimeUtils
import com.eclipsesource.v8.JavaVoidCallback import com.eclipsesource.v8.JavaVoidCallback
import com.eclipsesource.v8.V8 import com.eclipsesource.v8.V8
import com.eclipsesource.v8.V8Array import com.eclipsesource.v8.V8Array
import com.eclipsesource.v8.V8Object import com.eclipsesource.v8.V8Object
import com.qimai.log.LogUp
import kotlinx.android.synthetic.main.activity_main_printer.* import kotlinx.android.synthetic.main.activity_main_printer.*
import kotlinx.coroutines.* import kotlinx.coroutines.*
import zs.qimai.com.printer2.callback.* import zs.qimai.com.printer2.callback.*
...@@ -23,11 +20,11 @@ import zs.qimai.com.printer2.canvas.TestPrintTemplate ...@@ -23,11 +20,11 @@ import zs.qimai.com.printer2.canvas.TestPrintTemplate
import zs.qimai.com.printer2.executer.PrintExecutor import zs.qimai.com.printer2.executer.PrintExecutor
import zs.qimai.com.printer2.manager.DeviceManager import zs.qimai.com.printer2.manager.DeviceManager
import zs.qimai.com.printer2.manager.DeviceManager.Companion.BT import zs.qimai.com.printer2.manager.DeviceManager.Companion.BT
import zs.qimai.com.printer2.manager.DeviceManager.Companion.USB
import zs.qimai.com.printer2.manager.DeviceManagerUtils import zs.qimai.com.printer2.manager.DeviceManagerUtils
import zs.qimai.com.printer2.manager.UsbDeviceManager import zs.qimai.com.printer2.manager.UsbDeviceManager
import zs.qimai.com.printer2.utils.PrintManagerUtils import zs.qimai.com.printer2.utils.PrintManagerUtils
import java.io.* import java.io.*
import java.text.SimpleDateFormat
import java.util.* import java.util.*
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
...@@ -50,14 +47,6 @@ class MainActivityPtinter : AppCompatActivity(), PrintConnOrDisCallBack, JavaVoi ...@@ -50,14 +47,6 @@ class MainActivityPtinter : AppCompatActivity(), PrintConnOrDisCallBack, JavaVoi
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main_printer) setContentView(R.layout.activity_main_printer)
GlobalScope.launch(Dispatchers.Main) {
for (i in 0..3) {
LogUp.w("networknetworknetwork", LogUp.D, true)
}
}
//
Thread { LogUp.w("Thread", LogUp.E, true) }.start()
DeviceManagerUtils.getInstance().addConnectStatusCallBack(this) DeviceManagerUtils.getInstance().addConnectStatusCallBack(this)
initUsbPrinter() initUsbPrinter()
val value = Utils.getSN() val value = Utils.getSN()
...@@ -138,41 +127,10 @@ class MainActivityPtinter : AppCompatActivity(), PrintConnOrDisCallBack, JavaVoi ...@@ -138,41 +127,10 @@ class MainActivityPtinter : AppCompatActivity(), PrintConnOrDisCallBack, JavaVoi
} }
tv_connect_usb.setOnClickListener { tv_connect_usb.setOnClickListener {
LogUp.deleteLogByName("1636473600000") startActivity(Intent(this, UsbActivity::class.java))
// startActivity(Intent(this, UsbActivity::class.java))
} }
tv_disconnect_bt.setOnClickListener { tv_disconnect_bt.setOnClickListener {
LogUtils.d("---allfileinfo--->${LogUp.getAllFileInfo()}")
val filePath = LogUp.getLogFilePath()
val files = LogUp.getAllLogFile()
val dateStr = TimeUtils.getNowString(SimpleDateFormat("yyyy-MM-dd", Locale.US))
val file = LogUp.getLogFile(dateStr)
val content = LogUp.getLogFileContent(dateStr)
val contentFile = file?.run { LogUp.getLogFileContent(this) }
val contentDate = LogUp.getAllLogFileContent()
LogUtils.d("---filePath--->$filePath")
LogUtils.d("---filess--->$files")
LogUtils.d("---file--->$file")
LogUtils.d("---content--->$content")
LogUtils.d("---contentFile--->$contentFile")
LogUtils.d("---contentDate--->$contentDate")
LogUtils.d("---10--->${LogUp.getLogFileByPeriod("2021-11-10", "2021-11-10")}")
LogUtils.d("---1011--->${LogUp.getLogFileByPeriod("2021-11-10", "2021-11-11")}")
LogUtils.d(
"---list--->${
LogUp.getLogContentByPeriod(
TimeUtils.millis2String(1636615422000, "yyyy-MM-dd HH:mm:ss"),
TimeUtils.millis2String(1636615423000, "yyyy-MM-dd HH:mm:ss")
)
}"
)
list.forEach { list.forEach {
if (it.mType == BT) { if (it.mType == BT) {
PrintManagerUtils.getInstance().closeBtConn(it.address!!) PrintManagerUtils.getInstance().closeBtConn(it.address!!)
...@@ -181,15 +139,11 @@ class MainActivityPtinter : AppCompatActivity(), PrintConnOrDisCallBack, JavaVoi ...@@ -181,15 +139,11 @@ class MainActivityPtinter : AppCompatActivity(), PrintConnOrDisCallBack, JavaVoi
} }
tv_disconnect_usb.setOnClickListener { tv_disconnect_usb.setOnClickListener {
list.forEach {
if (it.mType == USB) {
LogUp.deleteLogByDate("2021-11-11") PrintManagerUtils.getInstance().closeUsbConn(it.address!!)
}
// list.forEach { }
// if (it.mType == USB) {
// PrintManagerUtils.getInstance().closeUsbConn(it.address!!)
// }
// }
} }
tv_connect_wifi.setOnClickListener { tv_connect_wifi.setOnClickListener {
PrintManagerUtils.getInstance().wifiConnect("192.168.31.200", PrintManagerUtils.getInstance().wifiConnect("192.168.31.200",
...@@ -229,12 +183,6 @@ class MainActivityPtinter : AppCompatActivity(), PrintConnOrDisCallBack, JavaVoi ...@@ -229,12 +183,6 @@ class MainActivityPtinter : AppCompatActivity(), PrintConnOrDisCallBack, JavaVoi
} }
} }
override fun onStop() {
LogUtils.d("---onStop--->")
LogUp.f()
super.onStop()
}
private fun initUsbPrinter() { private fun initUsbPrinter() {
DeviceManagerUtils.getInstance().addConnectStatusCallBack(object : PrintConnOrDisCallBack { DeviceManagerUtils.getInstance().addConnectStatusCallBack(object : PrintConnOrDisCallBack {
override fun onConectPrint(device: DeviceManager) { override fun onConectPrint(device: DeviceManager) {
......
...@@ -5,42 +5,19 @@ ...@@ -5,42 +5,19 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<Button <Button
android:id="@+id/btn_pick_date" android:id="@+id/btn_log"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="选择日期" android:text="初始化Log"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/et_date"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="2021-11-11 15:21:56 -- 2021-11-11 15:34:56"
android:textSize="12sp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/btn_search"
app:layout_constraintTop_toBottomOf="@+id/btn_pick_date" />
<Button <Button
android:id="@+id/btn_search" android:id="@+id/btn_write"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="查询" android:text="写日志"
app:layout_constraintBottom_toBottomOf="@+id/et_date"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/et_date" />
<TextView
android:id="@+id/tv_content"
android:layout_width="0dp"
android:layout_height="0dp"
android:hint="日志内容..."
android:padding="16dp"
android:scrollbars="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/btn_log" />
app:layout_constraintTop_toBottomOf="@+id/et_date" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.qimai.android.tool_network;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String LIBRARY_PACKAGE_NAME = "com.qimai.android.tool_network";
public static final String BUILD_TYPE = "debug";
public static final int VERSION_CODE = 1;
public static final String VERSION_NAME = "1.0";
}
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.qimai.android.tool_network"
android:versionCode="1"
android:versionName="1.0" >
<uses-sdk
android:minSdkVersion="19"
android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
</manifest>
\ No newline at end of file
{
"version": 1,
"applicationId": "com.qimai.android.tool_network",
"variantType": "LIBRARY",
"elements": [
{
"outputType": {
"type": "AAPT_FRIENDLY_MERGED_MANIFESTS"
},
"apkData": {
"type": "MAIN",
"splits": [],
"versionCode": 1,
"versionName": "1.0",
"outputFile": "fetch-debug.aar",
"fullName": "debug",
"baseName": "debug",
"dirName": ""
},
"path": "AndroidManifest.xml",
"properties": {
"packageId": "com.qimai.android.tool_network",
"split": ""
}
}
]
}
\ No newline at end of file
This diff is collapsed.
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\project\aaaqm\widget\fetch\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\project\aaaqm\widget\fetch\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\project\aaaqm\widget\fetch\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\project\aaaqm\widget\fetch\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\project\aaaqm\widget\fetch\src\main\assets"/><source path="D:\project\aaaqm\widget\fetch\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\project\aaaqm\widget\fetch\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">tool_network</string>
</resources>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\project\aaaqm\widget\fetch\src\main\res"/><source path="D:\project\aaaqm\widget\fetch\build\generated\res\rs\debug"/><source path="D:\project\aaaqm\widget\fetch\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\project\aaaqm\widget\fetch\src\main\res"><file path="D:\project\aaaqm\widget\fetch\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">tool_network</string></file></source><source path="D:\project\aaaqm\widget\fetch\build\generated\res\rs\debug"/><source path="D:\project\aaaqm\widget\fetch\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\project\aaaqm\widget\fetch\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\project\aaaqm\widget\fetch\src\debug\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.qimai.android.tool_network"
android:versionCode="1"
android:versionName="1.0" >
<uses-sdk
android:minSdkVersion="19"
android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
</manifest>
\ No newline at end of file
R_DEF: Internal format may change without notice
local
string app_name
1<?xml version="1.0" encoding="utf-8"?>
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 package="com.qimai.android.tool_network"
4 android:versionCode="1"
5 android:versionName="1.0" >
6
7 <uses-sdk
8 android:minSdkVersion="19"
8-->D:\project\aaaqm\widget\fetch\src\main\AndroidManifest.xml
9 android:targetSdkVersion="28" />
9-->D:\project\aaaqm\widget\fetch\src\main\AndroidManifest.xml
10
11 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
11-->D:\project\aaaqm\widget\fetch\src\main\AndroidManifest.xml:3:5-78
11-->D:\project\aaaqm\widget\fetch\src\main\AndroidManifest.xml:3:22-76
12 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
12-->D:\project\aaaqm\widget\fetch\src\main\AndroidManifest.xml:4:5-81
12-->D:\project\aaaqm\widget\fetch\src\main\AndroidManifest.xml:4:22-78
13
14</manifest>
{
"version": 1,
"applicationId": "com.qimai.android.tool_network",
"variantType": "LIBRARY",
"elements": [
{
"outputType": {
"type": "MERGED_MANIFESTS"
},
"apkData": {
"type": "MAIN",
"splits": [],
"versionCode": 1,
"versionName": "1.0",
"outputFile": "fetch-debug.aar",
"fullName": "debug",
"baseName": "debug",
"dirName": ""
},
"path": "../../library_manifest/debug/AndroidManifest.xml",
"properties": {
"packageId": "com.qimai.android.tool_network",
"split": ""
}
}
]
}
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">tool_network</string>
</resources>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment