diff --git a/app/src/main/java/com/pxkj/jwzs/FirstActivity.java b/app/src/main/java/com/pxkj/jwzs/FirstActivity.java
index 542d8c0..37ccbfb 100644
--- a/app/src/main/java/com/pxkj/jwzs/FirstActivity.java
+++ b/app/src/main/java/com/pxkj/jwzs/FirstActivity.java
@@ -2,6 +2,8 @@ package com.pxkj.jwzs;
import android.content.Intent;
import android.os.Bundle;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
import android.widget.Button;
import android.widget.TextView;
@@ -26,13 +28,24 @@ public class FirstActivity extends BaseActivity {
setContentView(R.layout.activity_main); // 必须先加载布局,再初始化控件
// 初始化TextView(关键!绑定布局中的tv_api_result)
- tvApiResult = findViewById(R.id.tv_api_result);
+// tvApiResult = findViewById(R.id.tv_api_result);
+
+// Button btnTestApi = findViewById(R.id.btn_test_api);
+// btnTestApi.setOnClickListener(v -> {
+// tvApiResult.setText("测试中..."); // 此时tvApiResult已初始化,不会空指针
+// fetchData();
+// });
+
+
+ WebView webView = findViewById(R.id.webview);
+ webView.getSettings().setJavaScriptEnabled(true); // 启用JS
+ webView.setWebViewClient(new WebViewClient()); // 防止跳转浏览器
+ webView.loadUrl("http://218.92.207.242:50022/"); // 加载H5地址
+ webView.getSettings().setDomStorageEnabled(true);
+ webView.clearCache(true); // 清除缓存
+ webView.getSettings().setUseWideViewPort(true);
+ webView.getSettings().setLoadWithOverviewMode(true);
- Button btnTestApi = findViewById(R.id.btn_test_api);
- btnTestApi.setOnClickListener(v -> {
- tvApiResult.setText("测试中..."); // 此时tvApiResult已初始化,不会空指针
- fetchData();
- });
init(); // 调用父类方法
}
@@ -40,8 +53,8 @@ public class FirstActivity extends BaseActivity {
private void fetchData() {
Retrofit retrofit = new Retrofit.Builder()
- .baseUrl("http://50.146.63.127:82/app/api/")
-// .baseUrl("http://218.92.207.242:50021/gwgl/")
+// .baseUrl("http://50.146.63.127:82/app/api/")
+ .baseUrl("http://218.92.207.242:50021/gwgl/")
.addConverterFactory(GsonConverterFactory.create())
.build();
ApiService service = retrofit.create(ApiService.class);
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8062857..3756785 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,28 +6,33 @@
android:layout_height="match_parent"
tools:context=".MainActivity">
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file