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

# 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/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 @@
-#Fri May 25 11:49:26 CST 2018
-debugName=429
+#Fri May 25 16:01:54 CST 2018
+debugName=438
 versionName=630
-debugCode=429
+debugCode=438
 versionCode=170

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/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/pay/MainMusicActivity.java

@@ -16,6 +16,7 @@ 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;
@@ -81,9 +82,16 @@ public class MainMusicActivity extends AppCompatActivity {
 			@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);
+
+				mPlayer.start();
+				mLrcView.setLrcRows(getLrcRows());
+				handler.sendEmptyMessage(0);
+				mPlayBtn.setText("暂停");
+				mPlayBtn.setSelected(true);
 			}
-		},1000);
+		},3000);
 		mPlayBtn = (Button) findViewById(R.id.btnPlay);
 		mPlayerSeekBar.setOnSeekBarChangeListener(onSeekBarChangeListener);
 		mPlayBtn.setOnClickListener(onClickListener);
@@ -97,19 +105,37 @@ public class MainMusicActivity extends AppCompatActivity {
 	    
 	}
 
+	
+	
+	@Override
+	protected void onPause() {
+		super.onPause();
+		mPlayer.pause();
+		mPlayBtn.setText("播放");
+		mPlayBtn.setSelected(false);
+	}
+
 	private void initPlayer() {
 		mPlayer = MediaPlayer.create(this, R.raw.yingtang);
 		mPlayer.setOnCompletionListener(onCompletionListener);
+		
 	}
 	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);
+
+			mPlayer.start();
+			mLrcView.setLrcRows(getLrcRows());
+			handler.sendEmptyMessage(0);
+			mPlayBtn.setText("暂停");
+			mPlayBtn.setSelected(true);
+			
 		}
 	};
 	OnLrcClickListener onLrcClickListener = new OnLrcClickListener() {