upgrade

app/src/main/java/com/tianrun/sipcall/login/MainActivity.java

@@ -7,6 +7,7 @@ import android.graphics.Color;
 import android.media.AudioManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.Message;
 import android.view.View;
 import android.view.ViewGroup;
@@ -56,6 +57,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class MainActivity extends TrBaseActivity {
+    public static Handler mainHandler;
     TextView textVolum;
     TextView textSelfNum;
     QMUITabSegment mTabSegment;
@@ -71,6 +73,8 @@ public class MainActivity extends TrBaseActivity {
     ImageView buttonAddVol;
     ImageView buttonDelVol;
     DBHead currSelectData;
+    ImageView imageViewSelfStatus;
+    TextView textViewSelfStatus;
 
     GridView gridUser;
     List<Object> allUsers = new ArrayList<>();
@@ -119,6 +123,8 @@ public class MainActivity extends TrBaseActivity {
         setContentView(R.layout.activity_main);
         textVolum = findViewById(R.id.Volumne);
         textSelfNum = findViewById(R.id.textViewSelfNum);
+        imageViewSelfStatus = findViewById(R.id.imageViewSelfStatus);
+        textViewSelfStatus = findViewById(R.id.textViewSelfStatus);
         mTabSegment = findViewById(R.id.HeadList);
         gridUser = findViewById(R.id.GridUser);
         mContentViewPager = findViewById(R.id.contentViewPager);
@@ -144,6 +150,7 @@ public class MainActivity extends TrBaseActivity {
                 return true;
             }
         });
+        mainHandler = this.handler;
 
         ButtonDelGroup.setVisibility(View.INVISIBLE);
         StartMeetingVoice.setVisibility(View.INVISIBLE);
@@ -155,7 +162,7 @@ public class MainActivity extends TrBaseActivity {
         headers.add(currSelectData);
         initTabAndPager();
         Net.getGroups(null, null);
-        Net.getUsers(null, null);
+        getUsersData();
         checkBeforeMeetingState();
     }
 
@@ -243,6 +250,7 @@ public class MainActivity extends TrBaseActivity {
                 if (currSelectData.isAll()) {
                     allUsers.addAll(DBUser.allUser);
                     setUsers();
+                    Net.getUsers(null, null);
                 } else {
                     DBGroup group = DBGroup.getGroup(currSelectData.id);
                     if (group != null) {
@@ -290,6 +298,17 @@ public class MainActivity extends TrBaseActivity {
             buttonAddGroup.setVisibility(View.INVISIBLE);
             imageViewAddGroupIcon.setVisibility(View.INVISIBLE);
         }
+
+        if (DBUser.mySelf.isBusy()) {
+            imageViewSelfStatus.setColorFilter(Color.RED);
+            textViewSelfStatus.setText("通话中");
+        } else if (DBUser.mySelf.isOnline()) {
+            imageViewSelfStatus.setColorFilter(Color.GREEN);
+            textViewSelfStatus.setText("在线");
+        } else {
+            imageViewSelfStatus.setColorFilter(Color.GRAY);
+            textViewSelfStatus.setText("离线");
+        }
     }
 
     void chgVolum(View v, boolean isAdd) {
@@ -314,7 +333,7 @@ public class MainActivity extends TrBaseActivity {
     static Runnable runGetUsers = new Runnable() {
         @Override
         public void run() {
-            Net.getUsers(null, null);
+            getUsersData();
         }
     };
 
@@ -322,8 +341,9 @@ public class MainActivity extends TrBaseActivity {
         return gridUser;
     }
 
-    public void getUsersData() {
-        handler.postDelayed(runGetUsers, 3000);
+    public static void getUsersData() {
+        Net.getUsers(null, null);
+        mainHandler.postDelayed(runGetUsers, 3000);
     }
 
     public void setUsers() {
@@ -404,7 +424,7 @@ public class MainActivity extends TrBaseActivity {
                                     public void onClick(QMUIQuickAction quickAction, QMUIQuickAction.Action action, int position) {
                                         quickAction.dismiss();
                                         QMUITipDialog dialog = UIUtl.toastLoading("");
-                                        Net.kickMember4Group(currSelectData.audio_code, d.phone, new HttpUtl.CallBack() {
+                                        Net.deleteMember4Group(currSelectData.id, d.phone, new HttpUtl.CallBack() {
                                             @Override
                                             public void onRequestComplete(int cmd, String result, Object orgs) {
                                                 UIUtl.toastS("移除分机成功");
@@ -526,6 +546,7 @@ public class MainActivity extends TrBaseActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        mainHandler.removeCallbacks(runGetUsers);
     }
 
     @Override
@@ -535,12 +556,12 @@ public class MainActivity extends TrBaseActivity {
                 finish();
                 break;
             case Net.CMD_getUsers:
-                getUsersData();
                 if (currSelectData.isAll()) {
                     allUsers.clear();
                     allUsers.addAll(DBUser.allUser);
                     setUsers();
                 }
+                refreshView();
                 break;
             case Net.CMD_getGroupMenbers:
                 NetPkg pkg = (NetPkg) (m.obj);
@@ -555,8 +576,8 @@ public class MainActivity extends TrBaseActivity {
                         u.isAddFlag = true;
                         allUsers.add(u);
                     }
-                    setUsers();
                 }
+                setUsers();
                 break;
             case Net.CMD_getGroups:
                 refreshHeaders();
@@ -568,7 +589,6 @@ public class MainActivity extends TrBaseActivity {
     @Override
     protected void onStop() {
         super.onStop();
-        handler.removeCallbacks(runGetUsers);
     }
 
     public void addVolume(View view) {