增加 app_launch_gh 公会成员启动应用 统计

core/src/main/java/com/yizhuan/xchat_android_core/statistic/protocol/StatisticsProtocol.java

@@ -46,7 +46,7 @@ public class StatisticsProtocol {
         FAMILY_FAMILY_SQUARE_CLICK("family_familySquare_click"), // 家族广场
         FAMILY_MY_FAMILY_CLICK("family_myFamily_click"), // 我的家族(家族页)
         MY_FAMILY_CLICK("my_family_click"), // 我的家族入口(我的页)
-
+        APP_LAUNCH_GH("app_launch_gh"), // 公会成员启动应用
         MY_HALL_CLICK("my_hall_click"), // 我的厅入口
         HALL_INCOME_CLICK("hall_income_click"), // 收入统计入口
         HALL_INCOME_WEEKLY_CLICK("hall_income_weekly_click"), // 切换每周统计

core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java

@@ -15,6 +15,8 @@ import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo;
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.OptionInfo;
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.OwnerHallInfo;
 import com.yizhuan.xchat_android_core.module_hall.hall.event.UserHallUpdateEvent;
+import com.yizhuan.xchat_android_core.statistic.StatisticManager;
+import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
 import com.yizhuan.xchat_android_core.user.UserModel;
 import com.yizhuan.xchat_android_core.user.bean.UserInfo;
 import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent;
@@ -64,7 +66,9 @@ public class HallModel extends BaseModel implements IHallModel {
         EventBus.getDefault().register(this);
     }
 
-    /**模厅ID*/
+    /**
+     * 模厅ID
+     */
     @Setter
     @Getter
     private long hallId;
@@ -75,6 +79,9 @@ public class HallModel extends BaseModel implements IHallModel {
         if (userInfo != null) {
             hallId = userInfo.getHallId();
             EventBus.getDefault().post(new UserHallUpdateEvent());
+            if (hallId != 0) {
+                StatisticManager.Instance().onEvent(StatisticsProtocol.Event.APP_LAUNCH_GH, "公会成员启动应用");
+            }
         }
     }
 
@@ -158,7 +165,9 @@ public class HallModel extends BaseModel implements IHallModel {
                 });
     }
 
-    /**获取厅信息*/
+    /**
+     * 获取厅信息
+     */
     @Override
     public Single<HallInfo> getHallInfo(long uid, long hallId) {
         return api.getHallInfo(AuthModel.get().getCurrentUid(), hallId)
@@ -166,8 +175,8 @@ public class HallModel extends BaseModel implements IHallModel {
     }
 
     @Override
-    public Single<ListMemberInfo> queryMembers(String queryString,int page,int pageSize) {
+    public Single<ListMemberInfo> queryMembers(String queryString, int page, int pageSize) {
-        return api.queryMembers(AuthModel.get().getCurrentUid(), queryString,page,pageSize)
+        return api.queryMembers(AuthModel.get().getCurrentUid(), queryString, page, pageSize)
                 .compose(RxHelper.handleCommon(ListMemberInfo::new));
     }
 
@@ -226,13 +235,14 @@ public class HallModel extends BaseModel implements IHallModel {
         return api.setHallManagerAuths(AuthModel.get().getCurrentUid(), managerUid, hallId, authStr)
                 .compose(RxHelper.handleSchAndExce())
                 .flatMap((Function<ServiceResult, SingleSource<String>>) response -> {
-                            if (response.isSuccess()) {
+                    if (response.isSuccess()) {
-                                return Single.just("success");
+                        return Single.just("success");
-                            } else {
+                    } else {
-                                return Single.error(new Throwable(response.getMessage()));
+                        return Single.error(new Throwable(response.getMessage()));
-                            }
+                    }
-                        });
+                });
     }
+
     /**
      * 高管邀请成员加入
      */
@@ -339,47 +349,53 @@ public class HallModel extends BaseModel implements IHallModel {
         @POST("/hall/quit")
         Single<ServiceResult> quit(@Query("uid") long uid);
 
-        /**模厅信息*/
+        /**
+         * 模厅信息
+         */
         @GET("/hall/getHallInfo")
         Single<ServiceResult<HallInfo>> getHallInfo(@Query("uid") long uid,
                                                     @Query("hallId") long hallId);
 
 
-        /** 按条件搜索成员 */
+        /**
+         * 按条件搜索成员
+         */
         @GET("/clan/listMember")
         Single<ServiceResult<ListMemberInfo>> queryMembers(@Query("uid") long uid,
                                                            @Query("queryStr") String queryString,
                                                            @Query("page") int page,
                                                            @Query("pageSize") int pageSize);
 
-        /** 添加高管 */
+        /**
+         * 添加高管
+         */
         @POST("/hall/setManager")
         Single<ServiceResult> setManager(@Query("uid") long uid, @Query("targetUid") long targetUid, @Query("hallId") long hallId);
 
-        /** 取消高管 */
+        /**
+         * 取消高管
+         */
         @POST("/hall/removeManager")
         Single<ServiceResult> removeManager(@Query("uid") long uid, @Query("targetUid") long targetUid, @Query("hallId") long hallId);
 
-        /** 获取高管列表 */
+        /**
+         * 获取高管列表
+         */
         @GET("/hall/getHallManager")
         Single<ServiceResult<ListMemberInfo>> getHallManager(@Query("hallId") long hallId);
 
         /**
          * 获取高管权限列表
          *
-         * @param uid
+         * @param uid        厅主id
-         * 厅主id
+         * @param managerUid 高管id
-         * @param managerUid
-         * 高管id
          */
         @POST("/hallAuth/getHallManagerAuths")
         Single<AuthListResult> getHallManagerAuths(@Query("uid") long uid,
                                                    @Query("managerUid") long managerUid);
 
         /**
-         *
+         * @param authStr member_join_manager,member_exit_manager,look_hall_income
-         * @param authStr
-         * member_join_manager,member_exit_manager,look_hall_income
          */
         @POST("/hallAuth/setHallManagerAuths")
         Single<ServiceResult> setHallManagerAuths(@Query("uid") long uid,
@@ -393,7 +409,7 @@ public class HallModel extends BaseModel implements IHallModel {
         @FormUrlEncoded
         @POST("/hall/invite")
         Single<ServiceResult<Void>> invite(@Field("uid") long uid,
-                                                     @Field("targetUid") long targetUid);
+                                           @Field("targetUid") long targetUid);
 
         /**
          * 获取厅主模厅信息
@@ -413,18 +429,16 @@ public class HallModel extends BaseModel implements IHallModel {
          */
         @GET("/clan/listMember")
         Single<ServiceResult<ListMemberInfo>> getClanAllMembers(@Query("uid") long uid,
-                                                            @Query("page") int page,
+                                                                @Query("page") int page,
-                                                            @Query("pageSize") int pageSize);
+                                                                @Query("pageSize") int pageSize);
 
         /**
-         *
          * 获取用户家族信息
          */
         @GET("/clan/getUserClanInfo")
         Single<ServiceResult<ClanInfo>> getUserClanInfo(@Query("uid") long uid);
 
         /**
-         *
          * 获取用户家族和公会信息
          */
         @GET("/clan/getUserHallAndClan")