图表

RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml

@@ -8,7 +8,7 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/jizhang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 336699
+                password: jieyi123
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

RuoYi-Vue/ruoyi-admin/src/main/resources/application.yml

@@ -16,7 +16,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8831
+  port: 8080
   servlet:
     # 应用的访问路径
     context-path: /

RuoYi-Vue/ruoyi-ui/vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8831`,
+        target: `http://localhost:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

app/src/main/java/com/example/tally/MonthChartActivity.java

@@ -7,9 +7,13 @@ import androidx.viewpager.widget.ViewPager;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Color;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
 import android.widget.Button;
 import android.widget.TextView;
 
@@ -40,10 +44,29 @@ public class MonthChartActivity extends AppCompatActivity {
     private ChartVPAdapter chartVPAdapter;
     float inMoneyOneMonth=0;
     float outMoneyOneMonth=0;
+
+    WebView webView;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_month_chart);
+        webView = findViewById(R.id.web_view);
+        webView.getSettings().setJavaScriptEnabled(true);
+        webView.setWebViewClient(new WebViewClient(){
+
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                webView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+            }
+
+        });
+        webView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP){
+            webView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+        }
+//        webView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+        webView.loadUrl("http://192.168.0.8:8080/chat/PolylineChat");
         initView();
         initTime();
         initStatistics(year,month);

app/src/main/java/com/example/tally/UniteApp.java

@@ -15,7 +15,7 @@ public class UniteApp  extends Application {
         XHttpSDK.init(this);
 
         //设置网络请求的全局基础地址
-        XHttpSDK.setBaseUrl("http://192.168.0.8:8831/");
+        XHttpSDK.setBaseUrl("http://192.168.0.8:8080/");
     }
 
 }

app/src/main/java/com/example/tally/frag_chart/MainFragment.java

@@ -12,6 +12,8 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
 import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.ImageButton;
@@ -193,6 +195,7 @@ public class MainFragment extends Fragment implements View.OnClickListener {
         super.onResume();
         LoadDBData();
         setTopTvShow();
+
     }
 
     /* 设置头布局当中文本内容的显示*/

app/src/main/res/layout/activity_history.xml

@@ -25,8 +25,8 @@
 
         <ImageView
             android:id="@+id/history_iv_rili"
-            android:layout_width="wrap_content"
+            android:layout_width="18dp"
-            android:layout_height="match_parent"
+            android:layout_height="22dp"
             android:layout_alignParentRight="true"
             android:layout_marginRight="10dp"
             android:onClick="onClick"