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

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

@@ -29,17 +29,15 @@
             android:background="@color/button_invalid"/>
         <TextView
             android:id="@+id/send_qzone_video"
-            style="@style/commonPopItem"
+            style="@style/commonPopSingleItem"
             android:text="@string/qzone_send_video"
             />
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="10dp"
-            android:background="@color/black_gray"/>
-        <TextView
-            android:id="@+id/send_qzone_cancel"
-            style="@style/commonPopCancelItem"
-            android:text="@string/common_cancel"
-            />
+
     </LinearLayout>
+
+    <TextView
+        android:id="@+id/send_qzone_cancel"
+        style="@style/commonPopCancelItem"
+        android:text="@string/common_cancel"
+        />
 </LinearLayout>

app_core/common/src/main/res/layout/action_data_inquiry_list.xml

@@ -47,8 +47,8 @@
 
         <ImageView
             android:id="@+id/data_inquiry_voice_iv"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="10dp"
+            android:layout_height="16dp"
             android:layout_alignParentRight="true"
             android:layout_alignRight="@+id/search_edit"
             android:layout_centerVertical="true"

app_core/common/src/main/res/layout/activity_add_meeting.xml

@@ -22,7 +22,12 @@
                 android:text="@string/meeting_name"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_hine" />
-
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="1dp"
+                android:layout_toRightOf="@+id/name_tag"
+                android:text="*"
+                android:textColor="@color/red" />
             <ImageView
                 android:id="@+id/voice_name_iv"
                 android:layout_width="10dp"

app_modular/appme/src/main/java/com/uas/appme/settings/activity/ImageSettingActivity.java

@@ -25,7 +25,6 @@ import com.common.ui.ProgressDialogUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.SupportToolBarActivity;
-import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.lidroid.xutils.HttpUtils;
@@ -147,7 +146,7 @@ public class ImageSettingActivity extends SupportToolBarActivity implements View
                 @Override
                 public void onStart() {
                     progressDialog.show();
-                    ViewUtil.ToastMessage(ct, getString(com.uas.appworks.R.string.sending_picture)+"...");
+                    showToast( getString(com.uas.appworks.R.string.sending_picture)+"...");
                 }
                 @Override
                 public void onLoading(long total, long current, boolean isUploading) {
@@ -178,7 +177,7 @@ public class ImageSettingActivity extends SupportToolBarActivity implements View
 
                 @Override
                 public void onFailure(HttpException error, String msg) {
-                    ViewUtil.ToastMessage(ct, getString(com.uas.appworks.R.string.common_save_failed) + msg);
+                    showToast( getString(com.uas.appworks.R.string.common_save_failed) + msg);
                     progressDialog.dismiss();
                 }
             });

app_modular/appme/src/main/res/layout/wage_forgetps.xml

@@ -143,6 +143,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/delete"
                     android:textSize="20sp"
+                    android:visibility="gone"
                     android:textColor="@color/black"/>
                 <TextView
                     android:layout_marginTop="30dp"

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessDetailInfoActivity.java

@@ -50,11 +50,10 @@ import com.core.utils.CommonUtil;
 import com.core.utils.OnGetDrivingRouteResult;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
-import com.modular.apputils.utils.PopupWindowHelper;
 import com.core.widget.MyListView;
-import com.core.widget.crouton.Crouton;
 import com.core.widget.crouton.Style;
 import com.core.widget.view.steps.StepsView;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.uas.appworks.CRM.erp.adapter.StickyListAdapter;
 import com.uas.appworks.CRM.erp.model.SimpleData;
 import com.uas.appworks.OA.erp.activity.MissionActivity;
@@ -142,9 +141,9 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
     private void initIDS() {
         bt_fenpei = (Button) findViewById(R.id.bt_fenpei);
         bt_qiang = (Button) findViewById(R.id.bt_qiang);
-        bt_manage_date   = (Button) findViewById(R.id.bt_manage_date);
-        bt_zhuanyi  = (Button) findViewById(R.id.bt_zhuanyi);
-        bt_manage_go  = (Button) findViewById(R.id.bt_manage_go);
+        bt_manage_date = (Button) findViewById(R.id.bt_manage_date);
+        bt_zhuanyi = (Button) findViewById(R.id.bt_zhuanyi);
+        bt_manage_go = (Button) findViewById(R.id.bt_manage_go);
         crm_ll_followup = (LinearLayout) findViewById(R.id.crm_ll_followup);
         crm_ll_qiang = (LinearLayout) findViewById(R.id.crm_ll_qiang);
         crm_ll_manage = (LinearLayout) findViewById(R.id.crm_ll_manage);
@@ -152,17 +151,17 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
         ll_card_line = findViewById(R.id.ll_card_line);
         bc_from = (TextView) findViewById(R.id.bc_from);
         bc_remark = (TextView) findViewById(R.id.bc_remark);
-        bc_recorder  = (TextView) findViewById(R.id.bc_recorder);
+        bc_recorder = (TextView) findViewById(R.id.bc_recorder);
         bc_recorddate = (TextView) findViewById(R.id.bc_recorddate);
         bc_code = (TextView) findViewById(R.id.bc_code);
         bc_description = (TextView) findViewById(R.id.bc_description);
         bc_nichehouse = (TextView) findViewById(R.id.bc_nichehouse);
         bc_type = (TextView) findViewById(R.id.bc_type);
         bc_currentprocess = (TextView) findViewById(R.id.bc_currentprocess);
-        bc_lastdate= (TextView) findViewById(R.id.bc_lastdate);
+        bc_lastdate = (TextView) findViewById(R.id.bc_lastdate);
         bc_doman = (TextView) findViewById(R.id.bc_doman);
         bc_custname = (TextView) findViewById(R.id.bc_custname);
-        bc_address= (TextView) findViewById(R.id.bc_address);
+        bc_address = (TextView) findViewById(R.id.bc_address);
         bc_contact = (TextView) findViewById(R.id.bc_contact);
         bc_position = (TextView) findViewById(R.id.bc_position);
         bt_tel = (TextView) findViewById(R.id.bt_tel);
@@ -219,7 +218,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
     }
 
     private void initView() {
-       setTitle(getString(R.string.business_detail));
+        setTitle(getString(R.string.business_detail));
         Intent intent = getIntent();
         if (intent != null) {
             type = intent.getIntExtra("type", 0);
@@ -273,17 +272,17 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
 
     @Override
     public void onClick(View v) {
-        if (v.getId() == R.id.bt_manage_go){
+        if (v.getId() == R.id.bt_manage_go) {
             showPopupWindow(v);
-        }else if (v.getId() == R.id.stage_follow){
+        } else if (v.getId() == R.id.stage_follow) {
             startActivityForResult(new Intent(BusinessDetailInfoActivity.this, BusinessLessActivity.class)
                     .putExtra("type", 2)
                     .putExtra("code", bt_code)
                     .putExtra("process", bt_process)
                     .putExtra("doman", bt_doman), BUSINESS_FOLLOW_REQUEST);
-        }else if (v.getId() == R.id.bt_manage_date){
+        } else if (v.getId() == R.id.bt_manage_date) {
             isEnableClick(bt_code, 5);
-        }else if (v.getId() == R.id.add_mission){
+        } else if (v.getId() == R.id.add_mission) {
             if (destination == null) {
                 ToastUtil.showToast(ct, getString(R.string.crmmain_business) + getString(R.string.location_error_try_agen));
                 return;
@@ -291,7 +290,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
             float dis = Float.valueOf(BaiduMapUtil.getInstence().getDistance(destination));
             setEndTime(destination, dis);
             progressDialog.show();
-        }else if (v.getId() == R.id.bt_qiang){
+        } else if (v.getId() == R.id.bt_qiang) {
             progressDialog.show();
             String url = CommonUtil.getAppBaseUrl(ct) + "mobile/crm/ifoverrecv.action";
             Map<String, Object> stringMap = new HashMap<String, Object>();
@@ -300,9 +299,9 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
             LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
             headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
             ViewUtil.httpSendRequest(ct, url, stringMap, mHandler, headers, CAN_QIANG_NOT, null, null, "post");
-        }else if (v.getId() == R.id.bt_fenpei){
+        } else if (v.getId() == R.id.bt_fenpei) {
             startActivityForResult(new Intent(ct, DbfindList2Activity.class), 1);
-        }else if (v.getId() == R.id.bt_zhuanyi){
+        } else if (v.getId() == R.id.bt_zhuanyi) {
             startActivity(new Intent(ct, BusinessTransferActivity.class).putExtra("code", bt_code).putExtra("name", bc_nichehouse.getText().toString().trim()));
         }
     }
@@ -330,23 +329,16 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                         case 1:
                             final String nichehouse = StringUtil.getTextRexHttp(bc_nichehouse);
                             if (/*存在商机库已选择*/!StringUtil.isEmpty(nichehouse)) {
-                                new MaterialDialog.Builder(ct).title(R.string.common_dialog_title)
-                                        .content(R.string.sure_business_release)
-                                        .negativeText(R.string.common_cancel)
-                                        .positiveText(R.string.common_sure)
-                                        .contentGravity(GravityEnum.CENTER)
-                                        .callback(new MaterialDialog.ButtonCallback() {
-                                            @Override
-                                            public void onNegative(MaterialDialog dialog) {
-                                                super.onNegative(dialog);
-                                            }
-
+                                PopupWindowHelper.showAlart(BusinessDetailInfoActivity.this,
+                                        getString(R.string.common_dialog_title), getString(R.string.sure_business_release),
+                                        new PopupWindowHelper.OnSelectListener() {
                                             @Override
-                                            public void onPositive(MaterialDialog dialog) {
-                                                super.onPositive(dialog);
-                                                sendHttpResquestRelease(nichehouse, BUSINESS_RELEASE);
+                                            public void select(boolean selectOk) {
+                                                if (selectOk) {
+                                                    sendHttpResquestRelease(nichehouse, BUSINESS_RELEASE);
+                                                }
                                             }
-                                        }).build().show();
+                                        });
                             } else
                                 loadNichehouse();
                             popupWindow.dismiss();
@@ -542,8 +534,8 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                     loadStagePoints();
                     break;
                 case BUSINESS_QIANG:
-                   showToast( "成功抢得此商机，\n" +
-                                    "请到商机跟进中查看商机!\n");
+                    showToast("成功抢得此商机，\n" +
+                            "请到商机跟进中查看商机!\n");
                     new Handler().postDelayed(new Runnable() {
                         @Override
                         public void run() {

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/AddMeetingActivity.java

@@ -12,6 +12,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
@@ -141,7 +142,9 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                         ToastUtil.showToast(ct, R.string.error_try_agen);
                         return;
                     }
-                    ToastUtil.showToast(ct, message == null ? "" : StringUtil.getChinese(message));
+
+                    LogUtil.i("gong","message="+message);
+                    ToastUtil.showToast(ct, message == null ? "" : message);
                     break;
             }
 

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/MeetDetailsActivity.java

@@ -65,11 +65,13 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                 case ENDMEET:
                     ToastUtil.showToast(ct, R.string.meet_success_end);
                     status_tv.setText(R.string.ended);
+                    setSigninAble(false);
                     end_meet_tv.setVisibility(View.GONE);
                     break;
                 case SIGNNIN:
                     ToastUtil.showToast(ct, R.string.meet_signin_success);
                     isPlay = false;
+                    click_btn.setText(R.string.signined);
                     setSigninAble(false);
                     loadNumData();
                     break;
@@ -84,6 +86,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                             for (int i = 0; i < confirmed; i++)
                                 if (array.getJSONObject(i).containsKey("EM_CODE") && code.equals(array.getJSONObject(i).getString("EM_CODE"))) {
                                     isPlay = false;
+                                    click_btn.setText(R.string.signined);
                                     setSigninAble(false);
                                     break;
                                 }
@@ -149,7 +152,6 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
             click_btn.setBackgroundResource(R.drawable.selector_confirm_bg);
         } else {
             click_btn.setBackgroundResource(R.drawable.shape_corner_blue_unable_bg);
-            click_btn.setText(R.string.signined);
             click_btn.setClickable(false);
             click_btn.setFocusable(false);
             click_btn.setPadding(20, 20, 20, 20);
@@ -196,13 +198,18 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                 statusColor=R.color.meeting_start_status;
             }else {
                 statusColor=R.color.meeting_end_status;
+                if ("已结束".equals(str)){
+                   setSigninAble(false);
+                }
             }
+
             status_tv.setTextColor(getResources().getColor(statusColor));
             status_tv.setText(str);
         }else{
             status_tv.setText("");
         }
 
+
         //设置开始和结束时间的显示
         name_tv.setText(entity.getMa_theme() == null ? "" : entity.getMa_theme());
         long startLongTime = TimeUtils.f_str_2_long(entity.getMa_starttime());