Browse Source

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

Bitliker 9 years ago
parent
commit
e3d92bfdce

+ 25 - 7
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/SelectCalendarActivity.java

@@ -10,6 +10,7 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -240,11 +241,21 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                 v_date_start.setText(startDate.substring(0, startDate.length() - 3));
                 v_date_end.setText(endDate.substring(0, endDate.length() - 3));
                 currentSelectDate = startDate.substring(0, 10);
+                Log.v("startDate1",startDate);
+                Log.v("endDate1",endDate);
+                Log.v("v_date_start1",v_date_start.getText().toString());
+                Log.v("v_date_end1",v_date_end.getText().toString());
+                Log.d("currentSelectDate1",currentSelectDate);
             }else{
                 String currentDate = TimeUtils.long_to_yMdHm_str(System.currentTimeMillis());
-                v_date_start.setText(currentDate.substring(0,currentDate.length() - 3));
-                v_date_end.setText(currentDate.substring(0,currentDate.length() - 3));
-                currentSelectDate = currentDate.substring(0,10);
+                v_date_start.setText(currentDate.substring(0,currentDate.length() ));
+                v_date_end.setText(currentDate.substring(0,currentDate.length()));
+                currentSelectDate = currentDate.substring(0, 10);
+                Log.v("startDate2", currentDate);
+                Log.v("endDate2",currentDate);
+                Log.v("v_date_start2", v_date_start.getText().toString());
+                Log.v("v_date_end2", v_date_end.getText().toString());
+                Log.d("currentSelectDate2",currentSelectDate);
             }
         }
         initListener();
@@ -302,14 +313,16 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                         //切换到开始时间
                         swichDateButton(false);//要不要清楚日历状态?
                         startDate = false;
-                        if (!StringUtils.isEmpty(v_date_end.getText().toString())) {
-                            currentSelectDate = v_date_end.getText().toString().substring(0, 10);//清空
+                        if (!StringUtils.isEmpty(v_date_start.getText().toString())) {
+                            currentSelectDate = v_date_start.getText().toString().substring(0, 10);//清空
+                            Log.d("currentSelectDate3",currentSelectDate);
                         } else {
-                            currentSelectDate = null;//清空  
+                            currentSelectDate = null;//清空
                         }
                         v_date_end.setText(v_date_start.getText().toString());
                     } else {
                         //结束时间
+                        Log.d("currentSelectDate4",currentSelectDate);
                         v_date_end.setText(currentSelectDate + " " + modle.tv_text.getText().toString());
                     }
 
@@ -367,15 +380,20 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
         int day = c.get(Calendar.DAY_OF_MONTH);
         String m = "";
         String d = "";
-
         if (month < 10){
             m = "0" + month;
+        }else {
+            m = month+"";
         }
         if (day < 10){
             d = "0" + day;
+        }else {
+            d = day+"";
         }
         if (startDate){
             v_date_start.setText(yeas + "-" + m + "-" + d );
+            Log.d("Slide_date", yeas + "-" + month + "-" + day);
+            Log.d("Slide_date1",yeas+"-"+m+"-"+d);
         }else {
             v_date_end.setText(yeas + "-" + m + "-" + d );
         }

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/MsgsSecondCommonActivity.java

@@ -479,7 +479,7 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
                     imageurl = R.drawable.home_image_03_u;
                     break;
                 case "common": // 普通知会
-                    imageurl = R.drawable.shenpizhihui;
+                    imageurl = R.drawable.putongzhihui;
                     break;
                 case "b2b": // b2b提醒
                     imageurl = R.drawable.b2btixing;
@@ -500,13 +500,13 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
                     imageurl = R.drawable.jihetixing;
                     break;
                 case "system": // 知会消息
-                    imageurl = R.drawable.shenpizhihui;
+                    imageurl = R.drawable.zhihuixiaoxi;
                     break;
                 case "task": // 任务提醒
                     imageurl = R.drawable.home_image_02_u;
                     break;
                 default:
-                    imageurl = R.drawable.shenpizhihui;
+                    imageurl = R.drawable.gongzuotixing;
             }
 
             viewHolder.msgs_img.setImageResource(imageurl);

+ 4 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/MessageAdapter.java

@@ -130,7 +130,7 @@ public class MessageAdapter extends BaseAdapter {
                     imageurl = R.drawable.home_image_03_u;
                     break;
                 case "common": // 普通知会
-                    imageurl = R.drawable.shenpizhihui;
+                    imageurl = R.drawable.putongzhihui;
                     break;
                 case "b2b": // b2b提醒
                     imageurl = R.drawable.b2btixing;
@@ -151,11 +151,13 @@ public class MessageAdapter extends BaseAdapter {
                     imageurl = R.drawable.jihetixing;
                     break;
                 case "system": // 知会消息
-                    imageurl = R.drawable.shenpizhihui;
+                    imageurl = R.drawable.zhihuixiaoxi;
                     break;
                 case "task": // 任务提醒
                     imageurl = R.drawable.home_image_02_u;
                     break;
+                default:
+                    imageurl = R.drawable.gongzuotixing;
             }holder.avatar_img.setImageResource(imageurl);
         }
     }

+ 90 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/OfficeAddressSettingsActivity.java

@@ -1,18 +1,27 @@
 package com.xzjmyk.pm.activity.ui.me;
 
+import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v7.app.AlertDialog;
+import android.text.Editable;
+import android.text.Selection;
 import android.text.TextUtils;
+import android.util.DisplayMetrics;
 import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.BaseAdapter;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -33,6 +42,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
@@ -326,6 +336,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity {
         } catch (Exception e) {
             e.printStackTrace();
         }
+        progressDialog.dismiss();
     }
 
     private void doShowSignAddress(String get_sign_address_result) {
@@ -386,6 +397,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity {
         } catch (JSONException e) {
             e.printStackTrace();
         }
+        progressDialog.dismiss();
     }
 
     private void clickEvent() {
@@ -558,16 +570,90 @@ public class OfficeAddressSettingsActivity extends BaseActivity {
             if (poi == null) return;
             // 将每次点击地址返回的值add到自定义列表中,
             address_lv.setVisibility(View.VISIBLE);
-            address_names.add(poi.name);
             address_location.add(poi.address);
             address_latitud.add(String.valueOf(poi.location.latitude));
             address_longitude.add(String.valueOf(poi.location.longitude));
             LogUtil.prinlnLongMsg("getpoi", JSON.toJSONString(poi));
+
+            doEditShortName(poi); //编辑地址简称
         }
-        myadapter.setAddress_names(address_names);
-        myadapter.notifyDataSetChanged();
     }
-
+    private PopupWindow popupWindow = null;
+    private void doEditShortName(final PoiInfo poi) {
+        // 一个自定义的布局,作为显示的内容
+        View contentView = LayoutInflater.from(ct).inflate(
+                R.layout.item_select_aim_pop, null);
+
+        // 设置按钮的点击事件
+        final EditText company_et = (EditText) contentView.findViewById(R.id.company_et);
+        TextView address_tv = (TextView) contentView.findViewById(R.id.address_tv);
+        company_et.setText(poi.name);
+        address_tv.setText("详细地址: " + poi.address);
+        Editable etext = company_et.getText();
+        Selection.setSelection(etext, etext.length());
+        DisplayMetrics dm = getResources().getDisplayMetrics();
+        int w_screen = dm.widthPixels;
+        int h_screen = dm.heightPixels;
+        w_screen = DisplayUtil.dip2px(this, 300);
+        h_screen = DisplayUtil.dip2px(this, 185);
+        contentView.findViewById(R.id.goto_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                address_names.add(poi.name);
+                myadapter.setAddress_names(address_names);
+                myadapter.notifyDataSetChanged();
+                popupWindow.dismiss();
+            }
+        });
+        contentView.findViewById(R.id.sure_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String com = company_et.getText().toString();
+                if (!StringUtils.isEmpty(com)) {
+                    address_names.add(com);
+                }else {
+                    address_names.add(poi.name);
+                }
+                myadapter.setAddress_names(address_names);
+                myadapter.notifyDataSetChanged();
+                popupWindow.dismiss();
+            }
+        });
+        popupWindow = new PopupWindow(contentView, w_screen, h_screen, true);
+        popupWindow.setTouchable(true);
+        popupWindow.setOutsideTouchable(false);
+        // 如果不设置PopupWindow的背景,无论是点击外部区域还是Back键都无法dismiss弹框
+//        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_main));
+        // 设置好参数之后再show
+        popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
+        setbg(0.4f);
+    }
+    private void setbg(float alpha) {
+        setBackgroundAlpha(this, alpha);
+        if (popupWindow == null) return;
+        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                setBackgroundAlpha(OfficeAddressSettingsActivity.this, 1f);
+            }
+        });
+    }
+    /**
+     * 设置页面的透明度
+     * 兼容华为手机(在个别华为手机上 设置透明度会不成功)
+     *
+     * @param bgAlpha 透明度   1表示不透明
+     */
+    public void setBackgroundAlpha(Activity activity, float bgAlpha) {
+        WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
+        lp.alpha = bgAlpha;
+        if (bgAlpha == 1) {
+            activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);//不移除该Flag的话,在有视频的页面上的视频会出现黑屏的bug
+        } else {
+            activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);//此行代码主要是解决在华为手机上半透明效果无效的bug
+        }
+        activity.getWindow().setAttributes(lp);
+    }
     //地点显示列表适配器
     public class OfficeAddressAdapter extends BaseAdapter {
         private OfficeAddressBean mOfficeAddressBean;

+ 6 - 6
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SignSeniorSettingActivity.java

@@ -119,9 +119,11 @@ public class SignSeniorSettingActivity extends BaseActivity implements View.OnCl
                         if (JSON.parseObject(auto_sign_result).getBoolean("success")){
                             if (auto_sign == 1) {
                                 ToastMessage("已设置自动打卡");
+                                auto_sign_sw.setChecked(true);
                                 AutoMemoryUtil.autosign = true;
-                            }else {
+                            } else {
                                 ToastMessage("您已关闭自动打卡,系统无法将帮您自动打卡");
+                                auto_sign_sw.setChecked(false);
                                 AutoMemoryUtil.autosign = false;
 
                             }
@@ -144,7 +146,7 @@ public class SignSeniorSettingActivity extends BaseActivity implements View.OnCl
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))){
                             String result = msg.getData().getString("result");
                             LogUtil.prinlnLongMsg("save_plat_senior_time",result);
-                           Toast.makeText(getApplicationContext(),"平台考勤时间设置成功",Toast.LENGTH_LONG).show();
+                            Toast.makeText(getApplicationContext(),"平台考勤时间设置成功",Toast.LENGTH_LONG).show();
                         }
                         progressDialog.dismiss();
                         save_btn.setEnabled(true);
@@ -368,22 +370,20 @@ public class SignSeniorSettingActivity extends BaseActivity implements View.OnCl
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             if (!platform){
+                                auto_sign = 0;
                                 doAutoSignSetting();
                             }else {
                                 ToastMessage("您已关闭自动打卡,系统无法将帮您自动打卡");
                             }
-                            auto_sign = 0;
-                            auto_sign_sw.setChecked(false);
                         }
                     }).show();
         } else if (auto_sign == 0) {
             if (!platform){
+                auto_sign = 1;
                 doAutoSignSetting();
             }else {
                 ToastMessage("已设置自动打卡");
             }
-            auto_sign = 1;
-            auto_sign_sw.setChecked(true);
         }
     }
 

BIN
WeiChat/src/main/res/drawable-hdpi/gongzuotixing.png


BIN
WeiChat/src/main/res/drawable-hdpi/putongzhihui.png


BIN
WeiChat/src/main/res/drawable-hdpi/zhihuixiaoxi.png


BIN
WeiChat/src/main/res/drawable-xhdpi/gongzuotixing.png


BIN
WeiChat/src/main/res/drawable-xhdpi/putongzhihui.png


BIN
WeiChat/src/main/res/drawable-xhdpi/zhihuixiaoxi.png


BIN
WeiChat/src/main/res/drawable-xxhdpi/gongzuotixing.png


BIN
WeiChat/src/main/res/drawable-xxhdpi/putongzhihui.png


BIN
WeiChat/src/main/res/drawable-xxhdpi/zhihuixiaoxi.png