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

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/CheckWagesActivity.java

@@ -66,7 +66,7 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
     private long SecondT = 59;
     private boolean isRun = false;
     private Boolean codeTimeOut = false;
-
+    private String vecodeStr = "";
     private Handler timeHandler = new Handler(){
         @Override
         public void handleMessage(Message msg) {
@@ -249,6 +249,7 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
                     if (o.toString().contains("success") && JSON.parseObject(o.toString()).getBoolean("success")) {
                         Toast.makeText(ct,getString(R.string.msg_send_success),Toast.LENGTH_LONG).show();
 //                        mWagesCodeEt.setText(JSON.parseObject(o.toString()).getString("vecode")+"");
+                        vecodeStr = JSON.parseObject(o.toString()).getString("vecode");
                     }
 
                 }
@@ -264,6 +265,11 @@ public class CheckWagesActivity extends BaseActivity implements View.OnClickList
                 ToastMessage(getString(R.string.input_search_password));
                 return;
             }
+            LogUtil.i("vecodeStr="+vecodeStr +'\n' + "inputStr="+mWagesCodeEt.getText().toString());
+            if( !mWagesCodeEt.getText().toString().equals(vecodeStr)){
+                ToastMessage(getString(R.string.auth_code_error));
+                return;
+            }
             if (!CommonUtil.isNetWorkConnected(ct)){
                 ToastMessage(getString(R.string.common_notlinknet));
                 return;

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/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());