Browse Source

Android版本6.3.1

Arison 7 years ago
parent
commit
b33d4f1536

+ 3 - 3
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Jun 11 16:47:16 CST 2018
-debugName=479
+#Mon Jun 11 19:04:00 CST 2018
+debugName=487
 versionName=631
-debugCode=479
+debugCode=487
 versionCode=172

+ 19 - 2
app_modular/appmusic/src/main/java/com/usoftchina/music/MusicService.java

@@ -6,6 +6,9 @@ import android.content.Intent;
 import android.media.MediaPlayer;
 import android.os.Binder;
 import android.os.IBinder;
+import android.util.Log;
+
+import com.common.LogUtil;
 
 /**
  * Created by Arison on 2018/6/4.
@@ -18,12 +21,24 @@ public class MusicService extends Service {
     private static final String TAG = "MusicService";
 
     public MusicService() {
-    
+    Log.i(TAG, "MusicService");
     }
 
 
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        LogUtil.d(TAG,"onCreate");
+        
+    }
+
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+        return flags;
+    }
+
+    private void initMusic() {
+        Log.i(TAG, "onStartCommand");
         try {
             mediaPlayer =  MediaPlayer.create(this, R.raw.yingtang);
             mediaPlayer.prepare();
@@ -31,13 +46,15 @@ public class MusicService extends Service {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return super.onStartCommand(intent, flags, startId);
+     
     }
 
     //  通过 Binder 来保持 Activity 和 Service 的通信
     public MyBinder binder = new MyBinder();
     public class MyBinder extends Binder {
         public  MusicService getService() {
+            Log.i(TAG, "getService");
+            initMusic();
             return MusicService.this;
         }
     }

+ 30 - 17
app_modular/appmusic/src/main/java/com/usoftchina/pay/MainMusicActivity.java

@@ -61,7 +61,7 @@ public class MainMusicActivity extends AppCompatActivity {
 	private void bindServiceConnection() {
 		LogUtil.d(TAG,"bindServiceConnection()");
 		Intent intent = new Intent(MainMusicActivity.this, MusicService.class);
-		startService(intent);
+//		startService(intent);
 		bindService(intent, serviceConnection, this.BIND_AUTO_CREATE);
 	}
 	
@@ -120,12 +120,21 @@ public class MainMusicActivity extends AppCompatActivity {
 		toolbar.setNavigationOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View view) {
-			   onBackPressed();
+//			   onBackPressed();
+				moveTaskToBack(true);
 			}
 		});
 	}
 
-	
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		Log.d(TAG,"musicService:"+musicService);
+		if (musicService!=null){
+			Log.d(TAG,"musicService mediaPlayer:"+musicService.mediaPlayer);
+		}
+	}
 
 	private void initViews() {
 		mLrcView = (com.lg.lrcview_master.LrcView) findViewById(R.id.lrcView);
@@ -237,20 +246,24 @@ public class MainMusicActivity extends AppCompatActivity {
 		@Override
 		public void onProgressChanged(SeekBar seekBar, int progress,
 				boolean fromUser) {
-			if(seekBar == mPlayerSeekBar){
-				mLrcView.seekTo(progress, true,fromUser);
-//				Log.d("timeStr",mLrcView.getmLrcRows().get(0).getTime()+"");
-				Log.d("timeStrA",progress+"");
-				tv_timeStart.setText(formatTimeFromProgress(progress));
-				tv_timeTotal.setText(formatTimeFromProgress(musicService.mediaPlayer.getDuration()));
-				if(fromUser){
-					
-					showPlayerToast(formatTimeFromProgress(progress));
-				}
-			}else if(seekBar == mLrcSeekBar){
-				float scalingFactor = com.lg.lrcview_master.LrcView.MIN_SCALING_FACTOR + progress*(com.lg.lrcview_master.LrcView.MAX_SCALING_FACTOR- com.lg.lrcview_master.LrcView.MIN_SCALING_FACTOR)/100;
-				mLrcView.setLrcScalingFactor(scalingFactor);
-				showLrcToast((int)(scalingFactor*100)+"%");
+			try {
+				if(seekBar == mPlayerSeekBar){
+                    mLrcView.seekTo(progress, true,fromUser);
+    //				Log.d("timeStr",mLrcView.getmLrcRows().get(0).getTime()+"");
+                    Log.d("timeStrA",progress+"");
+                    tv_timeStart.setText(formatTimeFromProgress(progress));
+                    tv_timeTotal.setText(formatTimeFromProgress(musicService.mediaPlayer.getDuration()));
+                    if(fromUser){
+                        
+                        showPlayerToast(formatTimeFromProgress(progress));
+                    }
+                }else if(seekBar == mLrcSeekBar){
+                    float scalingFactor = com.lg.lrcview_master.LrcView.MIN_SCALING_FACTOR + progress*(com.lg.lrcview_master.LrcView.MAX_SCALING_FACTOR- com.lg.lrcview_master.LrcView.MIN_SCALING_FACTOR)/100;
+                    mLrcView.setLrcScalingFactor(scalingFactor);
+                    showLrcToast((int)(scalingFactor*100)+"%");
+                }
+			} catch (Exception e) {
+				e.printStackTrace();
 			}
 		}