Browse Source

代码冲突

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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
#	app_core/common/src/main/java/com/common/data/StringUtil.java
Arison 8 years ago
parent
commit
72ffcf7abd

+ 4 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingAddActivity.java

@@ -41,10 +41,10 @@ import com.core.widget.view.selectcalendar.SelectCalendarActivity;
 import com.core.widget.view.selectcalendar.bean.DataState;
 import com.core.xmpp.model.AddAttentionResult;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.modular.booking.model.BookingModel;
 import com.uas.appcontact.model.contacts.ContactsModel;
 import com.uas.appcontact.ui.activity.ContactsActivity;
 import com.xzjmyk.pm.activity.R;
-import com.modular.booking.model.BookingModel;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;
@@ -573,6 +573,9 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
         };
         MyApplication.getInstance().getFastVolley().addDefaultRequest("Volley", request);
     }
+
+
+   
 }
 
 

+ 54 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingDetailActivity.java

@@ -20,6 +20,7 @@ import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.AdapterView;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
@@ -46,6 +47,7 @@ import com.core.model.SelectCollisionTurnBean;
 import com.core.model.SelectEmUser;
 import com.core.model.XmppMessage;
 import com.core.net.http.ViewUtil;
+import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.core.xmpp.CoreService;
 import com.core.xmpp.ListenerManager;
@@ -53,6 +55,7 @@ import com.core.xmpp.dao.ChatMessageDao;
 import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.listener.ChatMessageListener;
 import com.core.xmpp.model.ChatMessage;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.modular.booking.model.BookingModel;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;
@@ -536,18 +539,23 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
                         case 2:
                          //ab_reason  工作繁忙
                             map="{\"ab_confirmstatus\":\"已拒绝\",\"ab_reason\":\"工作繁忙\",\"ab_bmanid\":\""+model.getAb_bmanid()+"\"}";
+                            showLoading();
+                            updateBooking(map);
                             break;
                         case 3:
                             //ab_reason  没有必要
                             map="{\"ab_confirmstatus\":\"已拒绝\",\"ab_reason\":\"没有必要\",\"ab_bmanid\":\""+model.getAb_bmanid()+"\"}";
+                            showLoading();
+                            updateBooking(map);
                             break;
                         case 4:
                             //ab_reason  其它
-                            map="{\"ab_confirmstatus\":\"已拒绝\",\"ab_reason\":\"其它\",\"ab_bmanid\":\""+model.getAb_bmanid()+"\"}";
+                        
+                            showEditerDialog();
                             break;
                     }
-                    showLoading();
-                    updateBooking(map);
+                  ;
+           
                     
                 }
             });
@@ -581,4 +589,47 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
         }
         return list;
     }
+
+    private void showEditerDialog( ) {
+        final PopupWindow window = new PopupWindow(ct);
+        View view = LayoutInflater.from(ct).inflate(com.modular.booking.R.layout.item_select_remark_pop, null);
+        window.setContentView(view);
+        TextView title = (TextView) view.findViewById(com.modular.booking.R.id.title_tv);
+        TextView company_tag = (TextView) view.findViewById(com.modular.booking.R.id.company_tag);
+        title.setText("请输入拒绝理由!");
+        company_tag.setText("");
+        final EditText company_et = (EditText) view.findViewById(com.modular.booking.R.id.company_et);
+        view.findViewById(com.modular.booking.R.id.ok_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String message = company_et.getText().toString();
+                if (StringUtil.isEmpty(message))
+                    ToastUtil.showToast(ct, com.modular.booking.R.string.sure_input_valid);
+                else {
+                    String  map="{\"ab_confirmstatus\":\"已拒绝\",\"ab_reason\":\""+message+"\",\"ab_bmanid\":\""+model.getAb_bmanid()+"\"}";
+                    showLoading();
+                    updateBooking(map);
+                }
+            }
+        });
+        view.findViewById(com.modular.booking.R.id.not_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                window.dismiss();
+            }
+        });
+        window.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                DisplayUtil.backgroundAlpha(BookingDetailActivity.this, 1f);
+            }
+        });
+        window.setBackgroundDrawable(ct.getResources().getDrawable(com.modular.booking.R.drawable.pop_round_bg));
+        window.setTouchable(true);
+        window.setOutsideTouchable(false);
+        window.setFocusable(true);
+        PopupWindowHelper.setPopupWindowHW(this, window);
+        window.showAtLocation(view, Gravity.CENTER, 0, 0);
+        DisplayUtil.backgroundAlpha(this, 0.4f);
+    }
 }

+ 2 - 0
app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -431,6 +431,8 @@ public class ViewUtil {
             CommonUtil.setSharedPreferences(ct, "erp_master", erp_master);
             CommonUtil.setSharedPreferences(ct, "erp_commpany", erp_company);
             CommonUtil.setSharedPreferences(ct, "erp_uu", String.valueOf(dataMap.get("uu")));
+            LogUtil.d("ERPLOGIN","erp_uu1:"+String.valueOf(dataMap.get("uu")));
+            LogUtil.d("ERPLOGIN","erp_uu2:"+CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
             CommonUtil.setSharedPreferences(ct, "erp_masterId", erp_masterId);
             CommonUtil.setSharedPreferences(ct, "erp_login", true);
             CommonUtil.setSharedPreferences(ct, "erp_emname", String.valueOf(dataMap.get("emname")));

+ 1 - 0
app_core/common/src/main/res/layout/activity_book_add.xml

@@ -126,6 +126,7 @@
             android:paddingLeft="15dp"
             android:paddingRight="15dp"
             android:paddingTop="5dp"
+            android:layout_marginBottom="10dp"
             android:scrollbars="none"
             android:verticalSpacing="10dp"/>
 

+ 2 - 1
app_modular/appbooking/build.gradle

@@ -25,7 +25,8 @@ dependencies {
 
     compile project(':common')
     compile project(':appcontact')
-
+ 
 
     compile 'com.android.support.constraint:constraint-layout:+'
+    compile project(path: ':apputils')
 }

+ 51 - 6
app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingDetailActivity.java

@@ -18,6 +18,7 @@ import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.AdapterView;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
@@ -46,6 +47,7 @@ import com.core.model.OAConfig;
 import com.core.model.SelectCollisionTurnBean;
 import com.core.model.SelectEmUser;
 import com.core.model.XmppMessage;
+import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.core.widget.CustomerScrollView;
 import com.core.widget.MyListView;
@@ -59,6 +61,7 @@ import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.modular.booking.R;
 import com.modular.booking.adapter.ItemListTypeAdapter;
 import com.modular.booking.model.BookingModel;
@@ -607,26 +610,25 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
                     String action="已拒绝";
                     switch (position) {
                         case 1:
-
                             break;
                         case 2:
                             map="{\"ad_confirmstatus\":\""+action+"\",\"ad_reason\":\"工作繁忙\",\"ad_bmanid\":\""+MyApplication.getInstance().getLoginUserId()+"\",\"ad_sharestatus\":\"" +"未共享"+ "\"}";
                             //ab_reason  工作繁忙
-                         
+                            actionOrder(model.getAb_id(),map);
                             break;
                         case 3:
                             //ab_reason  没有必要
-                     
                             map="{\"ad_confirmstatus\":\""+action+"\",\"ad_reason\":\"沒有必要\",\"ad_bmanid\":\""+MyApplication.getInstance().getLoginUserId()+"\",\"ad_sharestatus\":\"" +"未共享"+ "\"}";
+                            actionOrder(model.getAb_id(),map);
                             break;
                         case 4:
                             //ab_reason  其它
-                    
-                            map="{\"ad_confirmstatus\":\""+action+"\",\"ad_reason\":\"其它\",\"ad_bmanid\":\""+MyApplication.getInstance().getLoginUserId()+"\",\"ad_sharestatus\":\"" +"未共享"+ "\"}";
+                            popupWindow.dismiss();
+                            showEditerDialog(model.getAb_id());
                             break;
                     }
                      popupWindow.dismiss();
-                    actionOrder(model.getAb_id(),map);
+                  
                 }
             });
 
@@ -661,6 +663,49 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
     }
 
 
+
+    private void showEditerDialog(final String id ) {
+        final PopupWindow window = new PopupWindow(ct);
+        View view = LayoutInflater.from(ct).inflate(R.layout.item_select_remark_pop, null);
+        window.setContentView(view);
+        TextView title = (TextView) view.findViewById(R.id.title_tv);
+        TextView company_tag = (TextView) view.findViewById(R.id.company_tag);
+        title.setText("请输入拒绝理由!");
+        company_tag.setText("");
+        final EditText company_et = (EditText) view.findViewById(R.id.company_et);
+        view.findViewById(R.id.ok_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String message = company_et.getText().toString();
+                if (StringUtil.isEmpty(message))
+                    ToastUtil.showToast(ct, R.string.sure_input_valid);
+                else {
+                  String   map="{\"ad_confirmstatus\":\""+"已拒绝"+"\",\"ad_reason\":\""+message+"\",\"ad_bmanid\":\""+MyApplication.getInstance().getLoginUserId()+"\",\"ad_sharestatus\":\"" +"未共享"+ "\"}";
+                  actionOrder(id,map);
+                }
+            }
+        });
+        view.findViewById(R.id.not_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                window.dismiss();
+            }
+        });
+        window.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                DisplayUtil.backgroundAlpha(BBookingDetailActivity.this, 1f);
+            }
+        });
+        window.setBackgroundDrawable(ct.getResources().getDrawable(R.drawable.pop_round_bg));
+        window.setTouchable(true);
+        window.setOutsideTouchable(false);
+        window.setFocusable(true);
+        PopupWindowHelper.setPopupWindowHW(this, window);
+        window.showAtLocation(view, Gravity.CENTER, 0, 0);
+        DisplayUtil.backgroundAlpha(this, 0.4f);
+    }
+    
     private void sendMessage( final String ownerId,String ownerName, final String objectId,  final String text) {
         ChatMessage message = new ChatMessage();
         message.setType(XmppMessage.TYPE_TEXT);

+ 68 - 13
app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceAddActivity.java

@@ -9,10 +9,15 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.android.volley.AuthFailureError;
+import com.android.volley.Request;
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
 import com.common.LogUtil;
 import com.common.config.BaseConfig;
 import com.common.data.DateFormatUtil;
@@ -24,11 +29,14 @@ import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
 import com.core.model.SelectBean;
 import com.core.net.utils.NetUtils;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.StringJsonObjectRequest;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.selectcalendar.SelectCalendarActivity;
+import com.core.xmpp.model.AddAttentionResult;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
@@ -578,7 +586,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         }
         submiting = true;
         progressDialog.show();
-        Map<String, Object> map = getServiceMap();
+        final Map<String, Object> map = getServiceMap();
         if (map == null) {
             LogUtil.i("map == null");
             submiting = false;
@@ -607,19 +615,25 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         .build(), new ResultSubscriber<>(new ResultListener<Object>() {
                     @Override
                     public void onResponse(Object o) {
-                        LogUtil.d("result", "result:" + o.toString());
-                        progressDialog.dismiss();
-                        submiting = true;
-                        //{"result":"true"}
-                        if (JSONUtil.validate(o.toString())) {
-                            String result = JSON.parseObject(o.toString()).getString("result");
-                            if ("true".equals(result)) {
-                                Intent intent = new Intent("com.modular.booking.BookingListActivity");
-                                intent.putExtra("curDate", startTime == null ? "" : startTime);
-                                startActivity(intent);
-                            } else {
-                                ToastMessage(getString(R.string.save_failed));
+                        try {
+                            LogUtil.d("result", "result:" + o.toString());
+                            progressDialog.dismiss();
+                            submiting = true;
+                            //{"result":"true"}
+                            if (JSONUtil.validate(o.toString())) {
+                                String result = JSON.parseObject(o.toString()).getString("result");
+                                if ("true".equals(result)) {
+                                    //发送短信
+                                    invite(map.get("sb_telephone").toString(), "8636ba7f-a1b4-4062-8571-782035101167");
+                                    Intent intent = new Intent("com.modular.booking.BookingListActivity");
+                                    intent.putExtra("curDate", startTime == null ? "" : startTime);
+                                    startActivity(intent);
+                                } else {
+                                    ToastMessage(getString(R.string.save_failed));
+                                }
                             }
+                        } catch (Exception e) {
+                            e.printStackTrace();
                         }
 
                     }
@@ -1049,4 +1063,45 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
 
         }
     }
+
+
+    private void invite(String user, final String modeid) {
+        final String name = CommonUtil.getName();
+        final String phone = user.trim().replaceAll(" ", "");
+        if (!StringUtil.isMobileNumber(phone)) {
+            showToast("选择人员电话号码为空或是格式不正确", R.color.load_submit);
+            return;
+        }
+        StringJsonObjectRequest<AddAttentionResult> request = new StringJsonObjectRequest<AddAttentionResult>(
+                Request.Method.POST, "http://message.ubtob.com/sms/send", new Response.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError arg0) {
+                dimssLoading();
+            }
+        }, new StringJsonObjectRequest.Listener<AddAttentionResult>() {
+            @Override
+            public void onResponse(ObjectResult<AddAttentionResult> result) {
+              //  showToast("短信发送成功", R.color.load_submit);
+                //ToastUtil.showToast(MyApplication.getInstance(),"短信发送成功");
+                Toast.makeText(MyApplication.getInstance(),"短信发送成功",Toast.LENGTH_SHORT).show();
+
+            }
+        }, AddAttentionResult.class, null) {
+            @Override
+            public byte[] getBody() throws AuthFailureError {
+                String param = "{\"receiver\":\"" + phone + "\",\"params\":[\"" + name + "\"],\"templateId\":\"" + modeid + "\"}";
+                LogUtil.i("param=" + param);
+                return param.getBytes();
+            }
+
+            @Override
+            public Map<String, String> getHeaders() {
+                HashMap<String, String> headers = new HashMap<String, String>();
+                headers.put("Accept", "application/json");
+                headers.put("Content-Type", "application/json; charset=UTF-8");
+                return headers;
+            }
+        };
+        MyApplication.getInstance().getFastVolley().addDefaultRequest("Volley", request);
+    }
 }