diff --git a/gradle.properties b/gradle.properties index 2e8a5f72e..6e88ff115 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,6 +26,6 @@ android.enableJetifier=true android.useAndroidX=true android.useDeprecatedNdk=true -versionCode=103 -versionName=4.12.03 +versionCode=105 +versionName=4.12.05 diff --git a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java index 5caf1c700..6e5d28d91 100644 --- a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java @@ -241,7 +241,7 @@ public class HotSpotConnentDeviceActivity extends BaseActivity { public void toDevice() { AppRoute.newToStart(HotSpotConnentDeviceActivity.this,deviceObj,true); - ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备成功"); +// ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备成功"); EventBean eventBean =new EventBean(EventBean.LINK_FINISH,0); EventBus.getDefault().post(eventBean); finish(); @@ -417,7 +417,7 @@ public class HotSpotConnentDeviceActivity extends BaseActivity { Commons.IS_CAMERA = false; sp.putBoolean(LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); AppRoute.newToStart(HotSpotConnentDeviceActivity.this,deviceObj,true); - ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备成功"); +// ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备成功"); EventBean eventBean =new EventBean(EventBean.LINK_FINISH,0); EventBus.getDefault().post(eventBean); AnimationUtil.startAnimation(HotSpotConnentDeviceActivity.this); @@ -456,13 +456,13 @@ public class HotSpotConnentDeviceActivity extends BaseActivity { Commons.DevicePosition = Commons.DEVICE.size() - 1; } catch (Exception e) { } - ToastUtil.show(HotSpotConnentDeviceActivity.this, "设备序号" + Commons.DevicePosition + "---" + Commons.DEVICE.size()); +// ToastUtil.show(HotSpotConnentDeviceActivity.this, "设备序号" + Commons.DevicePosition + "---" + Commons.DEVICE.size()); Commons.IS_EventBus = true; Commons.HAVE_DEVICE = true;//改变判断是否绑定的变量 Commons.IS_CAMERA = false; sp.putBoolean(LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); AppRoute.newToStart(HotSpotConnentDeviceActivity.this,deviceObj,true); - ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备成功"); +// ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备成功"); EventBean eventBean =new EventBean(EventBean.LINK_FINISH,0); EventBus.getDefault().post(eventBean); AnimationUtil.startAnimation(HotSpotConnentDeviceActivity.this); diff --git a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentPetDeviceActivity.java b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentPetDeviceActivity.java index ff84be814..7bcd26bf3 100644 --- a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentPetDeviceActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentPetDeviceActivity.java @@ -583,7 +583,7 @@ public class HotSpotConnentPetDeviceActivity extends BaseActivity { Commons.DevicePosition = Commons.DEVICE.size() - 1; } catch (Exception e) { } - ToastUtil.show(HotSpotConnentPetDeviceActivity.this, "设备序号" + Commons.DevicePosition + "---" + Commons.DEVICE.size()); +// ToastUtil.show(HotSpotConnentPetDeviceActivity.this, "设备序号" + Commons.DevicePosition + "---" + Commons.DEVICE.size()); Commons.IS_EventBus = true; Commons.HAVE_DEVICE = true;//改变判断是否绑定的变量 Commons.IS_CAMERA = false; diff --git a/iFish7/src/main/java/com/ifish/activity/MainSix_4F_ControlActivity.java b/iFish7/src/main/java/com/ifish/activity/MainSix_4F_ControlActivity.java index d9fec3e24..8bd601085 100644 --- a/iFish7/src/main/java/com/ifish/activity/MainSix_4F_ControlActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/MainSix_4F_ControlActivity.java @@ -4,18 +4,23 @@ import static com.ifish.activity.MainTabActivity.map; import android.app.AlertDialog; import android.app.Dialog; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.graphics.Color; import android.os.Bundle; import android.os.CountDownTimer; import android.os.Handler; import android.text.TextUtils; +import android.view.Gravity; +import android.view.LayoutInflater; import android.view.View; import android.view.Window; import android.widget.Button; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import android.widget.Toast; import com.bumptech.glide.Glide; import com.clj.fastble.data.BleScanState; @@ -104,6 +109,7 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi private Device deviceBean; private boolean isBind = false; + private boolean isShowHint = true; @Override protected void onCreate(Bundle savedInstanceState) { @@ -123,26 +129,26 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi e.printStackTrace(); } isBind = getIntent().getBooleanExtra(BaseGradeActivity.BINDDEVICE,false); - - + L.i("jjia------------"+isBind); if (isBind){ - DialogUtil.Companion.showLoadingDialog(this,true,"设备正在联网中，请耐心等待....."); + DialogUtil.Companion.showLoadingDialog(this,true,"设备正在联网中，请耐心等待"); startDownTimer(); } +// showHint(); } private void showHint(){ - IosAlertDialog openDialog = new IosAlertDialog(this).builder(); - openDialog.setCancelable(true); - openDialog.setTitle("温馨提示"); - openDialog.setMessage("请检查输入密码是否正确"); - openDialog.setPositiveButton("确定", new View.OnClickListener() { - @Override - public void onClick(View view) { - } - }); - openDialog.show(); + isShowHint = false; + Toast toast = new Toast(this); + toast.setDuration(Toast.LENGTH_LONG); + + LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE); + View view = inflater.inflate(R.layout.hint_toast, null); + toast.setView(view); + toast.setGravity(Gravity.CENTER,0,120); + toast.show(); + } public void onEventMainThread(EventBean eventBean){ if (eventBean!=null && EventBean.CHANGE_DEVICE_NAME.equals(eventBean.name)){ @@ -170,6 +176,7 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi protected void onDestroy() { isToast = false; EventBus.getDefault().unregister(this); + DialogUtil.Companion.setLoadingDialogDismiss(this); closeSoket(); closeDownTimer(); stopAllTimer(); @@ -414,7 +421,7 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi tv_wendu.setText(""); sw.setRefreshing(false); if (isToast) { - ToastUtil.showSpecial(MainSix_4F_ControlActivity.this, Commons.Text.Repost); +// ToastUtil.showSpecial(MainSix_4F_ControlActivity.this, Commons.Text.Repost); } } }; @@ -463,7 +470,7 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi resetIVFlag(); isWaterDialog = false; dismissProgressDialog(); - ToastUtil.showSpecial(MainSix_4F_ControlActivity.this, Commons.Text.Repost); +// ToastUtil.showSpecial(MainSix_4F_ControlActivity.this, Commons.Text.Repost); } }; } @@ -608,7 +615,12 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi L.i("jjia---------c------1"+event.toString()); hidegif(); dismissProgressDialog(); - DialogUtil.Companion.setLoadingDialogDismiss(this); + if (isBind){ + DialogUtil.Companion.setLoadingDialogDismiss(this); + if (isShowHint){ + showHint(); + } + } dismissProgressDialogCancelble(); tv_offline.setVisibility(View.GONE); backInfoModelSix_4F = event; @@ -1354,12 +1366,13 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi countDownTimer = new CountDownTimer(40000,1000) { @Override public void onTick(long l) { + DialogUtil.Companion.setProgress(dowmCount); + dowmCount++; } @Override public void onFinish() { - DialogUtil.Companion.setLoadingDialogDismiss(MainSix_4F_ControlActivity.this); - showHint(); + DialogUtil.Companion.setError(); } }; countDownTimer.start(); diff --git a/iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java b/iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java index ad45caa57..d71753f1c 100644 --- a/iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java +++ b/iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java @@ -532,7 +532,7 @@ public class AirKissUtil { Commons.HAVE_DEVICE = true;//改变判断是否绑定的变量 Commons.IS_CAMERA = false; sp.putBoolean(Commons.LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); - ToastUtil.show(curActivity, "绑定设备成功"); +// ToastUtil.show(curActivity, "绑定设备成功"); AppRoute.newToStart(curActivity,deviceObj,true); curActivity.finish(); L.i("===================绑定设备成功=" + device_mac); @@ -599,7 +599,7 @@ public class AirKissUtil { Commons.HAVE_DEVICE = true;//改变判断是否绑定的变量 Commons.IS_CAMERA = false; sp.putBoolean(Commons.LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); - ToastUtil.show(curActivity, "绑定设备成功"); +// ToastUtil.show(curActivity, "绑定设备成功"); AppRoute.newToStart(curActivity,deviceObj,true); curActivity.finish(); diff --git a/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java b/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java index 40dd6e8ae..3ead632c2 100644 --- a/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java @@ -494,7 +494,7 @@ public class NewBindDeviceActivity extends AppCompatActivity { case AirKiss: // 处理AirKiss逻辑 L.i("jjia----------------bssid="+bssid); - ToastUtil.show(NewBindDeviceActivity.this, "开始AirKiss联网..."); +// ToastUtil.show(NewBindDeviceActivity.this, "开始AirKiss联网..."); airKissUtil.connectDeviceByAirKiss(this, ssid, bssid, pwd); break; } @@ -1104,7 +1104,7 @@ public class NewBindDeviceActivity extends AppCompatActivity { } - ToastUtil.show(NewBindDeviceActivity.this, "设备序号" + Commons.DevicePosition + "---" + Commons.DEVICE.size()); +// ToastUtil.show(NewBindDeviceActivity.this, "设备序号" + Commons.DevicePosition + "---" + Commons.DEVICE.size()); if (deviceObj!=null){ @@ -1144,7 +1144,7 @@ public class NewBindDeviceActivity extends AppCompatActivity { private void toIntent(Device device){ dismissDialog(); - ToastUtil.show(NewBindDeviceActivity.this, "绑定设备成功"); +// ToastUtil.show(NewBindDeviceActivity.this, "绑定设备成功"); AppRoute.newToStart(NewBindDeviceActivity.this,device,true); EventBus.getDefault().post(new ConnectMessageEvent(1, "test")); finish(); @@ -1196,7 +1196,7 @@ public class NewBindDeviceActivity extends AppCompatActivity { Commons.HAVE_DEVICE = true;//改变判断是否绑定的变量 Commons.IS_CAMERA = false; sp.putBoolean(Commons.LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); - ToastUtil.show(NewBindDeviceActivity.this, "绑定设备成功"); +// ToastUtil.show(NewBindDeviceActivity.this, "绑定设备成功"); AppRoute.newToStart(NewBindDeviceActivity.this,deviceObj,true); finish(); L.i("===================绑定设备成功=" + device_mac); diff --git a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java index 45e7d8394..26461bef2 100644 --- a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java +++ b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java @@ -36,6 +36,7 @@ import android.provider.Settings; import android.text.TextUtils; import android.util.DisplayMetrics; import android.util.Log; +import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -1971,41 +1972,48 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi }); openDialog.show(); } - AlertDialog alertDialog; + IosAlertDialog alertDialog; public void showDevice(){ // 检测页面 if (!isShowIng){ isShowIng = true; isShowEd = true; - alertDialog = new AlertDialog.Builder(requireActivity()) - .setTitle("提示") - .setMessage("发现一个新设备是否去添加") - .setOnDismissListener(dialogInterface -> isShowIng = false) - .setPositiveButton("确定", (dialog, which) -> { - dialog.dismiss(); - isShowIng = false; - closeDownTimer(); - Intent intent = new Intent(); - intent.setClass(requireActivity(), NewBindDeviceActivity.class); - intent.putExtra("title", "连接水族箱"); - intent.putExtra("type", "bluetooth"); - //jjia-xpush - intent.putExtra("device", currentDevice); - startActivity(intent); - AnimationUtil.finishAnimation(requireActivity()); - }) - .setNegativeButton("取消", (dialog, which) -> { - dialog.dismiss(); - isShowIng = false; - startDownTimer(); - }) - .create(); - + alertDialog = new IosAlertDialog(requireContext(), Gravity.BOTTOM).builder(); + alertDialog.setTextColor(R.color.danghao_color); + alertDialog.setCancelable(false); + alertDialog.setTitle("发现设备"); + alertDialog.setMessage("鱼缸智能插座1个"); + alertDialog.setNegativeButton("忽略", new OnClickListener() { + @Override + public void onClick(View view) { + isShowIng = false; + alertDialog.dismiss(); + isShowIng = false; + startDownTimer(); + } + }); + alertDialog.setPositiveButton("添加", new OnClickListener() { + @Override + public void onClick(View view) { + alertDialog.dismiss(); + isShowIng = false; + closeDownTimer(); + Intent intent = new Intent(); + intent.setClass(requireActivity(), NewBindDeviceActivity.class); + intent.putExtra("title", "连接水族箱"); + intent.putExtra("type", "bluetooth"); + //jjia-xpush + intent.putExtra("device", currentDevice); + startActivity(intent); + AnimationUtil.finishAnimation(requireActivity()); + } + }); alertDialog.show(); } } + int dowmCount = 1; CountDownTimer countDownTimer; private void startDownTimer(){ @@ -2066,7 +2074,6 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi if (alertDialog!=null){ L.i("jjia---扫描暂停----------"); alertDialog.dismiss(); - alertDialog.cancel(); alertDialog = null; } closeDownTimer(); diff --git a/iFish7/src/main/java/com/ifish/utils/DialogUtil.kt b/iFish7/src/main/java/com/ifish/utils/DialogUtil.kt index 9229ef220..bd444d97a 100644 --- a/iFish7/src/main/java/com/ifish/utils/DialogUtil.kt +++ b/iFish7/src/main/java/com/ifish/utils/DialogUtil.kt @@ -1,7 +1,6 @@ package com.ifish.utils import android.app.Activity -import com.ifish.baseclass.BaseActivity /** * Created by achang on 2018/10/6. @@ -30,16 +29,23 @@ class DialogUtil{ return mLoadingDialog!! } + fun setProgress(value: Int){ + mLoadingDialog?.setProgress(value) + } + + fun setError(){ + mLoadingDialog?.setError() + } fun setLoadingDialogDismiss(activity: Activity?) { mLoadingDialog?.apply { if (this.isShowing ) { activity?.apply { if (!this.isFinishing) mLoadingDialog!!.dismiss() - mLoadingDialog = null } } } + mLoadingDialog = null // LogUtil.logD("setLoadingDialogDismiss===========") } } diff --git a/iFish7/src/main/java/com/ifish/utils/LoadingDialog.kt b/iFish7/src/main/java/com/ifish/utils/LoadingDialog.kt index 1bce44628..6077fff18 100644 --- a/iFish7/src/main/java/com/ifish/utils/LoadingDialog.kt +++ b/iFish7/src/main/java/com/ifish/utils/LoadingDialog.kt @@ -2,32 +2,62 @@ package com.ifish.utils import android.app.Activity import android.app.Dialog -import android.text.TextUtils +import android.graphics.drawable.AnimationDrawable +import android.os.Build import android.view.View import android.view.ViewGroup -import android.widget.LinearLayout +import android.widget.ImageView +import android.widget.ProgressBar import android.widget.TextView +import androidx.cardview.widget.CardView import com.ifish.activity.R -import com.ifish.utils.Commons.Text class LoadingDialog(context: Activity,hint:String?) : Dialog(context, R.style.fullDialog) { + var progress: ProgressBar + var ivCancel: ImageView? = null + var image: AnimationDrawable? = null + var cardview: CardView? = null + var tvCancel: TextView? = null init { val inflate = View.inflate(context, R.layout.dialog_loading, null) -// val mParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT) setCancelable(false) setContentView(inflate) - var view =findViewById(R.id.tv_hint) - view.text = hint - if (TextUtils.isEmpty(hint)){ + var icon =findViewById(R.id.iconx) + image = icon.drawable as AnimationDrawable + image?.start() + + progress =findViewById(R.id.dg_pb_loading) + cardview =findViewById(R.id.cardview) + ivCancel =findViewById(R.id.iv_cancel) + tvCancel =findViewById(R.id.tv_cancel) + + var view =findViewById(R.id.tv_hint) + tvCancel?.setOnClickListener { + dismiss() } + view.text = hint + window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); -// window!!.setDimAmount(0f) //去除阴影遮罩效果 setCanceledOnTouchOutside(false) - // setCancelable(false) } + + fun setProgress(value: Int){ + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + progress?.setProgress(value,true) + } + } + + fun setError(){ + cardview?.visibility = View.GONE + ivCancel?.visibility = View.VISIBLE + tvCancel?.visibility = View.VISIBLE + image?.stop() + + } + } diff --git a/iFish7/src/main/java/com/ifish/view/IosAlertDialog.java b/iFish7/src/main/java/com/ifish/view/IosAlertDialog.java index 66d6665b1..d3a6d1b51 100644 --- a/iFish7/src/main/java/com/ifish/view/IosAlertDialog.java +++ b/iFish7/src/main/java/com/ifish/view/IosAlertDialog.java @@ -14,6 +14,9 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; + +import androidx.core.content.ContextCompat; + import com.ifish.activity.R; /** @@ -37,7 +40,7 @@ public class IosAlertDialog { private boolean showNegBtn = false; private boolean isMiddleShowEclipse = false; //setMsg时 文本内容超过最多5行后，省略号是否居中显示，默认不居中 private int maxLines = 5; - + int gravity = Gravity.CENTER; public IosAlertDialog(Context context) { this.context = context; WindowManager windowManager = (WindowManager) context @@ -45,6 +48,16 @@ public class IosAlertDialog { display = windowManager.getDefaultDisplay(); } + public IosAlertDialog(Context context,int gravity) { + this.context = context; + WindowManager windowManager = (WindowManager) context + .getSystemService(Context.WINDOW_SERVICE); + display = windowManager.getDefaultDisplay(); + this.gravity = gravity; + } + + + public IosAlertDialog builder() { // 获取Dialog布局 View view = LayoutInflater.from(context).inflate( @@ -64,14 +77,18 @@ public class IosAlertDialog { // 定义Dialog布局和参数 dialog = new Dialog(context, R.style.AlertDialogStyle); - dialog.getWindow().setGravity(Gravity.CENTER); + dialog.getWindow().setGravity(gravity); dialog.setContentView(view); // 调整dialog背景大小 lLayout_bg.setLayoutParams(new FrameLayout.LayoutParams((int) (display - .getWidth() * 0.7), LinearLayout.LayoutParams.MATCH_PARENT)); + .getWidth() * 0.9), LinearLayout.LayoutParams.MATCH_PARENT)); return this; } + public void setTextColor(int color){ + txt_msg.setTextColor(ContextCompat.getColor(context,color)); + } + public IosAlertDialog setTitle(String title) { showTitle = true; if ("".equals(title)) { diff --git a/iFish7/src/main/res/drawable-xxhdpi/bluetooth_five.png b/iFish7/src/main/res/drawable-xxhdpi/bluetooth_five.png new file mode 100644 index 000000000..74231e155 Binary files /dev/null and b/iFish7/src/main/res/drawable-xxhdpi/bluetooth_five.png differ diff --git a/iFish7/src/main/res/drawable-xxhdpi/bluetooth_four.png b/iFish7/src/main/res/drawable-xxhdpi/bluetooth_four.png new file mode 100644 index 000000000..e795f10e0 Binary files /dev/null and b/iFish7/src/main/res/drawable-xxhdpi/bluetooth_four.png differ diff --git a/iFish7/src/main/res/drawable-xxhdpi/bluetooth_one.png b/iFish7/src/main/res/drawable-xxhdpi/bluetooth_one.png new file mode 100644 index 000000000..f2dbc333e Binary files /dev/null and b/iFish7/src/main/res/drawable-xxhdpi/bluetooth_one.png differ diff --git a/iFish7/src/main/res/drawable-xxhdpi/bluetooth_three.png b/iFish7/src/main/res/drawable-xxhdpi/bluetooth_three.png new file mode 100644 index 000000000..19ee41fa5 Binary files /dev/null and b/iFish7/src/main/res/drawable-xxhdpi/bluetooth_three.png differ diff --git a/iFish7/src/main/res/drawable-xxhdpi/bluetooth_two.png b/iFish7/src/main/res/drawable-xxhdpi/bluetooth_two.png new file mode 100644 index 000000000..3911b5d46 Binary files /dev/null and b/iFish7/src/main/res/drawable-xxhdpi/bluetooth_two.png differ diff --git a/iFish7/src/main/res/drawable/bluetooth_connect.xml b/iFish7/src/main/res/drawable/bluetooth_connect.xml new file mode 100755 index 000000000..623a89e45 --- /dev/null +++ b/iFish7/src/main/res/drawable/bluetooth_connect.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/iFish7/src/main/res/drawable/progress_drawable.xml b/iFish7/src/main/res/drawable/progress_drawable.xml new file mode 100755 index 000000000..bda2d4644 --- /dev/null +++ b/iFish7/src/main/res/drawable/progress_drawable.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/iFish7/src/main/res/layout/dialog_loading.xml b/iFish7/src/main/res/layout/dialog_loading.xml index 5010cef74..eb1e188d7 100644 --- a/iFish7/src/main/res/layout/dialog_loading.xml +++ b/iFish7/src/main/res/layout/dialog_loading.xml @@ -1,49 +1,84 @@ - + + + + - - - - - - - - + android:layout_centerInParent="true" + android:background="@color/white" + android:layout_width="match_parent" + android:orientation="vertical" + android:layout_height="wrap_content"> + + + + + + + + - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/iFish7/src/main/res/layout/hint_toast.xml b/iFish7/src/main/res/layout/hint_toast.xml new file mode 100644 index 000000000..aafea6aa0 --- /dev/null +++ b/iFish7/src/main/res/layout/hint_toast.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/iFish7/src/main/res/layout/ios_dialog_layout.xml b/iFish7/src/main/res/layout/ios_dialog_layout.xml index a5ab3c6d8..6279416a2 100644 --- a/iFish7/src/main/res/layout/ios_dialog_layout.xml +++ b/iFish7/src/main/res/layout/ios_dialog_layout.xml @@ -24,15 +24,15 @@ android:layout_height="wrap_content" android:layout_marginLeft="15dp" android:layout_marginRight="15dp" - android:layout_marginTop="8dp" + android:layout_marginTop="28dp" android:gravity="center" android:textColor="@color/black" - android:textSize="14sp" /> + android:textSize="16sp" />