CNLive Android Team / ModulePedometer · Commits

Commit 3890402a9f8474497261cdf2e6ef808671d2b2ee

Authored by YangShuai
1 parent 323d386e

1 修复提示对话框显示异常问题

Inline Side-by-side
Showing 5 changed files with 3 additions and 3 deletions
config.gradle
  View file @3890402
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "1.0.16", 24 + version: "1.0.17",
25 //Lib库前缀 25 //Lib库前缀
26 packeg : "com.cnlive.module", 26 packeg : "com.cnlive.module",
27 //Lib库名称 27 //Lib库名称
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/widget/SelectDialog.java
  View file @3890402
@@ -35,7 +35,7 @@ public class SelectDialog extends Dialog { @@ -35,7 +35,7 @@ public class SelectDialog extends Dialog {
35 public SelectDialog(@NonNull Context context, String tipText, String btnCancelText, DialogInterface cancelInterface, String btnOkText, DialogInterface okInterface) { 35 public SelectDialog(@NonNull Context context, String tipText, String btnCancelText, DialogInterface cancelInterface, String btnOkText, DialogInterface okInterface) {
36 super(context, R.style.MyDialog); 36 super(context, R.style.MyDialog);
37 this.context = context; 37 this.context = context;
38 - view = LayoutInflater.from(context).inflate(R.layout.dialog_select, null); 38 + view = LayoutInflater.from(context).inflate(R.layout.pedometer_dialog_select, null);
39 initView(view); 39 initView(view);
40 layoutParams = new LinearLayout.LayoutParams((int) (getScreenWidth(context) * 0.8), ViewGroup.LayoutParams.WRAP_CONTENT); 40 layoutParams = new LinearLayout.LayoutParams((int) (getScreenWidth(context) * 0.8), ViewGroup.LayoutParams.WRAP_CONTENT);
41 ll_child.setLayoutParams(layoutParams); 41 ll_child.setLayoutParams(layoutParams);
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/widget/TipDialog.java
  View file @3890402
@@ -33,7 +33,7 @@ public class TipDialog extends Dialog { @@ -33,7 +33,7 @@ public class TipDialog extends Dialog {
33 public TipDialog(@NonNull Context context, String tipText, String btnOkText, int okTextColor, DialogInterface okInterface) { 33 public TipDialog(@NonNull Context context, String tipText, String btnOkText, int okTextColor, DialogInterface okInterface) {
34 super(context, R.style.MyDialog); 34 super(context, R.style.MyDialog);
35 this.context = context; 35 this.context = context;
36 - view = LayoutInflater.from(context).inflate(R.layout.dialog_tip, null); 36 + view = LayoutInflater.from(context).inflate(R.layout.pedometer_dialog_tip, null);
37 initView(view); 37 initView(view);
38 layoutParams = new LinearLayout.LayoutParams((int) (getScreenWidth(context) * 0.75), ViewGroup.LayoutParams.WRAP_CONTENT); 38 layoutParams = new LinearLayout.LayoutParams((int) (getScreenWidth(context) * 0.75), ViewGroup.LayoutParams.WRAP_CONTENT);
39 ll_child.setLayoutParams(layoutParams); 39 ll_child.setLayoutParams(layoutParams);
moudle_pedometer/src/main/res/layout/dialog_select.xml renamed to moudle_pedometer/src/main/res/layout/pedometer_dialog_select.xml
  View file @3890402
moudle_pedometer/src/main/res/layout/dialog_tip.xml renamed to moudle_pedometer/src/main/res/layout/pedometer_dialog_tip.xml
  View file @3890402