Skip to content

polysoft-nafmii / polysoft-android

Go to a project
Commit 25760601 by amateur
Options

1

1 parent c04e0456
Inline Side-by-side
Showing 3 changed files with 51 additions and 9 deletions
app/src/main/java/com/polysoft/nafmii/utils/UpdateUtils.java
...@@ -31,6 +31,20 @@ public class UpdateUtils { ...@@ -31,6 +31,20 @@ public class UpdateUtils {
}); });
} }
public static String checkVersion(FragmentManager manager, UpdateVersion update) {
if (null != update) {
String upgradeType = update.getUpgradeType();
if ("1".equals(upgradeType)) { // h5
downH5Version(update);
return "";
} else if ("2".equals(upgradeType)) {
ExecutorUtils.main(() -> UpdateDialog.show(manager, update));
return "";
}
}
return "参数错误";
}
public static void checkH5Version(String h5Version) { public static void checkH5Version(String h5Version) {
ServerApi.postH5Version(h5Version, new RequestBack<UpdateVersion>() { ServerApi.postH5Version(h5Version, new RequestBack<UpdateVersion>() {
......
app/src/main/java/com/polysoft/nafmii/webview/NativeApi.java
...@@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSONObject; ...@@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.util.TypeUtils; import com.alibaba.fastjson.util.TypeUtils;
import com.polysoft.nafmii.bean.MenuBean; import com.polysoft.nafmii.bean.MenuBean;
import com.polysoft.nafmii.bean.Result; import com.polysoft.nafmii.bean.Result;
import com.polysoft.nafmii.bean.UpdateVersion;
import com.polysoft.nafmii.broadcast.PhotosReceiver; import com.polysoft.nafmii.broadcast.PhotosReceiver;
import com.polysoft.nafmii.broadcast.Receiver; import com.polysoft.nafmii.broadcast.Receiver;
import com.polysoft.nafmii.broadcast.WechatReceiver; import com.polysoft.nafmii.broadcast.WechatReceiver;
...@@ -115,7 +116,7 @@ public class NativeApi { ...@@ -115,7 +116,7 @@ public class NativeApi {
ShareBean bean = TypeUtils.castToJavaBean(data, ShareBean.class); ShareBean bean = TypeUtils.castToJavaBean(data, ShareBean.class);
if ("2".equals(bean.getScene())) { // 分享到QQ if ("2".equals(bean.getScene())) { // 分享到QQ
QQApi instance = QQApi.getInstance(); QQApi instance = QQApi.getInstance();
mActivity.runOnUiThread(() ->{ mActivity.runOnUiThread(() -> {
instance.share(mActivity, bean, new QQApi.JSShareCallback(js)); instance.share(mActivity, bean, new QQApi.JSShareCallback(js));
}); });
} else { } else {
...@@ -200,9 +201,9 @@ public class NativeApi { ...@@ -200,9 +201,9 @@ public class NativeApi {
@JavascriptInterface @JavascriptInterface
public void nativeEventMessage(String params) { public void nativeEventMessage(String params) {
new JsInterfaceHandler(handler).parse(params, (data, js) -> { new JsInterfaceHandler(handler).parse(params, (data, js) -> {
this.mActivity.runOnUiThread(()->{ this.mActivity.runOnUiThread(() -> {
handler.sendEventMessage(data.toJSONString()); handler.sendEventMessage(data.toJSONString());
}); });
js.success(null); js.success(null);
}); });
} }
...@@ -224,7 +225,7 @@ public class NativeApi { ...@@ -224,7 +225,7 @@ public class NativeApi {
name = FileUtils.getUrlFileName(url); name = FileUtils.getUrlFileName(url);
} }
final String fileName = name; final String fileName = name;
this.mActivity.runOnUiThread(()-> { this.mActivity.runOnUiThread(() -> {
FragmentManager manager = this.handler.getFragmentManager(); FragmentManager manager = this.handler.getFragmentManager();
DownloadDialog.show(manager, finalUrl, fileName); DownloadDialog.show(manager, finalUrl, fileName);
}); });
...@@ -233,7 +234,6 @@ public class NativeApi { ...@@ -233,7 +234,6 @@ public class NativeApi {
} }
@JavascriptInterface @JavascriptInterface
public void nativeCamera(String params) { public void nativeCamera(String params) {
new JsInterfaceHandler(handler).parse(params, (data, js) -> { new JsInterfaceHandler(handler).parse(params, (data, js) -> {
...@@ -270,7 +270,7 @@ public class NativeApi { ...@@ -270,7 +270,7 @@ public class NativeApi {
mActivity.runOnUiThread(() -> { mActivity.runOnUiThread(() -> {
String type = data.getString("type"); String type = data.getString("type");
if ("1".equals(type)) { if ("1".equals(type)) {
Intent intent= new Intent(); Intent intent = new Intent();
intent.setAction("android.intent.action.VIEW"); intent.setAction("android.intent.action.VIEW");
String linkUrl = data.getString("linkUrl"); String linkUrl = data.getString("linkUrl");
linkUrl = URLDecoder.decode(linkUrl); linkUrl = URLDecoder.decode(linkUrl);
...@@ -290,8 +290,27 @@ public class NativeApi { ...@@ -290,8 +290,27 @@ public class NativeApi {
@JavascriptInterface @JavascriptInterface
public void nativeUpdate(String param) { public void nativeUpdate(String param) {
new JsInterfaceHandler(handler).parse(param, (data, js) -> { new JsInterfaceHandler(handler).parse(param, (data, js) -> {
String version = data.getString("h5Version"); String type = data.getString("type");
UpdateUtils.checkVersion(handler.getFragmentManager(), version); if ("3".equals(type)) {
UpdateVersion update = data.getObject("update", UpdateVersion.class);
String res = UpdateUtils.checkVersion(handler.getFragmentManager(), update);
if (!TextUtils.isEmpty(res)) {
js.callJs(Result.fail(res));
return;
}
} else {
String version = data.getString("version");
if (TextUtils.isEmpty(version)) {
js.callJs(Result.fail("参数错误"));
return;
}
if ("1".equals(type)) { // 检测版本APP h5版本
UpdateUtils.checkVersion(handler.getFragmentManager(), version);
} else if ("2".equals(type)) { // 检测h5版本
UpdateUtils.checkH5Version(version);
}
}
js.success(null);
}); });
} }
......
app/src/main/res/layout/activity_input_url.xml
...@@ -56,4 +56,13 @@ ...@@ -56,4 +56,13 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/input_url" /> app:layout_constraintTop_toBottomOf="@+id/input_url" />
<Button
android:id="@+id/button1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="200dp"
android:text="测试"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/input_url" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file \ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!