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

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('C:/Users/FANGlh/Desktop/UUAPP/applicationsignname[20150409]')
+            storeFile file('D:/config/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

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

@@ -69,15 +69,16 @@ public class MissionActivity extends BaseActivity implements View.OnClickListene
         @Override
         public void onReceive(Context context, Intent intent) {
             locationOk = MyApplication.getInstance().getBdLocationHelper().locationOk();
-            if (locationOk && adapter != null && !ListUtils.isEmpty(adapter.getModels())) {
-                for (int i = 0; i < adapter.getModels().size(); i++) {
-                    if (adapter.getModels().get(i).getStatus() != 1) {
-                        adapter.getModels().get(i).setRecorddate(TimeUtils.f_long_2_str(System.currentTimeMillis()));
-                        adapter.getModels().get(i).setLocation(MyApplication.getInstance().getBdLocationHelper().getName());
-                        adapter.notifyItemChanged(i);
-                    }
-                }
-            }
+            //TODO 发布版本先关闭
+//            if (locationOk && adapter != null && !ListUtils.isEmpty(adapter.getModels())) {
+//                for (int i = 0; i < adapter.getModels().size(); i++) {
+//                    if (adapter.getModels().get(i).getStatus() != 1) {
+//                        adapter.getModels().get(i).setRecorddate(TimeUtils.f_long_2_str(System.currentTimeMillis()));
+//                        adapter.getModels().get(i).setLocation(MyApplication.getInstance().getBdLocationHelper().getName());
+//                        adapter.notifyItemChanged(i);
+//                    }
+//                }
+//            }
         }
     };
 
@@ -413,14 +414,11 @@ public class MissionActivity extends BaseActivity implements View.OnClickListene
             }
         });
         popupWindow = new PopupWindow(contentView, w_screen, h_screen, true);
-        popupWindow.setTouchable(true);
         // 如果不设置PopupWindow的背景，无论是点击外部区域还是Back键都无法dismiss弹框
-        // 我觉得这里是API的一个bug
         popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_main));
-
         // 设置好参数之后再show
         popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
-        setbg(0.7f);
+        setbg(0.4f);
     }
 
     private void setbg(float alpha) {

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

@@ -34,7 +34,9 @@
             android:layout_height="wrap_content"
             android:background="@null"
             android:ellipsize="end"
-            android:maxLines="2" />
+            android:maxLines="2"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
     </LinearLayout>
 
     <TextView