gaojian/oasystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

预览文件

Browse Source
This commit is contained in:
itgaojian 2024-02-22 10:21:27 +08:00
parent 217d12f63e
commit e4c5843c50
6 changed files with 67 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agentwebnodule/src/main/res/layout/agentweb_error_page.xml
View File

@ -5,7 +5,7 @@
android:background="#ffffff"> android:background="#ffffff">
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"

4
app/release/output-metadata.json
View File

@ -10,8 +10,8 @@
{ {
"type": "SINGLE", "type": "SINGLE",
"filters": [], "filters": [],
"versionCode": 3, "versionCode": 4,
"versionName": "1.0.3", "versionName": "1.0.4",
"outputFile": "app-release.apk" "outputFile": "app-release.apk"
} }
] ]

6
baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java
View File

@ -7,10 +7,10 @@ package com.tenlionsoft.baselib.core.retrofit_net;
*/ */
public class BaseUrlApi { public class BaseUrlApi {
public static final String IP = "http://192.168.0.120:8082/";/* 测试IP */ // public static final String IP = "http://192.168.0.120:8082/";/* 测试IP */
// public static final String IP = "http://121.36.71.250/";/* 测试IP */ // public static final String IP = "http://121.36.71.250/";/* 测试IP */
// public static final String IP = "http://106.12.218.237:8002/";/* 公司IP */ // public static final String IP = "http://106.12.218.237:8002/";/* 公司IP */
// public static final String IP="http://106.74.34.13:8081/";//* 呼市玉泉区司法 */ public static final String IP="http://106.74.34.13:8081/";//* 呼市玉泉区司法 */
// public static final String IP = "https://www.xzszwhy.cn/";/* 公司IP */ // public static final String IP = "https://www.xzszwhy.cn/";/* 公司IP */
// public static final String IP = "http://www.wlcbsyzl.cn/";/* 正式IP */ // public static final String IP = "http://www.wlcbsyzl.cn/";/* 正式IP */
// public static final String SYS_USERCENTER = "xzszwhy/";//西藏统一用户 // public static final String SYS_USERCENTER = "xzszwhy/";//西藏统一用户
@ -46,7 +46,7 @@ public class BaseUrlApi {
public static final String UPDATE_URL = "version.json"; public static final String UPDATE_URL = "version.json";
public static final String PREVIEW_URL = BASE_OA + "approute/onlinefile/onlineFileView/";//文件预览地址 public static final String PREVIEW_URL = BASE_OA + "approute/onlinefile/onlineFileView/";//文件预览地址 app/onlinefile/onlineFileView/{fileId}
//请求码 //请求码
public static final int PHOTO_REQUEST = 0x2121;//相册图片 public static final int PHOTO_REQUEST = 0x2121;//相册图片
public static final int CAMERA_REQUEST = 0x2222;//相机图片 public static final int CAMERA_REQUEST = 0x2222;//相机图片

39
baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/PreviewFileActivity.java
View File

@ -94,31 +94,31 @@ public class PreviewFileActivity extends BaseActivity {
return; return;
} }
InputParameter parameter = new InputParameter InputParameter parameter = new InputParameter
.Builder(BaseUrlApi.IP, url, absolutePath) .Builder(BaseUrlApi.IP, url, absolutePath)
.setCallbackOnUiThread(true) .setCallbackOnUiThread(true)
.build(); .build();
mDialog = UIUtil.initDialog(mActivity, "下载中..."); mDialog = UIUtil.initDialog(mActivity, "下载中...");
mDialog.show(); mDialog.show();
DownloadUtil.getInstance() DownloadUtil.getInstance()
.downloadFile(parameter, new DownloadListener() { .downloadFile(parameter, new DownloadListener() {
@Override @Override
public void onFinish(File file) { public void onFinish(File file) {
mDialog.dismiss(); mDialog.dismiss();
LogUtils.e(file.getAbsolutePath()); LogUtils.e(file.getAbsolutePath());
ToastUtils.show("下载完成,文件路径:" + file.getAbsolutePath().replace("/storage/emulated/0/", "SD卡/")); ToastUtils.show("下载完成,文件路径:" + file.getAbsolutePath().replace("/storage/emulated/0/", "SD卡/"));
} }
@Override @Override
public void onProgress(int progress, long downloadedLengthKb, long totalLengthKb) { public void onProgress(int progress, long downloadedLengthKb, long totalLengthKb) {
} }
@Override @Override
public void onFailed(String errMsg) { public void onFailed(String errMsg) {
mDialog.dismiss(); mDialog.dismiss();
ToastUtils.show("下载失败,请稍后重试"); ToastUtils.show("下载失败,请稍后重试");
} }
}); });
} }
private void setWebContent(String url) { private void setWebContent(String url) {
@ -161,6 +161,7 @@ public class PreviewFileActivity extends BaseActivity {
@Override @Override
public boolean shouldOverrideUrlLoading(WebView view, String url) { public boolean shouldOverrideUrlLoading(WebView view, String url) {
LogUtils.e("重定向:" + url);
view.loadUrl(url); view.loadUrl(url);
return true; return true;
} }

4
build.gradle
View File

@ -60,8 +60,8 @@ ext {
gMinSdkVersion = 19 gMinSdkVersion = 19
gTargetSdkVersion = 30 gTargetSdkVersion = 30
//玉泉区司法局 //玉泉区司法局
gVersionCode = 3 gVersionCode = 4
gVersionName = '1.0.3' gVersionName = '1.0.4'
//gVersionCode = 9 //gVersionCode = 9
//gVersionName = '1.0.9' //gVersionName = '1.0.9'
gBuildToolsVersion = "29.0.2" gBuildToolsVersion = "29.0.2"

39
oamodule/src/main/java/com/tenlionsoft/oamodule/activity/oaflow/OaFlowCenterActivity.java
View File

@ -220,6 +220,7 @@ public class OaFlowCenterActivity extends BaseActivity {
initView(); initView();
Map<String, Object> params = buildWebParams(); Map<String, Object> params = buildWebParams();
mUrl = (String) params.get("url"); mUrl = (String) params.get("url");
LogUtils.e(mUrl);
mProcessId = (String) params.get("processId"); mProcessId = (String) params.get("processId");
mTaskId = (String) params.get("taskId"); mTaskId = (String) params.get("taskId");
initWebView(); initWebView();
@ -960,12 +961,14 @@ public class OaFlowCenterActivity extends BaseActivity {
super.onPageFinished(view, url); super.onPageFinished(view, url);
mCsvWeb.setState(CustomStateView.STATE_SUCCESS); mCsvWeb.setState(CustomStateView.STATE_SUCCESS);
LogUtils.e("加载完成"); LogUtils.e("加载完成");
int measuredHeight = view.getMeasuredHeight();
runOnUiThread(() -> { runOnUiThread(() -> {
WebView webView = mWebView.getWebCreator().getWebView(); WebView webView = mWebView.getWebCreator().getWebView();
FrameLayout.LayoutParams params = FrameLayout.LayoutParams params =
new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,
FrameLayout.LayoutParams.WRAP_CONTENT); FrameLayout.LayoutParams.WRAP_CONTENT);
webView.setLayoutParams(params); webView.setLayoutParams(params);
// webView.post(() -> webView.measure(0, 0));
}); });
} }
@ -990,8 +993,11 @@ public class OaFlowCenterActivity extends BaseActivity {
iAgentWebSettings.getWebSettings().setAllowFileAccess(true);//允许选择文件 iAgentWebSettings.getWebSettings().setAllowFileAccess(true);//允许选择文件
iAgentWebSettings.getWebSettings().setAllowContentAccess(true);//允许选择文件 iAgentWebSettings.getWebSettings().setAllowContentAccess(true);//允许选择文件
iAgentWebSettings.getWebSettings().setAllowFileAccessFromFileURLs(true);//允许选择文件 iAgentWebSettings.getWebSettings().setAllowFileAccessFromFileURLs(true);//允许选择文件
iAgentWebSettings.getWebSettings().setDomStorageEnabled(true);
iAgentWebSettings.getWebSettings().setAllowUniversalAccessFromFileURLs(true);//允许选择文件 iAgentWebSettings.getWebSettings().setAllowUniversalAccessFromFileURLs(true);//允许选择文件
iAgentWebSettings.getWebSettings().setSupportMultipleWindows(true);//是否允许多个窗口 iAgentWebSettings.getWebSettings().setSupportMultipleWindows(true);//是否允许多个窗口
iAgentWebSettings.getWebSettings().setTextZoom(100);
iAgentWebSettings.getWebSettings().setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
return iAgentWebSettings; return iAgentWebSettings;
} }
}) })
@ -1199,6 +1205,8 @@ public class OaFlowCenterActivity extends BaseActivity {
.navigation(mActivity, 15); .navigation(mActivity, 15);
} else if ("chooseUser".equals(method)) { } else if ("chooseUser".equals(method)) {
onShowChooseUserDialog(params); onShowChooseUserDialog(params);
} else if ("androidAlert".equals(method)) {
ToastUtils.show(params);
} }
}); });
@ -1207,10 +1215,20 @@ public class OaFlowCenterActivity extends BaseActivity {
@JavascriptInterface @JavascriptInterface
public void invokeNative(String method) { public void invokeNative(String method) {
LogUtils.e(method);
if ("back".equals(method)) { if ("back".equals(method)) {
LogUtils.e("关闭"); LogUtils.e("关闭");
mActivity.setResult(RESULT_OK); mActivity.setResult(RESULT_OK);
mActivity.finish(); mActivity.finish();
} else if ("refreshView".equals(method)) {
runOnUiThread(() -> {
WebView webView = mWebView.getWebCreator().getWebView();
FrameLayout.LayoutParams params =
new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,
FrameLayout.LayoutParams.WRAP_CONTENT);
webView.setLayoutParams(params);
webView.post(() -> webView.measure(0, 0));
});
} }
} }
@ -1221,6 +1239,8 @@ public class OaFlowCenterActivity extends BaseActivity {
onShowTimePicker(type, callBack); onShowTimePicker(type, callBack);
} else if ("onShowPicker".equals(method)) { } else if ("onShowPicker".equals(method)) {
onShowPicker(type, callBack); onShowPicker(type, callBack);
} else if ("doConfirmNode".equals(method)) {
onShowConfirmNode(type, callBack);
} }
}); });
} }
@ -1243,6 +1263,24 @@ public class OaFlowCenterActivity extends BaseActivity {
} }
} }
/**
* 页面弹出提示确认框
*
* @param hint
* @param callBack
*/
private void onShowConfirmNode(String hint, String callBack) {
new AlertDialog.Builder(mActivity)
.setTitle("提示")
.setMessage(hint)
.setPositiveButton("确定", (dialog, which) -> {
mWebView.getJsAccessEntrace().quickCallJs(callBack);
})
.setNegativeButton("取消", (dialog, which) -> dialog.dismiss())
.create()
.show();
}
/** /**
* 显示选择人员 * 显示选择人员
*/ */
@ -1260,6 +1298,7 @@ public class OaFlowCenterActivity extends BaseActivity {
@Override @Override
public void doConfirmMulti(String ids, String names) { public void doConfirmMulti(String ids, String names) {
LogUtils.e(ids);
chooseDir.dismiss(); chooseDir.dismiss();
mWebView.getJsAccessEntrace().quickCallJs("addCheckUser", ids, names); mWebView.getJsAccessEntrace().quickCallJs("addCheckUser", ids, names);
} }