diff --git a/README.md b/README.md index 07b1376..ccf7eee 100644 --- a/README.md +++ b/README.md @@ -15,13 +15,10 @@ Mirai 是一个在全平台下运行，提供 QQ 协议支持的高效率机器 # mirai-compose -[comment]: <> (![](https://img.shields.io/github/v/release/sonder-joker/mirai-compose?include_prereleases) ) - -[comment]: <> (console-version:2.7.0-M1-dev-1 ) 基于[compose-jb](https://github.com/jetbrains/compose-jb) 实现的[mirai-console](https://github.com/mamoe/mirai-console) -前端 -目前正处于测试阶段。 +前端 +目前正处于测试阶段. ## 使用 -目前仅提供手动编译使用，文档正在补全 +可以在release页面下载. \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 295c780..ef9db46 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,11 +1,11 @@ @file:Suppress("ObjectPropertyName", "SpellCheckingInspection") object Versions { - const val mirai_compose = "1.1.1" + const val mirai_compose = "1.0.0" const val kotlin = "1.4.32" - const val mirai = "2.7-M1-dev-1" + const val mirai = "2.6.4" const val compose = "0.4.0-build188" const val decompose = "0.2.3" diff --git a/mirai-compose/build.gradle.kts b/mirai-compose/build.gradle.kts index 09d8703..bcbf94a 100644 --- a/mirai-compose/build.gradle.kts +++ b/mirai-compose/build.gradle.kts @@ -28,7 +28,6 @@ dependencies { implementation(yamlkt) implementation(compose.materialIconsExtended) //may remove in future - implementation("com.google.zxing:core:3.4.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0") diff --git a/mirai-compose/src/main/kotlin/console/MiraiCompose.kt b/mirai-compose/src/main/kotlin/console/MiraiCompose.kt index 9e2d7f9..e6af17d 100644 --- a/mirai-compose/src/main/kotlin/console/MiraiCompose.kt +++ b/mirai-compose/src/main/kotlin/console/MiraiCompose.kt @@ -102,27 +102,6 @@ object MiraiCompose : MiraiConsoleImplementation, MiraiComposeRepository, object MiraiComposeDescription : MiraiConsoleFrontEndDescription { override val name: String = "MiraiCompose" override val vendor: String = "Noire" - override val version: SemVersion = SemVersion("1.1.0") -} - -internal fun setSystemOut(out: MiraiLogger) { - System.setOut( - PrintStream( - BufferedOutputStream( - logger = out.run { ({ line: String? -> info(line) }) } - ), - false, - "UTF-8" - ) - ) - System.setErr( - PrintStream( - BufferedOutputStream( - logger = out.run { ({ line: String? -> warning(line) }) } - ), - false, - "UTF-8" - ) - ) + override val version: SemVersion = SemVersion("0.1.0-dev1") } diff --git a/mirai-compose/src/main/kotlin/ui/common/LogBox.kt b/mirai-compose/src/main/kotlin/ui/common/LogBox.kt index 5cbee42..62d920c 100644 --- a/mirai-compose/src/main/kotlin/ui/common/LogBox.kt +++ b/mirai-compose/src/main/kotlin/ui/common/LogBox.kt @@ -1,8 +1,6 @@ package com.youngerhousea.miraicompose.ui.common import androidx.compose.animation.animateContentSize -import androidx.compose.desktop.AppManager -import androidx.compose.desktop.AppWindow import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -10,13 +8,12 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.text.selection.SelectionContainer -import androidx.compose.material.OutlinedButton +import androidx.compose.material.Button import androidx.compose.material.OutlinedTextField import androidx.compose.material.Text import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.input.key.Key -import androidx.compose.ui.input.key.plus import androidx.compose.ui.input.key.shortcuts import com.youngerhousea.miraicompose.console.ComposeLog import kotlinx.coroutines.launch @@ -46,11 +43,8 @@ internal fun LogBox(modifier: Modifier = Modifier, logs: List, searc } } } - } - - LaunchedEffect(logs.size) { if (logs.isNotEmpty()) lazyListState.animateScrollToItem(logs.size) @@ -86,7 +80,7 @@ internal fun CommandSendBox(logger: MiraiLogger, modifier: Modifier = Modifier) Modifier.weight(1f) ) - OutlinedButton( + Button( onClick = onClick, modifier = Modifier .weight(2f), diff --git a/mirai-compose/src/main/kotlin/ui/feature/MiraiComposeView.kt b/mirai-compose/src/main/kotlin/ui/feature/MiraiComposeView.kt index b744d06..e233533 100644 --- a/mirai-compose/src/main/kotlin/ui/feature/MiraiComposeView.kt +++ b/mirai-compose/src/main/kotlin/ui/feature/MiraiComposeView.kt @@ -13,6 +13,9 @@ import com.youngerhousea.miraicompose.utils.asComponent import kotlinx.coroutines.cancel import net.mamoe.mirai.console.MiraiConsoleImplementation.Companion.start import java.awt.datatransfer.UnsupportedFlavorException +import java.nio.file.Files +import kotlin.io.path.createTempDirectory +import kotlin.io.path.div // 应用起点 fun MiraiComposeView() { @@ -51,4 +54,4 @@ private fun SetDefaultExceptionHandler() { } } } -} +} \ No newline at end of file diff --git a/mirai-compose/src/main/kotlin/ui/feature/NavHostView.kt b/mirai-compose/src/main/kotlin/ui/feature/NavHostView.kt index f2afe0c..d5a6a5c 100644 --- a/mirai-compose/src/main/kotlin/ui/feature/NavHostView.kt +++ b/mirai-compose/src/main/kotlin/ui/feature/NavHostView.kt @@ -178,6 +178,7 @@ fun NavHostUi(navHost: NavHost) { AvatarWithMenu( composeBotList = navHost.botList, onBoxClick = { + navigationIndex = 5 if (navHost.currentBot != null) navHost.onRouteMessage() else diff --git a/mirai-compose/src/main/kotlin/ui/feature/bot/LoadingView.kt b/mirai-compose/src/main/kotlin/ui/feature/bot/LoadingView.kt index 056d3f9..640b5be 100644 --- a/mirai-compose/src/main/kotlin/ui/feature/bot/LoadingView.kt +++ b/mirai-compose/src/main/kotlin/ui/feature/bot/LoadingView.kt @@ -1,6 +1,5 @@ package com.youngerhousea.miraicompose.ui.feature.bot -import androidx.compose.foundation.Canvas import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -16,15 +15,9 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.geometry.Offset -import androidx.compose.ui.geometry.Size -import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.text.input.TextFieldValue import com.arkivanov.decompose.ComponentContext -import com.google.zxing.BarcodeFormat -import com.google.zxing.MultiFormatWriter -import com.google.zxing.common.BitMatrix import com.youngerhousea.miraicompose.utils.ComponentScope import com.youngerhousea.miraicompose.utils.splitQuery import io.ktor.client.* @@ -141,27 +134,7 @@ fun SolveUnsafeDeviceLoginVerifyUi(solveUnsafeDeviceLoginVerify: SolveUnsafeDevi ) { Column { Text("Mirai UnsafeDeviceLoginVerify(${solveUnsafeDeviceLoginVerify.bot.id}") - if (solveUnsafeDeviceLoginVerify.string.isNotEmpty()) - Canvas(Modifier) { - val b: BitMatrix = - MultiFormatWriter().encode(solveUnsafeDeviceLoginVerify.string, BarcodeFormat.QR_CODE, 200, 200) - for (i in 0..200) { - for (j in 0..200) { - if (b.get(i, j)) - drawRect( - color = Color.Black, - topLeft = Offset(i.toFloat(), j.toFloat()), - size = Size(1f, 1f) - ) - else - drawRect( - color = Color.White, - topLeft = Offset(i.toFloat(), j.toFloat()), - size = Size(1f, 1f) - ) - } - } - } + SelectionContainer { Text(solveUnsafeDeviceLoginVerify.qrCodeUrl) } @@ -203,5 +176,3 @@ data class Res( class ReturnException(killBot: Boolean = true, message: String = "返回") : CustomLoginFailedException(killBot, message) -val qrcode = - "var QRCode;!function(){function a(a){this.mode=c.MODE_8BIT_BYTE,this.data=a,this.parsedData=[];for(var b=[],d=0,e=this.data.length;e>d;d++){var f=this.data.charCodeAt(d);f>65536?(b[0]=240|(1835008&f)>>>18,b[1]=128|(258048&f)>>>12,b[2]=128|(4032&f)>>>6,b[3]=128|63&f):f>2048?(b[0]=224|(61440&f)>>>12,b[1]=128|(4032&f)>>>6,b[2]=128|63&f):f>128?(b[0]=192|(1984&f)>>>6,b[1]=128|63&f):b[0]=f,this.parsedData=this.parsedData.concat(b)}this.parsedData.length!=this.data.length&&(this.parsedData.unshift(191),this.parsedData.unshift(187),this.parsedData.unshift(239))}function b(a,b){this.typeNumber=a,this.errorCorrectLevel=b,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=[]}function i(a,b){if(void 0==a.length)throw new Error(a.length+\"/\"+b);for(var c=0;c=f;f++){var h=0;switch(b){case d.L:h=l[f][0];break;case d.M:h=l[f][1];break;case d.Q:h=l[f][2];break;case d.H:h=l[f][3]}if(h>=e)break;c++}if(c>l.length)throw new Error(\"Too long data\");return c}function s(a){var b=encodeURI(a).toString().replace(/\\%[0-9a-fA-F]{2}/g,\"a\");return b.length+(b.length!=a?3:0)}a.prototype={getLength:function(){return this.parsedData.length},write:function(a){for(var b=0,c=this.parsedData.length;c>b;b++)a.put(this.parsedData[b],8)}},b.prototype={addData:function(b){var c=new a(b);this.dataList.push(c),this.dataCache=null},isDark:function(a,b){if(0>a||this.moduleCount<=a||0>b||this.moduleCount<=b)throw new Error(a+\",\"+b);return this.modules[a][b]},getModuleCount:function(){return this.moduleCount},make:function(){this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var d=0;d=7&&this.setupTypeNumber(a),null==this.dataCache&&(this.dataCache=b.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,b){for(var c=-1;7>=c;c++)if(!(-1>=a+c||this.moduleCount<=a+c))for(var d=-1;7>=d;d++)-1>=b+d||this.moduleCount<=b+d||(this.modules[a+c][b+d]=c>=0&&6>=c&&(0==d||6==d)||d>=0&&6>=d&&(0==c||6==c)||c>=2&&4>=c&&d>=2&&4>=d?!0:!1)},getBestMaskPattern:function(){for(var a=0,b=0,c=0;8>c;c++){this.makeImpl(!0,c);var d=f.getLostPoint(this);(0==c||a>d)&&(a=d,b=c)}return b},createMovieClip:function(a,b,c){var d=a.createEmptyMovieClip(b,c),e=1;this.make();for(var f=0;f=g;g++)for(var h=-2;2>=h;h++)this.modules[d+g][e+h]=-2==g||2==g||-2==h||2==h||0==g&&0==h?!0:!1}},setupTypeNumber:function(a){for(var b=f.getBCHTypeNumber(this.typeNumber),c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[Math.floor(c/3)][c%3+this.moduleCount-8-3]=d}for(var c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[c%3+this.moduleCount-8-3][Math.floor(c/3)]=d}},setupTypeInfo:function(a,b){for(var c=this.errorCorrectLevel<<3|b,d=f.getBCHTypeInfo(c),e=0;15>e;e++){var g=!a&&1==(1&d>>e);6>e?this.modules[e][8]=g:8>e?this.modules[e+1][8]=g:this.modules[this.moduleCount-15+e][8]=g}for(var e=0;15>e;e++){var g=!a&&1==(1&d>>e);8>e?this.modules[8][this.moduleCount-e-1]=g:9>e?this.modules[8][15-e-1+1]=g:this.modules[8][15-e-1]=g}this.modules[this.moduleCount-8][8]=!a},mapData:function(a,b){for(var c=-1,d=this.moduleCount-1,e=7,g=0,h=this.moduleCount-1;h>0;h-=2)for(6==h&&h--;;){for(var i=0;2>i;i++)if(null==this.modules[d][h-i]){var j=!1;g>>e));var k=f.getMask(b,d,h-i);k&&(j=!j),this.modules[d][h-i]=j,e--,-1==e&&(g++,e=7)}if(d+=c,0>d||this.moduleCount<=d){d-=c,c=-c;break}}}},b.PAD0=236,b.PAD1=17,b.createData=function(a,c,d){for(var e=j.getRSBlocks(a,c),g=new k,h=0;h8*l)throw new Error(\"code length overflow. (\"+g.getLengthInBits()+\">\"+8*l+\")\");for(g.getLengthInBits()+4<=8*l&&g.put(0,4);0!=g.getLengthInBits()%8;)g.putBit(!1);for(;;){if(g.getLengthInBits()>=8*l)break;if(g.put(b.PAD0,8),g.getLengthInBits()>=8*l)break;g.put(b.PAD1,8)}return b.createBytes(g,e)},b.createBytes=function(a,b){for(var c=0,d=0,e=0,g=new Array(b.length),h=new Array(b.length),j=0;j=0?p.get(q):0}}for(var r=0,m=0;mm;m++)for(var j=0;jm;m++)for(var j=0;j=0;)b^=f.G15<=0;)b^=f.G18<>>=1;return b},getPatternPosition:function(a){return f.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,b,c){switch(a){case e.PATTERN000:return 0==(b+c)%2;case e.PATTERN001:return 0==b%2;case e.PATTERN010:return 0==c%3;case e.PATTERN011:return 0==(b+c)%3;case e.PATTERN100:return 0==(Math.floor(b/2)+Math.floor(c/3))%2;case e.PATTERN101:return 0==b*c%2+b*c%3;case e.PATTERN110:return 0==(b*c%2+b*c%3)%2;case e.PATTERN111:return 0==(b*c%3+(b+c)%2)%2;default:throw new Error(\"bad maskPattern:\"+a)}},getErrorCorrectPolynomial:function(a){for(var b=new i([1],0),c=0;a>c;c++)b=b.multiply(new i([1,g.gexp(c)],0));return b},getLengthInBits:function(a,b){if(b>=1&&10>b)switch(a){case c.MODE_NUMBER:return 10;case c.MODE_ALPHA_NUM:return 9;case c.MODE_8BIT_BYTE:return 8;case c.MODE_KANJI:return 8;default:throw new Error(\"mode:\"+a)}else if(27>b)switch(a){case c.MODE_NUMBER:return 12;case c.MODE_ALPHA_NUM:return 11;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 10;default:throw new Error(\"mode:\"+a)}else{if(!(41>b))throw new Error(\"type:\"+b);switch(a){case c.MODE_NUMBER:return 14;case c.MODE_ALPHA_NUM:return 13;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 12;default:throw new Error(\"mode:\"+a)}}},getLostPoint:function(a){for(var b=a.getModuleCount(),c=0,d=0;b>d;d++)for(var e=0;b>e;e++){for(var f=0,g=a.isDark(d,e),h=-1;1>=h;h++)if(!(0>d+h||d+h>=b))for(var i=-1;1>=i;i++)0>e+i||e+i>=b||(0!=h||0!=i)&&g==a.isDark(d+h,e+i)&&f++;f>5&&(c+=3+f-5)}for(var d=0;b-1>d;d++)for(var e=0;b-1>e;e++){var j=0;a.isDark(d,e)&&j++,a.isDark(d+1,e)&&j++,a.isDark(d,e+1)&&j++,a.isDark(d+1,e+1)&&j++,(0==j||4==j)&&(c+=3)}for(var d=0;b>d;d++)for(var e=0;b-6>e;e++)a.isDark(d,e)&&!a.isDark(d,e+1)&&a.isDark(d,e+2)&&a.isDark(d,e+3)&&a.isDark(d,e+4)&&!a.isDark(d,e+5)&&a.isDark(d,e+6)&&(c+=40);for(var e=0;b>e;e++)for(var d=0;b-6>d;d++)a.isDark(d,e)&&!a.isDark(d+1,e)&&a.isDark(d+2,e)&&a.isDark(d+3,e)&&a.isDark(d+4,e)&&!a.isDark(d+5,e)&&a.isDark(d+6,e)&&(c+=40);for(var k=0,e=0;b>e;e++)for(var d=0;b>d;d++)a.isDark(d,e)&&k++;var l=Math.abs(100*k/b/b-50)/5;return c+=10*l}},g={glog:function(a){if(1>a)throw new Error(\"glog(\"+a+\")\");return g.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;a>=256;)a-=255;return g.EXP_TABLE[a]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},h=0;8>h;h++)g.EXP_TABLE[h]=1<h;h++)g.EXP_TABLE[h]=g.EXP_TABLE[h-4]^g.EXP_TABLE[h-5]^g.EXP_TABLE[h-6]^g.EXP_TABLE[h-8];for(var h=0;255>h;h++)g.LOG_TABLE[g.EXP_TABLE[h]]=h;i.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var b=new Array(this.getLength()+a.getLength()-1),c=0;cf;f++)for(var g=c[3*f+0],h=c[3*f+1],i=c[3*f+2],k=0;g>k;k++)e.push(new j(h,i));return e},j.getRsBlockTable=function(a,b){switch(b){case d.L:return j.RS_BLOCK_TABLE[4*(a-1)+0];case d.M:return j.RS_BLOCK_TABLE[4*(a-1)+1];case d.Q:return j.RS_BLOCK_TABLE[4*(a-1)+2];case d.H:return j.RS_BLOCK_TABLE[4*(a-1)+3];default:return void 0}},k.prototype={get:function(a){var b=Math.floor(a/8);return 1==(1&this.buffer[b]>>>7-a%8)},put:function(a,b){for(var c=0;b>c;c++)this.putBit(1==(1&a>>>b-c-1))},getLengthInBits:function(){return this.length},putBit:function(a){var b=Math.floor(this.length/8);this.buffer.length<=b&&this.buffer.push(0),a&&(this.buffer[b]|=128>>>this.length%8),this.length++}};var l=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]],o=function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){function g(a,b){var c=document.createElementNS(\"http://www.w3.org/2000/svg\",a);for(var d in b)b.hasOwnProperty(d)&&c.setAttribute(d,b[d]);return c}var b=this._htOption,c=this._el,d=a.getModuleCount();Math.floor(b.width/d),Math.floor(b.height/d),this.clear();var h=g(\"svg\",{viewBox:\"0 0 \"+String(d)+\" \"+String(d),width:\"100%\",height:\"100%\",fill:b.colorLight});h.setAttributeNS(\"http://www.w3.org/2000/xmlns/\",\"xmlns:xlink\",\"http://www.w3.org/1999/xlink\"),c.appendChild(h),h.appendChild(g(\"rect\",{fill:b.colorDark,width:\"1\",height:\"1\",id:\"template\"}));for(var i=0;d>i;i++)for(var j=0;d>j;j++)if(a.isDark(i,j)){var k=g(\"use\",{x:String(i),y:String(j)});k.setAttributeNS(\"http://www.w3.org/1999/xlink\",\"href\",\"#template\"),h.appendChild(k)}},a.prototype.clear=function(){for(;this._el.hasChildNodes();)this._el.removeChild(this._el.lastChild)},a}(),p=\"svg\"===document.documentElement.tagName.toLowerCase(),q=p?o:m()?function(){function a(){this._elImage.src=this._elCanvas.toDataURL(\"image/png\"),this._elImage.style.display=\"block\",this._elCanvas.style.display=\"none\"}function d(a,b){var c=this;if(c._fFail=b,c._fSuccess=a,null===c._bSupportDataURI){var d=document.createElement(\"img\"),e=function(){c._bSupportDataURI=!1,c._fFail&&_fFail.call(c)},f=function(){c._bSupportDataURI=!0,c._fSuccess&&c._fSuccess.call(c)};return d.onabort=e,d.onerror=e,d.onload=f,d.src=\"data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==\",void 0}c._bSupportDataURI===!0&&c._fSuccess?c._fSuccess.call(c):c._bSupportDataURI===!1&&c._fFail&&c._fFail.call(c)}if(this._android&&this._android<=2.1){var b=1/window.devicePixelRatio,c=CanvasRenderingContext2D.prototype.drawImage;CanvasRenderingContext2D.prototype.drawImage=function(a,d,e,f,g,h,i,j){if(\"nodeName\"in a&&/img/i.test(a.nodeName))for(var l=arguments.length-1;l>=1;l--)arguments[l]=arguments[l]*b;else\"undefined\"==typeof j&&(arguments[1]*=b,arguments[2]*=b,arguments[3]*=b,arguments[4]*=b);c.apply(this,arguments)}}var e=function(a,b){this._bIsPainted=!1,this._android=n(),this._htOption=b,this._elCanvas=document.createElement(\"canvas\"),this._elCanvas.width=b.width,this._elCanvas.height=b.height,a.appendChild(this._elCanvas),this._el=a,this._oContext=this._elCanvas.getContext(\"2d\"),this._bIsPainted=!1,this._elImage=document.createElement(\"img\"),this._elImage.style.display=\"none\",this._el.appendChild(this._elImage),this._bSupportDataURI=null};return e.prototype.draw=function(a){var b=this._elImage,c=this._oContext,d=this._htOption,e=a.getModuleCount(),f=d.width/e,g=d.height/e,h=Math.round(f),i=Math.round(g);b.style.display=\"none\",this.clear();for(var j=0;e>j;j++)for(var k=0;e>k;k++){var l=a.isDark(j,k),m=k*f,n=j*g;c.strokeStyle=l?d.colorDark:d.colorLight,c.lineWidth=1,c.fillStyle=l?d.colorDark:d.colorLight,c.fillRect(m,n,f,g),c.strokeRect(Math.floor(m)+.5,Math.floor(n)+.5,h,i),c.strokeRect(Math.ceil(m)-.5,Math.ceil(n)-.5,h,i)}this._bIsPainted=!0},e.prototype.makeImage=function(){this._bIsPainted&&d.call(this,a)},e.prototype.isPainted=function(){return this._bIsPainted},e.prototype.clear=function(){this._oContext.clearRect(0,0,this._elCanvas.width,this._elCanvas.height),this._bIsPainted=!1},e.prototype.round=function(a){return a?Math.floor(1e3*a)/1e3:a},e}():function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){for(var b=this._htOption,c=this._el,d=a.getModuleCount(),e=Math.floor(b.width/d),f=Math.floor(b.height/d),g=[''],h=0;d>h;h++){g.push(\"\");for(var i=0;d>i;i++)g.push('');g.push(\"\")}g.push(\"
\"),c.innerHTML=g.join(\"\");var j=c.childNodes[0],k=(b.width-j.offsetWidth)/2,l=(b.height-j.offsetHeight)/2;k>0&&l>0&&(j.style.margin=l+\"px \"+k+\"px\")},a.prototype.clear=function(){this._el.innerHTML=\"\"},a}();QRCode=function(a,b){if(this._htOption={width:256,height:256,typeNumber:4,colorDark:\"#000000\",colorLight:\"#ffffff\",correctLevel:d.H},\"string\"==typeof b&&(b={text:b}),b)for(var c in b)this._htOption[c]=b[c];\"string\"==typeof a&&(a=document.getElementById(a)),this._android=n(),this._el=a,this._oQRCode=null,this._oDrawing=new q(this._el,this._htOption),this._htOption.text&&this.makeCode(this._htOption.text)},QRCode.prototype.makeCode=function(a){this._oQRCode=new b(r(a,this._htOption.correctLevel),this._htOption.correctLevel),this._oQRCode.addData(a),this._oQRCode.make(),this._el.title=a,this._oDrawing.draw(this._oQRCode),this.makeImage()},QRCode.prototype.makeImage=function(){\"function\"==typeof this._oDrawing.makeImage&&(!this._android||this._android>=3)&&this._oDrawing.makeImage()},QRCode.prototype.clear=function(){this._oDrawing.clear()},QRCode.CorrectLevel=d}();" \ No newline at end of file diff --git a/mirai-compose/src/main/kotlin/ui/feature/log/LogView.kt b/mirai-compose/src/main/kotlin/ui/feature/log/LogView.kt index 3cf31d7..668a52a 100644 --- a/mirai-compose/src/main/kotlin/ui/feature/log/LogView.kt +++ b/mirai-compose/src/main/kotlin/ui/feature/log/LogView.kt @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.* import androidx.compose.material.* import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Search -import androidx.compose.material.icons.outlined.Search import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.input.key.Key @@ -21,6 +20,11 @@ import com.youngerhousea.miraicompose.ui.common.CommandSendBox import com.youngerhousea.miraicompose.ui.common.LogBox import net.mamoe.mirai.utils.MiraiLogger import java.awt.event.MouseEvent +import java.io.File +import java.time.LocalDate +import javax.swing.JFileChooser +import javax.swing.UIManager +import javax.swing.filechooser.FileNameExtensionFilter /** * Compose的所有日志 @@ -51,21 +55,45 @@ fun ConsoleLogUi(consoleLog: ConsoleLog) { }) { Box( modifier = Modifier - .padding(top = offset.y - 80.dp) - .offset(x = offset.x) + .padding(top = offset.y) + .offset(x = offset.x - 160.dp) ) { DropdownMenu( isExpand, onDismissRequest = { isExpand = false } ) { - DropdownMenuItem(onClick = { isExpand = false }) { - Text("OpenLog") - //TODO open log file in editor such as notepad - } - DropdownMenuItem(onClick = { isExpand = false }) { - Text("Report") - //TODO report error or do else + DropdownMenuItem(onClick = { + isExpand = false + // open maybe slow + val previousLF = UIManager.getLookAndFeel(); + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + val fc = JFileChooser() + UIManager.setLookAndFeel(previousLF); + fc.selectedFile = File("${LocalDate.now()}.log") + fc.dialogTitle = "Save log" + fc.dragEnabled = true + fc.fileSelectionMode = JFileChooser.FILES_ONLY + fc.fileFilter = FileNameExtensionFilter("log(*.log, *.txt)", "log", "txt") + if (fc.showSaveDialog(AppManager.focusedWindow!!.window) == JFileChooser.APPROVE_OPTION) { + val f = fc.selectedFile + consoleLog.logger.info("储存当前日志到文件: ${f.absolutePath}") + if (f.exists()) { + consoleLog.logger.error("储存失败,文件已存在") + } else { + f.createNewFile() + f.writeText(consoleLog.loggerStorage.joinToString("\n")) + consoleLog.logger.info("写入完成") + } + } + }) { + Text("Save log") } +// DropdownMenuItem(onClick = { +// //TODO report error or do else +// isExpand = false +// }) { +// Text("Report") +// } } } Column { diff --git a/mirai-compose/src/main/kotlin/utils/Utils.kt b/mirai-compose/src/main/kotlin/utils/Utils.kt index 16067c7..6d8302a 100644 --- a/mirai-compose/src/main/kotlin/utils/Utils.kt +++ b/mirai-compose/src/main/kotlin/utils/Utils.kt @@ -154,10 +154,6 @@ inline fun ColumnScope.itemsWithIndexed( } } -fun AnnotatedString.replace() { - -} - class ComponentScope(private val scope: CoroutineScope = MainScope()) : InstanceKeeper.Instance, CoroutineScope by scope {