From 27f892021762918bf3b7ef961d5e5d9f3e74e81e Mon Sep 17 00:00:00 2001 From: GatsbyH Date: Wed, 14 Feb 2024 16:51:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-druid.yml | 2 +- .../src/main/resources/application.yml | 2 +- RuoYi-Vue/ruoyi-ui/vue.config.js | 2 +- .../com/example/tally/MonthChartActivity.java | 23 +++++++++++++++++++ .../main/java/com/example/tally/UniteApp.java | 2 +- .../tally/frag_chart/MainFragment.java | 3 +++ app/src/main/res/layout/activity_history.xml | 4 ++-- 7 files changed, 32 insertions(+), 6 deletions(-) diff --git a/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml b/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml index 7b28d9e..c6f21e5 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml +++ b/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: # 从数据源开关/默认关闭 diff --git a/RuoYi-Vue/ruoyi-admin/src/main/resources/application.yml b/RuoYi-Vue/ruoyi-admin/src/main/resources/application.yml index 74e961e..e0c2996 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/resources/application.yml +++ b/RuoYi-Vue/ruoyi-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 - port: 8831 + port: 8080 servlet: # 应用的访问路径 context-path: / diff --git a/RuoYi-Vue/ruoyi-ui/vue.config.js b/RuoYi-Vue/ruoyi-ui/vue.config.js index 1bc51fd..f0cff54 100644 --- a/RuoYi-Vue/ruoyi-ui/vue.config.js +++ b/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]: '' diff --git a/app/src/main/java/com/example/tally/MonthChartActivity.java b/app/src/main/java/com/example/tally/MonthChartActivity.java index 4b487e9..cc7dbd9 100644 --- a/app/src/main/java/com/example/tally/MonthChartActivity.java +++ b/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); diff --git a/app/src/main/java/com/example/tally/UniteApp.java b/app/src/main/java/com/example/tally/UniteApp.java index 1e2b480..0065cc7 100644 --- a/app/src/main/java/com/example/tally/UniteApp.java +++ b/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/"); } } diff --git a/app/src/main/java/com/example/tally/frag_chart/MainFragment.java b/app/src/main/java/com/example/tally/frag_chart/MainFragment.java index 4b67929..299cd76 100644 --- a/app/src/main/java/com/example/tally/frag_chart/MainFragment.java +++ b/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(); + } /* 设置头布局当中文本内容的显示*/ diff --git a/app/src/main/res/layout/activity_history.xml b/app/src/main/res/layout/activity_history.xml index 3eb87b0..ef1ccfe 100644 --- a/app/src/main/res/layout/activity_history.xml +++ b/app/src/main/res/layout/activity_history.xml @@ -25,8 +25,8 @@