u

happylihappyli · Sep 7, 2019 · 3eec82c · 3eec82c
1 parent 7305d2e
commit 3eec82c
Show file tree

Hide file tree

Showing 15 changed files with 106 additions and 15 deletions.
diff --git a/FunnyApp/.vs/FunnyApp/v15/.suo b/FunnyApp/.vs/FunnyApp/v15/.suo
diff --git a/FunnyApp/.vs/FunnyApp/v15/Server/sqlite3/storage.ide-shm b/FunnyApp/.vs/FunnyApp/v15/Server/sqlite3/storage.ide-shm
diff --git a/FunnyApp/FunnyApp.csproj.user b/FunnyApp/FunnyApp.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartArguments>%40\Calculate\index.js</StartArguments>
+    <StartArguments>%40聊天.js</StartArguments>
   </PropertyGroup>
   <PropertyGroup>
     <ProjectView>ProjectFiles</ProjectView>

diff --git a/FunnyApp_Run/bin/Debug/JS/Clock/index.js b/FunnyApp_Run/bin/Debug/JS/Clock/index.js
@@ -119,7 +119,5 @@ run_click("");
 
 sys.Run_JS_Out("Clock\\参考消息.js");
 
-
 sys.Tray_Show(sys.Path_JS()+"\\clock2.ico");
 
-
diff --git a/FunnyApp_Run/bin/Debug/JS/FunnyApp_Java.js b/FunnyApp_Run/bin/Debug/JS/FunnyApp_Java.js
@@ -11,8 +11,12 @@ function run_click(){
     }
 }
 
+function fold_open(data){
+    sys.Open_Fold(sys.App_Path()+"\\config\\funny_app.txt");
+}
 
 sys.Button_Init("b1_1","运行",100,10,200,30,"run_click","");
+sys.Button_Init("b1_1","文件",300,10,200,30,"fold_open","");
 
 sys.ListBox_Init("list1",100,50,500,200);
 

diff --git a/FunnyApp_Run/bin/Debug/JS/FunnyGrid/data.js b/FunnyApp_Run/bin/Debug/JS/FunnyGrid/data.js
@@ -36,7 +36,7 @@ function data_init2(data){
 function data_init3(data){
     sys.DataGrid_Clear("grid1");
 
-    sys.DataGrid_Init_Column("grid1",6,"A,B,C,D,E,F");
+    sys.DataGrid_Init_Column("grid1",6,"good,bad,WOE,D,E,F");
     sys.DataGrid_Add_Line("grid1","50,40",",");
     sys.DataGrid_Add_Line("grid1","100,60",",");
     sys.DataGrid_Add_Line("grid1","100,80",",");

diff --git a/...n/bin/Debug/JS/data/echarts.html.template → ...g/JS/FunnyGrid/data/echarts.html.template b/...n/bin/Debug/JS/data/echarts.html.template → ...g/JS/FunnyGrid/data/echarts.html.template
diff --git a/FunnyApp_Run/bin/Debug/JS/FunnyGrid/data/test.html b/FunnyApp_Run/bin/Debug/JS/FunnyGrid/data/test.html
@@ -0,0 +1,79 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<script type="text/javascript" src="http://www.funnyai.com/Common/js/jquery-1.11.0.min.js"></script>
+<script type="text/javascript" src="https://www.echartsjs.com/examples/vendors/echarts/echarts.min.js?_v_=1567111902585"></script>
+<title>echarts</title>
+
+</head><body style="margin:0px">
+
+    <div id="main" style="height:600px"></div>
+
+    <script type="text/javascript">
+        var myChart = echarts.init(document.getElementById('main'));
+            var symbolSize = 20;
+    var data = [ [0,0],[1,2],[2,3],[3,3.5],[4,4],[5,4.5],[6,5],[7,6] ];
+
+    var option = {
+        title: {
+            text: '图表'
+        },
+        tooltip: {
+            formatter: function (params) {
+                return 'X: ' + params.data[0].toFixed(2) + '<br>Y: ' + params.data[1].toFixed(2);
+            }
+        },
+        grid: {
+        },
+        xAxis: {
+            min: 0,
+            max: 10,
+            type: 'value',
+            axisLine: {onZero: false}
+        },
+        yAxis: {
+            min: 0,
+            max: 10,
+            type: 'value',
+            axisLine: {onZero: false}
+        },
+        dataZoom: [
+            {
+                type: 'slider',
+                xAxisIndex: 0,
+                filterMode: 'empty'
+            },
+            {
+                type: 'slider',
+                yAxisIndex: 0,
+                filterMode: 'empty'
+            },
+            {
+                type: 'inside',
+                xAxisIndex: 0,
+                filterMode: 'empty'
+            },
+            {
+                type: 'inside',
+                yAxisIndex: 0,
+                filterMode: 'empty'
+            }
+        ],
+        series: [
+            {
+                id: 'a',
+                type: 'line',
+                smooth: true,
+                symbolSize: symbolSize,
+                data: data
+            }
+        ]
+    };
+
+
+
+        myChart.setOption(option);
+    </script>
+
+</body>
+</html>
diff --git a/FunnyApp_Run/bin/Debug/JS/data/tmp.data → ..._Run/bin/Debug/JS/FunnyGrid/data/tmp.data b/FunnyApp_Run/bin/Debug/JS/data/tmp.data → ..._Run/bin/Debug/JS/FunnyGrid/data/tmp.data
diff --git a/FunnyApp_Run/bin/Debug/JS/FunnyGrid/draw.js b/FunnyApp_Run/bin/Debug/JS/FunnyGrid/draw.js
@@ -14,11 +14,11 @@ function draw_line(){
         mydata=mydata.substring(0,mydata.length-1);
     }
 
-    var html=sys.File_Read("@\\data\\echarts.html.template");
-    var data=sys.File_Read("@\\data\\tmp.data");
+    var html=sys.File_Read(sys.Path_JS()+"\\data\\echarts.html.template");
+    var data=sys.File_Read(sys.Path_JS()+"\\data\\tmp.data");
     data=data.replace("{sys.data.0}",mydata);
     html=html.replace("{sys.data.0}",data);
-    sys.File_Save("@\\data\\test.html",html);
+    sys.File_Save(sys.Path_JS()+"\\data\\test.html",html);
     sys.Run_App("chrome.exe",sys.Path_JS()+"\\data\\test.html");
     //sys.Web_Content("web1",html);
 }
diff --git a/FunnyApp_Run/bin/Debug/JS/FunnyGrid/test.js b/FunnyApp_Run/bin/Debug/JS/FunnyGrid/test.js
@@ -22,7 +22,7 @@ function chi_square_sub(data){
         a[i]=data[i][0];
         b[i]=data[i][1];
         var delta=a[i]-b[i];
-        sys.Msg(delta);
+        //sys.Msg(delta);
         x+=delta*delta/b[i];
     }
     return x;
@@ -58,7 +58,13 @@ function WOE_IV(data){
 
         IV+=((a[i]/sum_a)-(b[i]/sum_b))*woe;
     }
-    sys.Web_Content("web1","IV="+IV);
+    var strInfo="<br> &lt; 0.03 无预测能力<br>"
+            +"0.03 - 0.09 低<br>"
+            +"0.1 - 0.29 中<br>"
+            +"0.3 - 0.49 高<br>"
+            +"&gt;=0.5 极高<br>";
+
+    sys.Web_Content("web1","IV="+IV+strInfo);
 }
 
 
diff --git a/FunnyApp_Run/bin/Debug/JS/client_tts.js → ...App_Run/bin/Debug/JS/Sample/client_tts.js b/FunnyApp_Run/bin/Debug/JS/client_tts.js → ...App_Run/bin/Debug/JS/Sample/client_tts.js
diff --git a/FunnyApp_Run/bin/Debug/JS/test1.js → FunnyApp_Run/bin/Debug/JS/Sample/test1.js b/FunnyApp_Run/bin/Debug/JS/test1.js → FunnyApp_Run/bin/Debug/JS/Sample/test1.js
diff --git a/FunnyApp_Run/bin/Debug/JS/聊天.js b/FunnyApp_Run/bin/Debug/JS/聊天.js
@@ -40,12 +40,13 @@ function send_msg_click(){
     sys.Web_Content("web",log_msg);
     sys.Show_Text("txt_send","");
 
-    sys.setTimeout("check_myMap", 3);//检查消息是否都发送过去了，没有发送的，再发送一次。
+    sys.setTimeout("check_myMap('')", 3);//检查消息是否都发送过去了，没有发送的，再发送一次。
 
 }
 
-function check_myMap() {
-    for(var pMsg in myMap){ 
+function check_myMap(data) {
+    for(var key in myMap){
+        var pMsg=myMap[key];
         if (pMsg.Count<3){
             pMsg.Count+=1;
             sys.Send_Msg("chat_event",pMsg.Msg);
@@ -96,7 +97,7 @@ function event_chat(data){
         var index=sys.ListBox_Select("list_friend",friend);
         if (index==-1){
             friend_list("");
-            sys.sleep(10);
+            //sys.sleep(10);
             sys.ListBox_Select("list_friend",friend);
         }
         var strMsg=sys.Time_Now()+" "+obj.message;
@@ -106,7 +107,7 @@ function event_chat(data){
 
         var id=obj.id;
         var strLine="{\"from\":\""+userName+"\",\"type\":\"chat_return\",\"to\":\""+obj.from+"\",\"message\":\""+id+"\"}";
-        sys.Send_Msg("sys_event",strLine); //服务器会记录用户名
+        sys.Send_Msg("sys_event",strLine); //消息返回
 
     }
 
@@ -121,7 +122,8 @@ function event_system(data){
     sys.Show_Text("txt_info",log_msg2);
     switch(obj.type){
         case "chat_return":
-            sys.Show_Text("txt_info","chat_return:"+obj.message);
+            //sys.Msg(obj.type);
+            sys.Text_Set("txt_info","chat_return:"+obj.message);
             delete myMap[obj.message];
             break;
         case "30s:session":

diff --git a/FunnyApp_Run/bin/Debug/config/funny_app.txt b/FunnyApp_Run/bin/Debug/config/funny_app.txt
@@ -1,4 +1,6 @@
 ks.js E:/Test/5442.data 0 1 2
+woe_iv.js E:/Test/5442.data 1 2
+chi_square.js E:/CloudStation/Robot5/GitHub/funny_app_java/funny_app/data/data1.txt 0 1
 sync_seg.js E:/Data/class_funnyai.ini
 sync_struct.js E:/Data/class_funnyai.ini
 map_db.js E:/Data/class_funnyai.ini
Original file line number	Diff line number	Diff line change
Expand Up		@@ -119,7 +119,5 @@ run_click("");

		sys.Run_JS_Out("Clock\\参考消息.js");


		sys.Tray_Show(sys.Path_JS()+"\\clock2.ico");