1

app/src/main/java/com/sikey/skvideo/activity/MainActivity.java

@@ -152,7 +152,7 @@ public class MainActivity extends BaseActivity implements Listener.VideoListener
 
     private void initVideoManager() {
         Log.d(TAG, "initVideoManager: ");
-        String userId = DataManager.getVideoUserId(this);
+        String userId = DataManager.getWatchTicket(this);
         mVideoManager.init(this, userId);
     }
 

app/src/main/java/com/sikey/skvideo/manager/DataManager.java

@@ -7,7 +7,7 @@ import com.sikey.skvideo.utils.Macros;
 
 public class DataManager {
 
-    public static String getVideoUserId(Context context) {
+    public static String getWatchTicket(Context context) {
         if (Macros.DEBUG) {
             return "TK_1ONFZ8pNwa";
             //return "TK_QjZ0vC1tBa";
@@ -15,7 +15,7 @@ public class DataManager {
         return Settings.Global.getString(context.getContentResolver(), "sk_tk");
     }
 
-    public static void setVideoUserId(Context context, String value) {
+    public static void setWatchTicket(Context context, String value) {
         Settings.Global.putString(context.getContentResolver(), "sk_tk", value);
     }
 }

app/src/main/java/com/sikey/skvideo/manager/VideoManager.java

@@ -15,31 +15,31 @@ import com.juphoon.cloud.JCMediaDeviceVideoCanvas;
 import com.juphoon.cloud.LoginParam;
 import com.juphoon.cloud.MediaConfig;
 import com.sikey.skvideo.observer.Listener;
+import com.sikey.skvideo.utils.Constant;
 
 public class VideoManager implements JCClientCallback, JCCallCallback, JCMediaDeviceCallback {
     public final String TAG = "losion / skvideo :" + getClass().getSimpleName();
     private Listener.VideoListener mVideoListener = null;
-    private static final String APP_KEY_JUPHOON = "99c9063b9f54482e1d586e08";
     private JCClient mClient = null;
-    public JCMediaDevice mMediaDevice = null;
     public JCCall mCall = null;
-    private String mUserId = "";
+    public JCMediaDevice mMediaDevice = null;
+    private String mTicket = "";
 
-    public void init(Context context, String userId) {
-        Log.d(TAG, "init: " + userId);
+    public void init(Context context, String ticket) {
+        Log.d(TAG, "init: " + ticket);
         mVideoListener = (Listener.VideoListener)context;
-        mUserId = userId;
+        mTicket = ticket;
 
         boolean isOK = initJuphoon(context);
         if (isOK) {
-            loginJuphoon(userId);
+            loginJuphoon(ticket);
         }
     }
 
     // 初始化函数
     private boolean initJuphoon(Context context) {
         Log.d(TAG, "initJuphoon: ");
-        mClient = JCClient.create(context, APP_KEY_JUPHOON, this, null);
+        mClient = JCClient.create(context, Constant.APP_KEY_JUPHOON, this, null);
         mMediaDevice = JCMediaDevice.create(mClient,this);
         mCall = JCCall.create(mClient, mMediaDevice, this);
         mCall.updateMediaConfig(MediaConfig.generateByMode(MediaConfig.MODE_INTELLIGENT_HARDWARE_SMALL));
@@ -106,7 +106,7 @@ public class VideoManager implements JCClientCallback, JCCallCallback, JCMediaDe
             new Handler().postDelayed(new Runnable() {
                 @Override
                 public void run() {
-                    loginJuphoon(mUserId);
+                    loginJuphoon(mTicket);
                 }
             }, 2000);
         }
@@ -121,7 +121,7 @@ public class VideoManager implements JCClientCallback, JCCallCallback, JCMediaDe
     public void onClientStateChange(int state, int oldState) {
         Log.d(TAG, "onClientStateChange: " + state);
         if (state == JCClient.STATE_IDLE) { // 未登录
-            //loginJuphoon(this.mUserId);
+            //loginJuphoon(this.mTicket);
         }
     }
 

app/src/main/java/com/sikey/skvideo/utils/Constant.java

@@ -5,4 +5,6 @@ public class Constant {
     public final static String EXTRA_VIDEO_TARGET_ID = "ExtraVideoTargetId";
     public static int VIDEO_CALL_OUT = 1;
     public static int VIDEO_CALL_IN = 2;
+
+    public static String APP_KEY_JUPHOON = "99c9063b9f54482e1d586e08";
 }