first commit
This commit is contained in:
parent
ea5084c580
commit
0c926f0da6
|
@ -22,7 +22,9 @@ android {
|
||||||
|
|
||||||
manifestPlaceholders = [
|
manifestPlaceholders = [
|
||||||
APPID : "320924230000-2-1-32092423SJNB12202505211658160001",
|
APPID : "320924230000-2-1-32092423SJNB12202505211658160001",
|
||||||
|
// APPID : "320500220500-2-1-32050022SJ97122021091XXXXXXXXXX",
|
||||||
REGIONALISMCODE : "\\0320924230000",
|
REGIONALISMCODE : "\\0320924230000",
|
||||||
|
// REGIONALISMCODE : "\\03205002xxxxxx",
|
||||||
NETWORKAREACODE : "\\02",
|
NETWORKAREACODE : "\\02",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,6 +35,8 @@ public abstract class BaseActivity extends AppCompatActivity {
|
||||||
protected static String departId = "320924230000";
|
protected static String departId = "320924230000";
|
||||||
// protected static String departId = "3205002xxxxxx";
|
// protected static String departId = "3205002xxxxxx";
|
||||||
|
|
||||||
|
private final String my_service_id = "320924230000-3-0400-EB013F207C9842D890327B6421C66EB2";
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
@ -155,7 +157,10 @@ public abstract class BaseActivity extends AppCompatActivity {
|
||||||
String resourceAddress = json.getString("resourceAddress");
|
String resourceAddress = json.getString("resourceAddress");
|
||||||
Log.e(TAG, "resourceId->"+resourceId);
|
Log.e(TAG, "resourceId->"+resourceId);
|
||||||
Log.e(TAG, "resourceAddress->"+resourceAddress);
|
Log.e(TAG, "resourceAddress->"+resourceAddress);
|
||||||
SpUtils.putString(BaseActivity.this, resourceId, resourceAddress);
|
// SpUtils.putString(BaseActivity.this, resourceId, resourceAddress);
|
||||||
|
if (my_service_id.equals(resourceId)) {
|
||||||
|
SpUtils.putString(BaseActivity.this, "TARGET_URL", resourceAddress);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
runOnUiThread(new Runnable() {
|
runOnUiThread(new Runnable() {
|
||||||
|
|
|
@ -2,10 +2,12 @@ package com.pxkj.jwzs;
|
||||||
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.text.TextUtils;
|
||||||
import android.webkit.WebView;
|
import android.webkit.WebView;
|
||||||
import android.webkit.WebViewClient;
|
import android.webkit.WebViewClient;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
import okhttp3.ResponseBody;
|
import okhttp3.ResponseBody;
|
||||||
import retrofit2.Call;
|
import retrofit2.Call;
|
||||||
|
@ -37,14 +39,15 @@ public class FirstActivity extends BaseActivity {
|
||||||
// });
|
// });
|
||||||
|
|
||||||
|
|
||||||
WebView webView = findViewById(R.id.webview);
|
// WebView webView = findViewById(R.id.webview);
|
||||||
webView.getSettings().setJavaScriptEnabled(true); // 启用JS
|
// webView.getSettings().setJavaScriptEnabled(true); // 启用JS
|
||||||
webView.setWebViewClient(new WebViewClient()); // 防止跳转浏览器
|
// webView.setWebViewClient(new WebViewClient()); // 防止跳转浏览器
|
||||||
webView.loadUrl("http://218.92.207.242:50022/"); // 加载H5地址
|
//// webView.loadUrl("http://218.92.207.242:50022/"); // 加载H5地址
|
||||||
webView.getSettings().setDomStorageEnabled(true);
|
// webView.loadUrl("http://50.146.63.127:82/app/"); // 加载H5地址
|
||||||
webView.clearCache(true); // 清除缓存
|
// webView.getSettings().setDomStorageEnabled(true);
|
||||||
webView.getSettings().setUseWideViewPort(true);
|
// webView.clearCache(true); // 清除缓存
|
||||||
webView.getSettings().setLoadWithOverviewMode(true);
|
// webView.getSettings().setUseWideViewPort(true);
|
||||||
|
// webView.getSettings().setLoadWithOverviewMode(true);
|
||||||
|
|
||||||
|
|
||||||
init(); // 调用父类方法
|
init(); // 调用父类方法
|
||||||
|
@ -53,8 +56,8 @@ public class FirstActivity extends BaseActivity {
|
||||||
|
|
||||||
private void fetchData() {
|
private void fetchData() {
|
||||||
Retrofit retrofit = new Retrofit.Builder()
|
Retrofit retrofit = new Retrofit.Builder()
|
||||||
// .baseUrl("http://50.146.63.127:82/app/api/")
|
.baseUrl("http://50.146.63.127:82/app/api/")
|
||||||
.baseUrl("http://218.92.207.242:50021/gwgl/")
|
// .baseUrl("http://218.92.207.242:50021/gwgl/")
|
||||||
.addConverterFactory(GsonConverterFactory.create())
|
.addConverterFactory(GsonConverterFactory.create())
|
||||||
.build();
|
.build();
|
||||||
ApiService service = retrofit.create(ApiService.class);
|
ApiService service = retrofit.create(ApiService.class);
|
||||||
|
@ -97,6 +100,14 @@ public class FirstActivity extends BaseActivity {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void refresh() {
|
protected void refresh() {
|
||||||
|
|
||||||
|
String targetUrl = SpUtils.getString(this, "TARGET_URL", "");
|
||||||
|
if (!TextUtils.isEmpty(targetUrl)) {
|
||||||
|
WebView webView = findViewById(R.id.webview);
|
||||||
|
webView.loadUrl(targetUrl); // 加载绑定服务ID的网址
|
||||||
|
} else {
|
||||||
|
Toast.makeText(this, "未获取到有效网址", Toast.LENGTH_SHORT).show();
|
||||||
|
}
|
||||||
// 寻址成功后,在这跳转下个页面
|
// 寻址成功后,在这跳转下个页面
|
||||||
startActivity(new Intent(this, MainActivity.class));
|
startActivity(new Intent(this, MainActivity.class));
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
<resources>
|
<resources>
|
||||||
<string name="app_name">jwzs</string>
|
<string name="app_name">警务助手</string>
|
||||||
</resources>
|
</resources>
|
Loading…
Reference in New Issue