diff --git a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
index 21f0765b..75a9cc5f 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
@@ -131,6 +131,12 @@ function FamilyMyFamily:Init()
self.cStyle = self._view:GetController("cStyle")
self.cWindow = self._view:GetController("cWindow")
self.cDisplayNumber = self._view:GetController("cDisplayNumber")
+ self.cTips = self._view:GetController("cTips")
+
+ self.com_tips = self._view:GetChild("com_tips")
+ self.tips_btn_comfirm = self.com_tips:GetChild("btn_comfirm")
+ self.tips_btn_cencel = self.com_tips:GetChild("btn_cencel")
+ self.tips_btn_bg = self.com_tips:GetChild("btn_bg")
self.input_text.emojies = EmojiDitc.EmojiesDitc
self.tex_fName.emojies = EmojiDitc.EmojiesDitc
@@ -196,16 +202,7 @@ function FamilyMyFamily:Init()
end)
self.btn_quitFamily.onClick:Set(function()
- local fgCtr = ControllerManager.GetController(NewGroupController)
- print("发送了退出协议 familyid = ", self.family.id)
- fgCtr:FG_ExitGroup(self.family.id, function(res)
- if res.ReturnCode ~= 0 then
- return
- end
- self:Close()
- ControllerManager.ChangeController(NewGroupController)
- ViewManager.ChangeView(ViewManager.View_Family)
- end)
+ self.cTips.selectedIndex = 1
end)
self.btn_quitNotice.onClick:Set(function()
@@ -258,17 +255,17 @@ function FamilyMyFamily:Init()
end)
self.btn_hideNumber.onClick:Set(function()
- if self.isShowContenting == true then
- ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后再试。。")
+ if self.networkSending == true then
+ ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后。。")
return
end
local fgCtr = ControllerManager.GetController(NewGroupController)
- self.isShowContenting = true
+ self.networkSending = true
fgCtr:FG_SetGroupShow(0, self.family.id, function(res)
print("收到协议M:FG_SetGroupShow")
pt(res)
- self.isShowContenting = false
+ self.networkSending = false
if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode)
return
@@ -280,19 +277,19 @@ function FamilyMyFamily:Init()
end)
self.btn_showNumber.onClick:Set(function()
- if self.isShowContenting == true then
- ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后再试。。")
+ if self.networkSending == true then
+ ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后。。")
return
end
print("点击了")
local fgCtr = ControllerManager.GetController(NewGroupController)
- self.isShowContenting = true
+ self.networkSending = true
fgCtr:FG_SetGroupShow(1, self.family.id, function(res)
print("收到协议M:FG_SetGroupShow")
pt(res)
- self.isShowContenting = false
+ self.networkSending = false
if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode)
return
@@ -303,6 +300,35 @@ function FamilyMyFamily:Init()
end)
end)
+ self.tips_btn_comfirm.onClick:Set(function()
+ if self.networkSending then
+ ViewUtil.ShowBannerOnScreenCenter("操作中，请稍后。。")
+ return
+ end
+
+ self.networkSending = true
+ local fgCtr = ControllerManager.GetController(NewGroupController)
+ print("发送了退出协议 familyid = ", self.family.id)
+ fgCtr:FG_ExitGroup(self.family.id, function(res)
+ if res.ReturnCode ~= 0 then
+ return
+ end
+ self.networkSending = false
+ self.cTips.selectedIndex = 1
+ self:Close()
+ ControllerManager.ChangeController(NewGroupController)
+ ViewManager.ChangeView(ViewManager.View_Family)
+ end)
+ end)
+
+ self.tips_btn_cencel.onClick:Set(function()
+ self.cTips.selectedIndex = 0
+ end)
+
+ self.tips_btn_bg.onClick:Set(function()
+ self.cTips.selectedIndex = 0
+ end)
+
return self
end
diff --git a/wb_new_ui/assets/Family/AuditNumber/Component/comp_auditNumberChild.xml b/wb_new_ui/assets/Family/AuditNumber/Component/comp_auditNumberChild.xml
index 67f4eaac..863310d9 100644
--- a/wb_new_ui/assets/Family/AuditNumber/Component/comp_auditNumberChild.xml
+++ b/wb_new_ui/assets/Family/AuditNumber/Component/comp_auditNumberChild.xml
@@ -1,17 +1,25 @@
-
-
-
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/Main.xml b/wb_new_ui/assets/Family/Main.xml
index 7df17575..d04e9594 100644
--- a/wb_new_ui/assets/Family/Main.xml
+++ b/wb_new_ui/assets/Family/Main.xml
@@ -1,6 +1,6 @@
-
+
@@ -31,7 +31,9 @@
-
+
+
+
@@ -184,7 +186,7 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/Tips/Tips.xml b/wb_new_ui/assets/Family/Tips/Tips.xml
new file mode 100644
index 00000000..3c3116e4
--- /dev/null
+++ b/wb_new_ui/assets/Family/Tips/Tips.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/Tips/component/btn_cancel.xml b/wb_new_ui/assets/Family/Tips/component/btn_cancel.xml
new file mode 100644
index 00000000..16360712
--- /dev/null
+++ b/wb_new_ui/assets/Family/Tips/component/btn_cancel.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/Tips/component/btn_comfirm.xml b/wb_new_ui/assets/Family/Tips/component/btn_comfirm.xml
new file mode 100644
index 00000000..233a0de9
--- /dev/null
+++ b/wb_new_ui/assets/Family/Tips/component/btn_comfirm.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/Tips/image/bg.png b/wb_new_ui/assets/Family/Tips/image/bg.png
new file mode 100644
index 00000000..2c80991d
Binary files /dev/null and b/wb_new_ui/assets/Family/Tips/image/bg.png differ
diff --git a/wb_new_ui/assets/Family/Tips/image/bt_cancel1.png b/wb_new_ui/assets/Family/Tips/image/bt_cancel1.png
new file mode 100644
index 00000000..98508791
Binary files /dev/null and b/wb_new_ui/assets/Family/Tips/image/bt_cancel1.png differ
diff --git a/wb_new_ui/assets/Family/Tips/image/queren_btn1.png b/wb_new_ui/assets/Family/Tips/image/queren_btn1.png
new file mode 100644
index 00000000..cadca6d9
Binary files /dev/null and b/wb_new_ui/assets/Family/Tips/image/queren_btn1.png differ
diff --git a/wb_new_ui/assets/Family/package.xml b/wb_new_ui/assets/Family/package.xml
index 42331ec5..420605b2 100644
--- a/wb_new_ui/assets/Family/package.xml
+++ b/wb_new_ui/assets/Family/package.xml
@@ -379,6 +379,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png
index 2d62a476..7dec15e9 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png
index aa0a4d23..98387cb2 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
index bfffc419..82f20d5c 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ