瀏覽代碼

修改版本号

jixionghui 4 年之前
父節點
當前提交
44dceff792

+ 3 - 3
jixin/build.gradle

@@ -6,7 +6,7 @@ def releaseTime() {
 
 buildscript {
     ext {
-        appId = 'com.jixin.im' // app的包名,
+        appId = 'com.ftw.im.junyou' // app的包名,
         channel = 'client' // bugly上显示的渠道名,
 
         buglyAppId = '3062b077ab' // bugly配置的appId,
@@ -51,8 +51,8 @@ android {
 
     defaultConfig {
         applicationId appId
-        versionCode 325
-        versionName "3.2.5"
+        versionCode 100
+        versionName "1.0.0"
         minSdkVersion min_version
         targetSdkVersion target_version
 

+ 0 - 2
jixin/src/main/java/com/jixin/im/fragment/MucChatFragment.java

@@ -2409,9 +2409,7 @@ public class MucChatFragment extends EasyFragment implements
 
     @Override
     public void clickRedpacket() {
-//        Intent intent = new Intent(getContext(), MucSendRedPacketActivity.class);
         Intent intent = new Intent(getContext(), SendRedPacketActivity.class);
-//        intent.putExtra(SendRedPacketActivity.INTENT_ACCEPTOR_ID,roomId);
         intent.putExtra(SendRedPacketActivity.INTENT_ACCEPTOR_ID,mUseId);
         intent.putExtra(SendRedPacketActivity.INTENT_ROOM_ID,roomId);
         intent.putExtra(ChatType.INTENT_CHAT_TYPE,ChatType.CHAT_GROUP);

+ 10 - 4
jixin/src/main/java/com/jixin/im/ui/message/multi/GroupMoreFeaturesActivity.java

@@ -223,10 +223,16 @@ public class GroupMoreFeaturesActivity extends BaseActivity {
                 }
 
                 if (isSelectReceiver){
-                    Intent intent = new Intent();
-                    intent.putExtra("selectReceiver",roomMember);
-                    setResult(RESULT_OK,intent);
-                    finish();
+                    if ( getUser().getUserId().equals(roomMember.getUserId())){
+                        ToastUtil.showToast(getApplicationContext(),"专属红包不能发送给自己");
+
+                    }else {
+                        Intent intent = new Intent();
+                        intent.putExtra("selectReceiver",roomMember);
+                        setResult(RESULT_OK,intent);
+                        finish();
+
+                    }
                     return;
                 }
                 if (isDelete) {// 踢人