合并

朱显松
2 parents 6691d9ea b38b31c0
Showing 5 changed files with 104 additions and 7 deletions
.idea/markdown-exported-files.xml
.idea/markdown-navigator.xml
.idea/markdown-navigator/profiles_settings.xml
app/src/main/java/com/cnlive/im/ui/ChatRoomActivity.java
app/src/main/java/com/cnlive/im/ui/PrivateChatActivity.java
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownExportedFiles">
+    <htmlFiles />
+    <imageFiles />
+    <otherFiles />
+  </component>
+</project>
 \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownProjectSettings">
+    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true">
+      <PanelProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
+      </PanelProvider>
+    </PreviewSettings>
+    <ParserSettings>
+      <PegdownExtensions>
+        <option name="ABBREVIATIONS" value="false" />
+        <option name="ANCHORLINKS" value="true" />
+        <option name="ATXHEADERSPACE" value="true" />
+        <option name="AUTOLINKS" value="true" />
+        <option name="DEFINITIONS" value="false" />
+        <option name="FENCED_CODE_BLOCKS" value="true" />
+        <option name="FOOTNOTES" value="false" />
+        <option name="HARDWRAPS" value="false" />
+        <option name="INSERTED" value="false" />
+        <option name="QUOTES" value="false" />
+        <option name="RELAXEDHRULES" value="true" />
+        <option name="SMARTS" value="false" />
+        <option name="STRIKETHROUGH" value="true" />
+        <option name="SUBSCRIPT" value="false" />
+        <option name="SUPERSCRIPT" value="false" />
+        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
+        <option name="SUPPRESS_INLINE_HTML" value="false" />
+        <option name="TABLES" value="true" />
+        <option name="TASKLISTITEMS" value="true" />
+        <option name="TOC" value="false" />
+        <option name="WIKILINKS" value="true" />
+      </PegdownExtensions>
+      <ParserOptions>
+        <option name="COMMONMARK_LISTS" value="false" />
+        <option name="DUMMY" value="false" />
+        <option name="EMOJI_SHORTCUTS" value="true" />
+        <option name="FLEXMARK_FRONT_MATTER" value="false" />
+        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="true" />
+        <option name="GFM_TABLE_RENDERING" value="true" />
+        <option name="GITBOOK_URL_ENCODING" value="false" />
+        <option name="GITHUB_EMOJI_URL" value="false" />
+        <option name="GITHUB_LISTS" value="true" />
+        <option name="GITHUB_WIKI_LINKS" value="true" />
+        <option name="JEKYLL_FRONT_MATTER" value="false" />
+        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
+      </ParserOptions>
+    </ParserSettings>
+    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true">
+      <GeneratorProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
+      </GeneratorProvider>
+      <headerTop />
+      <headerBottom />
+      <bodyTop />
+      <bodyBottom />
+    </HtmlSettings>
+    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssTextEnabled="false" isDynamicPageWidth="true">
+      <StylesheetProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
+      </StylesheetProvider>
+      <ScriptProviders />
+      <cssText />
+    </CssSettings>
+    <HtmlExportSettings updateOnSave="false" parentDir="$ProjectFileDir$" targetDir="$ProjectFileDir$" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetExt="" useTargetExt="false" noCssNoScripts="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" />
+    <LinkMapSettings>
+      <textMaps />
+    </LinkMapSettings>
+  </component>
+</project>
 \ No newline at end of file
+<component name="MarkdownNavigator.ProfileManager">
+  <settings default="" pdf-export="" />
+</component>
 \ No newline at end of file
@@ -66,6 +66,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         ChatUtil.setConnectStatusListener(connectStatusListener);
         ChatUtil.setOnChatRoomActionListener(chatRoomActionListener);
         ChatUtil.setOnReceiveMessageListener(receiveMessageListener);
+
         ChatUtil.setKickedOfflineListener(onKickedOfflineListener);
         Intent intent = getIntent();
         user_name_string = intent.getStringExtra("user_name_string");
@@ -155,9 +156,11 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         @Override
         public void processMessage(final CNMessage cnMessage) {
             Log.v(TAG, "receiveMessageListener" + "   " + cnMessage.getTargetId() + "   " + cnMessage.getContent());
+
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
+
                     try {
                         JSONObject jsonObject = new JSONObject(cnMessage.getContent().toString());
                         String type = (String) jsonObject.get("type");
@@ -179,6 +182,14 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     };
+
+
+
+
+
+
+
+
     //聊天室操作
     private IChat.OnChatRoomActionListener chatRoomActionListener = new IChat.OnChatRoomActionListener() {
         @Override
@@ -53,7 +53,7 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
     private EditText opposite_name_edit;
     private String user_name_string;
     private String user_id_string;
-    private int sendInfo = 1;
+    private int sendInfo = 3;
     private Button agree_btn;
     private Button reject_btn;
     private LinearLayout agree_reject_lin;
@@ -109,8 +109,12 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
                 } else if (sendInfo == 4) {
                     Toast.makeText(this, "对方已经拒绝不能发送", Toast.LENGTH_SHORT).show();
-                } else {
-
+                } else if (sendInfo == 3) {
+                    Toast.makeText(this, "还没有邀请对方呦~", Toast.LENGTH_SHORT).show();
+                }
+                else if (sendInfo == 5) {
+                    Toast.makeText(this, "你已经拒绝对方不能发送消息", Toast.LENGTH_SHORT).show();
+                }else {
                     if (messageContent.getText().toString().isEmpty()) {
                         Toast.makeText(this, "不能发送空消息呦~", Toast.LENGTH_SHORT).show();
                     } else {
@@ -118,11 +122,10 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
                         ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, objToJsonString, sendMessageListener);
                         messageContent.setText("");
                     }
-
-
                 }
                 break;
+
             case R.id.userId_btn_top:
                 //发送私聊消息，需要传入目标ID与发送的消息内容
                 if (user_id_edit.getText().toString().isEmpty()) {
@@ -217,13 +220,14 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
                             sendInfo = 2;
                             Toast.makeText(PrivateChatActivity.this, "申请已发送等待对方验证", Toast.LENGTH_SHORT).show();
                         } else if ("3".equals(type) && message.equals("拒绝")) {
+                            sendInfo=5;
                         } else if ("3".equals(type) && message.equals("同意")) {
+                            sendInfo=1;
                         } else if ("4".equals(type)) {
                             messageList.add(new ChatRoomActivity.CNMessageInfo(cnMessage, true));
                             chatListAdapter.updateItems(messageList);
                             chatListAdapter.notifyDataSetChanged();
                         }
-
                     } catch (JSONException e) {
@@ -265,10 +269,12 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
     private IChat.OnReceiveMessageListener receiveMessageListener = new IChat.OnReceiveMessageListener() {
         @Override
         public void processMessage(final CNMessage cnMessage) {
+
+
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
-
+                    Log.v("cnMessage", cnMessage.getTargetId() + "," + cnMessage.getUserInfo().getUserId());
                     JSONObject jsonObject = null;
                     try {
                         jsonObject = new JSONObject(cnMessage.getContent().toString());