TalkRecommendBean talkRecommendBean = null;
179 304
180 305 
    @Override
181 306 
    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
182 
        if (requestCode == -100 && resultCode == -100) {
307 
        super.onActivityResult(requestCode, resultCode, data);
308
309 
        if (requestCode == reqTopic && resultCode == -100) {
183 310 
            talkRecommendBean = (TalkRecommendBean) data.getSerializableExtra("topic");
184 311 
            if (talkRecommendBean != null) {
185 312 
                mPublishtopicChooseTopic.setText("# " + talkRecommendBean.name);

@ -188,7 +315,7 @@ public class PublishTopicActivity extends Activity implements OnClickListener {
188 315 
        } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
189 316 
            List<LocalMedia> selectList = PictureSelector.obtainMultipleResult(data);
190 317 
            if (selectList != null && selectList.size() > 0) {
191 
                LocalMedia media = selectList.get(0);
318 
                media = selectList.get(0);
192 319 
                if (TextUtils.isEmpty(media.getPath())) {
193 320 
                    return;
194 321 
                }

+ 22 - 3
app/src/main/java/com/electric/chargingpile/application/MainApplication.java
Просмотреть файл 

@ -21,6 +21,8 @@ import com.electric.chargingpile.gen.DaoMaster;
21 21 
import com.electric.chargingpile.gen.DaoSession;
22 22 
import com.electric.chargingpile.manager.ProfileManager;
23 23 
import com.electric.chargingpile.util.SharedPreferencesHelper;
24 
import com.mabeijianxi.smallvideorecord2.DeviceUtils;
25 
import com.mabeijianxi.smallvideorecord2.JianXiCamera;
24 26 
import com.mob.MobSDK;
25 27 
import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
26 28 
import com.nostra13.universalimageloader.core.DisplayImageOptions;

@ -201,7 +203,7 @@ public class MainApplication extends MultiDexApplication {
201 203
202 204 
        loginRemind();
203 205 
        setFestival();
204
206 
        initSmallVideo();
205 207 
    }
206 208
207 209 
    public static MainApplication getInstance() {

@ -219,11 +221,28 @@ public class MainApplication extends MultiDexApplication {
219 221 
        return mCurrentCity;
220 222 
    }
221 223
222 
    private static void setSph() {
223
224 
    /**
225 
     * 视频的初始化
226 
     */
227 
    public static void initSmallVideo() {
228 
        // 设置拍摄视频缓存路径
229 
        File dcim = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM);
230 
        if (DeviceUtils.isZte()) {
231 
            if (dcim.exists()) {
232 
                JianXiCamera.setVideoCachePath(dcim + "/mabeijianxi/");
233 
            } else {
234 
                JianXiCamera.setVideoCachePath(dcim.getPath().replace("/sdcard/",
235 
                        "/sdcard-ext/") + "/mabeijianxi/");
236 
            }
237 
        } else {
238 
            JianXiCamera.setVideoCachePath(dcim + "/mabeijianxi/");
239 
        }
240 
        // 初始化拍摄，遇到问题可选择开启此标记，以方便生成日志
241 
        //JianXiCamera.initialize(false, null);
224 242 
    }
225 243
226 244
245
227 246 
    public static void initImageLoader(Context context) {
228 247 
        ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(context).threadPoolSize(5).threadPriority(Thread.NORM_PRIORITY - 2).denyCacheImageMultipleSizesInMemory()
229 248 
                .discCacheFileNameGenerator(new Md5FileNameGenerator()).discCacheSize(50 * 1024 * 1024).memoryCacheSize(5 * 1024 * 1024).build();

+ 5 - 6
app/src/main/res/layout/activity_publishtopic.xml
Просмотреть файл 

@ -49,7 +49,6 @@
49 49 
            android:layout_width="match_parent"
50 50 
            android:layout_height="wrap_content"
51 51 
            android:orientation="vertical"
52 
            android:layout_marginBottom="50dp"
53 52 
            android:padding="15dp">
54 53
55 54 
            <EditText
 
@ -72,17 +71,17 @@
72 71
73 72 
            <RelativeLayout
74 73 
                android:id="@+id/item_video_ll"
75 
                android:visibility="gone"
76 
                android:layout_marginBottom="20dp"
77 74 
                android:layout_width="wrap_content"
78 
                android:layout_height="wrap_content">
75 
                android:layout_height="wrap_content"
76 
                android:layout_marginBottom="100dp"
77 
                android:visibility="gone">
79 78
80 79 
                <ImageView
81 80 
                    android:id="@+id/item_video"
82 81 
                    android:layout_width="wrap_content"
83 
                    android:minHeight="220dp"
82 
                    android:layout_height="wrap_content"
84 83 
                    android:minWidth="206dp"
85 
                    android:layout_height="wrap_content"   />
84 
                    android:minHeight="220dp" />
86 85
87 86 
                <View
88 87 
                    android:layout_width="40dp"

+ 3 - 24
videolibrary/picture_library/src/main/java/com/luck/picture/lib/PictureEditAudioActivity.java
Просмотреть файл 

@ -63,9 +63,9 @@ import static com.luck.picture.lib.tools.Constant.VIDEO_LENGTH_BYTE;
63 63 
 */
64 64 
public class PictureEditAudioActivity extends PictureBaseActivity implements View.OnClickListener {
65 65
66 
    private static final long MIN_CUT_DURATION = 1000L;// 最小剪辑时间1s
66 
    private static final long MIN_CUT_DURATION = 1500L;// 最小剪辑时间1s
67 67 
    private static final long MAX_CUT_DURATION = 15 * 1000L;//视频最多剪切多长时间
68 
    private static final int MAX_COUNT_RANGE = 10;//seekBar的区域内一共有多少张图片
68 
    private static final int MAX_COUNT_RANGE = 15;//seekBar的区域内一共有多少张图片
69 69
70 70 
    private static final String TAG = PictureEditAudioActivity.class.getSimpleName();
71 71 
@ -427,28 +427,6 @@ public class PictureEditAudioActivity extends PictureBaseActivity implements Vie
427 427 
                Log.e(TAG, "TANHQ===> ffmpeg裁剪 花时间： " + (System.currentTimeMillis() - startCropTime)
428 428 
                        + ",  getVideoPath() = " + onlyCompressOverBean.getVideoPath());
429 429
430 
//                startCompressTime = System.currentTimeMillis();
431 
//                if (onlyCompressOverBean.getVideoPath() == null || TextUtils.isEmpty(onlyCompressOverBean.getVideoPath())) {
432 
//                    return;
433 
//                }
434
435 
//                //压缩本地视频
436 
//                LocalMediaConfig.Buidler builder = new LocalMediaConfig.Buidler();
437 
//                LocalMediaConfig config = builder
438 
//                        .setVideoPath(onlyCompressOverBean.getVideoPath())
439 
//                        .captureThumbnailsTime(1)
440 
//                        .doH264Compress(new AutoVBRMode(Constant.AutoVBRMode))
441 
//                        .setFramerate(Constant.FRAMERATE)
442 
//                        .setScale(Constant.SCALE)
443 
//                        .build();
444 
//
445 
//
446 
//                LocalMediaCompress localMediaCompress = new LocalMediaCompress(config);
447 
//                final OnlyCompressOverBean onlyCompressOverBean11 = localMediaCompress.startCompress();
448 
//
449 
//                Log.e(TAG, "TANHQ===> ffmpeg 压缩花时间： " + (System.currentTimeMillis() - startCompressTime));
450
451
452 430 
                runOnUiThread(new Runnable() {
453 431 
                    @Override
454 432 
                    public void run() {
 
@ -650,6 +628,7 @@ public class PictureEditAudioActivity extends PictureBaseActivity implements Vie
650 628 
                        .setScale(Constant.SCALE_15)
651 629 
                        .build();
652 630
631
653 632 
                LocalMediaCompress localMediaCompress = new LocalMediaCompress(config);
654 633 
                localMediaCompress.setVideoOriginalWitdhHeight(videoWidth, videoHeight);
655 634 
                final OnlyCompressOverBean onlyCompressOverBean = localMediaCompress.startCompress();

+ 1 - 1
videolibrary/picture_library/src/main/java/com/luck/picture/lib/PicturePreviewActivity.java
Просмотреть файл 

@ -475,7 +475,7 @@ public class PicturePreviewActivity extends PictureBaseActivity implements View.
475 475
476 476 
            rlSelectBarLayout.setVisibility(View.VISIBLE);
477 477
478 
            if (media.getDuration() > 10 * 1000) {
478 
            if (media.getDuration() > 15 * 1000) {
479 479 
                video_layout.setVisibility(View.GONE);
480 480 
                video_layout10.setVisibility(View.VISIBLE);
481 481

+ 2 - 2
videolibrary/picture_library/src/main/res/layout/activity_picture_edit_audio.xml
Просмотреть файл 

@ -47,7 +47,7 @@
47 47 
            android:orientation="horizontal">
48 48
49 49 
            <View
50 
                android:layout_width="35dp"
50 
                android:layout_width="25dp"
51 51 
                android:layout_height="match_parent"
52 52 
                android:background="#66000000" />
53 53 
@ -60,7 +60,7 @@
60 60 
                android:orientation="vertical" />
61 61
62 62 
            <View
63 
                android:layout_width="35dp"
63 
                android:layout_width="25dp"
64 64 
                android:layout_height="match_parent"
65 65 
                android:background="#66000000" />
66 66 
        </LinearLayout>

聊聊首页分享按钮提示信息去除 · 8f21da4c4c - Gogs: Go Git Service
Home Explore Help
Register Sign In
dudu
/
cdzApp
Watch 2
Star 1
Fork 0
Code Issues 0 Pull Requests 0 Commits 117 Releases 18 Wiki
Browse Source

聊聊首页分享按钮提示信息去除

huyuguo 7 years ago
parent
77cfed7d5f
commit
8f21da4c4c
3 changed files with 24 additions and 3 deletions
Split View Show Diff Stats
  1. 8 0
      app/src/main/java/com/electric/chargingpile/activity/ChatActivity.java
  2. 13 1
      app/src/main/java/com/electric/chargingpile/activity/PublishItemsActivity.java
  3. 3 2
      app/src/main/java/com/electric/chargingpile/fragment/ChatRecommendFragment.java

+ 8 - 0
app/src/main/java/com/electric/chargingpile/activity/ChatActivity.java
View File 

@ -23,6 +23,7 @@ import com.electric.chargingpile.application.MainApplication;
23 23 
import com.electric.chargingpile.fragment.ChatRecommendFragment;
24 24 
import com.electric.chargingpile.fragment.QaActivityFragment;
25 25 
import com.electric.chargingpile.manager.ProfileManager;
26 
import com.electric.chargingpile.util.ToastUtil;
26 27 
import com.umeng.analytics.MobclickAgent;
27 28
28 29 
import java.util.List;
 
@ -312,4 +313,11 @@ public class ChatActivity extends AppCompatActivity implements View.OnClickListe
312 313 
            return false;
313 314 
        }
314 315 
    }
316
317 
    @Override
318 
    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
319 
        if (resultCode == ChatRecommendFragment.CLICK_PUBLISH_BTN) {
320 
            chatRecommendFragment.isFirst = false;
321 
        }
322 
    }
315 323 
}

+ 13 - 1
app/src/main/java/com/electric/chargingpile/activity/PublishItemsActivity.java
View File 

@ -18,6 +18,8 @@ import android.widget.Toast;
18 18
19 19 
import com.electric.chargingpile.R;
20 20 
import com.electric.chargingpile.application.MainApplication;
21 
import com.electric.chargingpile.fragment.ChatRecommendFragment;
22 
import com.electric.chargingpile.fragment.TalkRecommendFragment;
21 23 
import com.electric.chargingpile.manager.ProfileManager;
22 24 
import com.electric.chargingpile.util.BarColorUtil;
23 25 
import com.electric.chargingpile.util.ToastUtil;
 
@ -108,7 +110,7 @@ public class PublishItemsActivity extends AppCompatActivity implements View.OnCl
108 110 
                startActivity(intent);
109 111 
                break;
110 112 
            case R.id.share_publish_close:
111 
                finish();
113 
                backOperate();
112 114 
                break;
113 115 
            case R.id.publish_radio: // 用户发布内容规则radio
114 116 
                publishRadioClick();
 
@ -147,4 +149,14 @@ public class PublishItemsActivity extends AppCompatActivity implements View.OnCl
147 149 
            publish_radio.setImageDrawable(getResources().getDrawable(R.drawable.radio_unselected));
148 150 
        }
149 151 
    }
152
153 
    @Override
154 
    public void onBackPressed() {
155 
        backOperate();
156 
    }
157
158 
    private void backOperate() {
159 
        PublishItemsActivity.this.setResult(ChatRecommendFragment.CLICK_PUBLISH_BTN);
160 
        PublishItemsActivity.this.finish();
161 
    }
150 162 
}

+ 3 - 2
app/src/main/java/com/electric/chargingpile/fragment/ChatRecommendFragment.java
View File 

@ -41,6 +41,7 @@ import okhttp3.Call;
41 41
42 42 
public class ChatRecommendFragment extends Fragment implements View.OnClickListener {
43 43 
    private static final String TAG = "ChatRecommendFragment";
44 
    public static final int CLICK_PUBLISH_BTN = 1010;
44 45 
    private View view;
45 46 
    private XRefreshView refreshView;
46 47 
    private ImageView iv_ask;
 
@ -48,7 +49,7 @@ public class ChatRecommendFragment extends Fragment implements View.OnClickListe
48 49 
    private ChatRecommendAdapter chatRecommendAdapter;
49 50 
    private StaggeredGridLayoutManager layoutManager;
50 51 
    private ImageView chat_share_info_remind;
51 
    private boolean isFirst = false;
52 
    public boolean isFirst = false;
52 53 
    private int page = 1;
53 54 
    private LoadingDialog loadingDialog;
54 55 
@ -192,7 +193,7 @@ public class ChatRecommendFragment extends Fragment implements View.OnClickListe
192 193 
                if ("1000".equals(code)) {
193 194 
                    chat_share_info_remind.setVisibility(View.GONE);
194 195 
                    ProfileManager.getInstance().setFirstComeIn(getActivity(), "label");
195 
                    startActivity(new Intent(getActivity(), PublishItemsActivity.class));
196 
                    startActivityForResult(new Intent(getActivity(), PublishItemsActivity.class), CLICK_PUBLISH_BTN);
196 197 
                } else if ("8010".equals(code)) {
197 198 
                    startActivity(new Intent(getContext(), LoginActivity.class));
198 199 
                    ToastUtil.showToast(getContext(), desc, Toast.LENGTH_LONG);