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

# Conflicts:
#	WeiChat/version.properties
#	app_core/common/src/main/java/com/core/net/http/ViewUtil.java

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -494,12 +494,6 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
                 break;
             case R.id.rl_master_change:
                 if (!platform) {
-                    if (DialogUtils.isDialogShowing(ViewUtil.popupWindow)){
-                        ViewUtil.popupWindow.dismiss();
-                    }
-                    if (DialogUtils.isDialogShowing(popupWindow)){
-                        popupWindow.dismiss();
-                    }
                     changeMaster();
                 }
                 break;
@@ -575,11 +569,6 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
 
     //切换账套
     public void changeMaster() {
-//        if (ViewUtil.mdProcessDialog!=null&&!ViewUtil.mdProcessDialog.isShowing()){
-//            ViewUtil.mdProcessDialog.setContent("加载数据中...");
-//            ViewUtil.mdProcessDialog.getBuilder().autoDismiss(false);
-//            ViewUtil.mdProcessDialog.show();
-//        }
         if (StringUtil.isEmpty(CommonUtil.getSharedPreferences(ct, "erp_masterlist"))) {
             String url = com.core.utils.CommonUtil.getAppBaseUrl(ct) + "mobile/getAllMasters.action";
             Map<String, Object> params = new HashMap<>();
@@ -719,6 +708,13 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
 
     public void showPopDialog(final Activity ct, List<ItemsSelectType1> itemsSelectType1s) {
         View view = null;
+        if (DialogUtils.isDialogShowing(ViewUtil.popupWindow)){
+            ViewUtil.popupWindow.dismiss();
+        }
+        if (DialogUtils.isDialogShowing(popupWindow)){
+            popupWindow.dismiss();
+            popupWindow = null;
+        }
         popupWindow = null;
         WindowManager windowManager = (WindowManager) ct.getSystemService(Context.WINDOW_SERVICE);
         if (popupWindow == null) {

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri May 25 08:41:54 CST 2018
-debugName=409
+#Fri May 25 10:12:37 CST 2018
+debugName=419
 versionName=630
-debugCode=409
+debugCode=419
 versionCode=170

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -707,6 +707,7 @@ public class ViewUtil {
 //                    select = 0;
 //                }
                 LogUtil.d("AppInfo","phone:"+phone+"password:"+password);
+                
                 showPopDialog((Activity) ct,itemsSelectType1s,phone,password);
 //                loginERPDialog = new MaterialDialog.Builder(ct)
 //                        .title(ct.getString(R.string.user_dialog_company))
@@ -740,6 +741,7 @@ public class ViewUtil {
             popupWindow.dismiss();
             popupWindow=null;
         }
+        popupWindow=null;
         WindowManager windowManager = (WindowManager)ct. getSystemService(Context.WINDOW_SERVICE);
         if (popupWindow == null) {
             LayoutInflater layoutInflater = (LayoutInflater) ct.getSystemService(Context.LAYOUT_INFLATER_SERVICE);

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

@@ -12,6 +12,8 @@ import android.view.View;
 import android.view.ViewConfiguration;
 import android.widget.Scroller;
 
+import com.scwang.smartrefresh.layout.util.DensityUtil;
+
 import java.util.List;
 
 /***
@@ -35,12 +37,12 @@ public class LrcView extends View implements ILrcView {
 	/**无歌词数据的时候 显示的默认文字**/
 	private static final String DEFAULT_TEXT = "智慧英唐，全球共享";
 	/**默认文字的字体大小**/
-	private static final float SIZE_FOR_DEFAULT_TEXT = 60;
+	private static final float SIZE_FOR_DEFAULT_TEXT = DensityUtil.dp2px(18);
 
 	/**画高亮歌词的画笔***/
 	private Paint mPaintForHighLightLrc;
 	/**高亮歌词的默认字体大小***/
-	private static final float DEFAULT_SIZE_FOR_HIGHT_LIGHT_LRC = 37;
+	private static final float DEFAULT_SIZE_FOR_HIGHT_LIGHT_LRC =  DensityUtil.dp2px(15);
 	/**高亮歌词当前的字体大小***/
 	private float mCurSizeForHightLightLrc = DEFAULT_SIZE_FOR_HIGHT_LIGHT_LRC;
 	/**高亮歌词的默认字体颜色**/
@@ -51,7 +53,7 @@ public class LrcView extends View implements ILrcView {
 	/**画其他歌词的画笔***/
 	private Paint mPaintForOtherLrc;
 	/**其他歌词的默认字体大小***/
-	private static final float DEFAULT_SIZE_FOR_OTHER_LRC = 32;
+	private static final float DEFAULT_SIZE_FOR_OTHER_LRC =DensityUtil.dp2px(13);
 	/**其他歌词当前的字体大小***/
 	private float mCurSizeForOtherLrc = DEFAULT_SIZE_FOR_OTHER_LRC;
 	/**高亮歌词的默认字体颜色**/
@@ -65,7 +67,7 @@ public class LrcView extends View implements ILrcView {
 	/***时间线的颜色**/
 	private static final int COLOR_FOR_TIME_LINE = 0xffD02090;
 	/**时间文字大小**/
-	private static final int SIZE_FOR_TIME = 18;
+	private static final int SIZE_FOR_TIME = DensityUtil.dp2px(13);
 	/**是否画时间线**/
 	private boolean mIsDrawTimeLine = false;