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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java

@@ -72,7 +72,7 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
     public static final int LOCATION = 0x00a, DISPLAY = 0x00b;
 
     private int mType;
-    private String dailyexperience;
+    private String dailyexperience = null;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -113,10 +113,7 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
         dailyexperience = intent.getStringExtra("Experience");
         if(!TextUtils.isEmpty(dailyexperience)){
             mTextEdit.setText(dailyexperience);
-        }else{
-            return;
         }
-
         if (mType == 0) {
             mSelectImagePromptTv.setVisibility(View.GONE);
             mSelectImgLayout.setVisibility(View.GONE);
@@ -237,7 +234,12 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
         // 消息隐私范围 0=不可见；1=朋友可见；2=粉丝可见；3=广场
         params.put("visible", "3");
 
-        params.put("text", mTextEdit.getText().toString()+"[来自:工作日报>工作心得分享]");// 消息内容
+        if(!TextUtils.isEmpty(dailyexperience)){
+            params.put("text", mTextEdit.getText().toString()+"[来自:工作日报>工作心得分享]");// 消息内容
+        }else{
+            params.put("text", mTextEdit.getText().toString());// 消息内容
+        }
+
         if (!TextUtils.isEmpty(mImageData)) {
             params.put("images", mImageData);
         }
@@ -284,14 +286,14 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
                     setResult(RESULT_OK, intent);
 
                     if(!TextUtils.isEmpty(dailyexperience)){
-                        finish();
-                        Toast.makeText(getApplication(),"工作心得分享成功，稍后可到工作圈查看",Toast.LENGTH_LONG).show();
-                      /* new AlertDialog
+                        //Toast.makeText(getApplication(),"工作心得分享成功，稍后可到工作圈查看",Toast.LENGTH_LONG).show();
+                        //ToastMessage("工作心得分享成功，稍后可到工作圈查看");
+                       new AlertDialog
                                .Builder(mContext)
                                .setCancelable(false)  //设置点击对话框之外的对话框不消失
                                .setTitle("分享成功")
                                .setMessage("是否立即进入朋友圈查看")
-                               .setNegativeButton("不了，返回日报详情", new DialogInterface.OnClickListener() {
+                               .setNegativeButton("不了，继续编写日报", new DialogInterface.OnClickListener() {
                                    @Override
                                    public void onClick(DialogInterface dialog, int which) {
                                        finish();
@@ -303,12 +305,10 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
                                        Intent intent1 = new Intent(ct,BusinessCircleActivity.class);
                                        startActivity(intent1);
                                    }
-                               }).show();*/
-                   }
-
-                   else{
-                       finish();
-                   }
+                               }).show();
+                   }else{
+                        finish();
+                    }
                 }
                 ProgressDialogUtil.dismiss(mProgressDialog);
             }

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

@@ -87,7 +87,7 @@
 </LinearLayout>
     <View
         android:layout_width="match_parent"
-        android:layout_height="10dp"
+        android:layout_height="8dp"
         android:background="@color/gainsboro"
         />