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

WeiChat/build.gradle

@@ -8,7 +8,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/java/com/xzjmyk/pm/activity/CommonWebviewActivity.java

@@ -15,6 +15,7 @@ import android.webkit.WebViewClient;
 import com.xzjmyk.pm.activity.util.DownloadUtil;
 
 /**
+ * 公共网页打开页面
  * Created by RaoMeng on 2016/9/14.
  */
 public class CommonWebviewActivity extends Activity {

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

@@ -215,7 +215,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
                 mHeadPopupWindow = new PopupWindow(headSelectView,
                         LinearLayout.LayoutParams.MATCH_PARENT,
                         LinearLayout.LayoutParams.WRAP_CONTENT);
-                mHeadPopupWindow.setAnimationStyle(R.style.Animation_CustomPopup);
+                mHeadPopupWindow.setAnimationStyle(R.style.MenuAnimationFade);
                 mHeadPopupWindow.setFocusable(true);
                 mHeadPopupWindow.setOutsideTouchable(true);
                 DisplayUtil.backgroundAlpha(this, 0.5f);

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

@@ -46,6 +46,7 @@ public class ErpMenActivity extends BaseActivity {
         menus.add("加班申请");
         menus.add("特殊考勤");
         menus.add("查询与统计");
+        menus.add("春娇和志明");
         adapter = new DetailItemAdapter(this, menus);
         lv_tool.setAdapter(adapter);
 
@@ -108,6 +109,9 @@ public class ErpMenActivity extends BaseActivity {
                 if ("查询与统计".equals(tag)) {
                     falg = 6;
                 }
+                if ("春娇和志明".equals(tag)) {
+                    falg = 7;
+                }
 
                 switch (falg) {
                     case 0:
@@ -181,13 +185,12 @@ public class ErpMenActivity extends BaseActivity {
 
 
     public class DetailItemAdapter extends BaseAdapter {
-        ;
         private Context ct;
         private List<String> menus = new ArrayList<>();
         private LayoutInflater inflater;
 
         public DetailItemAdapter(Context ct, List<String> menus) {
-            ;
+
             this.ct = ct;
             this.menus = menus;
             this.inflater = LayoutInflater.from(ct);

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

@@ -124,8 +124,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener {
                     String result = msg.getData().getString("result");
 
                     try {
-                        Map<Object, Object> keMap = FlexJsonUtil.fromJson(msg.getData()
-                                .getString("result"));
+                        Map<Object, Object> keMap = FlexJsonUtil.fromJson(msg.getData().getString("result"));
 
                         if ((Boolean) keMap.get("success")) {
                             ToastMessage("保存成功！");
@@ -265,7 +264,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener {
                 case Constants.SUCCESS_INITDATA:
                     progressDialog.dismiss();
                     try {
-//						初始化数据
+                    //	初始化数据
                         String jsondata = msg.getData().getString("result");
                         Map<String, Object> map = FlexJsonUtil.fromJson(jsondata);
                         Log.i("jsondata",
@@ -689,8 +688,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener {
      * @注释：提交
      */
     public void httpCommit() {
-        String url = Constants.getAppBaseUrl(ct) +
-                "oa/check/submitVacation.action";
+        String url = Constants.getAppBaseUrl(ct) + "oa/check/submitVacation.action";
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("id", String.valueOf(va_id));
         params.put("caller", "Ask4Leave");

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

@@ -238,13 +238,13 @@ public class SubscribeDetailActivity extends BaseActivity {
             }
         }
         if (mIsApplied != -2){
-            if (mIsApplied == -1){
+//            if (mIsApplied == -1){
                 mApplyButton.setText("－退订");
                 mApplyButton.setEnabled(true);
-            }else if (mIsApplied == 0){
-                mApplyButton.setText("该订阅号不可退订");
-                mApplyButton.setEnabled(false);
-            }
+//            }else if (mIsApplied == 0){
+//                mApplyButton.setText("该订阅号不可退订");
+//                mApplyButton.setEnabled(false);
+//            }
         }
     }
 

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

@@ -206,7 +206,7 @@ public class OutSigninOKActivity extends BaseActivity {
             @Override
             public void onSuccess(ResponseInfo<String> responseInfo) {
                 progressDialog.dismiss();
-                ViewUtil.ToastMessage(ct, "上传成功：");
+                ViewUtil.ToastMessage(ct, "上传成功");
                 JsonValidator validator = new JsonValidator();
                 if (validator.validate(responseInfo.result) && JSON.parseObject(responseInfo.result).getBoolean("success")) {
                     id = getID(JSON.parseObject(responseInfo.result).getString("id"));
@@ -239,15 +239,16 @@ public class OutSigninOKActivity extends BaseActivity {
                         public void onClick(View v) {
                             LayoutInflater inflater = LayoutInflater.from(OutSigninOKActivity.this);
                             final View largeImageView = inflater.inflate(R.layout.layout_large_image, null);
-                            ImageView imageView = (ImageView) largeImageView.findViewById(R.id.large_image_iv);
-                            ImageLoader.getInstance().displayImage(Uri.fromFile(waterBitmapToFile).toString(), imageView);
+                            ImageView photoView = (ImageView) largeImageView.findViewById(R.id.large_image_iv);
+                            ImageLoader.getInstance().displayImage(Uri.fromFile(waterBitmapToFile).toString(), photoView);
+//                            PhotoViewAttacher viewAttacher = new PhotoViewAttacher(photoView,true);
                             final PopupWindow largeImageWindow = new PopupWindow(largeImageView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
                             largeImageWindow.setAnimationStyle(R.style.Animation_CustomPopup);
                             largeImageWindow.setFocusable(true);
                             largeImageWindow.setOutsideTouchable(true);
                             largeImageWindow.showAtLocation(View.inflate(OutSigninOKActivity.this, R.layout.activity_out_signin_ok, null), Gravity.CENTER, 0, 0);
 
-                            imageView.setOnClickListener(new View.OnClickListener() {
+                            photoView.setOnClickListener(new View.OnClickListener() {
                                 @Override
                                 public void onClick(View v) {
                                     if (largeImageWindow.isShowing()) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SubscriptionAllFragment.java

@@ -260,7 +260,6 @@ public class SubscriptionAllFragment extends BaseFragment implements RadioGroup.
                 mSubscriptionNumbers.get(mClickedPos - 1).setStatus(statu);
                 mAllSubscriptionAdapter.notifyDataSetChanged();
             }
-
         }
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SubscriptionMyFragment.java

@@ -90,9 +90,9 @@ public class SubscriptionMyFragment extends BaseFragment {
                 Intent intent = new Intent();
                 intent.setClass(getActivity(), SubscribeDetailActivity.class);
                 intent.putExtra("flag", "my");
-                intent.putExtra("subId", mPersonalSubscriptionBeans.get(position).getNUM_ID());
-                intent.putExtra("subTitle", mPersonalSubscriptionBeans.get(position).getTITLE());
-                intent.putExtra("isApplied", mPersonalSubscriptionBeans.get(position).getISAPPLED());
+                intent.putExtra("subId", mPersonalSubscriptionBeans.get(position - 1).getNUM_ID());
+                intent.putExtra("subTitle", mPersonalSubscriptionBeans.get(position - 1).getTITLE());
+                intent.putExtra("isApplied", mPersonalSubscriptionBeans.get(position - 1).getISAPPLED());
                 startActivityForResult(intent, SUBSCRIBE_MY_DETAIL_REQUEST);
             }
         });

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/ImageUtil.java

@@ -217,7 +217,6 @@ public class ImageUtil {
     public final static File compressWaterBitmapToFile(String filePath, int quality,int reqsW, int reqsH, String time, String address, int alpha) {
         Bitmap bitmap=compressBitmapWithFilePath(filePath,reqsW,reqsH);
         try {
-            // ByteArrayOutputStream baos = new ByteArrayOutputStream();//放入内存
             Paint paint = new Paint();
             paint.setTextSize(16);
             paint.setAlpha(alpha);

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

@@ -73,7 +73,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/addr_img"
-            android:layout_below="@id/addr_img"
+            android:layout_below="@id/addr"
             android:layout_marginTop="5dp"
             android:src="@drawable/icon_answer" />