Feature/api song upload complete

app/build.gradle

@@ -46,6 +46,9 @@ dependencies {
     // 카카오 로그인 sdk를 사용하기 위해 필요.
     implementation group: 'com.kakao.sdk', name: 'usermgmt', version: '1.17.0'
 
+    //애니메이션
+    implementation 'com.airbnb.android:lottie:2.6.0-beta19'
+
     // Glide is adapted
     implementation 'com.github.bumptech.glide:glide:4.9.0'
     implementation 'com.squareup.picasso:picasso:2.5.2'
@@ -56,4 +59,7 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-annotations:2.9.0'
 
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.7'
+
+    implementation 'com.airbnb.android:lottie:2.0.0-beta4'
+
 }

app/src/main/AndroidManifest.xml

@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
     <application
+
         android:name=".Util.Audio.AudioApplication"
         android:allowBackup="true"
         android:icon="@drawable/android_app_icon"
@@ -18,44 +19,50 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.AppCompat.NoActionBar"
         android:usesCleartextTraffic="true">
+
         <activity android:name=".ArtistSongListActivity"></activity>
-        <activity android:name=".StartActivity"></activity> <!-- 로그인 -->
+        <activity android:name=".StartActivity"></activity>
+
+        <!-- 로그인 -->
         <activity android:name=".UI.Login.LoginActivity2" />
         <activity android:name=".Util.Kakao.service.ScoringPlayerActivity" />
-        <activity android:name=".UI.Main.MyPage.UpLoadFileActivity" />
 
         <meta-data
             android:name="com.kakao.sdk.AppKey"
             android:value="@string/kakao_app_key" />
 
-        <!-- 메인 -->
-
+        <!-- 회원가입 -->
         <activity android:name=".UI.Signup.SignupFirstActivity"></activity>
         <activity android:name=".UI.Signup.SignupMoodActivity" />
+
+        <!--로그인-->
+        <activity android:name=".UI.Login.LoginActivity"
+                  android:windowSoftInputMode="adjustResize"></activity>
+
         <!-- 메인 -->
-        <activity
-            android:name=".SplashActivity">
+        <activity android:name=".UI.Main.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".UI.Main.MainActivity"
-            android:theme="@style/SplashTheme" />
-        <activity android:name=".UI.Main2Activity" />
-        <activity android:name=".UI.Artist.ArtistActivity" />
-        <activity android:name=".UI.Artist.ArtistLibraryActivity" /> <!-- 음악플레이어 -->
-        <activity android:name=".UI.MainPlayer.MainPlayerActivity" />
-
-        <service android:name=".Util.Player.Service.MusicService" />
 
-        <!-- 음악업로드 -->
+        <activity android:name=".UI.NetworkServiceTest.NetworkTestActivity"></activity>
         <activity android:name=".UI.Main.MyPage.MyPageProfileSettingActivity"></activity>
-        <activity android:name=".UI.Main.MyPage.SetStartPointActivity" />
-        <activity android:name=".UI.Main.MyPage.UploadSongInfoActivity"></activity>
 
-        <service android:name=".Util.Player.Service.MusicService" />
+        <activity android:name=".UI.Main2Activity"/>
+        <activity android:name=".UI.Artist.ArtistActivity"/>
+        <activity android:name=".UI.Artist.ArtistLibraryActivity"/>
+
+        <!-- 음악업로드 -->
+        <activity android:name=".UI.Main.MyPage.UpLoadFileActivity"></activity>
+        <activity android:name=".UI.Main.MyPage.SetStartPointActivity"/>
+        <activity android:name=".UI.Main.MyPage.UploadSongInfoActivity"/>
+        <activity android:name=".UI.Main.MyPage.UpLoadSongCoverActivity"></activity>
+        <activity android:name=".UI.Main.MyPage.UpLoadMoodActivity"/>
+        <activity android:name=".UI.Main.MyPage.UpLoadGenreActivity"/>
+        <service android:name=".Util.Player.Service.MusicService"/>
         <service
             android:name=".Util.Audio.AudioService"
             android:enabled="true"
@@ -66,22 +73,16 @@
                 <action android:name="FORWARD" />
                 <action android:name="CLOSE" />
             </intent-filter>
-        </service>
-
-        <!-- Declare foreground service -->
-
+        </service> <!-- Declare foreground service -->
         <service
             android:name=".Util.Player.Service.MyForeGroundService"
             android:enabled="true"
             android:exported="true" />
 
-        <activity android:name=".UI.MusicTestActivity" />
+        <activity android:name=".UI.MainPlayer.MainPlayerActivity" />
         <activity android:name=".Util.Audio.PlayerActivity" />
         <activity android:name=".UI.Signup.SignupSelectArtistActivity" />
         <activity android:name=".UI.Signup.SignupGenreActivity" />
-        <activity android:name=".UI.Main.MyPage.UpLoadSongCoverActivity"></activity>
-        <activity android:name=".UI.Login.LoginActivity"
-            android:windowSoftInputMode="adjustResize"></activity>
     </application>
 
 </manifest>

app/src/main/java/com/song2/wave/Data/model/SearchArtistData.kt

@@ -0,0 +1,5 @@
+package com.song2.wave.Data.model
+
+data class SearchArtistData(var image : String, var title : String ) {
+
+}

app/src/main/java/com/song2/wave/LikeAnimationActivity.kt

@@ -0,0 +1,53 @@
+package com.song2.wave
+
+import android.animation.Animator
+import android.net.Uri
+import android.support.v7.app.AppCompatActivity
+import android.os.Bundle
+import android.util.Log
+import android.widget.VideoView
+import com.airbnb.lottie.LottieAnimationView
+import kotlinx.android.synthetic.main.activity_like_animation.*
+
+class LikeAnimationActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_like_animation)
+
+        //--------------------------------------애니메이션---------
+        // val video : VideoView = findViewById(R.id.video)
+        //com.airbnb.lottie.LottieAnimationView 아이디
+        val love : LottieAnimationView = findViewById(R.id.lottie_main_act_like)
+        val videoView = findViewById<VideoView>(R.id.video)
+        val path = "android.resource://" + packageName + "/" + R.raw.try_11
+        videoView?.setVideoURI(Uri.parse(path))
+        //val button = findViewById<Button>(R.id.button)
+
+        lottie_main_act_like.setOnClickListener {
+            love.playAnimation()
+            val isPlaying = videoView.isPlaying
+            if (isPlaying) {
+                //videoView.pause()
+            } else {
+                videoView.start()
+            }
+        }
+        love.addAnimatorListener(object : Animator. AnimatorListener{
+            override fun onAnimationRepeat(animation: Animator?) {
+                Log.e("Animation:","repeat")
+            }
+            override fun onAnimationEnd(animation: Animator?) {
+                //Toast.makeText( application , "끝~",Toast. LENGTH_SHORT ).show()
+            }
+            override fun onAnimationCancel(animation: Animator?) {
+                Log.e("Animation:","cancel")  //취소
+            }
+            override fun onAnimationStart(animation: Animator?) {
+                Log.e("Animation ","star") //시작
+            }
+        })
+        //------------------------------------------------애니메이션
+
+    }
+}

app/src/main/java/com/song2/wave/UI/Main/Home/HomeOnFragment.kt

@@ -1,5 +1,6 @@
 package com.song2.wave.UI.Main.Home
 
+import android.app.Activity
 import android.content.Intent
 import android.database.Cursor
 import android.os.Bundle
@@ -33,11 +34,14 @@ import com.song2.wave.Data.model.Top10CategoryData
 import com.song2.wave.R
 import com.song2.wave.UI.Main.Home.Adapter.*
 import com.song2.wave.UI.Main.Home.Top10.Top10Fragment
+import com.song2.wave.UI.Main.MyPage.PointHistoryFragment
+import com.song2.wave.UI.Main.MyPage.UpLoadFileActivity
 import com.song2.wave.UI.Signup.SignupFirstActivity
 import com.song2.wave.Util.Network.ApiClient
 import com.song2.wave.Util.Network.NetworkService
 import kotlinx.android.synthetic.main.fragment_home_on.*
 import kotlinx.android.synthetic.main.fragment_home_on.view.*
+import org.jetbrains.anko.support.v4.startActivity
 import retrofit2.Call
 import retrofit2.Response
 
@@ -84,8 +88,11 @@ class HomeOnFragment : Fragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         var v : View = inflater.inflate(R.layout.fragment_home_on, container, false)
+        var pref = context!!.getSharedPreferences("auto", Activity.MODE_PRIVATE)
 
-        authorization_info = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxMDUsImlhdCI6MTU2MjcyMjQ5MCwiZXhwIjoxNTY1MzE0NDkwfQ.CdVtW28EY4XOWV_xlt2dlYFMdEdFcIRN6lmsmJ8_jKQ"
+        //authorization_info = pref.getString("token","")
+        authorization_info = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxNiwiaWF0IjoxNTYyOTY3NzY2LCJleHAiOjE1NjU1NTk3NjZ9.PmlhTASv3yT75I_RG9T6YRL-BdCAGZaE7fpB4r_G3BM"
+9
 
         //통신
         getHomeInfoResponse()
@@ -96,28 +103,31 @@ class HomeOnFragment : Fragment() {
         getUploadResponse()
         getHitsResponse()
 
+
+
         v.iv_home_frag_wavelogo.setOnClickListener {
             var intent = Intent(context, PlayerActivity::class.java)
             startActivity(intent)
         }
 
         v.tv_home_frag_ment.setOnClickListener {
-            var intent = Intent(context, SignupFirstActivity::class.java)
-            startActivity(intent)
+            startActivity<UpLoadFileActivity>()
+
+/*            var intent = Intent(context, SignupFirstActivity::class.java)
+            startActivity(intent)*/
         }
 
         v.iv_home_frag_top10_genre_more_btn.setOnClickListener {
-
-
             HomeFragment.homeFragment.replaceFragment(top10fragment)
         }
 
         v.iv_home_frag_top10_mood_more_btn.setOnClickListener {
-
-
-            HomeFragment.homeFragment.replaceFragment(Top10Fragment())
+            HomeFragment.homeFragment.replaceFragment(top10fragment)
         }
 
+        v.ll_point_container.setOnClickListener {
+            HomeFragment.homeFragment.replaceFragment(PointHistoryFragment())
+        }
         return v
     }
 
@@ -188,19 +198,28 @@ class HomeOnFragment : Fragment() {
             override fun onResponse(call: Call<GetPlaylistResponse>, response: Response<GetPlaylistResponse>) {
                 if (response.isSuccessful) {
                     val playlistDataList: PlayListData = response.body()!!.data
+
+                    Log.e("playlistDataList.songList", playlistDataList.songList.size.toString())
+                    if( playlistDataList.songList.size == 0){
+                        tv_home_frag_waiting_scoring_mine.visibility = View.GONE
+                        rv_home_frag_scoring_waiting_mine.visibility = View.GONE
+
+                    }else
+                    {
+
+                        tv_home_frag_waiting_scoring_mine.visibility = View.VISIBLE
+                        rv_home_frag_scoring_waiting_mine.visibility = View.VISIBLE
+                    }
+
                     for(i in playlistDataList.songList.indices) {
                         myWaitingSongDataList.add(MyWaitingSongData(playlistDataList.songList[i]._id, playlistDataList.songList[i].songUrl, playlistDataList.songList[i].deleteTime.substring(8,10), playlistDataList.songList[i].artwork, playlistDataList.songList[i].originTitle, playlistDataList.songList[i].originArtistName, playlistDataList.songList[i].coverArtistName))
                     }
                     myWaitingSongHomeAdapter = MyWaitingSongHomeAdapter(context!!, myWaitingSongDataList, requestManager)
                     rv_home_frag_scoring_waiting_mine.adapter = myWaitingSongHomeAdapter
                     rv_home_frag_scoring_waiting_mine.layoutManager = LinearLayoutManager(context,LinearLayoutManager.HORIZONTAL, false)
-
                 }
-
             }
-
         })
-
     }
 
     //rateReady
@@ -388,6 +407,10 @@ class HomeOnFragment : Fragment() {
         tv_home_frag_perfect_cnt.setText(temp.hitSongCount.toString())
         tv_home_frag_total_point.setText(temp.totalPoint.toString() + "P")
 
+        tv_home_frag_waiting_scoring_mine.setText(temp.nickname + "님이 평가를 기다리고 있는 곡")
+        tv_home_frag_waiting_scoring.setText(temp.nickname + "님의 평가를 기다리고 있는 곡")
+        tv_home_frag_recommend_song.setText(temp.nickname + "을 위한 추천 곡")
+
         //visible
         rl_home_frag_goto_login.visibility = View.GONE
         ll_home_frag_point_layout.visibility = View.VISIBLE

app/src/main/java/com/song2/wave/UI/Main/Home/Top10/Adapter/FragmentViewPagerAdapter.kt

@@ -9,13 +9,13 @@ class FragmentViewPagerAdapter(fm: FragmentManager, private val num_fragment: In
     override fun getItem(p0: Int): Fragment? {
         return when(p0){
             0 -> Idx0Fragment()
-            1 -> Idx0Fragment()
-            2 -> Idx0Fragment()
-            3 -> Idx0Fragment()
-            4 -> Idx0Fragment()
-            5 -> Idx0Fragment()
-            6 -> Idx0Fragment()
-            7 -> Idx0Fragment()
+            1 -> Idx1Fragment()
+            2 -> Idx2Fragment()
+            3 -> Idx3Fragment()
+            4 -> Idx4Fragment()
+            5 -> Idx5Fragment()
+            6 -> Idx6Fragment()
+            7 -> Idx7Fragment()
             else -> null
         }
     }

app/src/main/java/com/song2/wave/UI/Main/Library/LibraryLikeFragment.kt

@@ -76,8 +76,16 @@ class LibraryLikeFragment : Fragment() {
                 if (response.isSuccessful) {
                     val playlistDataList: PlayListData = response.body()!!.data
 
-                    if(playlistDataList == null)
+                    if(playlistDataList == null){
+                        recycler_library_like_frag_list.visibility = View.GONE
+                        iv_library_like_list.visibility = View.VISIBLE
                         return
+                    }
+                    recycler_library_like_frag_list.visibility = View.VISIBLE
+                    iv_library_like_list.visibility = View.GONE
+
+
+
 
                     for(i in playlistDataList.songList.indices)
                         songDataArr.add(SongData(playlistDataList.songList[i]._id, playlistDataList.songList[i].songUrl, playlistDataList.songList[i].artwork, playlistDataList.songList[i].originTitle,playlistDataList.songList[i].originArtistName, playlistDataList.songList[i].coverArtistName,playlistDataList.songList[i].genre))

app/src/main/java/com/song2/wave/UI/Main/MainActivity.kt

@@ -188,7 +188,7 @@ class MainActivity : AppCompatActivity() {
                 nowFrag = LibraryFragment()
             }
             "myPage" ->{
-                nowFrag = PointHistoryFragment()
+                nowFrag = MyPageFragment()
             }
         }
 
@@ -281,4 +281,20 @@ class MainActivity : AppCompatActivity() {
             }
         })
     }
+
+    fun addFragment(fragment : android.support.v4.app.Fragment){
+        val fm = supportFragmentManager
+        val transaction = fm.beginTransaction()
+        transaction.add(R.id.ll_home_frag_layout, fragment)
+        transaction.commit()
+    }
+
+    fun replaceFragment(fragment: android.support.v4.app.Fragment)
+    {
+        val fm = supportFragmentManager
+        val transaction = fm.beginTransaction()
+        transaction.replace(R.id.ll_home_frag_layout, fragment)
+        transaction.addToBackStack(null)
+        transaction.commit()
+    }
 }