diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index e8851f0..c1e7d14 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,8 +10,8 @@ { "type": "SINGLE", "filters": [], - "versionCode": 6, - "versionName": "1.1.7", + "versionCode": 118, + "versionName": "1.1.8", "outputFile": "app-release.apk" } ] diff --git a/app/src/main/java/com/sl/house_property/MainFragment.java b/app/src/main/java/com/sl/house_property/MainFragment.java index b7a920f..5c52bf5 100644 --- a/app/src/main/java/com/sl/house_property/MainFragment.java +++ b/app/src/main/java/com/sl/house_property/MainFragment.java @@ -302,7 +302,7 @@ public class MainFragment extends BaseFragment implements V resultBean.setContent("修复若干bug"); resultBean.setVersion(newVersion); mGetVesionResponseBean.setResult(resultBean); - ADialog mShareWechatDialog = new ADialog(getContext(), 0, mGetVesionResponseBean); + ADialog mShareWechatDialog = new ADialog(getContext(), 0, mGetVesionResponseBean,newVersion_url); mShareWechatDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);//代码中取消标题栏 mShareWechatDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); Window win = mShareWechatDialog.getWindow(); @@ -340,24 +340,25 @@ public class MainFragment extends BaseFragment implements V class ADialog extends Dialog implements View.OnClickListener { - private Context context; GetVesionResponseBean mGetVesionResponseBean; + private String url=""; - public ADialog(@NonNull Context context, @StyleRes int themeResId, GetVesionResponseBean mGetVesionResponseBean) { + public ADialog(@NonNull Context context, @StyleRes int themeResId, GetVesionResponseBean mGetVesionResponseBean,String str) { super(context, themeResId); this.context = context; this.mGetVesionResponseBean = mGetVesionResponseBean; + this.url=str; } @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); this.setContentView(R.layout.version_dailog); - launchAppDetail(); + launchAppDetail(url); } - public void launchAppDetail() { + public void launchAppDetail(String url) { String content = mGetVesionResponseBean.getResult().getContent(); content = content.replace("
", "
"); @@ -373,7 +374,7 @@ public class MainFragment extends BaseFragment implements V public void onClick(View view) { dismiss(); // 这里来检测版本是否需要更新 - mUpdateManager = new UpdateManager(getContext(), "http://ruilaizipj.com/door.apk"); + mUpdateManager = new UpdateManager(getContext(), url); mUpdateManager.checkUpdateDownload(); } }); @@ -395,7 +396,6 @@ public class MainFragment extends BaseFragment implements V } - private void getGankList(final String myurl, Map map, String string, final int getcode1) { progressDialog.setMessage(string); progressDialog.setCancelable(false); @@ -490,10 +490,7 @@ public class MainFragment extends BaseFragment implements V } catch (JSONException e) { e.printStackTrace(); } - - break; - } } @@ -710,7 +707,7 @@ public class MainFragment extends BaseFragment implements V IWXAPI api = WXAPIFactory.createWXAPI(getActivity(), appId); WXLaunchMiniProgram.Req req = new WXLaunchMiniProgram.Req(); req.userName = "gh_f750eee96b89"; // 填小程序原始id - req.path = "/pages/index/index"; ////拉起小程序页面的可带参路径,不填默认拉起小程序首页,对于小游戏,可以只传入 query 部分,来实现传参效果,如:传入 "?foo=bar"。 + req.path = "/pages/index/index"; //拉起小程序页面的可带参路径,不填默认拉起小程序首页,对于小游戏,可以只传入 query 部分,来实现传参效果,如:传入 "?foo=bar"。 req.miniprogramType = WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE;// 可选打开 开发版,体验版和正式版 api.sendReq(req); break;