合并冲突

陈硕
2 parents 7a9e45d8 915b1b18
Showing 6 changed files with 124 additions and 96 deletions
app/build.gradle
app/src/main/java/com/cnlive/gundam/main/presenter/AnchorInfoPresenter.java
app/src/main/java/com/cnlive/gundam/main/presenter/view/AnchorInfoView.java
app/src/main/java/com/cnlive/gundam/main/presenter/view/IAnchorInfoView.java
app/src/main/java/com/cnlive/gundam/main/ui/activity/MainActivity.java
signing.properties
@@ -22,12 +22,14 @@ android {
     }
     signingConfigs {
+        Properties props = new Properties();
+        props.load(new FileInputStream(rootProject.file('signing.properties')))
         myConfig {
-            storeFile file("cnlive_app.jks")
-            storePassword "000000"
-            keyAlias "CNliveApp"
-            keyPassword "000000"
             v2SigningEnabled false
+            storeFile file(props['KEYSTORE_FILE'])
+            storePassword props['KEYSTORE_PASSWORD']
+            keyAlias props['KEY_ALIAS']
+            keyPassword props['KEY_PASSWORD']
         }
     }
@@ -4,7 +4,7 @@ import android.content.Context;
 import com.cnlive.gundam.data.network.RetrofitUtil;
 import com.cnlive.gundam.data.network.util.SignUtil;
-import com.cnlive.gundam.main.presenter.view.AnchorInfoView;
+import com.cnlive.gundam.main.presenter.view.IAnchorInfoView;
 import com.cnlive.gundam.stream.model.ChannelInfoModel;
 import com.cnlive.libs.util.Config;
@@ -22,13 +22,13 @@ import retrofit2.Response;
 public class AnchorInfoPresenter {
-    private WeakReference<AnchorInfoView> viewRef;
+    private WeakReference<IAnchorInfoView> viewRef;
-    public AnchorInfoPresenter(AnchorInfoView view) {
+    public AnchorInfoPresenter(IAnchorInfoView view) {
         viewRef = new WeakReference<>(view);
     }
-    private AnchorInfoView getView(){
+    private IAnchorInfoView getView(){
         return viewRef == null ? null : viewRef.get();
     }
     /**
 package com.cnlive.gundam.main.presenter.view;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.support.v4.app.Fragment;
+import android.widget.Toast;
+
+import com.cnlive.gundam.R;
+import com.cnlive.gundam.main.ui.activity.WebViewActivity;
 import com.cnlive.gundam.stream.model.ChannelInfoModel;
+import com.cnlive.gundam.stream.ui.activity.StreamActivity;
+import com.cnlive.gundam.user.auth.UserService;
+import com.cnlive.libs.util.Config;
+
+/**
+ * Created by xiansong on 2017/7/10.
+ */
+
+public class AnchorInfoView implements IAnchorInfoView{
+
+    private Activity activity;
+
+    public AnchorInfoView(Activity activity){
+        this.activity = activity;
+    }
+
+    public AnchorInfoView(Fragment fragment){
+        this.activity = fragment != null ? fragment.getActivity() : null;
+    }
+
+    @Override
+    public void onAnchorInfo(ChannelInfoModel info) {
+        switch (info.getData().getStatus()) {
+            case -1:
+                Toast.makeText(activity, "主播不存在", Toast.LENGTH_SHORT).show();
+                showVerifiedDialog();
+                break;
+            case 1:
+                Toast.makeText(activity, "审核中，请耐心等待", Toast.LENGTH_SHORT).show();
+                break;
+            case 2:
+                Toast.makeText(activity, "审核失败", Toast.LENGTH_SHORT).show();
+                break;
+            case 3:
+                Toast.makeText(activity, "开启直播", Toast.LENGTH_SHORT).show();
+                startStreamActivity(info);
+                break;
+            case 4:
+                Toast.makeText(activity, "主播被禁用", Toast.LENGTH_SHORT).show();
+                break;
+        }
+    }
+
+    @Override
+    public void getAnchorFailure() {
+        Toast.makeText(activity, "主播信息认证失败", Toast.LENGTH_LONG).show();
+    }
-public interface AnchorInfoView {
     /**
-     * 获取主播信息成功
+     * 开启直播推流页面
      *
-     * @param channelInfo 主播信息
+     * @param info 主播信息
      */
-    void onAnchorInfo(ChannelInfoModel channelInfo);
+    private void startStreamActivity(ChannelInfoModel info) {
+        String activityId = System.currentTimeMillis() + "";
+        String channelId = info.getData().getChannelId();
+        String channelName = info.getData().getChannelName();
+        String coverImgUrl = info.getData().getCoverImgUrl();
+        StreamActivity.start(activity, activityId, channelId, channelName, coverImgUrl);
+    }
     /**
-     * 获取主播信息失败
+     * 显示主播申请页面
      */
-    void getAnchorFailure();
-}
 \ No newline at end of file
+    private void showVerifiedDialog() {
+        new AlertDialog.Builder(activity)
+                .setMessage("亲，完成实名认证就可以开播啦，现在就去认证吧？")
+                .setPositiveButton("去认证", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        dialogInterface.dismiss();
+                        String channelId = UserService.getInstance(activity).getActiveAccountInfo().getUid() + "";
+                        String base_url = activity.getString(Config.debug ? R.string.debug_verified_url : R.string.verified_url);
+                        String url = String.format(base_url, channelId, Config.getAppId());
+                        Intent intent = new Intent(activity, WebViewActivity.class);
+                        intent.putExtra("url", url);
+                        intent.putExtra("title", "主播认证");
+                        activity.startActivity(intent);
+                    }
+                })
+                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        dialogInterface.dismiss();
+                    }
+                }).show();
+    }
+
+}
+package com.cnlive.gundam.main.presenter.view;
+
+import com.cnlive.gundam.stream.model.ChannelInfoModel;
+
+public interface IAnchorInfoView {
+    /**
+     * 获取主播信息成功
+     *
+     * @param channelInfo 主播信息
+     */
+    void onAnchorInfo(ChannelInfoModel channelInfo);
+
+    /**
+     * 获取主播信息失败
+     */
+    void getAnchorFailure();
+}
 \ No newline at end of file
 package com.cnlive.gundam.main.ui.activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.widget.Toast;
 import com.cnlive.gundam.R;
 import com.cnlive.gundam.databinding.ActivityMainBinding;
@@ -18,15 +15,11 @@ import com.cnlive.gundam.main.ui.fragment.LiveFragment;
 import com.cnlive.gundam.main.ui.fragment.UGCListFragment;
 import com.cnlive.gundam.main.ui.widget.FragmentTabHost;
 import com.cnlive.gundam.main.utils.SharedPreferencesHelper;
-import com.cnlive.gundam.stream.model.ChannelInfoModel;
-import com.cnlive.gundam.stream.ui.activity.StreamActivity;
 import com.cnlive.gundam.stream.util.FileUtil;
 import com.cnlive.gundam.user.activity.LoginActivity;
 import com.cnlive.gundam.user.auth.UserService;
 import com.cnlive.gundam.user.model.User;
 import com.cnlive.gundam.video.view.VideoView;
-import com.cnlive.libs.util.Config;
-import com.cnlive.libs.util.ProbeUtil;
 import java.util.Arrays;
@@ -34,11 +27,10 @@ import java.util.Arrays;
  * Created by xiansong on 2017/6/27.
  */
-public class MainActivity extends AppCompatActivity implements FragmentTabHost.OnSetCurrentTabListener, AnchorInfoView {
+public class MainActivity extends AppCompatActivity implements FragmentTabHost.OnSetCurrentTabListener {
     private AnchorInfoPresenter mAnchorInfoPresenter;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -53,13 +45,10 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
                 FragmentTabHost.newTab("config", R.layout.indicator_main_mine, ConfigFragment.class)
         ));
-        mAnchorInfoPresenter = new AnchorInfoPresenter(this);
+        mAnchorInfoPresenter = new AnchorInfoPresenter(new AnchorInfoView(this));
         //加载水印图片
         FileUtil.copyFile(this, "cnlive_logo.png");
-
-        ProbeUtil.probeSDK("startupCount");
-
     }
     @Override
@@ -84,74 +73,6 @@ public class MainActivity extends AppCompatActivity implements FragmentTabHost.O
         }
     }
-
-    @Override
-    public void onAnchorInfo(ChannelInfoModel info) {
-        switch (info.getData().getStatus()) {
-            case -1:
-                Toast.makeText(this, "主播不存在", Toast.LENGTH_SHORT).show();
-                showVerifiedDialog();
-                break;
-            case 1:
-                Toast.makeText(this, "审核中，请耐心等待", Toast.LENGTH_SHORT).show();
-                break;
-            case 2:
-                Toast.makeText(this, "审核失败", Toast.LENGTH_SHORT).show();
-                break;
-            case 3:
-                Toast.makeText(this, "开启直播", Toast.LENGTH_SHORT).show();
-                startStreamActivity(info);
-                break;
-            case 4:
-                Toast.makeText(this, "主播被禁用", Toast.LENGTH_SHORT).show();
-                break;
-        }
-    }
-
-    @Override
-    public void getAnchorFailure() {
-        Toast.makeText(this, "主播信息认证失败", Toast.LENGTH_LONG).show();
-    }
-
-    /**
-     * 开启直播推流页面
-     *
-     * @param info 主播信息
-     */
-    private void startStreamActivity(ChannelInfoModel info) {
-        String activityId = System.currentTimeMillis() + "";
-        String channelId = info.getData().getChannelId();
-        String channelName = info.getData().getChannelName();
-        String coverImgUrl = info.getData().getCoverImgUrl();
-        StreamActivity.start(this, activityId, channelId, channelName, coverImgUrl);
-    }
-
-    /**
-     * 显示主播申请页面
-     */
-    private void showVerifiedDialog() {
-        new AlertDialog.Builder(this)
-                .setMessage("亲，完成实名认证就可以开播啦，现在就去认证吧？")
-                .setPositiveButton("去认证", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int i) {
-                        dialogInterface.dismiss();
-                        String channelId = UserService.getInstance(MainActivity.this).getActiveAccountInfo().getUid() + "";
-                        String url = String.format(getString(Config.debug ? R.string.debug_verified_url : R.string.verified_url), channelId, Config.getAppId());
-                        Intent intent = new Intent(MainActivity.this, WebViewActivity.class);
-                        intent.putExtra("url", url);
-                        intent.putExtra("title", "主播认证");
-                        startActivity(intent);
-                    }
-                })
-                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int i) {
-                        dialogInterface.dismiss();
-                    }
-                }).show();
-    }
-
     @Override
     protected void onDestroy() {
         super.onDestroy();
+KEYSTORE_FILE=cnlive_app.jks
+KEYSTORE_PASSWORD=000000
+KEY_ALIAS=CNliveApp
+KEY_PASSWORD=000000
 \ No newline at end of file