Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_bitliker

# Conflicts:
#	WeiChat/version.properties

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java

@@ -845,7 +845,7 @@ public class OAActivity extends SupportToolBarActivity implements View.OnClickLi
             popupWindow =new PopupWindow(view);
 //                    new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() / 3, windowManager.getDefaultDisplay().getHeight() / 3);
             popupWindow.setWidth(DisplayUtil.dip2px(ct,140));
-            popupWindow.setHeight(DisplayUtil.dip2px(ct,125));
+            popupWindow.setHeight(DisplayUtil.dip2px(ct,135));
             }
         // 使其聚集
         popupWindow.setFocusable(true);

WeiChat/src/main/res/layout/act_task_detail.xml

@@ -103,12 +103,14 @@
                 android:layout_height="wrap_content">
                 <LinearLayout
                     style="@style/form_linear_customer"
-                    android:layout_height="250dp"
+                    android:layout_height="300dp"
+                    android:minHeight="220dp"
                     android:paddingBottom="5dp">
 
                     <LinearLayout
                         style="@style/linear_task_background"
                         android:layout_marginBottom="5dp"
+                        android:layout_height="wrap_content"
                         android:layout_marginTop="10dp"
                         android:orientation="horizontal"
                         android:weightSum="4">
@@ -133,6 +135,7 @@
                     <LinearLayout
                         style="@style/linear_task_background"
                         android:orientation="horizontal"
+                        android:layout_height="wrap_content"
                         android:weightSum="4">
 
                         <TextView
@@ -156,6 +159,7 @@
                     <LinearLayout
                         style="@style/linear_task_background"
                         android:orientation="horizontal"
+                        android:layout_height="wrap_content"
                         android:weightSum="4">
 
                         <TextView
@@ -178,6 +182,7 @@
                     <LinearLayout
                         style="@style/linear_task_background"
                         android:orientation="horizontal"
+                        android:layout_height="wrap_content"
                         android:weightSum="4">
 
                         <TextView
@@ -200,6 +205,7 @@
                     <LinearLayout
                         style="@style/linear_task_background"
                         android:orientation="horizontal"
+                        android:layout_height="wrap_content"
                         android:weightSum="4">
 
                         <TextView
@@ -223,6 +229,7 @@
                         style="@style/linear_task_background"
                         android:orientation="horizontal"
                         android:visibility="gone"
+                        android:layout_height="wrap_content"
                         android:weightSum="4">
 
                         <TextView
@@ -247,6 +254,7 @@
                     <LinearLayout
                         style="@style/linear_task_background"
                         android:orientation="horizontal"
+                        android:layout_height="wrap_content"
                         android:weightSum="4">
 
                         <TextView
@@ -270,6 +278,7 @@
                     <LinearLayout
                         style="@style/linear_task_background"
                         android:orientation="horizontal"
+                        android:layout_height="wrap_content"
                         android:layout_marginLeft="20dp">
 
                         <TextView
@@ -298,6 +307,7 @@
                         android:layout_marginTop="5dp"/>
                     <LinearLayout
                         style="@style/linear_task_background"
+                        android:layout_height="wrap_content"
                         android:orientation="horizontal">
                         <TextView
                             android:layout_width="wrap_content"
@@ -320,6 +330,7 @@
                     <LinearLayout
                         android:id="@+id/lay_voice_task"
                         style="@style/linear_task_background"
+                        android:layout_height="wrap_content"
                         android:layout_marginBottom="5dp"
                         android:orientation="horizontal"
                         android:weightSum="4">

WeiChat/src/main/res/layout/activity_base_info.xml

@@ -134,7 +134,7 @@
                 android:layout_height="48dp"
                 android:layout_marginRight="10dp" 
                 android:layout_centerVertical="true"
-                android:background="@drawable/defaultpic"
+              
                 android:layout_toLeftOf="@+id/me_heard_arrow_img"
                
                 android:textColor="@color/dark_dark_grey" />

WeiChat/src/main/res/layout/activity_book_add.xml

@@ -24,7 +24,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="29dp"
+                android:layout_marginLeft="33dp"
                 android:layout_marginTop="5dp"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -50,7 +50,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="29dp"
+                android:layout_marginLeft="33dp"
                 android:layout_marginTop="5dp"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -77,7 +77,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="29dp"
+                android:layout_marginLeft="33dp"
                 android:layout_marginTop="5dp"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -106,7 +106,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="29dp"
+                android:layout_marginLeft="33dp"
                 android:layout_marginTop="5dp"
                 android:text="*"
                 android:textColor="@color/red" />

WeiChat/src/main/res/values-v21/styles.xml

@@ -1,5 +1,4 @@
 <resources>>
-
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -980,7 +980,7 @@
     <string name="taskdetail_time">时间</string>
     <string name="taskdetail_content">内容</string>
     <!--我的订阅-->
-    <string name="subscribe_title">订阅号</string>
+    <string name="subscribe_title">我的订阅</string>
     <string name="subscribe_manager">订阅管理</string>
     <string name="subscribe_unsure">未订阅</string>
     <string name="subscribe_confirmed">已订阅</string>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu May 31 17:19:41 CST 2018
-debugName=431
+#Tue Jun 05 16:10:35 CST 2018
+debugName=477
 versionName=630
-debugCode=431
-versionCode=170
+debugCode=477
+versionCode=171

app_core/common/src/main/res/layout/activity_customer_list.xml

@@ -108,8 +108,6 @@
 
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/list_business"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
         style="@style/ListViewBasic">
 
     </com.handmark.pulltorefresh.library.PullToRefreshListView>

app_core/common/src/main/res/values-zh-rCN/strings.xml

@@ -981,7 +981,7 @@
     <string name="taskdetail_time">时间</string>
     <string name="taskdetail_content">内容</string>
     <!--我的订阅-->
-    <string name="subscribe_title">订阅号</string>
+    <string name="subscribe_title">我的订阅</string>
     <string name="subscribe_manager">订阅管理</string>
     <string name="subscribe_unsure">未订阅</string>
     <string name="subscribe_confirmed">已订阅</string>

app_core/common/src/main/res/values/strings.xml

@@ -1324,7 +1324,7 @@
     <string name="taskdetail_time">时间</string>
     <string name="taskdetail_content">内容</string>
     <!--我的订阅-->
-    <string name="subscribe_title">订阅号</string>
+    <string name="subscribe_title">我的订阅</string>
     <string name="subscribe_manager">订阅管理</string>
     <string name="subscribe_unsure">未订阅</string>
     <string name="subscribe_confirmed">已订阅</string>

app_modular/appbooking/src/main/res/layout/activity_bbooking_add.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -32,7 +32,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="29dp"
+                    android:layout_marginLeft="43dp"
                     android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
@@ -60,7 +60,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="29dp"
+                    android:layout_marginLeft="43dp"
                     android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
@@ -88,7 +88,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="29dp"
+                    android:layout_marginLeft="43dp"
                     android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
@@ -119,7 +119,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="29dp"
+                    android:layout_marginLeft="43dp"
                     android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
@@ -151,7 +151,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="29dp"
+                    android:layout_marginLeft="43dp"
                     android:layout_marginTop="5dp"
                     android:text="*"
                     android:textColor="@color/red" />
@@ -233,4 +233,4 @@
 
 
     </ScrollView>
-</android.support.constraint.ConstraintLayout>
+</RelativeLayout>

app_modular/appme/build.gradle

@@ -27,4 +27,5 @@ dependencies {
     compile project(':appcontact')
 
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    compile project(path: ':appmusic')
 }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/AboutActivity.java

@@ -15,6 +15,7 @@ import android.widget.TextView;
 
 import com.afollestad.materialdialogs.GravityEnum;
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.common.LogUtil;
 import com.common.system.SystemUtil;
 import com.core.base.SupportToolBarActivity;
 import com.core.utils.CommonUtil;
@@ -37,6 +38,7 @@ public class AboutActivity extends SupportToolBarActivity implements View.OnClic
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        LogUtil.d("AboutActivity extends","onCreate()");
         setContentView(R.layout.activity_about);
         setTitle(getString(R.string.set_about));
         TextView versionTv = (TextView) findViewById(R.id.version_tv);

app_modular/appmusic/build.gradle

@@ -21,4 +21,5 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile project(':common')
+    testCompile deps.junit
 }

app_modular/appmusic/src/main/AndroidManifest.xml

@@ -1,18 +1,36 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.usoftchina.music">
-
+    <!--打电话广播-->
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"/>
+    <!--监听电话状态-->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
         android:supportsRtl="true">
         <activity android:name="com.usoftchina.pay.MainMusicActivity"
             android:theme="@style/AppTheme.NoActionBar"
+            android:launchMode="singleInstance"
             android:label="智慧英唐">
             <intent-filter>
                 <action android:name="com.usoftchina.pay.MainMusicActivity" />
-
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+
+         
         </activity>
+        <service
+            android:name="com.usoftchina.music.MusicService"
+            android:enabled="true"
+            android:exported="true" />
+
+      <!--  <receiver android:name="com.usoftchina.PhoneBroadcastReceiver">
+            <intent-filter android:priority="1000">
+                //主动打电话时,发送的广播
+                <action android:name="android.intent.action.NEW_OUTGOING_CALL"/>
+                //电话状态改变时,发送的广播 (振铃,挂断,接通)
+                <action android:name="android.intent.action.PHONE_STATE"/>
+            </intent-filter>
+        </receiver>-->
     </application>
 </manifest>

app_modular/appmusic/src/main/java/com/lg/lrcview_master/LrcView.java

@@ -37,12 +37,12 @@ public class LrcView extends View implements ILrcView {
 	/**无歌词数据的时候 显示的默认文字**/
 	private static final String DEFAULT_TEXT = "智慧英唐，全球共享";
 	/**默认文字的字体大小**/
-	private static final float SIZE_FOR_DEFAULT_TEXT = DensityUtil.dp2px(18);
+	private static final float SIZE_FOR_DEFAULT_TEXT = DensityUtil.dp2px(22);
 
 	/**画高亮歌词的画笔***/
 	private Paint mPaintForHighLightLrc;
 	/**高亮歌词的默认字体大小***/
-	private static final float DEFAULT_SIZE_FOR_HIGHT_LIGHT_LRC =  DensityUtil.dp2px(15);
+	private static final float DEFAULT_SIZE_FOR_HIGHT_LIGHT_LRC =  DensityUtil.dp2px(22);
 	/**高亮歌词当前的字体大小***/
 	private float mCurSizeForHightLightLrc = DEFAULT_SIZE_FOR_HIGHT_LIGHT_LRC;
 	/**高亮歌词的默认字体颜色**/
@@ -53,7 +53,7 @@ public class LrcView extends View implements ILrcView {
 	/**画其他歌词的画笔***/
 	private Paint mPaintForOtherLrc;
 	/**其他歌词的默认字体大小***/
-	private static final float DEFAULT_SIZE_FOR_OTHER_LRC =DensityUtil.dp2px(13);
+	private static final float DEFAULT_SIZE_FOR_OTHER_LRC =DensityUtil.dp2px(17);
 	/**其他歌词当前的字体大小***/
 	private float mCurSizeForOtherLrc = DEFAULT_SIZE_FOR_OTHER_LRC;
 	/**高亮歌词的默认字体颜色**/
@@ -65,7 +65,7 @@ public class LrcView extends View implements ILrcView {
 	/**画时间线的画笔***/
 	private Paint mPaintForTimeLine;
 	/***时间线的颜色**/
-	private static final int COLOR_FOR_TIME_LINE = 0xffD02090;
+	private static final int COLOR_FOR_TIME_LINE = 0xff2FABCF;
 	/**时间文字大小**/
 	private static final int SIZE_FOR_TIME = DensityUtil.dp2px(13);
 	/**是否画时间线**/
@@ -79,9 +79,9 @@ public class LrcView extends View implements ILrcView {
 	/**歌词的最大缩放比例**/
 	public static final float MAX_SCALING_FACTOR = 2.5f;
 	/**歌词的最小缩放比例**/
-	public static final float MIN_SCALING_FACTOR = 1.5f;
+	public static final float MIN_SCALING_FACTOR = 1f;
 	/**默认缩放比例**/
-	private static final float DEFAULT_SCALING_FACTOR = 1.8f;
+	private static final float DEFAULT_SCALING_FACTOR = 1f;
 	/**歌词的当前缩放比例**/
 	private float mCurScalingFactor = DEFAULT_SCALING_FACTOR;
 
@@ -393,7 +393,7 @@ public class LrcView extends View implements ILrcView {
 		mCurPadding = DEFAULT_PADDING * mCurScalingFactor;
 		mTotleDrawRow = (int) (getHeight()/(mCurSizeForOtherLrc+mCurPadding))+3;
 		log("mRowTotal="+mTotleDrawRow);
-		scrollTo(getScrollX(), (int) (mCurRow*(mCurSizeForOtherLrc+mCurPadding)));
+		//scrollTo(getScrollX(), (int) (mCurRow*(mCurSizeForOtherLrc+mCurPadding)));
 		invalidate();
 		mScroller.forceFinished(true);
 	}

app_modular/appmusic/src/main/java/com/usoftchina/PhoneBroadcastReceiver.java

@@ -0,0 +1,16 @@
+package com.usoftchina;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * Created by Arison on 2018/6/5.
+ */
+
+public class PhoneBroadcastReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+     
+    }
+}

app_modular/appmusic/src/main/java/com/usoftchina/music/MusicService.java

@@ -0,0 +1,75 @@
+package com.usoftchina.music;
+
+
+import android.app.Service;
+import android.content.Intent;
+import android.media.MediaPlayer;
+import android.os.Binder;
+import android.os.IBinder;
+
+/**
+ * Created by Arison on 2018/6/4.
+ */
+
+public class MusicService extends Service {
+    public MediaPlayer mediaPlayer;
+    public boolean tag = false;
+    
+    private static final String TAG = "MusicService";
+
+    public MusicService() {
+    
+    }
+
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        try {
+            mediaPlayer =  MediaPlayer.create(this, R.raw.yingtang);
+            mediaPlayer.prepare();
+            mediaPlayer.setLooping(true);
+        } 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() {
+            return MusicService.this;
+        }
+    }
+
+    public void playOrPause() {
+        if (mediaPlayer.isPlaying()) {
+            mediaPlayer.pause();
+        } else {
+            mediaPlayer.start();
+        }
+    }
+
+    public void stop() {
+        if (mediaPlayer != null) {
+            mediaPlayer.stop();
+            try {
+                mediaPlayer.reset();
+                mediaPlayer.prepare();
+                mediaPlayer.seekTo(0);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    @Override
+    public boolean onUnbind(Intent intent) {
+        return super.onUnbind(intent);
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return binder;
+    }
+}

app_modular/appmusic/src/main/java/com/usoftchina/pay/MainMusicActivity.java

@@ -1,12 +1,22 @@
 package com.usoftchina.pay;
 
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.ServiceConnection;
 import android.media.MediaPlayer;
 import android.media.MediaPlayer.OnCompletionListener;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.IBinder;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.telephony.TelephonyManager;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -16,11 +26,13 @@ import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.common.LogUtil;
 import com.core.utils.StatusBarUtil;
 import com.lg.lrcview_master.DefaultLrcParser;
 import com.lg.lrcview_master.LrcRow;
 import com.lg.lrcview_master.LrcView.OnLrcClickListener;
 import com.lg.lrcview_master.LrcView.OnSeekToListener;
+import com.usoftchina.music.MusicService;
 import com.usoftchina.music.R;
 
 import java.io.BufferedReader;
@@ -31,41 +43,90 @@ import java.util.List;
 
 public class MainMusicActivity extends AppCompatActivity {
 	private MediaPlayer mPlayer;
-	/**    控制播放的SeekBar***/
-	
 	private SeekBar mPlayerSeekBar;
-	/**控制歌词字体大小的SeekBar***/
 	private SeekBar mLrcSeekBar;
 	private Button mPlayBtn;
 	private com.lg.lrcview_master.LrcView mLrcView;
 	private	TextView tv_timeStart;
 	private	TextView tv_timeTotal;
 
+	PhoneBroadcastReceiver phoneBroadcastReceiver;
+
 	private Toast mPlayerToast;
 	private Toast mLrcToast;
 	private Toolbar toolbar;
+	private MusicService musicService;
+    private static final String TAG = "MainMusicActivity";
+	//  在Activity中调用 bindService 保持与 Service 的通信
+	private void bindServiceConnection() {
+		LogUtil.d(TAG,"bindServiceConnection()");
+		Intent intent = new Intent(MainMusicActivity.this, MusicService.class);
+		startService(intent);
+		bindService(intent, serviceConnection, this.BIND_AUTO_CREATE);
+	}
+	
+	//  回调onServiceConnected 函数，通过IBinder 获取 Service对象，实现Activity与 Service的绑定
+	private ServiceConnection serviceConnection = new ServiceConnection() {
+		@Override
+		public void onServiceConnected(ComponentName name, IBinder service) {
+			LogUtil.d(TAG,"onServiceConnected()");
+			musicService = ((MusicService.MyBinder) (service)).getService();
+			LogUtil.d(TAG,"musicService"+musicService.mediaPlayer);
+			musicService.mediaPlayer.setOnCompletionListener(onCompletionListener);
+			if (!musicService.mediaPlayer.isPlaying()){
+				new Handler().postDelayed(new Runnable() {
+					@Override
+					public void run() {
+						float scalingFactor = com.lg.lrcview_master.LrcView.MIN_SCALING_FACTOR + 0*(com.lg.lrcview_master.LrcView.MAX_SCALING_FACTOR- com.lg.lrcview_master.LrcView.MIN_SCALING_FACTOR)/100;
+						LogUtil.d("MusicApp","scalingFactor:"+scalingFactor+"");
+						mLrcView.setLrcScalingFactor(scalingFactor);
+
+						musicService.playOrPause();
+						mLrcView.setLrcRows(getLrcRows());
+						handler.sendEmptyMessage(0);
+						mPlayBtn.setText("暂停");
+						mPlayBtn.setSelected(true);
+					}
+				},1000);
+			}
+			//musicTotal.setText(time.format(musicService.mediaPlayer.getDuration()));
+		}
+		@Override
+		public void onServiceDisconnected(ComponentName name) {
+			musicService = null;
+		}
+	};
+	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		LogUtil.d(TAG,"OnCreate()");
 		setContentView(R.layout.activity_main_music);
-         
-		
 		initViews();
 		initPlayer();
+		
+		phoneBroadcastReceiver=new PhoneBroadcastReceiver();
+		IntentFilter filter = new IntentFilter();
+		filter.addAction(Intent.ACTION_NEW_OUTGOING_CALL);
+		filter.addAction("android.intent.action.PHONE_STATE");
+		registerReceiver(phoneBroadcastReceiver, filter);
+
 		toolbar=findViewById(R.id.commonToolBar);
 		StatusBarUtil.immersive(this, 0x00000000, 0.0f);
 		setSupportActionBar(toolbar);
 		getSupportActionBar().setDisplayShowTitleEnabled(false);
 		StatusBarUtil.setPaddingSmart(this, toolbar);
-
 		toolbar.setNavigationIcon(R.drawable.back_black);
 		toolbar.setNavigationOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				onBackPressed();
+			   onBackPressed();
 			}
 		});
 	}
+
+	
+
 	private void initViews() {
 		mLrcView = (com.lg.lrcview_master.LrcView) findViewById(R.id.lrcView);
 		mLrcView.setOnSeekToListener(onSeekToListener);
@@ -77,13 +138,6 @@ public class MainMusicActivity extends AppCompatActivity {
 		mLrcSeekBar.setMax(100);
 		//为seekbar设置当前的progress
 		mLrcSeekBar.setOnSeekBarChangeListener(onSeekBarChangeListener);
-		new Handler().postDelayed(new Runnable() {
-			@Override
-			public void run() {
-				float scalingFactor = com.lg.lrcview_master.LrcView.MIN_SCALING_FACTOR + 0*(com.lg.lrcview_master.LrcView.MAX_SCALING_FACTOR- com.lg.lrcview_master.LrcView.MIN_SCALING_FACTOR)/100;
-				mLrcView.setLrcScalingFactor(scalingFactor);
-			}
-		},1000);
 		mPlayBtn = (Button) findViewById(R.id.btnPlay);
 		mPlayerSeekBar.setOnSeekBarChangeListener(onSeekBarChangeListener);
 		mPlayBtn.setOnClickListener(onClickListener);
@@ -91,27 +145,30 @@ public class MainMusicActivity extends AppCompatActivity {
 		
 	}
 
-	@Override
-	protected void onResume() {
-		super.onResume();
-	    
-	}
-
+	
 	private void initPlayer() {
-		mPlayer = MediaPlayer.create(this, R.raw.yingtang);
-		mPlayer.setOnCompletionListener(onCompletionListener);
+//		mPlayer = MediaPlayer.create(this, R.raw.yingtang);
+//		mPlayer.setOnCompletionListener(onCompletionListener);
+		bindServiceConnection();
 	}
 	OnCompletionListener onCompletionListener = new OnCompletionListener() {
 		
 		@Override
 		public void onCompletion(MediaPlayer mp) {
 			mPlayBtn.setText("play");
-			mPlayBtn.setSelected(false);
+			//mPlayBtn.setSelected(false);
 			mLrcView.reset();
 			handler.removeMessages(0);
 			mPlayerSeekBar.setProgress(0);
+
+			musicService.mediaPlayer.start();
+			mLrcView.setLrcRows(getLrcRows());
+			handler.sendEmptyMessage(0);
+			mPlayBtn.setText("暂停");
+			mPlayBtn.setSelected(true);
 		}
 	};
+	
 	OnLrcClickListener onLrcClickListener = new OnLrcClickListener() {
 
 		@Override
@@ -123,14 +180,14 @@ public class MainMusicActivity extends AppCompatActivity {
 
 		@Override
 		public void onSeekTo(int progress) {
-			mPlayer.seekTo(progress);
+			musicService.mediaPlayer.seekTo(progress);
 			
 		}
 	};
 	Handler handler = new Handler(){
 		public void handleMessage(android.os.Message msg) {
-			mPlayerSeekBar.setMax(mPlayer.getDuration());
-			mPlayerSeekBar.setProgress(mPlayer.getCurrentPosition());
+			mPlayerSeekBar.setMax(musicService.mediaPlayer.getDuration());
+			mPlayerSeekBar.setProgress(musicService.mediaPlayer.getCurrentPosition());
 			handler.sendEmptyMessageDelayed(0, 100);
 		};
 	};
@@ -140,20 +197,19 @@ public class MainMusicActivity extends AppCompatActivity {
 		public void onClick(View v) {
 			if(v == mPlayBtn){
 				if("play".equals(mPlayBtn.getText())){
-					mPlayer.start();
+					musicService.playOrPause();
 					mLrcView.setLrcRows(getLrcRows());
 					handler.sendEmptyMessage(0);
 					mPlayBtn.setText("暂停");
 					mPlayBtn.setSelected(true);
 				}else{
-
-					if(mPlayer.isPlaying()){
-						mPlayer.pause();
+					if(musicService.mediaPlayer.isPlaying()){
+						musicService.playOrPause();
 						mPlayBtn.setText("播放");
 						mPlayBtn.setSelected(false);
 					}else{
 						mPlayBtn.setSelected(true);
-						mPlayer.start();
+						musicService.playOrPause();
 						mPlayBtn.setText("暂停");
 					}
 				}
@@ -166,7 +222,7 @@ public class MainMusicActivity extends AppCompatActivity {
 		@Override
 		public void onStopTrackingTouch(SeekBar seekBar) {
 			if(seekBar == mPlayerSeekBar){
-				mPlayer.seekTo(seekBar.getProgress());
+				musicService.mediaPlayer.seekTo(seekBar.getProgress());
 				handler.sendEmptyMessageDelayed(0, 100);
 			}
 		}
@@ -186,7 +242,7 @@ public class MainMusicActivity extends AppCompatActivity {
 //				Log.d("timeStr",mLrcView.getmLrcRows().get(0).getTime()+"");
 				Log.d("timeStrA",progress+"");
 				tv_timeStart.setText(formatTimeFromProgress(progress));
-				tv_timeTotal.setText(formatTimeFromProgress(mPlayer.getDuration()));
+				tv_timeTotal.setText(formatTimeFromProgress(musicService.mediaPlayer.getDuration()));
 				if(fromUser){
 					
 					showPlayerToast(formatTimeFromProgress(progress));
@@ -258,14 +314,57 @@ public class MainMusicActivity extends AppCompatActivity {
 		mLrcToastTv.setText(text);
 		mLrcToast.show();
 	}
+
 	
-	@Override
+		@Override
 	protected void onDestroy() {
 		super.onDestroy();
 		handler.removeMessages(0);
-		mPlayer.stop();
-		mPlayer.release();
-		mPlayer = null;
+		musicService.mediaPlayer.stop();
+		musicService.mediaPlayer.release();
+		musicService.mediaPlayer = null;
 		mLrcView.reset();
 	}
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		if (keyCode == KeyEvent.KEYCODE_BACK) {
+			moveTaskToBack(true);
+			return false;
+		}
+		return super.onKeyDown(keyCode, event);
+	}
+
+
+	class PhoneBroadcastReceiver   extends BroadcastReceiver{
+
+		@Override
+		public void onReceive(Context context, Intent intent) {
+			// 如果是拨打电话
+			if (intent.getAction().equals(Intent.ACTION_NEW_OUTGOING_CALL)) {
+				musicService.playOrPause();
+				//拨打电话会优先,收到此广播. 再收到 android.intent.action.PHONE_STATE 的 TelephonyManager.CALL_STATE_OFFHOOK 状态广播;();
+			} else {
+			
+				// 如果是来电
+				TelephonyManager tManager = (TelephonyManager) context
+						.getSystemService(Service.TELEPHONY_SERVICE);
+				//电话的状态
+				switch (tManager.getCallState()) {
+					case TelephonyManager.CALL_STATE_RINGING:
+						//等待接听状态
+						musicService.playOrPause();
+						break;
+					case TelephonyManager.CALL_STATE_OFFHOOK:
+						//接听状态
+						
+						break;
+					case TelephonyManager.CALL_STATE_IDLE:
+						//挂断状态
+					    musicService.playOrPause();
+						break;
+				}
+			}
+		}
+	}
 }

app_modular/appworks/src/main/res/layout/activity_data_inquiry_search.xml

@@ -31,8 +31,8 @@
 
         <ImageView
             android:id="@+id/data_inquiry_search_voice_iv"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="10dp"
+            android:layout_height="16dp"
             android:layout_alignParentRight="true"
             android:layout_alignRight="@+id/search_edit"
             android:layout_centerVertical="true"