From 2ea213805382439c5998c2c9f5b4893a7b08877a Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Wed, 27 Apr 2022 02:49:55 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=8C=EC=95=85=ED=8C=8C=EC=9D=BC=205?=
 =?UTF-8?q?=EA=B0=9C=20=EA=B8=B0=EB=B3=B8=ED=8C=8C=EC=9D=BC=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  5 +-
 .../com.backoffice.m.member_env.xml           |  2 +-
 .../views/ftl/m/member_env/view_set_music.ftl | 52 +++++++++++--------
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7a1b907..1c781d0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,10 +10,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="아이디 저장기능 적용">
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index_20220426.ftl" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml b/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml
index 93e06a5..a44b913 100644
--- a/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml
+++ b/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml
@@ -61,7 +61,7 @@
 			a.reg_dt
 		FROM tbl_music a
 		WHERE a.member_id = #member_id#
-		ORDER BY a.reg_dt
+		ORDER BY a.base_yn desc, a.reg_dt asc
 	</select>
 
 	<!-- 계정연동 기가입 사용자 이메일 확인 -->
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl
index 93178ee..a385bf7 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl
@@ -25,20 +25,24 @@
 									<input type="hidden" name="music_list" value="/bf/upload/${item['music_file_path']!}">
 									<div>${item['music_name']!}</div>
 
+									<#if item['base_yn'] == 'N'>
 									<div class='btn_cont'>
+									</#if>
 										<#if item['mute_yn'] == 'N'>
-											<input class="mute" key="${item['idx']!}" type="hidden" name="mute_yn" value="Y">
-											<div class="btn" onclick="fncMute(this);">음소거</div>
+											<input class="mute" key="${item['idx']!}" type="hidden" name="mute_yn" value="N">
+											<div class="btn" key="Y" onclick="fncMute(this)">음소거</div>
 										</#if>
 										<#if item['mute_yn'] == 'Y'>
-											<input class="mute" key="${item['idx']!}" type="hidden" name="mute_yn" value="N">
-											<div class="btn" onclick="fncMute(this);">음소거해제</div>
+											<input class="mute" key="${item['idx']!}" type="hidden" name="mute_yn" value="Y">
+											<div class="btn" key="N" onclick="fncMute(this)">음소거해제</div>
 										</#if>
 										<#if item['base_yn'] == 'N'>
 											<input class="del" type="hidden" value="${item['idx']!}">
 											<div class="btn" onclick="fncRemove(this);">삭제</div>
 										</#if>
+									<#if item['base_yn'] == 'N'>
 									</div>
+									</#if>
 								</div>
 							</#list>
 						</div>
@@ -48,10 +52,14 @@
 				<div class="list_cont01">
 					<div class="item_add" onclick="fncAddItem(this)"><img src="../img/setting/add_circle_ico.png" /></div>
 				</div>
-				<div class="info">
-					* 텍스트를 눌러 표현을 수정하거나 버튼을 눌러 삭제할 수 있습니다.
+				<audio src="/m/" controls id="audio_control" style="width: 100%" onended="fncNextPlay()"></audio>
+				<div class="m_set_description">
+					*음악은 랜덤으로 재생됩니다.<br>
+					*원하는 음악을 추가하실 수 있습니다. (최대 5개 / MP3파일만 지원)<br>
+					*추가하신 음악은 삭제 및 수정이 가능합니다<br>
+					*원하지 않은 음악은 삭제 버튼을 눌러 재생 목록에서 제거할 수 있습니다<br>
 				</div>
-				<button type="submit" onclick="fncSave()" id="" name="" class="btns blue_btn save">저장</button>
+				<button type="submit" onclick="fncSave()" id="" name="" class="btns blue_btn save">확인</button>
 			</form>
 		</div>
 	</main>
@@ -59,7 +67,6 @@
 
 <script>
 	var delList = "";
-	// var muteYnIdxList = "";
 	var music_idx = 0;
 
 	$("#audio_control").attr("src", $("input[name='music_list']").eq(0).val());
@@ -77,17 +84,20 @@
 
 	function fncMute(e) {
 		// console.log($(e).parent().attr("name") + "," + $(e).parent().attr("value"));
+		// var p_mute_yn = $(e).parent().children('.mute').val();
+		var p_mute_yn = $(e).attr('key');
 
-		var type = $(e).parent().children('.mute').val();
+		console.log(p_mute_yn);
 
-		if(type == "Y") {
+		if(p_mute_yn == "Y") {
 			$(e).text("음소거해제");
-			$(e).parent().children('.mute').val("N");
+			$(e).parent().children('.mute').val("Y");
+			$(e).attr("key","N");
 		} else {
 			$(e).text("음소거");
-			$(e).parent().children('.mute').val("Y");
+			$(e).parent().children('.mute').val("N");
+			$(e).attr("key","Y");
 		}
-		// muteYnIdxList += $(e).attr("key") + ",";
 	}
 
 	function fncSave() {
@@ -96,11 +106,14 @@
 		var delList = $("#delList").val();
 
 		//음소거여부 yn목록
-		$("button[name='mute_yn']").each(function(index, item){
+		$("input[name='mute_yn']").each(function(index, item){
 			muteYnList += $(item).attr("value") + ",";
 			muteYnIdxList += $(item).attr("key") + ",";
 		});
 
+		// console.log("muteYnList:" + muteYnList);
+		// console.log("muteYnIdxList:" + muteYnIdxList);
+
 		//삭제키
 		if(delList.length > 0) {
 			$("#delList").val( delList.substring(0, delList.length-1) );
@@ -168,25 +181,20 @@
 	function fncAddItem() {
 		var size = $("input[name='file']").length + $("input[name='music_list']").length;
 
-		if(size >=5) {
-			Swal.fire({text: '음악파일은 5개까지 설정 가능합니다.'});
+		if(size >=10) {
+			Swal.fire({text: '음악파일은 10개까지 설정 가능합니다.'});
 			return;
 		}
 
 		$(".list").append(
 				"<div name='list_item' class='item_order flex_box'>" +
 				"	<div><input type='file' accept='audio/*' onchange='fn_M_my_fileSave(this);' name='file'></div>" +
-				"   <div class='btn_cont'>" +
-				"		<div class='btn' onclick='fncMute(this);'>음소거</div>" +
+				"   <div>" +
 				"		<div class='btn' onclick='fncRemove(this);'>삭제</div>" +
 				"	</div>" +
 				"</div>"
 		);
 	}
-
-	// function fncRemove(e) {
-	// 	$(e).parent().parent().remove();
-	// }
 </script>
 <#include "/m/member_env/include_return_url.ftl">
 </body>