Commit 6bdb5db8 authored by jianglx's avatar jianglx

修改升级弹框不弹出的问题

parent b0a326fb
...@@ -4,21 +4,17 @@ import android.content.ComponentName; ...@@ -4,21 +4,17 @@ import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v4.view.ViewPager;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.frame.base.url.Constance; import com.frame.base.url.Constance;
import com.frame.rv.config.RvFrameConfig; import com.frame.rv.config.RvFrameConfig;
...@@ -38,7 +34,6 @@ import com.rv.home.rv.module.basic.presenter.CommonPresenter; ...@@ -38,7 +34,6 @@ import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.home.HomeFragment; import com.rv.home.rv.module.ui.main.home.HomeFragment;
import com.rv.home.rv.module.ui.main.home.bean.EffectiveTimeBean; import com.rv.home.rv.module.ui.main.home.bean.EffectiveTimeBean;
import com.rv.rvmine.MineFragment; import com.rv.rvmine.MineFragment;
import com.rv.share.WebViewActivity;
import com.rv.share.view.PromotionDialog; import com.rv.share.view.PromotionDialog;
import com.rv.tourism.R2; import com.rv.tourism.R2;
import com.rv.tourism.TourismFragment; import com.rv.tourism.TourismFragment;
...@@ -57,7 +52,6 @@ import butterknife.BindView; ...@@ -57,7 +52,6 @@ import butterknife.BindView;
import butterknife.OnClick; import butterknife.OnClick;
public class MainActivity extends BaseActivity<CommonPresenter> { public class MainActivity extends BaseActivity<CommonPresenter> {
// @BindView(R2.id.pager_view_fragment) // @BindView(R2.id.pager_view_fragment)
...@@ -105,7 +99,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> { ...@@ -105,7 +99,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
StatusBarUtil.setRootViewFitsSystemWindows(mActivity,false); StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
} }
@Override @Override
...@@ -172,7 +166,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> { ...@@ -172,7 +166,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
public void onClick(View view) { public void onClick(View view) {
promotionDialog.dismiss(); promotionDialog.dismiss();
postActivityPopup(act.getId()); postActivityPopup(act.getId());
startActivity(WebViewActivity.getIntent(getApplicationContext(), act.getUrl(), act.getName()));
} }
}).setData(act).create(); }).setData(act).create();
promotionDialog.show(); promotionDialog.show();
......
...@@ -2,6 +2,7 @@ package com.ruiwenliu.wrapper.bean; ...@@ -2,6 +2,7 @@ package com.ruiwenliu.wrapper.bean;
import com.ruiwenliu.wrapper.base.BaseBean; import com.ruiwenliu.wrapper.base.BaseBean;
import java.io.Serializable;
import java.util.List; import java.util.List;
/***** /*****
...@@ -29,7 +30,7 @@ public class ActBean extends BaseBean { ...@@ -29,7 +30,7 @@ public class ActBean extends BaseBean {
this.data = data; this.data = data;
} }
public static class Act { public static class Act implements Serializable {
private int id; private int id;
private String name; private String name;
private String descr; private String descr;
......
...@@ -82,7 +82,6 @@ public class PromotionDialog extends Dialog { ...@@ -82,7 +82,6 @@ public class PromotionDialog extends Dialog {
return dialog; return dialog;
} }
} }
} }
...@@ -3,6 +3,7 @@ package com.rv.version; ...@@ -3,6 +3,7 @@ package com.rv.version;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.text.Html;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
...@@ -86,7 +87,7 @@ public class VersionUpdateDialog extends Dialog { ...@@ -86,7 +87,7 @@ public class VersionUpdateDialog extends Dialog {
if (this.updateBean != null) { if (this.updateBean != null) {
if (!TextUtils.isEmpty(this.updateBean.getUpdateInfo())) { if (!TextUtils.isEmpty(this.updateBean.getUpdateInfo())) {
txtContent.setText(this.updateBean.getUpdateInfo()); txtContent.setText(Html.fromHtml(this.updateBean.getUpdateInfo()));
} }
if (!TextUtils.isEmpty(this.updateBean.getServerVersionName())) { if (!TextUtils.isEmpty(this.updateBean.getServerVersionName())) {
......
...@@ -33,7 +33,7 @@ public class VersionCheckBean extends BaseBean { ...@@ -33,7 +33,7 @@ public class VersionCheckBean extends BaseBean {
private int downloadSwitch; private int downloadSwitch;
private int isCompe ; private int isCompe ;
private int weigh; private int weigh;
private int crtTime; private long crtTime;
private int isDel; private int isDel;
public int getId() { public int getId() {
...@@ -108,11 +108,11 @@ public class VersionCheckBean extends BaseBean { ...@@ -108,11 +108,11 @@ public class VersionCheckBean extends BaseBean {
this.weigh = weigh; this.weigh = weigh;
} }
public int getCrtTime() { public long getCrtTime() {
return crtTime; return crtTime;
} }
public void setCrtTime(int crtTime) { public void setCrtTime(long crtTime) {
this.crtTime = crtTime; this.crtTime = crtTime;
} }
......
...@@ -6,16 +6,17 @@ ...@@ -6,16 +6,17 @@
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="300dp" android:layout_width="@dimen/dialog_width"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/dialog_content_bg" android:background="@drawable/dialog_content_bg"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:minWidth="300dp" android:minWidth="@dimen/dialog_width"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:layout_width="300dp" android:scaleType="fitXY"
android:layout_height="110dp" android:layout_width="@dimen/dialog_width"
android:layout_height="@dimen/dialog_img_height"
android:src="@drawable/icon_dialog_top" /> android:src="@drawable/icon_dialog_top" />
<TextView <TextView
......
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="dialog_width">160dp</dimen>
<dimen name="dialog_img_height">55dp</dimen>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="dialog_width">213.33dp</dimen>
<dimen name="dialog_img_height">73.33dp</dimen>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="dialog_width">320dp</dimen>
<dimen name="dialog_img_height">110dp</dimen>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment